datagrid 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7dd21661c0b7829a023451513b73670d0b0be11
-  data.tar.gz: 4b2b5bb748791497da883b6c24ad8f19c7ce3c81
+  metadata.gz: 3e94155c2af961e78d34637a09881263afa9b47d
+  data.tar.gz: a8573f7be208ac8d629e5a453a3ee52f899333ee
 SHA512:
-  metadata.gz: 7d33aa9a4a8eceaacad1ff76ee91ba9dc3b9e312d2158f70998e7eaef707877042ace5218df8de47a28373dce7d92f6886e4fdf7be70ea27bf90baa6246f763c
-  data.tar.gz: d19b2234cbaba7712206f4b9ed7159cdcf2fd44ec320ff0c3a937a4ea3f03caf237499b4d2a594a0f76a84526fe28cbf23132279e0072a3eaf0535334179692c
+  metadata.gz: c994fd4f81436a191195851226c4ff1dd11f1cf0ff17027ee2dd0fe04eed653475d2785e1c90e8765ea997249284fb30344f99e50c8fc5e271f8fb6fee25b3fb
+  data.tar.gz: 87bf1d14751e50059eb0414665608936f39002a42bb81021ca93e8b710eef37d231cdf6957fb9c032b9293bba598b270bd855f6339b5aca998a81f8d6cf88097

data/VERSION

@@ -1 +1 @@
-1.3.3
+1.3.4

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.3.3 ruby lib
+# stub: datagrid 1.3.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "1.3.3"
+  s.version = "1.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2014-11-12"
+  s.date = "2015-01-08"
   s.description = "This allows you to easily build datagrid aka data tables with sortable columns and filters"
   s.email = "agresso@gmail.com"
   s.extra_rdoc_files = [

data/lib/datagrid/core.rb

@@ -98,6 +98,7 @@ module Datagrid
       end
 
 
+      # Updates datagrid attributes with a passed hash argument
       def assign_attributes(attributes)
         attributes.each do |name, value|
           self[name] = value
@@ -159,6 +160,12 @@ module Datagrid
         self.class.send :check_scope_defined!, message
       end
 
+      def inspect
+        attrs = attributes.map do |key, value|
+          "#{key}: #{value.inspect}"
+        end.join(", ")
+        "#<#{self.class} #{attrs}>"
+      end
 
     end # InstanceMethods
   end

data/lib/datagrid/filters/base_filter.rb

@@ -33,13 +33,13 @@ class Datagrid::Filters::BaseFilter #:nodoc:
 
   def parse_values(value)
     if multiple?
+      return nil if value.nil?
       normalize_multiple_value(value).map do |v|
         parse(v)
       end
+    elsif value.is_a?(Array)
+      raise Datagrid::ArgumentError, "#{grid_class}##{name} filter can not accept Array argument. Use :multiple option."
     else
-      if value.is_a?(Array)
-        raise Datagrid::ArgumentError, "#{grid_class}##{name} filter can not accept Array argument. Use :multiple option."
-      end
       parse(value)
     end
   end

data/lib/datagrid/filters/ranged_filter.rb

@@ -10,31 +10,26 @@ module RangedFilter
 
   def parse_values(value)
     result = super(value)
-    if range? 
-      if result.is_a?(Array)
-        case result.size
-        when 0
-          nil
-        when 1
-          result.first
-        when 2
-          if result.first && result.last && result.first > result.last
-            # If wrong range is given - reverse it to be always valid
-            result.reverse
-          else
-            result
-          end
-        else
-          raise ArgumentError, "Can not create a date range from array of more than two: #{result.inspect}"
-        end
+    return result if !range? || result.nil?
+    # Simulate single point range
+    return result..result unless result.is_a?(Array)
+
+    case result.size
+    when 0
+      nil
+    when 1
+      result.first
+    when 2
+      if result.first && result.last && result.first > result.last
+        # If wrong range is given - reverse it to be always valid
+        result.reverse
       else
-        # Simulate single point range
-        result..result
+        result
       end
-
     else
-      result
+      raise ArgumentError, "Can not create a date range from array of more than two: #{result.inspect}"
     end
+
   end
 
   def range?

data/lib/datagrid/filters/select_options.rb

@@ -1,9 +1,9 @@
 module Datagrid::Filters::SelectOptions
 
   def select(object = nil)
-    #unless object
-      #Datagrid::Utils.warn_once("#{self.class.name}#select without argument is deprecated")
-    #end
+    unless object
+      Datagrid::Utils.warn_once("#{self.class.name}#select without argument is deprecated")
+    end
     select = self.options[:select]
     if select.is_a?(Symbol)
       object.send(select)

data/lib/datagrid/rspec.rb

@@ -45,8 +45,7 @@ shared_examples_for "Datagrid" do
           when :integer
             1
           when :enum
-            select = filter.select
-            select = select.call(subject)  if select.respond_to?(:call)
+            select = filter.select(subject)
             select.first.try(:last)
           else
             raise "unknown filter type: #{filter.class}"

data/spec/datagrid/core_spec.rb

@@ -48,4 +48,18 @@ describe Datagrid::Core do
       end
     end
   end
+
+  describe ".inspect" do
+    it "should show all attribute values" do
+      class InspectTest
+        include Datagrid
+        scope {Entry}
+        filter(:created_at, :date, :range => true)
+        column(:name)
+      end
+
+      grid = InspectTest.new(:created_at => ['2014-01-01', '2014-08-05'], :descending => true, :order => 'name')
+      expect(grid.inspect).to eq('#<InspectTest order: :name, descending: true, created_at: [Wed, 01 Jan 2014, Tue, 05 Aug 2014]>')
+    end
+  end
 end

data/spec/datagrid/filters/enum_filter_spec.rb

@@ -3,17 +3,19 @@ require 'spec_helper'
 describe Datagrid::Filters::EnumFilter do
 
   it "should support select option" do
-    expect(test_report do
+    report = test_report do
       scope {Entry}
       filter(:group_id, :enum, :select =>  [1,2] )
-    end.class.filter_by_name(:group_id).select).to eq([1,2])
+    end
+    expect(report.filter_by_name(:group_id).select(report)).to eq([1,2])
   end
 
   it "should support select option as proc" do
-    expect(test_report do
+    grid = test_report do
       scope {Entry}
       filter(:group_id, :enum, :select => proc { [1,2] })
-    end.class.filter_by_name(:group_id).select).to eq([1,2])
+    end
+    expect(grid.filter_by_name(:group_id).select(grid)).to eq([1,2])
   end
 
   it "should support select option as proc with instace input" do

data/spec/datagrid/filters/extended_boolean_filter_spec.rb

@@ -3,10 +3,11 @@ require 'spec_helper'
 describe Datagrid::Filters::ExtendedBooleanFilter do
 
   it "should support select option" do
-    expect(test_report do
+    grid = test_report do
       scope {Entry}
       filter(:disabled, :xboolean)
-    end.class.filter_by_name(:disabled).select).to eq([["Yes", "YES"], ["No", "NO"]])
+    end
+    expect(grid.filter_by_name(:disabled).select(grid)).to eq([["Yes", "YES"], ["No", "NO"]])
   end
 
   it "should generate pass boolean value to filter block" do

data/spec/datagrid/filters/integer_filter_spec.rb

@@ -2,83 +2,73 @@ require 'spec_helper'
 
 describe Datagrid::Filters::IntegerFilter do
 
+
+  let(:entry1) { Entry.create!(:group_id => 1) }
+  let(:entry2) { Entry.create!(:group_id => 2) }
+  let(:entry3) { Entry.create!(:group_id => 3) }
+  let(:entry4) { Entry.create!(:group_id => 4) }
+  let(:entry5) { Entry.create!(:group_id => 5) }
+  let(:entry7) { Entry.create!(:group_id => 7) }
+
   it "should support integer range argument" do
-    e1 = Entry.create!(:group_id => 1)
-    e2 = Entry.create!(:group_id => 4)
-    e3 = Entry.create!(:group_id => 7)
     report = test_report(:group_id => 3..5) do
       scope { Entry } 
       filter(:group_id, :integer)
     end
-    expect(report.assets).not_to include(e1)
-    expect(report.assets).to include(e2)
-    expect(report.assets).not_to include(e3)
+    expect(report.assets).not_to include(entry1)
+    expect(report.assets).to include(entry4)
+    expect(report.assets).not_to include(entry7)
   end
 
   it "should support integer range given as array argument" do
-    e1 = Entry.create!(:group_id => 7)
-    e2 = Entry.create!(:group_id => 4)
-    e3 = Entry.create!(:group_id => 1)
     report = test_report(:group_id => [3.to_s, 5.to_s]) do
       scope { Entry } 
       filter(:group_id, :integer, :range => true)
     end
-    expect(report.assets).not_to include(e1)
-    expect(report.assets).to include(e2)
-    expect(report.assets).not_to include(e3)
+    expect(report.assets).not_to include(entry7)
+    expect(report.assets).to include(entry4)
+    expect(report.assets).not_to include(entry1)
   end
 
   it "should support minimum integer argument" do
-    e1 = Entry.create!(:group_id => 1)
-    e2 = Entry.create!(:group_id => 4)
-    e3 = Entry.create!(:group_id => 7)
     report = test_report(:group_id => [5.to_s, nil]) do
       scope { Entry } 
       filter(:group_id, :integer, :range => true)
     end
-    expect(report.assets).not_to include(e1)
-    expect(report.assets).not_to include(e2)
-    expect(report.assets).to include(e3)
+    expect(report.assets).not_to include(entry1)
+    expect(report.assets).not_to include(entry4)
+    expect(report.assets).to include(entry7)
   end
 
   it "should support maximum integer argument" do
-    e1 = Entry.create!(:group_id => 1)
-    e2 = Entry.create!(:group_id => 4)
-    e3 = Entry.create!(:group_id => 7)
     report = test_report(:group_id => [nil, 5.to_s]) do
       scope { Entry } 
       filter(:group_id, :integer, :range => true)
     end
-    expect(report.assets).to include(e1)
-    expect(report.assets).to include(e2)
-    expect(report.assets).not_to include(e3)
+    expect(report.assets).to include(entry1)
+    expect(report.assets).to include(entry4)
+    expect(report.assets).not_to include(entry7)
   end
 
   it "should find something in one integer interval" do
 
-    e1 = Entry.create!(:group_id => 7)
-    e2 = Entry.create!(:group_id => 4)
-    e3 = Entry.create!(:group_id => 1)
     report = test_report(:group_id => (4..4)) do
       scope { Entry } 
       filter(:group_id, :integer, :range => true)
     end
-    expect(report.assets).not_to include(e1)
-    expect(report.assets).to include(e2)
-    expect(report.assets).not_to include(e3)
+    expect(report.assets).not_to include(entry7)
+    expect(report.assets).to include(entry4)
+    expect(report.assets).not_to include(entry1)
   end
   it "should support invalid range" do
 
-    e1 = Entry.create!(:group_id => 7)
-    e2 = Entry.create!(:group_id => 4)
-    e3 = Entry.create!(:group_id => 1)
     report = test_report(:group_id => (7..1)) do
       scope { Entry } 
       filter(:group_id, :integer, :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.assets).not_to include(entry7)
+    expect(report.assets).not_to include(entry4)
+    expect(report.assets).not_to include(entry1)
   end
 
 
@@ -89,8 +79,8 @@ describe Datagrid::Filters::IntegerFilter do
         where("group_id >= ?", value)
       end
     end
-    expect(report.assets).not_to include(Entry.create!(:group_id => 1))
-    expect(report.assets).to include(Entry.create!(:group_id => 5))
+    expect(report.assets).not_to include(entry1)
+    expect(report.assets).to include(entry5)
   end
 
 
@@ -99,6 +89,7 @@ describe Datagrid::Filters::IntegerFilter do
       scope { Entry.joins(:group) } 
       filter(:rating, :integer, :range => true)
     end
+    expect(report.rating).to eq([4,nil])
     expect(report.assets).not_to include(Entry.create!(:group => Group.create!(:rating => 3)))
     expect(report.assets).to include(Entry.create!(:group => Group.create!(:rating => 5)))
   end
@@ -106,39 +97,37 @@ describe Datagrid::Filters::IntegerFilter do
   it "should support multiple values" do
     report = test_report(:group_id => "1,2") do
       scope {Entry}
-      filter(:group_id, :string, :multiple => true)
+      filter(:group_id, :integer, :multiple => true)
     end
-    expect(report.assets).to include(Entry.create!( :group_id => 1))
-    expect(report.assets).to include(Entry.create!( :group_id => 2))
-    expect(report.assets).not_to include(Entry.create!( :group_id => 3))
+    expect(report.group_id).to eq([1,2])
+    expect(report.assets).to include(entry1)
+    expect(report.assets).to include(entry2)
+    expect(report.assets).not_to include(entry3)
   end
   it "should support custom separator multiple values" do
     report = test_report(:group_id => "1|2") do
       scope {Entry}
-      filter(:group_id, :string, :multiple => '|')
+      filter(:group_id, :integer, :multiple => '|')
     end
-    expect(report.assets).to include(Entry.create!( :group_id => 1))
-    expect(report.assets).to include(Entry.create!( :group_id => 2))
-    expect(report.assets).not_to include(Entry.create!( :group_id => 3))
+    expect(report.group_id).to eq([1,2])
+    expect(report.assets).to include(entry1)
+    expect(report.assets).to include(entry2)
+    expect(report.assets).not_to include(entry3)
   end
   
-  it "should support multiple values" do
-    report = test_report(:group_id => "1,2") do
-      scope {Entry}
-      filter(:group_id, :string, :multiple => true)
-    end
-    expect(report.assets).to include(Entry.create!( :group_id => 1))
-    expect(report.assets).to include(Entry.create!( :group_id => 2))
-    expect(report.assets).not_to include(Entry.create!( :group_id => 3))
-  end
-
-  it "should support custom separator multiple values" do
-    report = test_report(:group_id => "1|2") do
+  it "should support multiple with allow_blank allow_nil options" do
+    report  = test_report do
       scope {Entry}
-      filter(:group_id, :string, :multiple => '|')
+      filter(:group_id, :integer, :multiple => true, :allow_nil => false, :allow_blank => true )
     end
-    expect(report.assets).to include(Entry.create!( :group_id => 1))
-    expect(report.assets).to include(Entry.create!( :group_id => 2))
-    expect(report.assets).not_to include(Entry.create!( :group_id => 3))
+    report.group_id = []
+    expect(report.assets).to_not include(entry1)
+    expect(report.assets).to_not include(entry2)
+    report.group_id = [1]
+    expect(report.assets).to include(entry1)
+    expect(report.assets).to_not include(entry2)
+    report.group_id = nil
+    expect(report.assets).to include(entry1)
+    expect(report.assets).to include(entry2)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails