datagrid 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73197170df7e4ea6b273acbf39a305d2fda2e43f
-  data.tar.gz: d5b443380915e544d250a887eed816f87872eaf3
+  metadata.gz: 2e27c90403d5aa7a2c924c000961747a6f8aad08
+  data.tar.gz: dc805468469c8c967b06f69b33e875038d606ae2
 SHA512:
-  metadata.gz: 20eab0fc5d58eadb673fc1f0a4c0a3a844bf04b0a3511e9f20365f9b73462b343a58e393492819705910571782a57802e36108fae67486a443bdd7e314cfe37d
-  data.tar.gz: 90de90dc86bbbed3887c637b6d8d4c1da92a6467da19ab8248c84ec9280311c510750ccf8c38e7b5bf90dbc0d244b840164e155477f94ad6d008634d50bcc116
+  metadata.gz: 033dd01f968f8af3360e92623c2921d6b08cc5032eac39d46e948bc9fc14b6f5d988c21e9c3aea4493aebfb59c30f986770b2cee35beb2a1aa0423fd51f91004
+  data.tar.gz: 609622339821f30c85f9d8abcb603ee592763ac0a57c78f0d0e0e00d9691292d224ab443d369ef4672336debb5bab9cf2392e0c83ce2854d2019c4affbb2bcb4

data/.travis.yml

@@ -3,7 +3,7 @@ language: ruby
 rvm:
   - 2.2.2
   - 2.3.0
-  - 2.4.0
+  - 2.4.1
   #- jruby
   #- jruby-head
 #env: JRUBY_OPTS="--server -J-Xms512m -J-Xmx1024m"

data/VERSION

@@ -1 +1 @@
-1.5.3
+1.5.4

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.3 ruby lib
+# stub: datagrid 1.5.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid".freeze
-  s.version = "1.5.3"
+  s.version = "1.5.4"
 
   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.date = "2017-06-16"
   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 = [

data/lib/datagrid/active_model.rb

@@ -4,7 +4,7 @@ module Datagrid
   # Required to be ActiveModel compatible
   # @private
   module ActiveModel #:nodoc:
-  
+
     def self.included(base)
       base.extend         ClassMethods
       base.class_eval do
@@ -13,21 +13,23 @@ module Datagrid
           extend ::ActiveModel::Naming
         rescue LoadError
         end
+        begin
+          require 'active_model/attributes_assignment'
+          extend ::ActiveModel::AttributesAssignment
+        rescue LoadError
+        end
+
       end
       base.send :include, InstanceMethods
     end # self.included
-  
+
     module ClassMethods
-  
       def param_name
         self.to_s.underscore.tr('/', '_')
       end
-
-
     end # ClassMethods
-  
+
     module InstanceMethods
-  
       def param_name
         self.class.param_name
       end
@@ -52,8 +54,5 @@ module Datagrid
         self.param_name
       end
     end # InstanceMethods
-  
   end
-    
-  
 end

data/lib/datagrid/core.rb

@@ -103,14 +103,18 @@ module Datagrid
 
 
       # Updates datagrid attributes with a passed hash argument
-      def assign_attributes(attributes)
-        attributes.each do |name, value|
-          self[name] = value
+      def attributes=(attributes)
+        if respond_to?(:assign_attributes)
+          assign_attributes(attributes)
+        else
+          attributes.each do |name, value|
+            self[name] = value
+          end
+          self
         end
-        self
       end
-      alias attributes= assign_attributes
 
+      # Returns serializable query arguments skipping all nil values
       def as_query
         attributes = self.attributes.clone
         attributes.each do |key, value|

data/lib/datagrid/drivers/sequel.rb

@@ -13,7 +13,7 @@ module Datagrid
 
       def to_scope(scope)
         return scope if scope.is_a?(::Sequel::Dataset)
-        scope.where
+        scope.where({})
       end
 
       def append_column_queries(assets, columns)
@@ -41,11 +41,11 @@ module Datagrid
       end
 
       def greater_equal(scope, field, value)
-        scope.where(["#{prefix_table_name(scope, field)} >= ?", value])
+        scope.where(::Sequel.lit("#{prefix_table_name(scope, field)} >= ?", value))
       end
 
       def less_equal(scope, field, value)
-        scope.where(["#{prefix_table_name(scope, field)} <= ?", value])
+        scope.where(::Sequel.lit("#{prefix_table_name(scope, field)} <= ?", value))
       end
 
       def has_column?(scope, column_name)

data/lib/datagrid/form_builder.rb

@@ -103,7 +103,7 @@ module Datagrid
       input_name = "#{object_name}[#{filter.name.to_s}][]"
       field, operation, value = object.filter_value(filter)
       options = options.merge(:name => input_name)
-      field_input = select(
+      field_input = dynamic_filter_select(
         filter.name,
         object.select_options(filter) || [],
         {
@@ -114,7 +114,7 @@ module Datagrid
         },
         add_html_classes(options, "field")
       )
-      operation_input = select(
+      operation_input = dynamic_filter_select(
         filter.name, filter.operations_select,
         {:include_blank => false, :include_hidden => false, :prompt => false, :selected => operation },
         add_html_classes(options, "operation")
@@ -123,6 +123,18 @@ module Datagrid
       [field_input, operation_input, value_input].join("\n").html_safe
     end
 
+    def dynamic_filter_select(name, variants, select_options, html_options)
+      if variants.size <= 1
+        value = variants.first
+        # select options format may vary
+        value = value.last if value.is_a?(Array)
+        # don't render any visible input when there is nothing to choose from
+        hidden_field(name, html_options.merge(value: value))
+      else
+        select(name, variants, select_options, html_options)
+      end
+    end
+
     def datagrid_range_filter(type, attribute_or_filter, options = {})
       filter = datagrid_get_filter(attribute_or_filter)
       if filter.range?

data/lib/datagrid/utils.rb

@@ -13,17 +13,18 @@ module Datagrid
       end
 
       def translate_from_namespace(namespace, grid_class, key)
-        deprecated_key = :"datagrid.#{grid_class.param_name}.#{namespace}.#{key}"
-        live_key = :"datagrid.#{grid_class.model_name.i18n_key}.#{namespace}.#{key}"
-        i18n_key = grid_class.model_name.i18n_key.to_s
-
-        if grid_class.param_name != i18n_key && I18n.exists?(deprecated_key)
-          Datagrid::Utils.warn_once(
-            "Deprecated translation namespace 'datagrid.#{grid_class.param_name}' for #{grid_class}. Use 'datagrid.#{i18n_key}' instead."
-          )
-          return I18n.t(deprecated_key)
+
+        lookups = []
+        namespaced_key = "#{namespace}.#{key}"
+
+        grid_class.ancestors.each do |ancestor|
+          if ancestor.respond_to?(:model_name)
+            lookups << :"datagrid.#{ancestor.model_name.i18n_key}.#{namespaced_key}"
+          end
         end
-        I18n.t(live_key, default: key.to_s.humanize).presence
+        lookups << :"datagrid.defaults.#{namespaced_key}"
+        lookups << key.to_s.humanize
+        I18n.t(lookups.shift, default: lookups).presence
       end
 
       def warn_once(message, delay = 5)

data/spec/datagrid/columns_spec.rb

@@ -63,30 +63,36 @@ describe Datagrid::Columns do
           column(:name)
         end
       end
-      it "translates column with deprecated namespace" do
-        silence_warnings do
-          store_translations(:en, datagrid: {ns45_translated_report: {columns: {name: "Navn"}}}) do
-            expect(Ns45::TranslatedReport.new.header.first).to eq("Navn")
-          end
-        end
-      end
-
-      it "translates column with namespace" do
+      it "translates column-header with namespace" do
         store_translations(:en, datagrid: {:"ns45/translated_report" => {columns: {name: "Navn"}}}) do
           expect(Ns45::TranslatedReport.new.header.first).to eq("Navn")
         end
       end
 
-      it "translates column without namespace" do
+      it "translates column-header without namespace" do
         class Report27
           include Datagrid
           scope {Entry}
           column(:name)
         end
+
         store_translations(:en, datagrid: {:"report27" => {columns: {name: "Nombre"}}}) do
           expect(Report27.new.header.first).to eq("Nombre")
         end
       end
+
+      it "translates column-header in using defaults namespace" do
+        class Report27
+          include Datagrid
+          scope {Entry}
+          column(:name)
+        end
+
+        store_translations(:en, datagrid: {defaults: {columns: {name: "Nombre"}}}) do
+          expect(Report27.new.header.first).to eq("Nombre")
+        end
+      end
+
     end
 
     it "should return html_columns" do

data/spec/datagrid/filters_spec.rb

@@ -207,13 +207,8 @@ describe Datagrid::Filters do
         scope { Entry }
         filter(:name)
       end
-    end
-    it "translates filter with deprecated namespace" do
-      grid = Ns46::TranslatedReport.new
-      silence_warnings do
-        store_translations(:en, datagrid: {ns46_translated_report: {filters: {name: "Navn"}}}) do
-          expect(grid.filters.map(&:header)).to eq(["Navn"])
-        end
+
+      class InheritedReport < TranslatedReport
       end
     end
 
@@ -224,6 +219,19 @@ describe Datagrid::Filters do
       end
     end
 
+    it "translates filter using defaults namespace" do
+      grid = Ns46::TranslatedReport.new
+      store_translations(:en, datagrid: {defaults: {filters: {name: "Navn"}}}) do
+        expect(grid.filters.map(&:header)).to eq(["Navn"])
+      end
+    end
+
+    it "translates filter using parent report" do
+      grid = Ns46::InheritedReport.new
+      store_translations(:en, datagrid: {:"ns46/translated_report" => {filters: {name: "Navn"}}}) do
+        expect(grid.filters.map(&:header)).to eq(["Navn"])
+      end
+    end
   end
 
 

data/spec/datagrid/form_builder_spec.rb

@@ -567,35 +567,44 @@ DOM
         it {should equal_to_dom(expected_html)}
 
       end
-      context "when select option passed" do
+
+      context "when operations and options are defined" do
         let(:filter_options) do
-          {:select => [:id, :name]}
+          {:operations => %w(>= <=), :select => [:id, :name]}
         end
         let(:expected_html) do
           <<-HTML
-        <select class="condition dynamic_filter field" name="report[condition][]" id="report_condition"><option value="id">id</option>
-       <option value="name">name</option></select><select class="condition dynamic_filter operation" name="report[condition][]" id="report_condition"><option value="=">=</option>
-       <option value="=~">&asymp;</option>
-       <option value="&gt;=">&ge;</option>
-       <option value="&lt;=">&le;</option></select><input class="condition dynamic_filter value" name="report[condition][]" type="text" id="report_condition">
+          <select class="condition dynamic_filter field" name="report[condition][]" id="report_condition"><option value="id">id</option><option value="name">name</option></select><select class="condition dynamic_filter operation" name="report[condition][]" id="report_condition"><option value="&gt;=">≥</option>
+       <option value="&lt;=">≤</option></select><input class="condition dynamic_filter value" name="report[condition][]" type="text" id="report_condition">
           HTML
         end
         it {should equal_to_dom(expected_html)}
-
       end
 
-      context "when operation options passed" do
+      context "when the field is predefined" do
         let(:filter_options) do
           {:operations => %w(>= <=), :select => [:id]}
         end
         let(:expected_html) do
           <<-HTML
-          <select class="condition dynamic_filter field" name="report[condition][]" id="report_condition"><option value="id">id</option></select><select class="condition dynamic_filter operation" name="report[condition][]" id="report_condition"><option value="&gt;=">≥</option>
+          <input class="condition dynamic_filter field" name="report[condition][]" value="id" type="hidden" id="report_condition"><select class="condition dynamic_filter operation" name="report[condition][]" id="report_condition"><option value="&gt;=">≥</option>
        <option value="&lt;=">≤</option></select><input class="condition dynamic_filter value" name="report[condition][]" type="text" id="report_condition">
           HTML
         end
         it {should equal_to_dom(expected_html)}
       end
+      context "when operation is predefined" do
+        let(:filter_options) do
+          {:operations => %w(=), :select => [:id, :name]}
+        end
+        let(:expected_html) do
+          <<-HTML
+          <select class="condition dynamic_filter field" name="report[condition][]" id="report_condition"><option value="id">id</option><option value="name">name</option></select><input class="condition dynamic_filter operation" name="report[condition][]" value="=" type="hidden" id="report_condition"><input class="condition dynamic_filter value" name="report[condition][]" type="text" id="report_condition">
+          HTML
+        end
+        it {should equal_to_dom(expected_html)}
+      end
+
     end
   end
 

data/spec/spec_helper.rb

@@ -86,7 +86,7 @@ RSpec.configure do |config|
     #TODO better database truncation
     Group.delete_all
     Entry.delete_all
-    SequelEntry.where.delete
+    SequelEntry.where({}).delete
     unless NO_MONGO
       MongoidEntry.delete_all
       MongoMapperEntry.delete_all if defined?(MongoMapperEntry)

data/spec/support/i18n_helpers.rb

@@ -3,5 +3,4 @@ def store_translations(locale, translations, &block)
   yield
 ensure
   I18n.reload!
-  I18n.backend.send :init_translations
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails