datagrid 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdb4b360ee72ca1cb7506bcc9cce315dfd3b8088
-  data.tar.gz: 48bea2ce4e237383bc9dae59cf34a6e8df40e6b8
+  metadata.gz: 0a5c31c4749036fb87065560c115eedfd90a4c26
+  data.tar.gz: afe23674ce0a6092e9a38aef5755327a934d942b
 SHA512:
-  metadata.gz: 528d0971df683ae4bef8e677f54d0b4344500bd3a8a560863135908cad2c56966bc96acdbe46563527cd30469717c459c88e53619e0912df241886674ecede49
-  data.tar.gz: 3d510e71bef9a64f68b7f09c3afca21d60f3c4187fe1634e8b31ade014a3843370a67dcee9d87e02c1c9b81cbb3e065d932861ef4a45db826d2a08ab67ca7e09
+  metadata.gz: 3fc66b0df7f1c502250b47dad4d1f92b56b155d2d4a89e5a04d8fb706565c2438d35b0a84a0776cf7ef93b7221e93b79e69591576d931bfe3bde8cab111db8af
+  data.tar.gz: f174e306b193df406d8bd519f7de01f91da7d37431ec7b898ef1bbab6150265054a82de1d256015efd3281d19940f42d689927d41a081ff72226e992f8185d19

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.1
+  - 2.2.0
   #- jruby
   #- jruby-head
 #env: JRUBY_OPTS="--server -J-Xms512m -J-Xmx1024m"

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "rails", ">= 3.0"
+gem "rails", ">= 3.2.18"
 
 group :development do
 
@@ -8,9 +8,8 @@ group :development do
   gem "jeweler"
 
 
-  gem "debugger", :platform => "ruby_19"
-  gem "byebug", :platform => ["ruby_20", "ruby_21"]
-  gem "ruby-debug", :platform => "ruby_18"
+  gem "debugger", :platform => :ruby_19
+  gem "byebug", :platform => [:ruby_20, :ruby_21, :ruby_22] & Bundler::Dsl::VALID_PLATFORMS
 
   gem "rspec", ">= 3"
   gem "nokogiri" # used to test html output
@@ -24,5 +23,4 @@ group :development do
     gem "bson_ext", "1.4.0"
   end
 
-  gem "fastercsv", :platform => "mri_18"
 end

data/VERSION

@@ -1 +1 @@
-1.3.6
+1.3.7

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

@@ -0,0 +1,3 @@
+<%= form.text_field(filter.name, from_options) %>
+<span class="separator <%= filter.type %>"> - </span>
+<%= form.text_field(filter.name, to_options) %>

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.3.6 ruby lib
+# stub: datagrid 1.3.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "1.3.6"
+  s.version = "1.3.7"
 
   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 = "2015-02-05"
+  s.date = "2015-03-25"
   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 = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "app/views/datagrid/_form.html.erb",
     "app/views/datagrid/_head.html.erb",
     "app/views/datagrid/_order_for.html.erb",
+    "app/views/datagrid/_range_filter.html.erb",
     "app/views/datagrid/_row.html.erb",
     "app/views/datagrid/_table.html.erb",
     "datagrid.gemspec",
@@ -67,7 +68,6 @@ Gem::Specification.new do |s|
     "lib/datagrid/filters/string_filter.rb",
     "lib/datagrid/form_builder.rb",
     "lib/datagrid/helper.rb",
-    "lib/datagrid/i18n.rb",
     "lib/datagrid/locale/en.yml",
     "lib/datagrid/ordering.rb",
     "lib/datagrid/renderer.rb",
@@ -103,7 +103,7 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/support/active_record.rb",
     "spec/support/configuration.rb",
-    "spec/support/locale/custom_range_format.yml",
+    "spec/support/locale/deprecated_range_format.yml",
     "spec/support/locale/deprecated_range_separator.yml",
     "spec/support/matchers.rb",
     "spec/support/mongo_mapper.rb",
@@ -128,12 +128,11 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.0"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.2.18"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<debugger>, [">= 0"])
       s.add_development_dependency(%q<byebug>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 3"])
       s.add_development_dependency(%q<nokogiri>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
@@ -141,14 +140,12 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mongo_mapper>, [">= 0.11.0"])
       s.add_development_dependency(%q<bson>, ["= 1.4.0"])
       s.add_development_dependency(%q<bson_ext>, ["= 1.4.0"])
-      s.add_development_dependency(%q<fastercsv>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.0"])
+      s.add_dependency(%q<rails>, [">= 3.2.18"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<debugger>, [">= 0"])
       s.add_dependency(%q<byebug>, [">= 0"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 3"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
@@ -156,15 +153,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mongo_mapper>, [">= 0.11.0"])
       s.add_dependency(%q<bson>, ["= 1.4.0"])
       s.add_dependency(%q<bson_ext>, ["= 1.4.0"])
-      s.add_dependency(%q<fastercsv>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.0"])
+    s.add_dependency(%q<rails>, [">= 3.2.18"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<debugger>, [">= 0"])
     s.add_dependency(%q<byebug>, [">= 0"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 3"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
@@ -172,7 +167,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mongo_mapper>, [">= 0.11.0"])
     s.add_dependency(%q<bson>, ["= 1.4.0"])
     s.add_dependency(%q<bson_ext>, ["= 1.4.0"])
-    s.add_dependency(%q<fastercsv>, [">= 0"])
   end
 end
 

data/lib/datagrid/columns.rb

@@ -419,7 +419,7 @@ module Datagrid
         instance_eval(&dynamic_block) if dynamic_block
       end
 
-      # Returns all columns available for current grid configuration
+      # Returns all columns available for current grid configuration.
       #   
       #   class MyGrid
       #     filter(:search)

data/lib/datagrid/filters/extended_boolean_filter.rb

@@ -16,8 +16,16 @@ class Datagrid::Filters::ExtendedBooleanFilter < Datagrid::Filters::EnumFilter #
   end
 
   def parse(value)
-    return nil if value.blank?
-    super(value)
+    case
+    when value == true
+      YES
+    when value == false
+      NO
+    when value.blank?
+      nil
+    else
+      super(value)
+    end
   end
 
 end

data/lib/datagrid/form_builder.rb

@@ -137,19 +137,36 @@ module Datagrid
         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 separator = I18n.t("datagrid.filters.#{type}.range_separator", default: '').presence
+        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 range_format option
-          I18n.t("datagrid.filters.#{type}.range_format", :from_input => from_input, :to_input => to_input).html_safe
+          # More flexible way to render via partial
+          @template.render :partial => 'datagrid/range_filter', :locals => {
+            :from_options => from_options, :to_options => to_options, :filter => filter, :form => self
+          }
         end
       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/helper.rb

@@ -131,7 +131,7 @@ module Datagrid
     end
 
     def datagrid_column_classes(grid, column)
-      order_class = grid.order == column.name ? ["ordered", grid.descending ? "desc" : "asc"] : nil
+      order_class = grid.ordered_by?(column) ? ["ordered", grid.descending ? "desc" : "asc"] : nil
       [column.name, order_class, column.options[:class]].compact.join(" ")
     end
   end

data/lib/datagrid/locale/en.yml

@@ -10,18 +10,18 @@ en:
       search: "Search"
       reset: "Reset"
     filters:
-      integer:
-        range_format:
-          "%{from_input}<span class=\"separator integer\"> - </span>%{to_input}"
-      date:
-        range_format:
-          "%{from_input}<span class=\"separator date\"> - </span>%{to_input}"
-      datetime:
-        range_format:
-          "%{from_input}<span class=\"separator datetime\"> - </span>%{to_input}"
-      float:
-        range_format:
-          "%{from_input}<span class=\"separator float\"> - </span>%{to_input}"
+      #integer:
+        #range_format:
+          #"%{from_input}<span class=\"separator integer\"> - </span>%{to_input}"
+      #date:
+        #range_format:
+          #"%{from_input}<span class=\"separator date\"> - </span>%{to_input}"
+      #datetime:
+        #range_format:
+          #"%{from_input}<span class=\"separator datetime\"> - </span>%{to_input}"
+      #float:
+        #range_format:
+          #"%{from_input}<span class=\"separator float\"> - </span>%{to_input}"
 
       xboolean:
         "yes": "Yes"

data/lib/datagrid/ordering.rb

@@ -11,16 +11,8 @@ module Datagrid
         include Datagrid::Columns
 
         datagrid_attribute :order do |value|
-          unless value.blank?
-            value = value.to_sym
-            column = column_by_name(value)
-            unless column 
-              self.class.order_unsupported(value, "no column #{value} in #{self.class}")
-            end
-            unless column.supports_order?
-              self.class.order_unsupported(column.name, "column don't support order" ) 
-            end
-            value
+          if value.present?
+            value.to_sym
           else
             nil
           end
@@ -47,6 +39,7 @@ module Datagrid
     module InstanceMethods
 
       def assets # :nodoc:
+        check_order_valid!
         apply_order(super)
       end
 
@@ -60,7 +53,13 @@ module Datagrid
       #   MyGrid.new(:order => "name").order_column # => #<Column name: "name", ...>
       #
       def order_column
-        column_by_name(order)
+        order && column_by_name(order)
+      end
+
+      # Returns true if given grid is ordered by given column.
+      # <tt>column</tt> can be given as name or as column object
+      def ordered_by?(column)
+        order_column == column_by_name(column)
       end
 
       private
@@ -85,6 +84,17 @@ module Datagrid
         end
       end
 
+      def check_order_valid!
+        return unless order
+        column = column_by_name(order)
+        unless column 
+          self.class.order_unsupported(order, "no column #{order} in #{self.class}")
+        end
+        unless column.supports_order?
+          self.class.order_unsupported(column.name, "column don't support order" ) 
+        end
+      end
+
       def apply_asc_order(assets, order)
         if order.respond_to?(:call)
           apply_block_order(assets, order)

data/spec/datagrid/columns_spec.rb

@@ -212,7 +212,10 @@ describe Datagrid::Columns do
       end
       first = Entry.create(:name => '1st')
       second = Entry.create(:name => '2nd')
-      expect { report.attributes = {:order => :id} }.to raise_error(Datagrid::OrderUnsupported)
+      expect do
+        report.attributes = {:order => :id} 
+        report.assets
+      end.to raise_error(Datagrid::OrderUnsupported)
       report.attributes = {:order => :name, :descending => true}
       expect(report.assets).to eq([second, first])
     end

data/spec/datagrid/drivers/mongo_mapper_spec.rb

@@ -92,7 +92,7 @@ describe Datagrid::Drivers::MongoMapper, :mongomapper do
         test_report(:order => :test) do
           scope { MongoMapperEntry }
           column(:test)
-        end
+        end.assets
       }.to raise_error(Datagrid::OrderUnsupported)
     end
   end

data/spec/datagrid/drivers/mongoid_spec.rb

@@ -92,7 +92,7 @@ describe Datagrid::Drivers::Mongoid, :mongoid do
         test_report(:order => :test) do
           scope { MongoidEntry }
           column(:test)
-        end
+        end.assets
       }.to raise_error(Datagrid::OrderUnsupported)
     end
 

data/spec/datagrid/filters/extended_boolean_filter_spec.rb

@@ -30,7 +30,17 @@ describe Datagrid::Filters::ExtendedBooleanFilter do
     expect(grid.disabled).to eq("NO")
     expect(grid.assets).to include(enabled_entry)
     expect(grid.assets).not_to include(disabled_entry)
+  end
 
+  it "should normalize true/false as YES/NO" do
+    grid = test_report do
+      scope {Entry}
+      filter(:disabled, :xboolean)
+    end
+    grid.disabled = true
+    expect(grid.disabled).to eq("YES")
+    grid.disabled = false
+    expect(grid.disabled).to eq("NO")
   end
 
 end

data/spec/datagrid/form_builder_spec.rb

@@ -130,12 +130,14 @@ describe Datagrid::FormBuilder do
         )}
       end
 
-      context "when custom format translation specified" do
+      context "when deprecated format translation specified" do
         let(:_range) { nil }
         around(:each) do |example|
-          I18n.load_path << File.expand_path('../../support/locale/custom_range_format.yml', __FILE__)
+          I18n.load_path << File.expand_path('../../support/locale/deprecated_range_format.yml', __FILE__)
           I18n.reload!
-          example.run
+          silence_warnings do
+            example.run
+          end
           I18n.load_path.pop
           I18n.reload!
         end
@@ -148,7 +150,9 @@ describe Datagrid::FormBuilder do
         around(:each) do |example|
           I18n.load_path << File.expand_path('../../support/locale/deprecated_range_separator.yml', __FILE__)
           I18n.reload!
-          example.run
+          silence_warnings do
+            example.run
+          end
           I18n.load_path.pop
           I18n.reload!
 
@@ -290,14 +294,6 @@ describe Datagrid::FormBuilder do
          <option value="second">second</option></select>'
         )}
       end
-      context "with checkboxes option" do
-        let(:_filter) { :category_with_prompt }
-        it { should equal_to_dom(
-          '<select class="category_with_prompt enum_filter" id="report_category_with_prompt" name="report[category_with_prompt]"><option value="">My Prompt</option>
-         <option value="first">first</option>
-         <option value="second">second</option></select>'
-        )}
-      end
       context "with checkboxes option" do
         let(:_grid) do
           test_report do

data/spec/datagrid/ordering_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 describe Datagrid::Ordering do
 
 
-  let!(:first) { Entry.create!(:name => "aa")}
-  let!(:second) { Entry.create!(:name => "bb")}
   let!(:third) { Entry.create!(:name => "cc")}
+  let!(:second) { Entry.create!(:name => "bb")}
+  let!(:first) { Entry.create!(:name => "aa")}
 
 
   it "should support order" do
@@ -30,7 +30,7 @@ describe Datagrid::Ordering do
 
   it "should raise error if ordered by not existing column" do
     expect {
-      test_report(:order => :hello)
+      test_report(:order => :hello).assets
     }.to raise_error(Datagrid::OrderUnsupported)
   end
 
@@ -40,7 +40,7 @@ describe Datagrid::Ordering do
         filter(:category, :default, :order => false) do |value|
           self
         end
-      end
+      end.assets
     end.to raise_error(Datagrid::OrderUnsupported)
   end
 
@@ -121,4 +121,30 @@ describe Datagrid::Ordering do
     grid.descending = true
     expect(grid.assets).to eq([third, second, first])
   end
+  it "should support ordering by dynamic columns" do
+
+    report = test_report(:order => "name") do
+      scope {Entry}
+      dynamic do
+        column(:name)
+      end
+    end
+
+    expect(report.assets).to eq([first, second, third])
+
+  end
+
+  it "should support #ordered_by? method" do
+    report = test_report(:order => "name") do
+      scope  {Entry}
+      column(:id)
+      column(:name)
+    end
+    expect(report).to be_ordered_by(:name)
+    expect(report).to be_ordered_by("name")
+    expect(report).to be_ordered_by(report.column_by_name(:name))
+    expect(report).to_not be_ordered_by(:id)
+    expect(report).to_not be_ordered_by("id")
+    expect(report).to_not be_ordered_by(report.column_by_name(:id))
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.18
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-debug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +178,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.4.0
-- !ruby/object:Gem::Dependency
-  name: fastercsv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: This allows you to easily build datagrid aka data tables with sortable
   columns and filters
 email: agresso@gmail.com
@@ -228,6 +200,7 @@ files:
 - app/views/datagrid/_form.html.erb
 - app/views/datagrid/_head.html.erb
 - app/views/datagrid/_order_for.html.erb
+- app/views/datagrid/_range_filter.html.erb
 - app/views/datagrid/_row.html.erb
 - app/views/datagrid/_table.html.erb
 - datagrid.gemspec
@@ -263,7 +236,6 @@ files:
 - lib/datagrid/filters/string_filter.rb
 - lib/datagrid/form_builder.rb
 - lib/datagrid/helper.rb
-- lib/datagrid/i18n.rb
 - lib/datagrid/locale/en.yml
 - lib/datagrid/ordering.rb
 - lib/datagrid/renderer.rb
@@ -299,7 +271,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/active_record.rb
 - spec/support/configuration.rb
-- spec/support/locale/custom_range_format.yml
+- spec/support/locale/deprecated_range_format.yml
 - spec/support/locale/deprecated_range_separator.yml
 - spec/support/matchers.rb
 - spec/support/mongo_mapper.rb