datagrid 1.5.8 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aa302439fb009cb596541a3cd2c6d5d584dc973c
-  data.tar.gz: 53a5b714ec1ecc3279c7cd0fb278c7c4c150785d
+SHA256:
+  metadata.gz: 94a9a3ff232cd83f323e280e35a805ebd4ec725b74b531c18328c4de27952f2f
+  data.tar.gz: c91f39764fa86f0d8b016de33eeabfd37b47d16411f3f52ec796f2bf1d14d534
 SHA512:
-  metadata.gz: 72b9bb255878dafebf1a932ee8908fedeba902e306480ebe3a1792267c63f19ff61959336be9d7c48f4df9b8f922f24ba21c781e9c000708a632d1b45577f1ac
-  data.tar.gz: ec7577b30d0579b9ba106e220d4c89c2d2fb70bb83f33d31fce3feb4396a7bb28850ef81664187567696b585b26c2ef0873f2165859f36fe9d6233e3e092409d
+  metadata.gz: b999afc64d7094dfd47a2e4f393824df58edf15769c445a9d16712dc6f531f3b30f872046cd657bc9323df6a460b4d1a74334fc4b498de141a9998d3aa6c34bc
+  data.tar.gz: 89d0e83bd75e28ee33dc890d2f5f82de6391a9d32b0723e77afa8dfc0856d126c1fe0ee4c8ab5b0b2f5491e5908b45e14de0bd18669c2786764faeac8c6fc0c2

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 2.2.2
   - 2.3.0
   - 2.4.1
+  - 2.5.1
   #- jruby
   #- jruby-head
 #env: JRUBY_OPTS="--server -J-Xms512m -J-Xmx1024m"

data/Gemfile

@@ -6,17 +6,17 @@ group :development do
 
   gem "bundler"
   if RUBY_VERSION >= "2.3"
-    gem "jeweler", ">= 2.1.2", platform: [:ruby_23, :ruby_24]
+    gem "jeweler", ">= 2.1.2", platform: [:ruby_23, :ruby_24, :ruby_25]
   end
 
 
   #gem "json", ">= 1.9"
-  gem "pry-byebug", :platform => [:ruby_20, :ruby_21, :ruby_22, :ruby_23] & Bundler::Dsl::VALID_PLATFORMS
+  gem "pry-byebug", :platform => [:ruby_24, :ruby_25, :ruby_22, :ruby_23] & Bundler::Dsl::VALID_PLATFORMS
 
   gem "rspec", ">= 3"
   gem "nokogiri" # used to test html output
 
-  gem "sqlite3"
+  gem "sqlite3", "~> 1.3.6"
   gem "sequel"
 
   group :mongo do

data/VERSION

@@ -1 +1 @@
-1.5.8
+1.5.9

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.5.8 ruby lib
+# stub: datagrid 1.5.9 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid".freeze
-  s.version = "1.5.8"
+  s.version = "1.5.9"
 
   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-12-12"
+  s.date = "2019-05-10"
   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 = [
@@ -130,7 +130,7 @@ Gem::Specification.new do |s|
   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.14".freeze
+  s.rubygems_version = "2.7.8".freeze
   s.summary = "Ruby gem to create datagrids".freeze
 
   if s.respond_to? :specification_version then
@@ -143,7 +143,7 @@ Gem::Specification.new do |s|
       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<sqlite3>.freeze, ["~> 1.3.6"])
       s.add_development_dependency(%q<sequel>.freeze, [">= 0"])
       s.add_development_dependency(%q<mongoid>.freeze, [">= 0"])
       s.add_development_dependency(%q<bson>.freeze, [">= 0"])
@@ -155,7 +155,7 @@ Gem::Specification.new do |s|
       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<sqlite3>.freeze, ["~> 1.3.6"])
       s.add_dependency(%q<sequel>.freeze, [">= 0"])
       s.add_dependency(%q<mongoid>.freeze, [">= 0"])
       s.add_dependency(%q<bson>.freeze, [">= 0"])
@@ -168,7 +168,7 @@ Gem::Specification.new do |s|
     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<sqlite3>.freeze, ["~> 1.3.6"])
     s.add_dependency(%q<sequel>.freeze, [">= 0"])
     s.add_dependency(%q<mongoid>.freeze, [">= 0"])
     s.add_dependency(%q<bson>.freeze, [">= 0"])

data/lib/datagrid/columns/column.rb

@@ -123,11 +123,6 @@ class Datagrid::Columns::Column
   end
 
 
-  def block
-    Datagrid::Utils.warn_once("Datagrid::Columns::Column#block is deprecated. Use #html_block or #data_block instead")
-    data_block
-  end
-
   def generic_value(model, grid)
     grid.generic_value(self, model)
   end

data/lib/datagrid/filters.rb

@@ -53,7 +53,7 @@ module Datagrid
       def filter_by_name(attribute)
         return attribute if attribute.is_a?(Datagrid::Filters::BaseFilter)
         self.filters.find do |filter|
-          filter.name.to_sym == attribute.to_sym
+          filter.name == attribute.to_sym
         end
       end
 

data/lib/datagrid/filters/base_filter.rb

@@ -7,7 +7,7 @@ class Datagrid::Filters::BaseFilter #:nodoc:
 
   def initialize(grid_class, name, options = {}, &block)
     self.grid_class = grid_class
-    self.name = name
+    self.name = name.to_sym
     self.options = options
     self.block = block || default_filter_block
   end
@@ -61,18 +61,10 @@ class Datagrid::Filters::BaseFilter #:nodoc:
     end
   end
 
-  def default(object = nil)
-    unless object
-      Datagrid::Utils.warn_once("#{self.class.name}#default without argument is deprecated")
-    end
+  def default(object)
     default = self.options[:default]
     if default.is_a?(Symbol)
-      if object.respond_to?(default)
-        object.send(default)
-      else
-        Datagrid::Utils.warn_once(":default as a Symbol is now treated as a method name. Use String instead or -> { default } if you really want default value to be a Symbol but not a String.")
-        default
-      end
+      object.send(default)
     elsif default.respond_to?(:call)
       Datagrid::Utils.apply_args(object, &default)
     else
@@ -80,11 +72,6 @@ class Datagrid::Filters::BaseFilter #:nodoc:
     end
   end
 
-  def multiple
-    Datagrid::Utils.warn_once("Filter#multiple method is deprecated. Use Filter#multiple? instead")
-    multiple?
-  end
-
   def multiple?
     self.options[:multiple]
   end

data/lib/datagrid/filters/dynamic_filter.rb

@@ -4,12 +4,22 @@ class Datagrid::Filters::DynamicFilter < Datagrid::Filters::BaseFilter
 
   include Datagrid::Filters::SelectOptions
 
+  EQUAL_OPERATION = '='
+  LIKE_OPERATION = '=~'
+  MORE_EQUAL_OPERATION = '>='
+  LESS_EQUAL_OPERATION = '<='
+  DEFAULT_OPERATIONS = [
+    EQUAL_OPERATION,
+    LIKE_OPERATION,
+    MORE_EQUAL_OPERATION,
+    LESS_EQUAL_OPERATION,
+  ]
   AVAILABLE_OPERATIONS = %w(= =~ >= <=)
 
   def initialize(*)
     super
     options[:select] ||= default_select
-    options[:operations] ||= AVAILABLE_OPERATIONS
+    options[:operations] ||= DEFAULT_OPERATIONS
     unless options.has_key?(:include_blank)
       options[:include_blank] = false
     end
@@ -35,12 +45,12 @@ class Datagrid::Filters::DynamicFilter < Datagrid::Filters::BaseFilter
       raise Datagrid::FilteringError, "Unknown operation: #{operation.inspect}. Available operations: #{operations.join(' ')}"
     end
     case operation
-    when '='
+    when EQUAL_OPERATION
       if date_conversion
         value = Datagrid::Utils.format_date_as_timestamp(value)
       end
       driver.where(scope, field, value)
-    when '=~'
+    when LIKE_OPERATION
       if column_type(field) == :string
         driver.contains(scope, field, value)
       else
@@ -49,12 +59,12 @@ class Datagrid::Filters::DynamicFilter < Datagrid::Filters::BaseFilter
         end
         driver.where(scope, field, value)
       end
-    when '>='
+    when MORE_EQUAL_OPERATION
       if date_conversion
         value = value.beginning_of_day
       end
       driver.greater_equal(scope, field, value)
-    when '<='
+    when LESS_EQUAL_OPERATION
       if date_conversion
         value = value.end_of_day
       end

data/lib/datagrid/filters/select_options.rb

@@ -1,9 +1,6 @@
 module Datagrid::Filters::SelectOptions
 
-  def select(object = nil)
-    unless object
-      Datagrid::Utils.warn_once("#{self.class.name}#select without argument is deprecated")
-    end
+  def select(object)
     select = self.options[:select]
     if select.is_a?(Symbol)
       object.send(select)

data/lib/datagrid/form_builder.rb

@@ -140,43 +140,16 @@ module Datagrid
       if filter.range?
         partial = partial_path('range_filter')
         options = options.merge(:multiple => true)
-
-
         from_options = datagrid_range_filter_options(object, filter, :from, options)
         to_options = datagrid_range_filter_options(object, filter, :to, options)
-        from_input = text_field(filter.name, from_options)
-        to_input = text_field(filter.name, to_options)
-
-        format_key = "datagrid.filters.#{type}.range_format"
-        separator_key = "datagrid.filters.#{type}.range_separator"
-        # 2 inputs: "from date" and "to date" to specify a range
-        if I18n.exists?(separator_key)
-          # Support deprecated translation option: range_separator
-          warn_deprecated_range_localization(separator_key)
-          separator = I18n.t(separator_key, default: '').presence
-          [from_input, separator, to_input].join.html_safe
-        elsif I18n.exists?(format_key)
-          # Support deprecated translation option: range_format
-          warn_deprecated_range_localization(format_key)
-          I18n.t(format_key, :from_input => from_input, :to_input => to_input).html_safe
-        else
-          # More flexible way to render via partial
-          @template.render :partial => partial, :locals => {
-            :from_options => from_options, :to_options => to_options, :filter => filter, :form => self
-          }
-        end
+        @template.render :partial => partial, :locals => {
+          :from_options => from_options, :to_options => to_options, :filter => filter, :form => self
+        }
       else
         datagrid_default_filter(filter, options)
       end
     end
 
-    def warn_deprecated_range_localization(key)
-      Datagrid::Utils.warn_once(
-        "#{key} localization key is deprectated. " +
-        "Customize formatting by rake datagrid:copy_partials and editing app/views/datagrid/range_filter partial."
-      )
-    end
-
     def datagrid_range_filter_options(object, filter, type, options)
       type_method_map = {:from => :first, :to => :last}
       options = add_html_classes(options, type)

data/lib/datagrid/locale/en.yml

@@ -1,11 +1,11 @@
 en:
   datagrid:
     no_results:
-      "——"
+      "――"
     table:
       order:
-        asc: "↑"
-        desc: "↓"
+        asc: "↑"
+        desc: "↓"
       no_columns: "No columns selected"
     form:
       search: "Search"
@@ -17,7 +17,7 @@ en:
 
       dynamic:
         operations:
-          ">=": "≥"
-          "<=": "&le;"
+          ">=": "≥"
+          "<=": "≤"
           "=": "="
-          "=~": "&asymp;"
+          "=~": "≈"

data/spec/datagrid/form_builder_spec.rb

@@ -154,34 +154,8 @@ describe Datagrid::FormBuilder do
         ) }
 
       end
-
-      context "when deprecated format translation specified" do
-        let(:_range) { nil }
-        around(:each) do |example|
-          store_translations(:en, datagrid: {filters: {integer: {range_format: "from %{from_input} to %{to_input}"}}}) do
-            silence_warnings do
-              example.run
-            end
-          end
-        end
-        it { should equal_to_dom(
-          'from <input class="group_id integer_filter from" multiple type="text" name="report[group_id][]"> to <input class="group_id integer_filter to" multiple type="text" name="report[group_id][]">'
-        )}
-      end
-      context "when deprecated separator is specified" do
-        let(:_range) { nil }
-        around(:each) do |example|
-          store_translations(:en, datagrid: {filters: {integer: {range_separator: " | "}}}) do
-            silence_warnings do
-              example.run
-            end
-          end
-        end
-        it { should equal_to_dom(
-          '<input class="group_id integer_filter from" multiple type="text" name="report[group_id][]"> | <input class="group_id integer_filter to" multiple type="text" name="report[group_id][]">'
-        )}
-      end
     end
+
     context "with float filter type and range option" do
       let(:_filter) { :rating }
       let(:_grid) {
@@ -198,7 +172,6 @@ describe Datagrid::FormBuilder do
       )}
     end
 
-
     context "with date filter type and range option" do
       let(:_filter) { :created_at }
       let(:_grid) {

data/spec/datagrid/helper_spec.rb

@@ -44,7 +44,7 @@ describe Datagrid::Helper do
       expect(datagrid_table).to match_css_pattern(
         "table.datagrid tr td.noresults" => 1
       )
-      expect(datagrid_table).to include("——")
+      expect(datagrid_table).to include(I18n.t("datagrid.no_results"))
     end
   end
 

data/spec/support/active_record.rb

@@ -1,3 +1,4 @@
+require "sqlite3"
 
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 #ActiveRecord::Base.configurations = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.5.9
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -98,16 +98,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -300,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Ruby gem to create datagrids