datagrid 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e883f173edbcd8f8a7791d5bfa043beb51b31b7c
-  data.tar.gz: 5a5287b4320935f8537fcc32b49c4666fd735770
+  metadata.gz: 0b69adb5df9eebf47a8446dd095c6b966b635649
+  data.tar.gz: 576710b7d11168fcde29d19eddc77f730b94fd43
 SHA512:
-  metadata.gz: 5558c20d49ea5b4dcaf3071a861f2eeb86f72e968331d8c1fedd7bf028f857bfe6b1402aaf89fa2e697c1d65d33559cedcc3ee91daf586a0d55d321d2b2a2445
-  data.tar.gz: a7e98810429dfdd395f051bc783c27eb89673fcf45742a8107d47a020b68b51047e9dda4636526b49d8205d8147be24f476fc96e732e17a95d0845e2e6dbe6ce
+  metadata.gz: 74512141aa0e4dd111ed9dea6783f562c71f509ae45b7a81395371b716331d75a5a95383e2157858c1555f7183de042f33143286eadef72a17db72dba9a83d3f
+  data.tar.gz: 79d7d6e111160e03a1df224be0c3f8263cf968dc2d2266a1c3ca5a2f495adf9c0edb0f71d62e5428953f380b5b4fd3c1594848c7a89f03a41a40227f60b9a7d9

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "rails", ">= 3.2.18"
+gem "rails", ">= 3.2.22.2"
 
 group :development do
 

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.4.2

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.4.1 ruby lib
+# stub: datagrid 1.4.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "1.4.1"
+  s.version = "1.4.2"
 
   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 = "2016-02-10"
+  s.date = "2016-03-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 = [
@@ -78,6 +78,7 @@ Gem::Specification.new do |s|
     "lib/tasks/datagrid_tasks.rake",
     "spec/datagrid/active_model_spec.rb",
     "spec/datagrid/column_names_attribute_spec.rb",
+    "spec/datagrid/columns/column_spec.rb",
     "spec/datagrid/columns_spec.rb",
     "spec/datagrid/core_spec.rb",
     "spec/datagrid/drivers/active_record_spec.rb",
@@ -128,14 +129,14 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/bogdan/datagrid"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.8"
+  s.rubygems_version = "2.4.5"
   s.summary = "Ruby gem to create datagrids"
 
   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>, [">= 3.2.18"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.2.22.2"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<debugger>, [">= 0"])
@@ -149,7 +150,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bson>, [">= 0"])
       s.add_development_dependency(%q<bson_ext>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.2.18"])
+      s.add_dependency(%q<rails>, [">= 3.2.22.2"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<debugger>, [">= 0"])
@@ -164,7 +165,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bson_ext>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.2.18"])
+    s.add_dependency(%q<rails>, [">= 3.2.22.2"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<debugger>, [">= 0"])

data/lib/datagrid/columns/column.rb

@@ -41,8 +41,6 @@ class Datagrid::Columns::Column
       end
     end
     self.query = query
-    options[:if] = convert_option_to_proc(options[:if])
-    options[:unless] = convert_option_to_proc(options[:unless])
   end
 
   def data_value(model, grid)
@@ -56,7 +54,11 @@ class Datagrid::Columns::Column
   end
 
   def header
-    self.options[:header] || Datagrid::Utils.translate_from_namespace(:columns, grid_class, name)
+    if header = options[:header] 
+      callable(header)
+    else
+      Datagrid::Utils.translate_from_namespace(:columns, grid_class, name)
+    end
   end
 
   def order
@@ -101,11 +103,12 @@ class Datagrid::Columns::Column
   end
 
   def enabled?(grid)
-    (!options[:if] || (options[:if] && options[:if].call(grid))) && !options[:unless] || (options[:unless] && !options[:unless].call(grid))
+    column_availability(grid, options[:if], true) &&
+      !column_availability(grid, options[:unless], false)
   end
 
   def inspect
-    "#<Datagrid::Columns::Column #{grid_class}##{name} #{options.inspect}>"
+    "#<#{self.class} #{grid_class}##{name} #{options.inspect}>"
   end
 
   def to_s
@@ -127,11 +130,20 @@ class Datagrid::Columns::Column
   end
 
   private
-  def convert_option_to_proc(option)
-    if option.is_a?(Proc)
-      option
-    elsif option
-      proc {|object| object.send(option.to_sym) }
+  def column_availability(grid, option, default)
+    case option
+    when nil
+      default
+    when Proc
+      option.call(grid)
+    when Symbol, String
+      grid.send(option.to_sym) 
+    else
+      raise Datagrid::ConfigurationError, "Incorrect column availability option: #{option.insepct}"
     end
   end
+
+  def callable(value)
+    value.respond_to?(:call) ? value.call : value
+  end
 end

data/lib/datagrid/filters/base_filter.rb

@@ -49,7 +49,11 @@ class Datagrid::Filters::BaseFilter #:nodoc:
   end
 
   def header
-    options[:header] || Datagrid::Utils.translate_from_namespace(:filters, grid_class, name)
+    if header = options[:header] 
+      callable(header)
+    else
+      Datagrid::Utils.translate_from_namespace(:filters, grid_class, name)
+    end
   end
 
   def default(object = nil)
@@ -154,6 +158,10 @@ class Datagrid::Filters::BaseFilter #:nodoc:
     ','
   end
 
+  def callable(value)
+    value.respond_to?(:call) ? value.call : value
+  end
+
   def driver
     grid_class.driver
   end

data/spec/datagrid/columns/column_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Datagrid::Columns::Column do
+  
+  describe ".inspect" do
+    subject do
+      class ColumnInspectTest
+        include Datagrid
+        scope {Entry}
+        column(:id, header: "ID")
+      end
+      ColumnInspectTest.column_by_name(:id)
+    end
+
+    it "shows inspect information" do
+      expect(subject.inspect).to eq("#<Datagrid::Columns::Column ColumnInspectTest#id {:header=>\"ID\"}>")
+    end
+  end
+end

data/spec/datagrid/columns_spec.rb

@@ -118,6 +118,15 @@ describe Datagrid::Columns do
       ])
     end
 
+    it "supports dynamic header" do
+      grid = test_report do
+        scope {Entry}
+        column(:id, header: proc { rand(10**9) })
+      end
+
+      expect(grid.header).to_not eq(grid.header)
+    end
+
     it "should generate hash for given asset" do
       expect(subject.hash_for(entry)).to eq({
         :group => "Pop",

data/spec/datagrid/filters_spec.rb

@@ -192,6 +192,17 @@ describe Datagrid::Filters do
 
   end
 
+    
+  it "supports dynamic header" do
+    grid = test_report do
+      scope {Entry}
+      filter(:id, :integer, header: proc { rand(10**9) })
+    end
+
+    filter = grid.filter_by_name(:id)
+    expect(filter.header).to_not eq(filter.header)
+  end
+
 
   describe "#filter_by_name" do
     it "should return filter object" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.18
+        version: 3.2.22.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.18
+        version: 3.2.22.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -260,6 +260,7 @@ files:
 - lib/tasks/datagrid_tasks.rake
 - spec/datagrid/active_model_spec.rb
 - spec/datagrid/column_names_attribute_spec.rb
+- spec/datagrid/columns/column_spec.rb
 - spec/datagrid/columns_spec.rb
 - spec/datagrid/core_spec.rb
 - spec/datagrid/drivers/active_record_spec.rb
@@ -327,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby gem to create datagrids