datagrid 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a695cb0107f631edef6c8ff40d794e88559dfca
-  data.tar.gz: 49b8de0521a68a356134ae23b529a162756fa117
+  metadata.gz: 73197170df7e4ea6b273acbf39a305d2fda2e43f
+  data.tar.gz: d5b443380915e544d250a887eed816f87872eaf3
 SHA512:
-  metadata.gz: 899d48d0a4a15e09463284d1f724191f59e005e4333bd27c33497f6c410ad679244d8e33b69a1d45b92587459349b35f1bfe72bf88c6e3b05b6bd6e3dd1365a7
-  data.tar.gz: 5f4463260e920a12e4f1f04f2414c6391dd87c8a697523a53aaf307e213b3a01989d57801460a6bfa89d4c1833172838e9bc43b8713c802cfadf2cf9ff7150e9
+  metadata.gz: 20eab0fc5d58eadb673fc1f0a4c0a3a844bf04b0a3511e9f20365f9b73462b343a58e393492819705910571782a57802e36108fae67486a443bdd7e314cfe37d
+  data.tar.gz: 90de90dc86bbbed3887c637b6d8d4c1da92a6467da19ab8248c84ec9280311c510750ccf8c38e7b5bf90dbc0d244b840164e155477f94ad6d008634d50bcc116

data/VERSION

@@ -1 +1 @@
-1.5.2
+1.5.3

data/datagrid.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: datagrid 1.5.2 ruby lib
+# stub: datagrid 1.5.3 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "datagrid"
-  s.version = "1.5.2"
+  s.name = "datagrid".freeze
+  s.version = "1.5.3"
 
-  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 = "2017-02-28"
-  s.description = "This allows you to easily build datagrid aka data tables with sortable columns and filters"
-  s.email = "agresso@gmail.com"
+  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-03-06"
+  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 = [
     "LICENSE.txt"
   ]
@@ -126,52 +126,52 @@ Gem::Specification.new do |s|
     "templates/grid.rb.erb",
     "templates/index.html.erb"
   ]
-  s.homepage = "http://github.com/bogdan/datagrid"
-  s.licenses = ["MIT"]
-  s.required_ruby_version = Gem::Requirement.new(">= 2.0")
-  s.rubygems_version = "2.5.1"
-  s.summary = "Ruby gem to create datagrids"
+  s.homepage = "http://github.com/bogdan/datagrid".freeze
+  s.licenses = ["MIT".freeze]
+  s.required_ruby_version = Gem::Requirement.new(">= 2.0".freeze)
+  s.rubygems_version = "2.6.7".freeze
+  s.summary = "Ruby gem to create datagrids".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 4.0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 2.1.2"])
-      s.add_development_dependency(%q<pry-byebug>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 3"])
-      s.add_development_dependency(%q<nokogiri>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<sequel>, [">= 0"])
-      s.add_development_dependency(%q<mongoid>, [">= 0"])
-      s.add_development_dependency(%q<bson>, [">= 0"])
-      s.add_development_dependency(%q<bson_ext>, [">= 0"])
+      s.add_runtime_dependency(%q<rails>.freeze, [">= 4.0"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 2.1.2"])
+      s.add_development_dependency(%q<pry-byebug>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rspec>.freeze, [">= 3"])
+      s.add_development_dependency(%q<nokogiri>.freeze, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>.freeze, [">= 0"])
+      s.add_development_dependency(%q<sequel>.freeze, [">= 0"])
+      s.add_development_dependency(%q<mongoid>.freeze, [">= 0"])
+      s.add_development_dependency(%q<bson>.freeze, [">= 0"])
+      s.add_development_dependency(%q<bson_ext>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 4.0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 2.1.2"])
-      s.add_dependency(%q<pry-byebug>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 3"])
-      s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<sequel>, [">= 0"])
-      s.add_dependency(%q<mongoid>, [">= 0"])
-      s.add_dependency(%q<bson>, [">= 0"])
-      s.add_dependency(%q<bson_ext>, [">= 0"])
+      s.add_dependency(%q<rails>.freeze, [">= 4.0"])
+      s.add_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 2.1.2"])
+      s.add_dependency(%q<pry-byebug>.freeze, [">= 0"])
+      s.add_dependency(%q<rspec>.freeze, [">= 3"])
+      s.add_dependency(%q<nokogiri>.freeze, [">= 0"])
+      s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
+      s.add_dependency(%q<sequel>.freeze, [">= 0"])
+      s.add_dependency(%q<mongoid>.freeze, [">= 0"])
+      s.add_dependency(%q<bson>.freeze, [">= 0"])
+      s.add_dependency(%q<bson_ext>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 4.0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 2.1.2"])
-    s.add_dependency(%q<pry-byebug>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 3"])
-    s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<sequel>, [">= 0"])
-    s.add_dependency(%q<mongoid>, [">= 0"])
-    s.add_dependency(%q<bson>, [">= 0"])
-    s.add_dependency(%q<bson_ext>, [">= 0"])
+    s.add_dependency(%q<rails>.freeze, [">= 4.0"])
+    s.add_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 2.1.2"])
+    s.add_dependency(%q<pry-byebug>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, [">= 3"])
+    s.add_dependency(%q<nokogiri>.freeze, [">= 0"])
+    s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
+    s.add_dependency(%q<sequel>.freeze, [">= 0"])
+    s.add_dependency(%q<mongoid>.freeze, [">= 0"])
+    s.add_dependency(%q<bson>.freeze, [">= 0"])
+    s.add_dependency(%q<bson_ext>.freeze, [">= 0"])
   end
 end
 

data/lib/datagrid/filters.rb

@@ -139,7 +139,7 @@ module Datagrid
 
       def initialize(*args, &block) # :nodoc:
         self.filters_array = self.class.filters_array.clone
-        filters.each do |filter|
+        self.filters_array.each do |filter|
           self[filter.name] = filter.default(self)
         end
         super(*args, &block)

data/spec/datagrid/filters_spec.rb

@@ -292,5 +292,33 @@ describe Datagrid::Filters do
       expect(non_admin_filters).to_not include(:id)
       expect(non_admin_filters).to include(:name)
     end
+
+    context 'with delegation to attribute' do
+      let(:role) { OpenStruct.new('admin?' => admin) }
+      let(:klass) do
+        test_report_class do
+          attr_accessor :role
+          delegate :admin?, to: :role
+
+          scope { Entry }
+
+          filter(:id, :integer, if: :admin?)
+        end
+      end
+
+      subject { klass.new(role: role).filters.map(&:name) }
+
+      context 'when condition is true' do
+        let(:admin) { true }
+
+        it { is_expected.to include(:id) }
+      end
+
+      context 'when condition is false' do
+        let(:admin) { false }
+
+        it { is_expected.to_not include(:id) }
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -299,7 +299,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