effective_datatables 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 698076a0613349e6b87650757f70464530e59933
-  data.tar.gz: 6ec43352f2160e31f382dcccfdc5091537f0fcdb
+  metadata.gz: 4cc8bee1f23053d54e283c7300a106c2357014c4
+  data.tar.gz: e433bbad08218dc5e13c2ffc58449dbec5a7cefa
 SHA512:
-  metadata.gz: bf5374370d10c21eda392ea2db88460eeb676de33a7e6e3f0236940955aa6a7399e14c3bbc52c902d390df5f3154b567a443819752b0ec4b8c19610964bd3aee
-  data.tar.gz: 0dfdf316d031c7d34c2e2fa0b338d1dde5560375fb14bc9e319129dcc77e2d7845ce3004c276e9f3527dd0f3c760ab05bf302cf362f56b295b7d3637aeed4169
+  metadata.gz: d360f64c24af9e92337d89c86b3670e3b6d2b7ec1bd1fb1bd66b6ef358da4cb23de97492edc487cdcd5628a6d02369e127b4b4b95e3d6c4a2a45f9623b740935
+  data.tar.gz: 692685e7a4543fbf591754fd615f1b2b4ccad5bbf55e39806c099b1c2e8ce27b4a3f1e5c1266ef688744b52128446abc1dad907b78954f1b7ee4a65f5bbc8035

data/README.md

@@ -555,6 +555,12 @@ def collection
 end
 ```
 
+As well, you need to change the controller where you define the datatable to be aware of the scope params.
+
+```ruby
+@datatable = Effective::Datatables::Posts.new(params[:scopes])
+```
+
 So initially, the `:start_date` will have the value of `Time.zone.now-3.months` and when submitted by the form, the value will be set there.
 
 The form value will come back as a string, so you may need to `Time.zone.parse` that value.

data/app/controllers/effective/datatables_controller.rb

@@ -5,8 +5,9 @@ module Effective
     # This will respond to both a GET and a POST
     def show
       attributes = (params[:attributes].presence || {}).merge(referer: request.referer)
+      scopes = (params[:scopes].presence || {})
 
-      @datatable = find_datatable(params[:id]).try(:new, attributes)
+      @datatable = find_datatable(params[:id]).try(:new, attributes.merge(scopes))
       @datatable.view = view_context if !@datatable.nil?
 
       EffectiveDatatables.authorized?(self, :index, @datatable.try(:collection_class) || @datatable.try(:class))

data/app/models/effective/datatable.rb

@@ -5,7 +5,7 @@ module Effective
     # These two options control the render behaviour of a datatable
     attr_accessor :table_html_class, :simple
 
-    delegate :render, :controller, :link_to, :mail_to, :number_to_currency, :to => :@view
+    delegate :render, :controller, :link_to, :mail_to, :number_to_currency, :number_to_percentage, :to => :@view
 
     include Effective::EffectiveDatatable::Dsl
     extend Effective::EffectiveDatatable::Dsl::ClassMethods
@@ -23,8 +23,8 @@ module Effective
       end
 
       initialize_datatable  # This creates @table_columns based on the DSL datatable do .. end block
+      initialize_scopes     # This normalizes scopes, and copies scope default values to attributes
       initialize_options    # This normalizes all the options
-      initialize_scopes     # This normalizes scopes, and copies scopes to attributes
 
       unless active_record_collection? || array_collection?
         raise "Unsupported collection type. Should be ActiveRecord class, ActiveRecord relation, or an Array of Arrays [[1, 'something'], [2, 'something else']]"
@@ -119,22 +119,6 @@ module Effective
       @view = view_context
       @view.formats = [:html]
 
-      # Set any scopes
-      if @view.params[:scopes].kind_of?(Hash)
-        @view.params[:scopes].each do |name, value|
-          next unless scopes.key?(name)
-
-          if scopes[name][:fallback] || scopes[name][:presence]
-            value = value.presence || scopes[name][:default]
-          end
-
-          self.attributes[name] = value
-
-          self.scopes[name][:filter][:input_html] ||= HashWithIndifferentAccess.new
-          self.scopes[name][:filter][:input_html][:value] = value
-        end
-      end
-
       # 'Just work' with attributes
       @view.class.send(:attr_accessor, :attributes)
       @view.attributes = self.attributes

data/app/models/effective/effective_datatable/options.rb

@@ -19,23 +19,28 @@ module Effective
       protected
 
       # The scope DSL is
-      # scope :start_date, default_value, options {}
+      # scope :start_date, default_value, options: {}
+      #
+      # The value might already be assigned, but if not, we have to assign the default to attributes
 
       # A scope comes to us like {:start_date => {default: Time.zone.now, filter: {as: :select, collection: ... input_html :}}}
       # We want to make sure an input_html: { value: default } exists
       def initialize_scope_options(scopes)
         (scopes || []).each do |name, options|
+          value = attributes.key?(name) ? attributes[name] : options[:default]
+
           options[:filter] ||= HashWithIndifferentAccess.new()
           options[:filter][:input_html] ||= HashWithIndifferentAccess.new()
-          options[:filter][:input_html][:value] = options[:default]
-        end
+          options[:filter][:input_html][:value] = value
 
-        # For each scope, copy it into the attributes, so we can get at the value
-        (scopes || []).each do |name, options|
-          self.attributes[name] ||= options[:default]
-        end
+          if attributes.key?(name) == false
+            self.attributes[name] = options[:default]
+          end
 
-        scopes
+          if (options[:fallback] || options[:presence]) && attributes[name].blank? && attributes[name] != false
+            self.attributes[name] = options[:default]
+          end
+        end
       end
 
       def initialize_column_options(cols)

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.5.0'.freeze
+  VERSION = '2.5.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails