data_tables-responder 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d023fd29dc4a27f1f0b86fe48f778923a768eb1c
-  data.tar.gz: 70197f9c9f67a15028f43653080c3edc7b29b64d
+  metadata.gz: a83b526e4f4224368d73806333dff683042e76cc
+  data.tar.gz: 135113fa38ca6d8df40315a0d5cde7372cf92739
 SHA512:
-  metadata.gz: 193ca253646034ee7746b5821008a9939f0ab8a7816bf7d231c5dda2ff62ed537cdd8255ac333ae315de55dd95cbb16bf1062f335e9b3cf6e2cbe6839cb45ccd
-  data.tar.gz: 9ff1044bc705159ea5b6105d804f9cadb144be9f4639820eb58659125aa291556604a268960c659225b88a0f8e8a5d39e68ed329696762069a734f2602781efb
+  metadata.gz: a403b7f8443f716245bb1a2c1714586d9f08c899ded9378bd742cc939a667ebd2a9cf0a0c738480ccb55157a0e6dacf5785419daa5964d52b50042341216f0f3
+  data.tar.gz: 64d5519e436855129d00dd227c79b9fabd39e60fec2676e311338bace7df56620925c2df7d0ad82bbdde4b9b462ff5867f296676e07880f8cab94619d63fb4df

data/.travis.yml

@@ -0,0 +1,18 @@
+language: ruby
+sudo: false
+rvm:
+  - 2.3.1
+  - 2.4.0
+cache: bundler
+script:
+  - bundle exec rspec
+
+after_success:
+  - bundle exec codeclimate-test-reporter
+
+addons:
+  postgresql: "9.3"
+
+env:
+  - RSPEC_VERSION="<2.99"
+  - RSPEC_VERSION="~>3.0

data/data_tables-responder.gemspec

@@ -34,7 +34,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'activerecord', rails_versions
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_development_dependency 'database_cleaner'
+  spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/data_tables/modules/order.rb

@@ -4,20 +4,18 @@ module DataTables
 
       attr_reader :scope, :context
 
-      def initialize(scope, request_parameters)
+      def initialize(model, scope, params)
         @scope = scope.dup
-        @request_parameters = request_parameters
+        @model = model
+        @params = params
       end
 
       def order
-        # default_order = @request_parameters.dig(:order, :value)
-
-        model = @scope.try(:model) || @scope
-        columns = orderable_columns(@request_parameters[:order], @request_parameters[:columns])
+        columns = orderable_columns(@params[:order], @params[:columns])
 
         orders = DataTables::Responder.flat_keys_to_nested columns
 
-        order_by, join_hash = build_order(model, orders)
+        order_by, join_hash = build_order(@model, orders)
 
         @scope = @scope.joins(join_hash)
 
@@ -49,13 +47,13 @@ module DataTables
       protected
 
       def orderable_columns(orders, columns)
-        sums = {}
-        (orders || []).inject(sums) do |sum, order|
-          if (name = columns[order[:column]][:data]).present?
-            sum[name] = order[:dir]
+        orders&.inject({}) do |collection, order|
+          column = columns[order[:column]]
+          if (column[:orderable] && column[:data].present?)
+            collection[column[:data]] = order[:dir]
           end
+          collection
         end
-        sums
       end
 
     end

data/lib/data_tables/modules/pagination.rb

@@ -3,21 +3,22 @@ module DataTables
   module Modules
     class Pagination
 
-      FIRST_PAGE = 1
+      FIRST_PAGE = '0'
+      DEFAULT_LENGTH = '10'
 
-      attr_reader :original_scope, :filtered_scope, :context
+      attr_reader :scope, :context
 
-      def initialize(original_scope, filtered_scope, request_parameters)
-        @original_scope = original_scope
-        @filtered_scope = filtered_scope
-        @request_parameters = request_parameters
+      def initialize(model, scope, params)
+        @scope = scope.dup
+        @model = model
+        @params = params
       end
 
       def paginate
-        start = (@request_parameters[:start] || '0').to_i
-        length = (@request_parameters[:length] || '10').to_i
+        start = (@params[:start] || FIRST_PAGE).to_i
+        length = (@params[:length] || DEFAULT_LENGTH).to_i
         page = (start / length)
-        @filtered_scope = @filtered_scope.offset(page * length).limit(length)
+        @scope.offset(page * length).limit(length)
       end
 
     end

data/lib/data_tables/modules/search.rb

@@ -4,20 +4,18 @@ module DataTables
 
       attr_reader :scope, :context
 
-      def initialize(scope, request_parameters)
-        @scope = scope
-        @request_parameters = request_parameters
+      def initialize(model, scope, params)
+        @scope = scope.dup
+        @model = model
+        @params = params
       end
 
       def search
-        default_search = @request_parameters.dig(:search, :value)
-
-        model = @scope.try(:model) || @scope
-        columns = searchable_columns(default_search)
+        columns = searchable_columns(@params.dig(:search, :value), @params[:columns])
 
         searches = DataTables::Responder.flat_keys_to_nested columns
 
-        search_by, join_hash = build_search(model, searches)
+        search_by, join_hash = build_search(@model, searches)
 
         @scope = @scope.joins(join_hash)
 
@@ -55,7 +53,7 @@ module DataTables
           # I'm pretty sure this is safe from SQL Injection
           model.arel_table[column].matches("%#{query}%")
         when :integer
-          model.arel_table[column].eq(value) if value = query&.to_i
+          value = query&.to_i and model.arel_table[column].eq(value)
         when :datetime
           datetime = Time.parse(query)
           range = (datetime-1.second)..(datetime+1.second)
@@ -67,18 +65,15 @@ module DataTables
         result
       end
 
-      def searchable_columns(default_search)
-        @searchable_columns = {}
-        @request_parameters[:columns]&.inject(@searchable_columns) do |a, b|
-          if (b[:searchable] && b[:data].present?)
-            if ((value = b.dig(:search, :value).present? ? b.dig(:search, :value) : default_search).present?)
-              a[b[:data]] = value
+      def searchable_columns(default_search, columns)
+        columns&.inject({}) do |collection, column|
+          if (column[:searchable] && column[:data].present?)
+            if ((value = column.dig(:search, :value).present? ? column.dig(:search, :value) : default_search).present?)
+              collection[column[:data]] = value
             end
           end
-          a
+          collection
         end
-
-        @searchable_columns
       end
 
     end

data/lib/data_tables/responder/version.rb

@@ -1,5 +1,5 @@
 module DataTables
   module Responder
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
   end
 end

data/lib/data_tables/responder.rb

@@ -18,12 +18,11 @@ module DataTables
 
       filtered_scope = original_scope&.dup || model.none
 
-      filtered_scope = order(filtered_scope, params)
+      filtered_scope = order(model, filtered_scope, params)
 
-      filtered_scope = search(filtered_scope, params)
+      filtered_scope = search(model, filtered_scope, params)
 
-      # Rails.logger.warn "SEARCH BY: #{search_by}"
-      filtered_scope = paginate(original_scope, filtered_scope, params)
+      filtered_scope = paginate(model, filtered_scope, params)
     end
 
     def self.flat_keys_to_nested(hash)
@@ -34,16 +33,16 @@ module DataTables
       end
     end
 
-    def self.paginate(original_scope, filtered_scope, params)
-      Modules::Pagination.new(original_scope, filtered_scope, params).paginate
+    def self.paginate(model, filtered_scope, params)
+      Modules::Pagination.new(model, filtered_scope, params).paginate
     end
 
-    def self.search(filtered_scope, params)
-      Modules::Search.new(filtered_scope, params).search
+    def self.search(model, filtered_scope, params)
+      Modules::Search.new(model, filtered_scope, params).search
     end
 
-    def self.order(filtered_scope, params)
-      Modules::Order.new(filtered_scope, params).order
+    def self.order(model, filtered_scope, params)
+      Modules::Order.new(model, filtered_scope, params).order
     end
 
   end

data/lib/data_tables.rb

@@ -1,6 +1,6 @@
 
 module DataTables
   def self.root
-    @root ||= Pathname.new(File.dirname(File.expand_path(File.dirname(__FILE__), '/../')))
+    @root ||= Pathname.new(File.expand_path('../', File.dirname(__FILE__)))
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_tables-responder
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -98,20 +98,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +163,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md