datagrid 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e94155c2af961e78d34637a09881263afa9b47d
-  data.tar.gz: a8573f7be208ac8d629e5a453a3ee52f899333ee
+  metadata.gz: 22ba5c3d97717d9f5d236b7f8559346d8e2255ad
+  data.tar.gz: 6f80355aafcb9f54870d42f458d8f8c4aa152cd2
 SHA512:
-  metadata.gz: c994fd4f81436a191195851226c4ff1dd11f1cf0ff17027ee2dd0fe04eed653475d2785e1c90e8765ea997249284fb30344f99e50c8fc5e271f8fb6fee25b3fb
-  data.tar.gz: 87bf1d14751e50059eb0414665608936f39002a42bb81021ca93e8b710eef37d231cdf6957fb9c032b9293bba598b270bd855f6339b5aca998a81f8d6cf88097
+  metadata.gz: 93798b31a87ed1c8f81e49da6293d996f3952f8db26eb387446f57d46c2507c00a78bd6e5fc6908c64b822f1cdfa175b13cdd875e3afb0021edba3f32c584c2a
+  data.tar.gz: 296aa0e6501289e986a9a0de697f1c2ae0fd068e631c358ce8dad7f7edae2e45a40881512199a37492d936ed0166503bbc46766bc258c40eb96a264fc0388a9e

data/VERSION

@@ -1 +1 @@
-1.3.4
+1.3.5

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.4 ruby lib
+# stub: datagrid 1.3.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "1.3.4"
+  s.version = "1.3.5"
 
   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 = "2015-01-08"
+  s.date = "2015-01-21"
   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/filters/dynamic_filter.rb

@@ -4,9 +4,12 @@ class Datagrid::Filters::DynamicFilter < Datagrid::Filters::BaseFilter
 
   include Datagrid::Filters::SelectOptions
 
+  AVAILABLE_OPERATIONS = %w(= =~ >= <=)
+
   def initialize(*)
     super
     options[:select] ||= default_select
+    options[:operations] ||= AVAILABLE_OPERATIONS
     unless options.has_key?(:include_blank)
       options[:include_blank] = false
     end
@@ -19,13 +22,18 @@ class Datagrid::Filters::DynamicFilter < Datagrid::Filters::BaseFilter
   end
 
   def unapplicable_value?(filter)
-    field, operation, value = filter
-    field.blank? || operation.blank? || super(value)
+    _, _, value = filter
+    super(value)
   end
 
   def default_filter_where(driver, scope, filter)
     field, operation, value = filter
     date_conversion = value.is_a?(Date) && driver.is_timestamp?(scope, field)
+
+    return scope if field.blank? || operation.blank?
+    unless operations.include?(operation)
+      raise Datagrid::FilteringError, "Unknown operation: #{operation.inspect}. Available operations: #{operations.join(' ')}"
+    end
     case operation
     when '='
       if date_conversion
@@ -52,12 +60,16 @@ class Datagrid::Filters::DynamicFilter < Datagrid::Filters::BaseFilter
       end
       driver.less_equal(scope, field, value)
     else
-      raise "unknown operation: #{operation.inspect}"
+      raise Datagrid::FilteringError, "Unknown operation: #{operation.inspect}. Use filter block argument to implement operation"
     end
   end
 
+  def operations
+    options[:operations]
+  end
+
   def operations_select
-    %w(= =~ >= <=).map do |operation|
+    operations.map do |operation|
       [I18n.t(operation, :scope => "datagrid.filters.dynamic.operations").html_safe, operation]
     end
   end

data/spec/datagrid/filters/dynamic_filter_spec.rb

@@ -119,4 +119,31 @@ describe Datagrid::Filters::DynamicFilter do
     expect(report.assets).not_to include(Entry.create!(:shipping_date => '1986-08-06'))
   end
 
+  it "should support allow_nil and allow_blank options" do
+    grid = test_report do
+      scope {Entry}
+      filter(:condition, :dynamic, :allow_nil => true, :allow_blank => true, operations: ['>=', '<=']) do |(field, operation, value), scope|
+        if value.blank?
+          scope.where(disabled: false)
+        else
+          scope.where("#{field} #{operation} ?", value)
+        end
+      end
+    end
+
+    expect(grid.assets).to_not include(Entry.create!(disabled: true))
+    expect(grid.assets).to include(Entry.create!(disabled: false))
+
+    grid.condition = [:group_id, '>=', 3]
+    expect(grid.assets).to include(Entry.create!(disabled: true, group_id: 4))
+    expect(grid.assets).to_not include(Entry.create!(disabled: false, group_id: 2))
+  end
+
+  it "should raise if unknown operation" do
+    report.condition = [:shipping_date, "<>", '1996-08-05']
+    expect{
+      report.assets
+    }.to raise_error(Datagrid::FilteringError)
+  end
+
 end

data/spec/datagrid/form_builder_spec.rb

@@ -544,6 +544,19 @@ DOM
         it {should equal_to_dom(expected_html)}
 
       end
+
+      context "when operation options passed" do
+        let(:filter_options) do
+          {:operations => %w(>= <=), :select => [:id]}
+        end
+        let(:expected_html) do
+          <<-HTML
+          <select class="condition dynamic_filter field" id="report_condition" name="report[condition][]"><option value="id">id</option></select><select class="condition dynamic_filter operation" id="report_condition" name="report[condition][]"><option value="&gt;=">≥</option>
+       <option value="&lt;=">≤</option></select><input class="condition dynamic_filter value" id="report_condition" name="report[condition][]" size="30" type="text">
+          HTML
+        end
+        it {should equal_to_dom(expected_html)}
+      end
     end
   end
 

metadata

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