datagrid 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e27c90403d5aa7a2c924c000961747a6f8aad08
-  data.tar.gz: dc805468469c8c967b06f69b33e875038d606ae2
+  metadata.gz: 012d1468059f7ed2bc98a58b26d982960eb40c9c
+  data.tar.gz: 6bd2b6019015f43c84e372fd27a5472e7f72d115
 SHA512:
-  metadata.gz: 033dd01f968f8af3360e92623c2921d6b08cc5032eac39d46e948bc9fc14b6f5d988c21e9c3aea4493aebfb59c30f986770b2cee35beb2a1aa0423fd51f91004
-  data.tar.gz: 609622339821f30c85f9d8abcb603ee592763ac0a57c78f0d0e0e00d9691292d224ab443d369ef4672336debb5bab9cf2392e0c83ce2854d2019c4affbb2bcb4
+  metadata.gz: 430016e9d03c4f09f0d8e0efec3faac6ec8c9428aa77a98679de546e3c52f7325aad22aae6a7aaed04b5bdb5be1048f2a9df73df43101bdb3178cdf1a57888c9
+  data.tar.gz: bdeb1423e1bdbf3ef66d2e4656ff565c50ec1a3e2cd18dc5d076e3b364528618cec623b20b528b8b98399a9f15ebbd1cb9f0bdbb7de8a35993ccc174f389ca08

data/VERSION

@@ -1 +1 @@
-1.5.4
+1.5.5

data/app/views/datagrid/_order_for.html.erb

@@ -1,10 +1,10 @@
 <div class="order">
   <%= link_to(
       I18n.t("datagrid.table.order.asc").html_safe,
-      url_for(grid.param_name => grid.as_query.merge(:order => column.name, :descending => false)),
+      datagrid_order_path(grid, column, false),
       :class => "asc") %>
   <%= link_to(
       I18n.t("datagrid.table.order.desc").html_safe,
-      url_for(grid.param_name => grid.as_query.merge(:order => column.name, :descending => true )),
+      datagrid_order_path(grid, column, true),
       :class => "desc") %>
 </div>

data/datagrid.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: datagrid 1.5.4 ruby lib
+# stub: datagrid 1.5.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid".freeze
-  s.version = "1.5.4"
+  s.version = "1.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Bogdan Gusiev".freeze]
-  s.date = "2017-06-16"
+  s.date = "2017-10-03"
   s.description = "This allows you to easily build datagrid aka data tables with sortable columns and filters".freeze
   s.email = "agresso@gmail.com".freeze
   s.extra_rdoc_files = [

data/lib/datagrid/columns.rb

@@ -20,8 +20,6 @@ module Datagrid
         class_attribute :columns_array
         self.columns_array = []
 
-        class_attribute :dynamic_block, :instance_writer => false
-
         class_attribute :cached
         self.cached = false
 
@@ -163,42 +161,6 @@ module Datagrid
         end
       end
 
-      # Allows dynamic columns definition, that could not be defined at class level
-      #
-      #   class MerchantsGrid
-      #
-      #     scope { Merchant }
-      #
-      #     column(:name)
-      #
-      #     dynamic do
-      #       PurchaseCategory.all.each do |category|
-      #         column(:"#{category.name.underscore}_sales") do |merchant|
-      #           merchant.purchases.where(:category_id => category.id).count
-      #         end
-      #       end
-      #     end
-      #   end
-      #
-      #   grid = MerchantsGrid.new
-      #   grid.data # => [
-      #             #      [ "Name",   "Swimwear Sales", "Sportswear Sales", ... ]
-      #             #      [ "Reebok", 2083382,            8382283,          ... ]
-      #             #      [ "Nike",   8372283,            18734783,         ... ]
-      #             #    ]
-      def dynamic(&block)
-        previous_block = dynamic_block
-        self.dynamic_block =
-          if previous_block
-            proc {
-              instance_eval(&previous_block)
-              instance_eval(&block)
-            }
-          else
-            block
-          end
-      end
-
       # Defines a model decorator that will be used to define a column value.
       # All column blocks will be given a decorated version of the model.
       #
@@ -450,7 +412,6 @@ module Datagrid
       def initialize(*) #:nodoc:
         self.columns_array = self.class.columns_array.clone
         super
-        instance_eval(&dynamic_block) if dynamic_block
       end
 
       # Returns all columns available for current grid configuration.

data/lib/datagrid/core.rb

@@ -8,8 +8,14 @@ module Datagrid
       base.extend         ClassMethods
       base.class_eval do
         class_attribute :scope_value
+
         class_attribute :datagrid_attributes
         self.datagrid_attributes = []
+
+        class_attribute :dynamic_block, :instance_writer => false
+        if defined?(::ActiveModel::AttributeAssignment)
+          include ::ActiveModel::AttributeAssignment
+        end
       end
       base.send :include, InstanceMethods
     end # self.included
@@ -50,6 +56,42 @@ module Datagrid
         @driver ||= Drivers::AbstractDriver.guess_driver(scope).new
       end
 
+      # Allows dynamic columns definition, that could not be defined at class level
+      #
+      #   class MerchantsGrid
+      #
+      #     scope { Merchant }
+      #
+      #     column(:name)
+      #
+      #     dynamic do
+      #       PurchaseCategory.all.each do |category|
+      #         column(:"#{category.name.underscore}_sales") do |merchant|
+      #           merchant.purchases.where(:category_id => category.id).count
+      #         end
+      #       end
+      #     end
+      #   end
+      #
+      #   grid = MerchantsGrid.new
+      #   grid.data # => [
+      #             #      [ "Name",   "Swimwear Sales", "Sportswear Sales", ... ]
+      #             #      [ "Reebok", 2083382,            8382283,          ... ]
+      #             #      [ "Nike",   8372283,            18734783,         ... ]
+      #             #    ]
+      def dynamic(&block)
+        previous_block = dynamic_block
+        self.dynamic_block =
+          if previous_block
+            proc {
+              instance_eval(&previous_block)
+              instance_eval(&block)
+            }
+          else
+            block
+          end
+      end
+
       protected
       def check_scope_defined!(message = nil)
         message ||= "#{self}.scope is not defined"
@@ -72,6 +114,7 @@ module Datagrid
           self.attributes = attributes
         end
 
+        instance_eval(&dynamic_block) if dynamic_block
         if block_given?
           self.scope(&block)
         end

data/lib/datagrid/filters.rb

@@ -105,7 +105,6 @@ module Datagrid
         datagrid_attribute(name) do |value|
           filter.parse_values(value)
         end
-
       end
 
       def default_filter

data/lib/datagrid/filters/base_filter.rb

@@ -156,6 +156,8 @@ class Datagrid::Filters::BaseFilter #:nodoc:
     when String
       #TODO: write tests and doc
       value.split(separator)
+    when Range
+      [value.first, value.last]
     when Array
       value
     else

data/lib/datagrid/filters/ranged_filter.rb

@@ -12,7 +12,7 @@ module Datagrid::Filters::RangedFilter
     result = super(value)
     return result if !range? || result.nil?
     # Simulate single point range
-    return result..result unless result.is_a?(Array)
+    return [result, result] unless result.is_a?(Array)
 
     case result.size
     when 0

data/lib/datagrid/helper.rb

@@ -116,6 +116,11 @@ module Datagrid
       end
     end
 
+    # Generates an ascending or descending order url for the given column
+    def datagrid_order_path(grid, column, descending)
+      datagrid_renderer.order_path(grid, column, descending, request)
+    end
+
     # Represents a datagrid row that provides access to column values for the given asset
     #
     #   row = datagrid_row(grid, user)

data/lib/datagrid/renderer.rb

@@ -78,6 +78,16 @@ module Datagrid
                       { :grid => grid, :column => column })
     end
 
+    def order_path(grid, column, descending, request)
+      column = grid.column_by_name(column)
+      query = request ? request.query_parameters : {}
+      order_parameter = {grid.param_name => grid.as_query.merge(:order => column.name, :descending => descending)}
+      ActionDispatch::Http::URL.path_for(
+        path: request ? request.path : '/',
+        params: query.merge(order_parameter)
+      )
+    end
+
     private
 
     def _safe(string)

data/spec/datagrid/columns_spec.rb

@@ -459,38 +459,6 @@ describe Datagrid::Columns do
     end
   end
 
-  describe 'dynamic helper' do
-    it "should work" do
-      grid = test_report do
-        scope {Entry}
-        column(:id)
-        dynamic {
-          column(:name)
-          column(:category)
-        }
-      end
-
-      expect(grid.columns.map(&:name)).to eq([:id, :name, :category])
-      expect(grid.class.columns.map(&:name)).to eq([:id])
-
-      expect(grid.column_by_name(:id)).not_to be_nil
-      expect(grid.column_by_name(:name)).not_to be_nil
-    end
-
-    it "has access to attributes" do
-      grid = test_report(:attribute_name => 'value') do
-        scope {Entry}
-        datagrid_attribute :attribute_name
-        dynamic {
-          value = attribute_name
-          column(:name) { value }
-        }
-      end
-
-      expect(grid.data_value(:name, Entry.create!)).to eq('value')
-    end
-  end
-
   describe ".data_value" do
     it "should return value" do
       grid = test_report do

data/spec/datagrid/core_spec.rb

@@ -109,4 +109,53 @@ describe Datagrid::Core do
       expect(EqualTest.new).to_not eq(EqualTest.new {|s| s.reorder(:name)})
     end
   end
+
+  describe 'dynamic helper' do
+    it "should work" do
+      grid = test_report do
+        scope {Entry}
+        column(:id)
+        dynamic {
+          column(:name)
+          column(:category)
+        }
+      end
+
+      expect(grid.columns.map(&:name)).to eq([:id, :name, :category])
+      expect(grid.class.columns.map(&:name)).to eq([:id])
+
+      expect(grid.column_by_name(:id)).not_to be_nil
+      expect(grid.column_by_name(:name)).not_to be_nil
+    end
+
+    it "has access to attributes" do
+      grid = test_report(:attribute_name => 'value') do
+        scope {Entry}
+        datagrid_attribute :attribute_name
+        dynamic {
+          value = attribute_name
+          column(:name) { value }
+        }
+      end
+
+      expect(grid.data_value(:name, Entry.create!)).to eq('value')
+    end
+
+    it "applies before instance scope" do
+      klass = test_report_class do
+        scope {Entry}
+        dynamic do
+          scope do |s|
+            s.limit(1)
+          end
+        end
+      end
+
+      grid = klass.new do |s|
+        s.limit(2)
+      end
+
+      expect(grid.assets.limit_value).to eq(2)
+    end
+  end
 end

data/spec/datagrid/filters/date_filter_spec.rb

@@ -104,18 +104,20 @@ describe Datagrid::Filters::DateFilter do
     expect(report.assets).to include(e2)
     expect(report.assets).not_to include(e3)
   end
-  it "should support invalid range" do
 
+  it "should invert invalid range" do
+    range = 1.days.ago..7.days.ago
     e1 = Entry.create!(:created_at => 7.days.ago)
     e2 = Entry.create!(:created_at => 4.days.ago)
     e3 = Entry.create!(:created_at => 1.day.ago)
-    report = test_report(:created_at => (1.days.ago.to_date..7.days.ago.to_date)) do
+    report = test_report(:created_at => range) do
       scope { Entry }
       filter(:created_at, :date, :range => true)
     end
-    expect(report.assets).not_to include(e1)
-    expect(report.assets).not_to include(e2)
-    expect(report.assets).not_to include(e3)
+    expect(report.created_at).to eq([range.last.to_date, range.first.to_date])
+    expect(report.assets).to include(e1)
+    expect(report.assets).to include(e2)
+    expect(report.assets).to include(e3)
   end
 
 

data/spec/datagrid/filters/date_time_filter_spec.rb

@@ -85,7 +85,7 @@ describe Datagrid::Filters::DateTimeFilter do
     e1 = Entry.create!(:created_at => Time.new(2013, 1, 1, 1, 0))
     e2 = Entry.create!(:created_at => Time.new(2013, 1, 1, 2, 0))
     e3 = Entry.create!(:created_at => Time.new(2013, 1, 1, 3, 0))
-    report = test_report(:created_at => (Time.new(2013, 1, 1, 2, 0)..Time.new(2013, 1, 1, 2, 0))) do
+    report = test_report(:created_at => Time.new(2013, 1, 1, 2, 0)..Time.new(2013, 1, 1, 2, 0)) do
       scope { Entry }
       filter(:created_at, :datetime, :range => true)
     end
@@ -93,18 +93,20 @@ describe Datagrid::Filters::DateTimeFilter do
     expect(report.assets).to include(e2)
     expect(report.assets).not_to include(e3)
   end
-  it "should support invalid range" do
+  it "should reverse invalid range" do
 
+    range = Time.new(2013, 1, 1, 3, 0)..Time.new(2013, 1, 1, 1, 0)
     e1 = Entry.create!(:created_at => Time.new(2013, 1, 1, 1, 0))
     e2 = Entry.create!(:created_at => Time.new(2013, 1, 1, 2, 0))
     e3 = Entry.create!(:created_at => Time.new(2013, 1, 1, 3, 0))
-    report = test_report(:created_at => (Time.new(2013, 1, 1, 3, 0)..Time.new(2013, 1, 1, 1, 0))) do
+    report = test_report(:created_at => range) do
       scope { Entry }
       filter(:created_at, :datetime, :range => true)
     end
-    expect(report.assets).not_to include(e1)
-    expect(report.assets).not_to include(e2)
-    expect(report.assets).not_to include(e3)
+    expect(report.created_at).to eq([range.last, range.first])
+    expect(report.assets).to include(e1)
+    expect(report.assets).to include(e2)
+    expect(report.assets).to include(e3)
   end
 
 

data/spec/datagrid/filters/integer_filter_spec.rb

@@ -59,15 +59,17 @@ describe Datagrid::Filters::IntegerFilter do
     expect(report.assets).to include(entry4)
     expect(report.assets).not_to include(entry1)
   end
+
   it "should support invalid range" do
 
     report = test_report(:group_id => (7..1)) do
       scope { Entry }
       filter(:group_id, :integer, :range => true)
     end
-    expect(report.assets).not_to include(entry7)
-    expect(report.assets).not_to include(entry4)
-    expect(report.assets).not_to include(entry1)
+    expect(report.group_id).to eq([1,7])
+    expect(report.assets).to include(entry7)
+    expect(report.assets).to include(entry4)
+    expect(report.assets).to include(entry1)
   end
 
 

data/spec/datagrid/form_builder_spec.rb

@@ -131,9 +131,9 @@ describe Datagrid::FormBuilder do
       context "with invalid range value" do
         let(:_range) { 2..1 }
         it { should equal_to_dom(
-          '<input class="group_id integer_filter from" multiple value="2" type="text" name="report[group_id][]"/>' +
+          '<input class="group_id integer_filter from" multiple value="1" type="text" name="report[group_id][]"/>' +
           '<span class="separator integer"> - </span>' +
-          '<input class="group_id integer_filter to" multiple value="1" type="text" name="report[group_id][]"/>'
+          '<input class="group_id integer_filter to" multiple value="2" type="text" name="report[group_id][]"/>'
         )}
       end
 
@@ -243,9 +243,9 @@ describe Datagrid::FormBuilder do
       context "with invalid range value" do
         let(:_range) { Date.parse('2012-01-02')..Date.parse('2012-01-01') }
         it { should equal_to_dom(
-          '<input class="created_at date_filter from" multiple value="2012-01-02" type="text" name="report[created_at][]"/>' +
+          '<input class="created_at date_filter from" multiple value="2012-01-01" type="text" name="report[created_at][]"/>' +
           '<span class="separator date"> - </span>' +
-          '<input class="created_at date_filter to" multiple value="2012-01-01" type="text" name="report[created_at][]"/>'
+          '<input class="created_at date_filter to" multiple value="2012-01-02" type="text" name="report[created_at][]"/>'
         )}
       end
       context "with blank range value" do

data/spec/datagrid/helper_spec.rb

@@ -15,6 +15,9 @@ describe Datagrid::Helper do
 
   before(:each) do
     allow(subject).to receive(:params).and_return({})
+    allow(subject).to receive(:request) do
+      Struct.new(:path, :query_parameters).new("/location", {})
+    end
     allow(subject).to receive(:url_for) do |options|
       options.is_a?(String) ? options : ["/location", options.to_param.presence].compact.join('?')
     end

data/spec/support/matchers.rb

@@ -70,7 +70,7 @@ class CssPattern
         if !html.match(pattern_or_string)
           return error!("#{css.inspect} did not match #{pattern_or_string.inspect}. It was \n:#{html.inspect}")
         end
-      elsif amount_or_pattern_or_string_or_proc.is_a? Fixnum
+      elsif amount_or_pattern_or_string_or_proc.is_a? Numeric
         expected_amount = amount_or_pattern_or_string_or_proc
         amount = path.size
         if amount != expected_amount

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-16 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails