datagrid 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a86d3d1a93e184496486be98659d834991d87789
-  data.tar.gz: 04571cb15dee9f818907c3832bdecbe65d3a1002
+  metadata.gz: 9a695cb0107f631edef6c8ff40d794e88559dfca
+  data.tar.gz: 49b8de0521a68a356134ae23b529a162756fa117
 SHA512:
-  metadata.gz: 520a31aecb53d6afedd645e0442504b0f9d581a6e3d076e5f0cd3cc1629c3b5dd88c0aa9dc49046c483d78ab5227131e1f7eeb64b7f9c90aa638ed1b20fd5372
-  data.tar.gz: acb8a306c7f666a4cab3a7d31a78264ca351b754ae2aded735feaf9e7feddf8675d77e2a31515d846c3ad1c90866517d93e563abf2cf1150ad9cec33e1abab65
+  metadata.gz: 899d48d0a4a15e09463284d1f724191f59e005e4333bd27c33497f6c410ad679244d8e33b69a1d45b92587459349b35f1bfe72bf88c6e3b05b6bd6e3dd1365a7
+  data.tar.gz: 5f4463260e920a12e4f1f04f2414c6391dd87c8a697523a53aaf307e213b3a01989d57801460a6bfa89d4c1833172838e9bc43b8713c802cfadf2cf9ff7150e9

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 #bundler_args: --without development
 rvm:
-  - 2.0.0
-  - 2.1.1
-  - 2.2.0
+  - 2.2.2
+  - 2.3.0
+  - 2.4.0
   #- jruby
   #- jruby-head
 #env: JRUBY_OPTS="--server -J-Xms512m -J-Xmx1024m"

data/Gemfile

@@ -1,13 +1,16 @@
 source "https://rubygems.org"
 
-gem "rails", ">= 3.2.22.2"
+gem "rails", ">= 4.0"
 
 group :development do
 
   gem "bundler"
-  gem "jeweler", ">= 2.1.2"
+  if RUBY_VERSION >= "2.3"
+    gem "jeweler", ">= 2.1.2", platform: [:ruby_23, :ruby_24]
+  end
 
 
+  #gem "json", ">= 1.9"
   gem "pry-byebug", :platform => [:ruby_20, :ruby_21, :ruby_22, :ruby_23] & Bundler::Dsl::VALID_PLATFORMS
 
   gem "rspec", ">= 3"
@@ -17,8 +20,8 @@ group :development do
   gem "sequel"
 
   group :mongo do
-    gem "mongoid", "3.1.7"
-    gem "mongo_mapper", "~> 0.13.0"
+    gem "mongoid"
+    #gem "mongo_mapper", "~> 0.13.0"
     gem "bson"
     gem "bson_ext"
   end

data/Rakefile

@@ -11,20 +11,22 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "datagrid"
-  gem.homepage = "http://github.com/bogdan/datagrid"
-  gem.license = "MIT"
-  gem.summary = %Q{Ruby gem to create datagrids}
-  gem.description = %Q{This allows you to easily build datagrid aka data tables with sortable columns and filters}
-  gem.email = "agresso@gmail.com"
-  gem.authors = ["Bogdan Gusiev"]
-  gem.required_ruby_version = '>= 2.0'
-  # dependencies defined in Gemfile
+if RUBY_VERSION >= "2.3"
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+    gem.name = "datagrid"
+    gem.homepage = "http://github.com/bogdan/datagrid"
+    gem.license = "MIT"
+    gem.summary = %Q{Ruby gem to create datagrids}
+    gem.description = %Q{This allows you to easily build datagrid aka data tables with sortable columns and filters}
+    gem.email = "agresso@gmail.com"
+    gem.authors = ["Bogdan Gusiev"]
+    gem.required_ruby_version = '>= 2.0'
+    # dependencies defined in Gemfile
+  end
+  Jeweler::RubygemsDotOrgTasks.new
 end
-Jeweler::RubygemsDotOrgTasks.new
 
 require 'rspec/core'
 require 'rspec/core/rake_task'

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

data/app/views/datagrid/_enum_checkboxes.html.erb

@@ -5,7 +5,7 @@ You can add indent if whitespace doesn't matter for you
 <%- elements.each do |value, text, checked| -%>
 <%- id = [form.object_name, filter.name, value].join('_').underscore -%>
 <%= form.label filter.name, options.merge(:for => id) do -%>
-<%= form.check_box(filter.name, form.datagrid_extra_checkbox_options.merge(:multiple => true, :id => id, :checked => checked), value.to_s, nil) -%>
+<%= form.check_box(filter.name, {:multiple => true, :id => id, :checked => checked, :include_hidden => false}, value.to_s, nil) -%>
 <%= text -%>
 <%- end -%>
 <%- end -%>

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.1 ruby lib
+# stub: datagrid 1.5.2 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "datagrid".freeze
-  s.version = "1.5.1"
+  s.name = "datagrid"
+  s.version = "1.5.2"
 
-  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 = "2016-10-25"
-  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.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.extra_rdoc_files = [
     "LICENSE.txt"
   ]
@@ -126,55 +126,52 @@ Gem::Specification.new do |s|
     "templates/grid.rb.erb",
     "templates/index.html.erb"
   ]
-  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
+  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"
 
   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>.freeze, [">= 3.2.22.2"])
-      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, ["= 3.1.7"])
-      s.add_development_dependency(%q<mongo_mapper>.freeze, ["~> 0.13.0"])
-      s.add_development_dependency(%q<bson>.freeze, [">= 0"])
-      s.add_development_dependency(%q<bson_ext>.freeze, [">= 0"])
+      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"])
     else
-      s.add_dependency(%q<rails>.freeze, [">= 3.2.22.2"])
-      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, ["= 3.1.7"])
-      s.add_dependency(%q<mongo_mapper>.freeze, ["~> 0.13.0"])
-      s.add_dependency(%q<bson>.freeze, [">= 0"])
-      s.add_dependency(%q<bson_ext>.freeze, [">= 0"])
+      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"])
     end
   else
-    s.add_dependency(%q<rails>.freeze, [">= 3.2.22.2"])
-    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, ["= 3.1.7"])
-    s.add_dependency(%q<mongo_mapper>.freeze, ["~> 0.13.0"])
-    s.add_dependency(%q<bson>.freeze, [">= 0"])
-    s.add_dependency(%q<bson_ext>.freeze, [">= 0"])
+    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"])
   end
 end
 

data/lib/datagrid.rb

@@ -15,10 +15,10 @@ module Datagrid
 
   autoload :Helper
   ActionView::Base.send(:include, Datagrid::Helper)
-  
+
   autoload :FormBuilder
   ActionView::Helpers::FormBuilder.send(:include, Datagrid::FormBuilder)
-  
+
   autoload :Renderer
 
   autoload :Engine

data/lib/datagrid/columns/column.rb

@@ -59,7 +59,7 @@ class Datagrid::Columns::Column
 
   def header
     if header = options[:header]
-      callable(header)
+      Datagrid::Utils.callable(header)
     else
       Datagrid::Utils.translate_from_namespace(:columns, grid_class, name)
     end
@@ -157,10 +157,6 @@ class Datagrid::Columns::Column
 
   end
 
-  def callable(value)
-    value.respond_to?(:call) ? value.call : value
-  end
-
   def driver
     grid_class.driver
   end

data/lib/datagrid/core.rb

@@ -171,6 +171,12 @@ module Datagrid
         "#<#{self.class} #{attrs}>"
       end
 
+      def ==(other)
+        self.class == other.class &&
+          attributes == other.attributes &&
+          scope == other.scope
+      end
+
     end # InstanceMethods
   end
 end

data/lib/datagrid/drivers/abstract_driver.rb

@@ -63,7 +63,7 @@ module Datagrid
       end
 
       def is_timestamp?(scope, field)
-        raise NotImplementedError
+        normalized_column_type(scope, field) == :timestamp
       end
 
       def contains(scope, field, value)

data/lib/datagrid/drivers/active_record.rb

@@ -81,18 +81,14 @@ module Datagrid
         scope.column_names
       end
 
-      def is_timestamp?(scope, field)
-        column_type(scope, field) == :datetime
-      end
-
       def contains(scope, field, value)
         field = prefix_table_name(scope, field)
         scope.where("#{field} #{contains_predicate} ?", "%#{value}%")
       end
 
       def normalized_column_type(scope, field)
-        type = column_type(scope, field)
-        return nil unless type
+        return nil unless has_column?(scope, field)
+        builtin_type = scope.columns_hash[field.to_s].type
         {
           [:string, :text, :time, :binary] => :string,
           [:integer, :primary_key] => :integer,
@@ -101,7 +97,7 @@ module Datagrid
           [:datetime, :timestamp] => :timestamp,
           [:boolean] => :boolean
         }.each do |keys, value|
-          return value if keys.include?(type)
+          return value if keys.include?(builtin_type)
         end
       end
 
@@ -135,10 +131,6 @@ module Datagrid
           ::ActiveRecord::Base.connection.is_a?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) ?
           'ilike' : 'like'
       end
-
-      def column_type(scope, field)
-        has_column?(scope, field) ? scope.columns_hash[field.to_s].type : nil
-      end
     end
   end
 end

data/lib/datagrid/drivers/array.rb

@@ -32,6 +32,10 @@ module Datagrid
         column_name
       end
 
+      def reverse_order(scope)
+        scope.reverse
+      end
+
       def greater_equal(scope, field, value)
         scope.select do |object|
           compare_value = object.send(field)

data/lib/datagrid/drivers/mongoid.rb

@@ -46,11 +46,6 @@ module Datagrid
         column_names(scope).include?(column_name.to_s)
       end
 
-      def is_timestamp?(scope, column_name)
-        has_column?(scope, column_name) &&
-          timestamp_class?(to_scope(scope).klass.fields[column_name.to_s].type)
-      end
-
       def contains(scope, field, value)
         scope.where(field => Regexp.compile(Regexp.escape(value)))
       end
@@ -70,7 +65,7 @@ module Datagrid
 
           TIMESTAMP_CLASSES => :timestamp,
 
-          [Float] => :fload,
+          [Float] => :float,
 
           [Integer] => :integer,
         }.each do |keys, value|

data/lib/datagrid/drivers/sequel.rb

@@ -56,10 +56,6 @@ module Datagrid
         scope.columns
       end
 
-      def is_timestamp?(scope, column_name)
-        column_type(scope, column_name) == :datetime
-      end
-
       def contains(scope, field, value)
         field = prefix_table_name(scope, field)
         scope.where(Sequel.like(field, "%#{value}%"))
@@ -73,7 +69,7 @@ module Datagrid
           [:integer, :primary_key] => :integer,
           [:float, :decimal] => :float,
           [:date] => :date,
-          [:datetime] => :datetime,
+          [:datetime] => :timestamp,
           [:boolean] => :boolean
         }.each do |keys, value|
           return value if keys.include?(type)

data/lib/datagrid/filters/base_filter.rb

@@ -55,7 +55,7 @@ class Datagrid::Filters::BaseFilter #:nodoc:
 
   def header
     if header = options[:header]
-      callable(header)
+      Datagrid::Utils.callable(header)
     else
       Datagrid::Utils.translate_from_namespace(:filters, grid_class, name)
     end
@@ -167,10 +167,6 @@ class Datagrid::Filters::BaseFilter #:nodoc:
     ','
   end
 
-  def callable(value)
-    value.respond_to?(:call) ? value.call : value
-  end
-
   def driver
     grid_class.driver
   end

data/lib/datagrid/filters/extended_boolean_filter.rb

@@ -1,16 +1,14 @@
-class Datagrid::Filters::ExtendedBooleanFilter < Datagrid::Filters::EnumFilter #:nodoc: 
+class Datagrid::Filters::ExtendedBooleanFilter < Datagrid::Filters::EnumFilter #:nodoc:
 
   YES = "YES"
   NO = "NO"
 
   def initialize(report, attribute, options = {}, &block)
-    options[:select] = [YES, NO].map do |key, value|
-      [I18n.t("datagrid.filters.xboolean.#{key.downcase}"), key]
-    end
+    options[:select] = -> { boolean_select }
     super(report, attribute, options, &block)
   end
 
-  def execute(value, scope, grid_object) 
+  def execute(value, scope, grid_object)
     value = value.blank? ? nil : ::Datagrid::Utils.booleanize(value)
     super(value, scope, grid_object)
   end
@@ -28,4 +26,11 @@ class Datagrid::Filters::ExtendedBooleanFilter < Datagrid::Filters::EnumFilter #
     end
   end
 
+  protected
+
+  def boolean_select
+    [YES, NO].map do |key, value|
+      [I18n.t("datagrid.filters.xboolean.#{key.downcase}"), key]
+    end
+  end
 end

data/lib/datagrid/filters/integer_filter.rb

@@ -6,6 +6,10 @@ class Datagrid::Filters::IntegerFilter < Datagrid::Filters::BaseFilter
 
   def parse(value)
     return nil if value.blank?
+    if defined?(ActiveRecord) && value.is_a?(ActiveRecord::Base) &&
+        value.respond_to?(:id) && value.id.is_a?(Integer)
+      return value.id
+    end
     return value if value.is_a?(Range)
     value.to_i
   end

data/lib/datagrid/filters/select_options.rb

@@ -16,11 +16,12 @@ module Datagrid::Filters::SelectOptions
 
   def include_blank
     unless prompt
-      options.has_key?(:include_blank) ? options[:include_blank] : !multiple?
+      options.has_key?(:include_blank) ?
+        Datagrid::Utils.callable(options[:include_blank]) : !multiple?
     end
   end
-  
+
   def prompt
-    options.has_key?(:prompt) ? options[:prompt] : false
+    options.has_key?(:prompt) ? Datagrid::Utils.callable(options[:prompt]) : false
   end
 end