data_tables 0.1.18 → 0.1.19

data/data_tables.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'data_tables'
-  s.version     = '0.1.18'
+  s.version     = '0.1.19'
   s.date        = Time.now.strftime("%Y-%m-%d")
   s.summary     = "Rails friendly interface into DataTables"
   s.description = "DataTables for Rails"

data/lib/data_tables.rb

@@ -313,12 +313,12 @@ module DataTablesController
 
             if named_scope
                 objects = modelCls.send(named_scope, *args).paginate(:page => current_page,
-                                            :order => order, 
+                                            :order => order,
                                             :conditions => conditions.join(" AND "),
                                             :per_page => params[:iDisplayLength])
             else
                 objects = modelCls.paginate(:page => current_page,
-                                            :order => order, 
+                                            :order => order,
                                             :conditions => conditions.join(" AND "),
                                             :per_page => params[:iDisplayLength])
             end
@@ -388,8 +388,11 @@ module DataTablesController
       end
     elsif column[:attribute]
       val = instance.send(column[:attribute].to_sym)
-      return I18n.t(val.to_s.to_sym, :default => val.to_s) if not val.blank?
-      return ''
+      if !val.blank? || val == false
+        return I18n.t(val.to_s.to_sym, :default => val.to_s)
+      else
+        return ''
+      end
     end
     return "value not found"
   end

data/spec/data_tables_spec.rb

@@ -1,15 +1,18 @@
 require 'spec_helper'
 
 describe 'data_tables' do
+
   before :each do
-    if DEBUG
-      ExceptOptionController.any_instance.stub_chain(:logger, :debug){ |*args| puts args.first }
-      ExceptOptionController.any_instance.stub_chain(:logger, :info){ |*args| puts args.first }
-    else
-      ExceptOptionController.any_instance.stub(:logger).and_return(double("Logger").as_null_object)
+    [ExceptOptionController, SearchTypeController].each do |controller|
+      if DEBUG
+        controller.any_instance.stub_chain(:logger, :debug){ |*args| puts args.first }
+        controller.any_instance.stub_chain(:logger, :info){ |*args| puts args.first }
+      else
+        controller.any_instance.stub(:logger).and_return(double("Logger").as_null_object)
+      end
+      controller.any_instance.stub(:params).and_return({iSortCol_0: 1})
+      controller.any_instance.stub(:render)
     end
-    ExceptOptionController.any_instance.stub(:params).and_return({})
-    ExceptOptionController.any_instance.stub(:render)
     ActiveRecord::Base.stub_chain(:connection, :schema_search_path).and_return("public")
   end
 
@@ -32,29 +35,64 @@ describe 'data_tables' do
   end
 
   let(:instance){ExceptOptionController.new.dummy_class_source}
+  let(:search_type_instance){SearchTypeController.new.search_type_class_source}
   let(:index_name){ "#{Tire::Model::Search.index_prefix}dummy_class" }
 
-  context "Redis Models" do
-    context "with ElasticSearch" do
-      {"iTotalDisplayRecords" => 2, "iTotalRecords" => 2}.each do |k,v|
-        it "respects datatables' except to calculate #{k} (#{v})" do
-          # create index
-          data = [{ id: 5002, name: 'not_valid', domain: 'public' },
-                  { id: 561, name: 'Native AP VLAN', domain: 'public' },
-                  { id: 56, name: 'valid', domain: 'public' }]
-          save_elasticsearch(index_name, data)
-
-          ExceptOptionController.any_instance.should_receive(:render) do |*args|
-            arg = JSON.parse(args.first[:text])
-            arg[k].should == v
-          end
-          instance
+  context "total records" do
+    {"iTotalDisplayRecords" => 2, "iTotalRecords" => 2}.each do |k,v|
+      it "respects datatables' except to calculate #{k} (#{v})" do
+        data = [{ id: 5002, name: 'not_valid', domain: 'public' },
+                { id: 561, name: 'Native AP VLAN', domain: 'public' },
+                { id: 56, name: 'valid', domain: 'public' }]
+        save_elasticsearch(index_name, data)
+
+        ExceptOptionController.any_instance.should_receive(:render) do |*args|
+          arg = JSON.parse(args.first[:text])
+          arg[k].should == v
         end
+        instance
       end
     end
   end
-  context "Elastic Search Models" do
-  end
-  context "Postgres Models" do
+
+  context "mapping types sorting" do
+    before do
+      @data = %w[192.168.102.36:10.0.0.30 192.168.102.30 192.168.102.47]
+      SearchTypeClass.index.delete
+      SearchTypeClass.create_elasticsearch_index
+      @data.each do |d|
+        SearchTypeClass.create ipaddr: d, domain: :public
+      end
+      index_name = SearchTypeClass.index_name
+      Tire.index(index_name){refresh}
+    end
+
+    it "sorts IP addresses asc correctly" do
+      SearchTypeController.any_instance.stub(:params).and_return({
+        iSortCol_0: 0,
+        sSortDir_0: 'asc'
+      })
+
+      SearchTypeController.any_instance.should_receive(:render) do |*args|
+        data = JSON.parse(args.first[:text])["aaData"]
+        ips = data.map{|i| i[0]}
+        ips.should == @data.sort
+      end
+      search_type_instance
+    end
+
+    it "sorts IP addresses desc correctly" do
+      SearchTypeController.any_instance.stub(:params).and_return({
+        iSortCol_0: 0,
+        sSortDir_0: 'desc'
+      })
+
+      SearchTypeController.any_instance.should_receive(:render) do |*args|
+        data = JSON.parse(args.first[:text])["aaData"]
+        ips = data.map{|i| i[0]}
+        ips.should == @data.sort.reverse
+      end
+      search_type_instance
+    end
   end
 end

data/spec/models/condition_model.rb

@@ -1,6 +1,15 @@
 class DummyClass < Ohm::Model
 end
 
+class SearchTypeClass
+  include Tire::Model::Search
+  include Tire::Model::Persistence
+
+  property :name, type: 'string'
+  property :ipaddr, type: 'string', index: 'not_analyzed'
+  property :domain, type: 'string'
+end
+
 class ConditionModel
   include DataTablesController
   datatables_source(:dummy_class_source, :dummy_class,
@@ -22,4 +31,11 @@ class ExceptOptionController
                                  {:name =>"Access Points",
                                    :method => :location_statuses_accesspoint_list}
                                 ],:except => [['name','Native AP VLAN']])
-end
+end
+
+class SearchTypeController
+  include DataTablesController
+  datatables_source(:search_type_class_source, :search_type_class,
+                :columns => [:ipaddr, :name],
+                :conditions => ['id!=5002',"name!= 'Native AP VLAN'"])
+end

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ Dir[File.join(APP_ROOT, "spec/models/*.rb")].each {|f| require f}
 
 DEBUG = false
 
-Tire.configure { logger STDOUT } if DEBUG
+Tire.configure { logger STDOUT, level: :debug } if DEBUG
 Tire::Model::Search.index_prefix('test_datatable_')
 
 RSpec.configure do |config|
@@ -21,4 +21,4 @@ RSpec.configure do |config|
   config.after(:each) do
     #Tire.index("#{Tire::Model::Search.index_prefix}*"){delete}
   end
-end
+end

metadata

@@ -2,7 +2,7 @@
 name: data_tables
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Duane Compton
@@ -13,19 +13,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rspec
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.10'
     none: false
-  prerelease: false
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.26
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails friendly interface into DataTables