datagrid 1.4.4 → 1.5.0

data/spec/datagrid/filters/date_filter_spec.rb

@@ -171,6 +171,15 @@ describe Datagrid::Filters::DateFilter do
     expect(report.created_at).to eq([Date.new(2012, 01, 01), Date.new(2013, 01, 01)])
   end
 
+  it "should nullify blank range" do
+    report = test_report(:created_at => [nil, nil]) do
+      scope  {Entry}
+      filter(:created_at, :date, :range => true)
+    end
+
+    expect(report.created_at).to eq(nil)
+  end
+
   it "should properly format date in filter_value_as_string" do
     with_date_format do
       report = test_report(:created_at => "2012-01-02") do

data/spec/datagrid/filters/dynamic_filter_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper" 
+require "spec_helper"
 
 
 describe Datagrid::Filters::DynamicFilter do
@@ -139,6 +139,32 @@ describe Datagrid::Filters::DynamicFilter do
     expect(grid.assets).to_not include(Entry.create!(disabled: false, group_id: 2))
   end
 
+  it "should support custom operations" do
+    entry = Entry.create!(name: 'hello')
+
+    grid = test_report do
+      scope {Entry}
+      filter(
+        :condition, :dynamic, operations: ["=", "!="]
+      ) do |(field, operation, value), scope|
+        if operation == "!="
+          scope.where("#{field} != ?", value)
+        else
+          default_filter
+        end
+      end
+    end
+
+    grid.condition = ["name", "=", "hello"]
+    expect(grid.assets).to include(entry)
+    grid.condition = ["name", "!=", "hello"]
+    expect(grid.assets).to_not include(entry)
+    grid.condition = ["name", "=", "hello1"]
+    expect(grid.assets).to_not include(entry)
+    grid.condition = ["name", "!=", "hello1"]
+    expect(grid.assets).to include(entry)
+  end
+
   it "should raise if unknown operation" do
     report.condition = [:shipping_date, "<>", '1996-08-05']
     expect{

data/spec/datagrid/filters_spec.rb

@@ -112,7 +112,7 @@ describe Datagrid::Filters do
       end
       expect(grid.assets.to_a.size).to eq(1)
     end
-    
+
   end
   describe "default filter as scope" do
     it "should create default filter if scope respond to filter name method" do
@@ -176,23 +176,6 @@ describe Datagrid::Filters do
     end
   end
 
-  it "should support instance filter rejection" do
-    grid = test_report(:name => 'hello') do
-      scope { Entry }
-      filter(:id)
-      filter(:name)
-    end
-
-    Entry.create!(:name => 'hello1')
-    expect(grid.assets).to be_empty
-    grid.filters.reject! {|f| f.name == :name }
-    expect(grid.filters.map(&:name)).to eq([:id])
-    expect(grid.assets).to_not be_empty
-    expect(grid.class.filters.map(&:name)).to eq([:id, :name])
-
-  end
-
-    
   it "supports dynamic header" do
     grid = test_report do
       scope {Entry}
@@ -217,7 +200,7 @@ describe Datagrid::Filters do
   end
 
   describe "tranlations" do
-    
+
     module ::Ns46
       class TranslatedReport
         include Datagrid
@@ -263,4 +246,51 @@ describe Datagrid::Filters do
       }.to raise_error(Datagrid::ArgumentError)
     end
   end
+
+  describe "#inspect" do
+    it "should list all fitlers with types" do
+
+      module ::NsInspect
+        class TestGrid
+          include Datagrid
+          scope {Entry}
+          filter(:id, :integer)
+          filter(:name, :string)
+          filter(:current_user)
+        end
+      end
+
+      expect(NsInspect::TestGrid.inspect).to eq(
+        "NsInspect::TestGrid(id: integer, name: string, current_user: default)"
+      )
+    end
+
+    it "dislays no filters" do
+      class TestGrid8728
+        include Datagrid
+        scope {Entry}
+      end
+
+      expect(TestGrid8728.inspect).to eq("TestGrid8728(no filters)")
+    end
+  end
+
+
+  describe ":if :unless options" do
+    it "supports :if option" do
+      klass = test_report_class do
+        scope {Entry}
+        filter(:admin_mode, :boolean, dummy: true)
+        filter(:id, :integer, if: :admin_mode)
+        filter(:name, :integer, unless: :admin_mode)
+      end
+
+      admin_filters = klass.new(admin_mode: true).filters.map(&:name)
+      non_admin_filters = klass.new(admin_mode: false).filters.map(&:name)
+      expect(admin_filters).to include(:id)
+      expect(admin_filters).to_not include(:name)
+      expect(non_admin_filters).to_not include(:id)
+      expect(non_admin_filters).to include(:name)
+    end
+  end
 end

data/spec/datagrid/helper_spec.rb

@@ -221,6 +221,19 @@ describe Datagrid::Helper do
         "tr td.name.ordered.asc" => "Star"
       )
     end
+    it "should add ordering classes to column" do
+      rp = test_report(:order => :name) do
+        scope { Entry }
+        column(:name)
+      end
+      expect(
+        subject.datagrid_rows(rp) do |row|
+          subject.content_tag(:strong, row.name)
+        end
+      ).to match_css_pattern(
+        "strong" => "Star"
+      )
+    end
 
     it "should add ordering classes to column" do
       rp = test_report(:order => :name, :descending => true) do
@@ -505,6 +518,12 @@ describe Datagrid::Helper do
       expect(r.name).to eq("Hello")
       expect(r.category).to eq("greetings")
     end
+    it "should provide an interator" do
+      r = subject.datagrid_row(grid, entry)
+      expect(r.map {|z| z.upcase}).to eq(["HELLO", "GREETINGS"])
+      expect(r.name).to eq("Hello")
+      expect(r.category).to eq("greetings")
+    end
 
     it "should yield block" do
       subject.datagrid_row(grid, entry) do |row|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.0
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,188 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.22.2
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.7
+- !ruby/object:Gem::Dependency
+  name: mongo_mapper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+- !ruby/object:Gem::Dependency
+  name: bson
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.22.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.22.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -319,7 +501,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -327,7 +509,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Ruby gem to create datagrids