Extract methods, add tests

Nicolas Rodriguez · Nicolas Rodriguez · commit c0fa680f326d · 2017-04-15T04:27:43.000+02:00
diff --git a/lib/ajax-datatables-rails/base.rb b/lib/ajax-datatables-rails/base.rb
@@ -34,10 +34,10 @@ def get_raw_records
       fail(NotImplemented, raw_records_error_text)
     end
 
-    def as_json(options = {})
+    def as_json(*)
       {
-        recordsTotal: get_raw_records.count(:all),
-        recordsFiltered: get_raw_records.model.from("(#{filter_records(get_raw_records).except(:limit, :offset, :order).to_sql}) AS foo").count,
+        recordsTotal: records_total_count,
+        recordsFiltered: records_filtered_count,
         data: sanitize(data)
       }
     end
@@ -87,6 +87,14 @@ def retrieve_records
       records
     end
 
+    def records_total_count
+      get_raw_records.count(:all)
+    end
+
+    def records_filtered_count
+      get_raw_records.model.from("(#{filter_records(get_raw_records).except(:limit, :offset, :order).to_sql}) AS foo").count
+    end
+
     # Private helper methods
     def load_orm_extension
       case config.orm
diff --git a/spec/ajax-datatables-rails/base_spec.rb b/spec/ajax-datatables-rails/base_spec.rb
@@ -88,8 +88,21 @@
         end
       end
     end
+
+    describe '#as_json' do
+      it 'should return a hash' do
+        datatable = ComplexDatatableHash.new(view)
+        create_list(:user, 5)
+        data = datatable.as_json
+        expect(data[:recordsTotal]).to eq 5
+        expect(data[:recordsFiltered]).to eq 5
+        expect(data[:data]).to be_a(Array)
+        expect(data[:data].size).to eq 5
+      end
+    end
   end
 
+
   context 'Private API' do
 
     let(:view) { double('view', params: sample_params) }
