datagrid 1.2.2 → 1.2.3

data/Gemfile

@@ -12,7 +12,7 @@ group :development do
   gem "byebug", :platform => ["ruby_20", "ruby_21"]
   gem "ruby-debug", :platform => "ruby_18"
 
-  gem "rspec", ">= 2.14"
+  gem "rspec", ">= 3"
   gem "nokogiri" # used to test html output
 
   gem "sqlite3"

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.2.3

data/datagrid.gemspec

@@ -2,16 +2,14 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: datagrid 1.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "1.2.2"
+  s.version = "1.2.3"
 
   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 = "2014-05-24"
+  s.date = "2014-07-01"
   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 = [
@@ -101,6 +99,8 @@ 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_separator.yml",
     "spec/support/matchers.rb",
     "spec/support/mongo_mapper.rb",
     "spec/support/mongoid.rb",
@@ -117,11 +117,12 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/bogdan/datagrid"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.25"
   s.summary = "Ruby gem to create datagrids"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 4
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.0"])
@@ -130,7 +131,7 @@ Gem::Specification.new do |s|
       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>, [">= 2.14"])
+      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<mongoid>, ["= 2.2.2"])
@@ -145,7 +146,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<debugger>, [">= 0"])
       s.add_dependency(%q<byebug>, [">= 0"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 2.14"])
+      s.add_dependency(%q<rspec>, [">= 3"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<mongoid>, ["= 2.2.2"])
@@ -161,7 +162,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<debugger>, [">= 0"])
     s.add_dependency(%q<byebug>, [">= 0"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 2.14"])
+    s.add_dependency(%q<rspec>, [">= 3"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<mongoid>, ["= 2.2.2"])

data/lib/datagrid/filters.rb

@@ -113,6 +113,7 @@ module Datagrid
     module InstanceMethods
 
       def initialize(*args, &block) # :nodoc:
+        self.filters = self.class.filters.clone
         self.filters.each do |filter|
           self[filter.name] = filter.default
         end
@@ -120,12 +121,7 @@ module Datagrid
       end
 
       def assets # :nodoc:
-        apply_filters(super, self.class.filters)
-      end
-
-      # Returns all defined filters Array
-      def filters
-        self.class.filters
+        apply_filters(super, filters)
       end
 
       # Returns filter value for given filter definition

data/lib/datagrid/form_builder.rb

@@ -116,18 +116,22 @@ module Datagrid
 
         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)
+
         # 2 inputs: "from date" and "to date" to specify a range
-        [
-          text_field(filter.name, from_options),
-          I18n.t("datagrid.filters.#{type}.range_separator"),
-          text_field(filter.name, to_options)
-        ].join.html_safe
+        if separator = I18n.t("datagrid.filters.#{type}.range_separator", default: '').presence
+          # Support deprecated translation option: range_separator
+          [from_input, separator, to_input].join.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
+        end
       else
         datagrid_default_filter(filter, options)
       end
     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

@@ -11,14 +11,14 @@ en:
       reset: "Reset"
     filters:
       integer:
-        range_separator:
-          "<span class=\"separator integer\"> - </span>"
+        range_format:
+          "%{from_input}<span class=\"separator integer\"> - </span>%{to_input}"
       date:
-        range_separator:
-          "<span class=\"separator date\"> - </span>"
+        range_format:
+          "%{from_input}<span class=\"separator date\"> - </span>%{to_input}"
       datetime:
-        range_separator:
-          "<span class=\"separator datetime\"> - </span>"
+        range_format:
+          "%{from_input}<span class=\"separator datetime\"> - </span>%{to_input}"
 
       eboolean:
         "yes": "Yes"

data/lib/datagrid/rspec.rb

@@ -8,8 +8,6 @@ shared_examples_for "Datagrid" do
       subject.assets.should_not be_empty
     end
 
-    its(:data) {should_not be_empty}
-
     described_class.columns(:data => true).each do |column|
       describe "column ##{column.name}" do
 

data/lib/datagrid/scaffold.rb

@@ -43,22 +43,20 @@ class Datagrid::Scaffold < Rails::Generators::NamedBase
   end
 
   def paginate_code
-    if defined?(Kaminari)
+    if defined?(::Kaminari) || defined?(::WillPaginate)
       "page(params[:page])"
-    elsif defined?(WillPaginate)
-      "paginate(:page => params[:page])"
     else
       "paginate_somehow"
     end
   end
 
   def pagination_helper_code
-    if defined?(Kaminari)
-      "paginate(@assets)"
-    elsif defined?(WillPaginate)
-      "will_paginate(@assets)"
+    if defined?(::Kaminari)
+      "paginate(@grid.assets)"
+    elsif defined?(::WillPaginate)
+      "will_paginate(@grid.assets)"
     else
-      "some_pagination_helper(@assets)"
+      "some_pagination_helper(@grid.assets)"
     end
 
   end

data/spec/datagrid/columns_spec.rb

@@ -98,8 +98,8 @@ describe Datagrid::Columns do
     end
     Entry.create!(:category => "foo")
     Entry.create!(:category => "foobar")
-    expect(report.rows.first.first).to be_true
-    expect(report.rows.last.first).to be_false
+    expect(report.rows.first.first).to eq(true)
+    expect(report.rows.last.first).to eq(false)
   end
 
   it "should inherit columns correctly" do

data/spec/datagrid/drivers/mongoid_spec.rb

@@ -1,3 +1,5 @@
+require "spec_helper"
+
 describe Datagrid::Drivers::Mongoid, :mongoid do
 
   describe ".match?" do
@@ -66,8 +68,8 @@ describe Datagrid::Drivers::Mongoid, :mongoid do
       let(:_attributes) { {:from_group_id => 3} }
 
       describe '#assets' do
-        subject { super().assets }
-        it {should_not include(first)}
+        subject { super().assets.map(&:_id) }
+        it {should_not include(first.id)}
       end
 
       describe '#assets' do

data/spec/datagrid/filters_spec.rb

@@ -169,10 +169,26 @@ describe Datagrid::Filters do
         filter(:id)
         filter(:name)
       end
-      e = Entry.create!(:name => 'hello')
+      Entry.create!(:name => 'hello')
       grid.attributes = {:id => -1, :name => 'hello'}
       expect(grid.assets).to be_empty
       expect(grid.filter_by(:name)).not_to be_empty
     end
   end
+
+  it "should support instance filter rejection" do
+    grid = test_report(:name => 'hello') do
+      scope { Entry }
+      filter(:id)
+      filter(:name)
+    end
+
+    Entry.create!(:name => 'hello1')
+    expect(grid.assets).to be_empty
+    grid.filters.reject! {|f| f.name == :name }
+    expect(grid.filters.map(&:name)).to eq([:id])
+    expect(grid.assets).to_not be_empty
+    expect(grid.class.filters.map(&:name)).to eq([:id, :name])
+
+  end
 end

data/spec/datagrid/form_builder_spec.rb

@@ -123,6 +123,34 @@ describe Datagrid::FormBuilder do
           '<input class="group_id integer_filter to" multiple name="report[group_id][]" size="30" type="text" value="1"/>'
         )}
       end
+
+      context "when custom 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.reload!
+          example.run
+          I18n.load_path.pop
+          I18n.reload!
+        end
+        it { should equal_to_dom(
+          'from <input class="group_id integer_filter from" multiple name="report[group_id][]" size="30" type="text"> to <input class="group_id integer_filter to" multiple name="report[group_id][]" size="30" type="text">'
+        )}
+      end
+      context "when deprecated separator is specified" do
+        let(:_range) { nil }
+        around(:each) do |example|
+          I18n.load_path << File.expand_path('../../support/locale/deprecated_range_separator.yml', __FILE__)
+          I18n.reload!
+          example.run
+          I18n.load_path.pop
+          I18n.reload!
+
+        end
+        it { should equal_to_dom(
+          '<input class="group_id integer_filter from" multiple name="report[group_id][]" size="30" type="text"> | <input class="group_id integer_filter to" multiple name="report[group_id][]" size="30" type="text">'
+        )}
+      end
     end
 
 

data/spec/datagrid/scaffold_spec.rb

@@ -11,7 +11,20 @@ describe Datagrid::Scaffold do
 
   describe '.pagination_helper_code' do
     it 'should fall through options successfully' do
-      expect(subject.pagination_helper_code).to eql('some_pagination_helper(@assets)')
+      expect(subject.pagination_helper_code).to eql('some_pagination_helper(@grid.assets)')
+    end
+
+    context "when Kaminari exists" do
+      before(:each) do
+        Object.const_set("Kaminari", 1)
+      end
+      it 'should fall through options successfully' do
+        expect(subject.pagination_helper_code).to eql('paginate(@grid.assets)')
+      end
+
+      after(:each) do
+        Object.send(:remove_const, "Kaminari")
+      end
     end
   end
 end

data/spec/datagrid/utils_spec.rb

@@ -6,13 +6,13 @@ describe Datagrid::Utils do
   describe ".warn_once" do
     it "should work" do
       silence_warnings do
-        expect(Datagrid::Utils.warn_once("hello", 0.2)).to be_true
+        expect(Datagrid::Utils.warn_once("hello", 0.2)).to eq(true)
       end
       sleep(0.1)
-      expect(Datagrid::Utils.warn_once("hello", 0.2)).to be_false
+      expect(Datagrid::Utils.warn_once("hello", 0.2)).to eq(false)
       sleep(0.2)
       silence_warnings do
-        expect(Datagrid::Utils.warn_once("hello", 0.2)).to be_true
+        expect(Datagrid::Utils.warn_once("hello", 0.2)).to eq(true)
       end
     end
   end

data/spec/spec_helper.rb

@@ -74,13 +74,16 @@ RSpec.configure do |config|
 
   end
 
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-
   if NO_MONGO
     config.filter_run_excluding :mongoid => true
     config.filter_run_excluding :mongomapper => true
   end
 
+  config.expect_with :rspec do |c|
+    #c.syntax = :expect
+    c.syntax = [:should, :expect]
+  end
+
 end
 
 

data/spec/support/locale/custom_range_format.yml

@@ -0,0 +1,7 @@
+en:
+  datagrid:
+    filters:
+      integer:
+        range_format:
+          "from %{from_input} to %{to_input}"
+

data/spec/support/locale/deprecated_range_separator.yml

@@ -0,0 +1,5 @@
+en:
+  datagrid:
+    filters:
+      integer:
+        range_separator: " | "

data/spec/support/matchers.rb

@@ -82,7 +82,7 @@ class CssPattern
     end 
   end
 
-  def negative_failure_message
+  def failure_message
     "Expected do not match dom pattern. But it was"
   end
 

data/templates/controller.rb.erb

@@ -1,8 +1,9 @@
 class <%= grid_controller_name %> < ApplicationController
 
   def index
-    @grid = <%= grid_class_name %>.new(params[:<%= grid_ivar_name %>])
-    @assets = @grid.assets.<%= paginate_code %>
+    @grid = <%= grid_class_name %>.new(params[:<%= grid_ivar_name %>]) do |scope|
+      scope.<%= paginate_code %>
+    end
   end
 
 end

data/templates/index.html.erb

@@ -1,5 +1,5 @@
 <%%= datagrid_form_for @grid, :method => :get, :url => <%= grid_route_name %> %>
 
 <%%= <%=pagination_helper_code%> %>
-<%%= datagrid_table @grid, @assets %>
+<%%= datagrid_table @grid %>
 <%%= <%=pagination_helper_code%> %>

metadata

@@ -1,144 +1,164 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
+  prerelease: 
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-debug
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -153,20 +174,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: bson
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -174,6 +198,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -181,6 +206,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -188,6 +214,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -195,15 +222,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This allows you to easily build datagrid aka data tables with sortable
@@ -214,9 +243,9 @@ extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 files:
-- ".document"
-- ".rspec"
-- ".travis.yml"
+- .document
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - Rakefile
@@ -297,6 +326,8 @@ 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_separator.yml
 - spec/support/matchers.rb
 - spec/support/mongo_mapper.rb
 - spec/support/mongoid.rb
@@ -313,25 +344,29 @@ files:
 homepage: http://github.com/bogdan/datagrid
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1488750085625410873
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby gem to create datagrids
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 24c667cba7edebeb70344d88471bae4d2264f63a
-  data.tar.gz: e40ef73cdb3b643fccb14afb793feb67a95396f6
-SHA512:
-  metadata.gz: 5991d5a4a1cabce8cb4051ccf43fb38f87ded3de02d39f3b662dafa4d7645a3e2530fa044409032bf6cd9d2447dc77cfb2cdd0ddf598434275b3f5e35a5452b9
-  data.tar.gz: bf103e76c8ff87c1c521c49c63cf5d1ab4718f4f2af21413e9caf081f53701d4c6db2cadadb8b501562ca8c2bcc1c3ba9bcc371e5494883bb080dde2a95f8537