datagrid 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb6758027fb0dcc66c2d3a285466b5aed3d4c3f1
-  data.tar.gz: ea86794219dd8af94986c010c976809580680b55
+  metadata.gz: e883f173edbcd8f8a7791d5bfa043beb51b31b7c
+  data.tar.gz: 5a5287b4320935f8537fcc32b49c4666fd735770
 SHA512:
-  metadata.gz: f91876b2190e994ff3259106a296034ff000ea1f3da233af811491d0c881e7a0bb14519b4a419f048b0865d4a9bc02c275a95ea10b648e2184d36f8d0cd4c50c
-  data.tar.gz: a337280ece74f2b3e4b97e2749dde0d6a422405d71b051871222b0c5e2622bc8437e0bbbf40cff5cac04441b456c8640fcda82deb4f0a3399451ae16bb25dd94
+  metadata.gz: 5558c20d49ea5b4dcaf3071a861f2eeb86f72e968331d8c1fedd7bf028f857bfe6b1402aaf89fa2e697c1d65d33559cedcc3ee91daf586a0d55d321d2b2a2445
+  data.tar.gz: a7e98810429dfdd395f051bc783c27eb89673fcf45742a8107d47a020b68b51047e9dda4636526b49d8205d8147be24f476fc96e732e17a95d0845e2e6dbe6ce

data/Gemfile

@@ -18,10 +18,10 @@ group :development do
   gem "sequel"
 
   group :mongo do
-    gem "mongoid", "3.1.6"
-    gem "mongo_mapper", "~> 0.11.0"
-    gem "bson", "1.4.0"
-    gem "bson_ext", "1.4.0"
+    gem "mongoid", "3.1.7"
+    gem "mongo_mapper", "~> 0.13.0"
+    gem "bson"
+    gem "bson_ext"
   end
 
 end

data/Readme.markdown

@@ -180,6 +180,10 @@ All advanced frontend things are described in:
 
 [Frontend section on wiki](https://github.com/bogdan/datagrid/wiki/Frontend)
 
+## Questions & Issues
+
+If you have a question of any kind, just make an issue and describe your problem in details.
+
 ## Self-Promotion
 
 Like datagrid?

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

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.4.0 ruby lib
+# stub: datagrid 1.4.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "1.4.0"
+  s.version = "1.4.1"
 
   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-11-05"
+  s.date = "2016-02-10"
   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 = [
@@ -85,6 +85,7 @@ Gem::Specification.new do |s|
     "spec/datagrid/drivers/mongo_mapper_spec.rb",
     "spec/datagrid/drivers/mongoid_spec.rb",
     "spec/datagrid/drivers/sequel_spec.rb",
+    "spec/datagrid/filters/base_filter_spec.rb",
     "spec/datagrid/filters/boolean_enum_filter_spec.rb",
     "spec/datagrid/filters/composite_filters_spec.rb",
     "spec/datagrid/filters/date_filter_spec.rb",
@@ -127,7 +128,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/bogdan/datagrid"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.5"
+  s.rubygems_version = "2.4.8"
   s.summary = "Ruby gem to create datagrids"
 
   if s.respond_to? :specification_version then
@@ -143,10 +144,10 @@ Gem::Specification.new do |s|
       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>, ["= 3.1.6"])
-      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<mongoid>, ["= 3.1.7"])
+      s.add_development_dependency(%q<mongo_mapper>, ["~> 0.13.0"])
+      s.add_development_dependency(%q<bson>, [">= 0"])
+      s.add_development_dependency(%q<bson_ext>, [">= 0"])
     else
       s.add_dependency(%q<rails>, [">= 3.2.18"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -157,10 +158,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<sequel>, [">= 0"])
-      s.add_dependency(%q<mongoid>, ["= 3.1.6"])
-      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<mongoid>, ["= 3.1.7"])
+      s.add_dependency(%q<mongo_mapper>, ["~> 0.13.0"])
+      s.add_dependency(%q<bson>, [">= 0"])
+      s.add_dependency(%q<bson_ext>, [">= 0"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.2.18"])
@@ -172,10 +173,10 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<sequel>, [">= 0"])
-    s.add_dependency(%q<mongoid>, ["= 3.1.6"])
-    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<mongoid>, ["= 3.1.7"])
+    s.add_dependency(%q<mongo_mapper>, ["~> 0.13.0"])
+    s.add_dependency(%q<bson>, [">= 0"])
+    s.add_dependency(%q<bson_ext>, [">= 0"])
   end
 end
 

data/lib/datagrid/drivers/active_record.rb

@@ -48,7 +48,11 @@ module Datagrid
       end
 
       def desc(scope, order)
-        scope.reorder(order).reverse_order
+        if order.respond_to?(:desc)
+          scope.reorder(order.desc)
+        else
+          scope.reorder(order).reverse_order
+        end
       end
 
       def reverse_order(scope)
@@ -102,6 +106,9 @@ module Datagrid
       end
 
       def batch_each(scope, batch_size, &block)
+        if scope.limit_value
+          raise Datagrid::ConfigurationError, "ActiveRecord can not use batches in combination with SQL limit"
+        end
         scope.find_each(batch_size ? { :batch_size => batch_size} : {}, &block)
       end
 

data/lib/datagrid/filters.rb

@@ -115,7 +115,7 @@ module Datagrid
       def initialize(*args, &block) # :nodoc:
         self.filters = self.class.filters.clone
         self.filters.each do |filter|
-          self[filter.name] = filter.default
+          self[filter.name] = filter.default(self)
         end
         super(*args, &block)
       end

data/lib/datagrid/filters/base_filter.rb

@@ -52,9 +52,23 @@ class Datagrid::Filters::BaseFilter #:nodoc:
     options[:header] || Datagrid::Utils.translate_from_namespace(:filters, grid_class, name)
   end
 
-  def default
+  def default(object = nil)
+    unless object
+      Datagrid::Utils.warn_once("#{self.class.name}#default without argument is deprecated")
+    end
     default = self.options[:default]
-    default.respond_to?(:call) ? default.call : 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
+    elsif default.respond_to?(:call) 
+      Datagrid::Utils.apply_args(object, &default)
+    else
+      default
+    end
   end
 
   def multiple

data/lib/datagrid/utils.rb

@@ -53,11 +53,18 @@ module Datagrid
       end
 
       def extract_position_from_options(array, options)
-        position = options.extract!(:before, :after)
-        if position[:before]
-          array.index {|c| c.name.to_sym == position[:before].to_sym }
-        elsif position[:after]
-          array.index {|c| c.name.to_sym == position[:after].to_sym } + 1
+        before, after = options[:before], options[:after]
+        if before && after
+          raise Datagrid::ConfigurationError, "Options :before and :after can not be used together"
+        end
+        # Consider as before all
+        return 0 if before == true
+        if before
+          before = before.to_sym
+          array.index {|c| c.name.to_sym == before }
+        elsif after
+          after = after.to_sym
+          array.index {|c| c.name.to_sym == after } + 1
         else
           -1
         end

data/spec/datagrid/columns_spec.rb

@@ -26,7 +26,7 @@ describe Datagrid::Columns do
       grid = test_report do
         scope {Entry}
         column(:name)
-        column(:action, :html => true) do 
+        column(:action, :html => true) do
           'dummy'
         end
       end
@@ -37,7 +37,7 @@ describe Datagrid::Columns do
       grid = test_report do
         scope {Entry}
         column(:name)
-        column(:action, :html => true) do 
+        column(:action, :html => true) do
           'dummy'
         end
       end
@@ -47,7 +47,7 @@ describe Datagrid::Columns do
       grid = test_report do
         scope {Entry}
         column(:name)
-        column(:action, :html => true) do 
+        column(:action, :html => true) do
           'dummy'
         end
       end
@@ -55,7 +55,7 @@ describe Datagrid::Columns do
     end
 
     describe "translations" do
-      
+
       module ::Ns45
         class TranslatedReport
           include Datagrid
@@ -214,6 +214,15 @@ describe Datagrid::Columns do
       expect(report.available_columns.map(&:name)).to eq([:category])
     end
 
+    it "raises when :before and :after used together" do
+      expect do
+        test_report do
+          column(:id)
+          column(:name, :before => :id, :after => :name)
+        end
+      end.to raise_error(Datagrid::ConfigurationError)
+    end
+
   describe ".column_names attributes" do
     let(:grid) do
       test_report(:column_names => ["id", "name"]) do
@@ -270,7 +279,7 @@ describe Datagrid::Columns do
       first = Entry.create(:name => '1st')
       second = Entry.create(:name => '2nd')
       expect do
-        report.attributes = {:order => :id} 
+        report.attributes = {:order => :id}
         report.assets
       end.to raise_error(Datagrid::OrderUnsupported)
       report.attributes = {:order => :name, :descending => true}
@@ -289,6 +298,7 @@ describe Datagrid::Columns do
       fake_assets = double(:assets)
       expect(report).to receive(:assets) { fake_assets }
       expect(fake_assets).to receive(:find_each).with(batch_size: 25)
+      expect(fake_assets).to receive(:limit_value).and_return(nil)
       report.rows
     end
     it "should be able to disable batches" do
@@ -305,7 +315,7 @@ describe Datagrid::Columns do
       expect(fake_assets).not_to receive(:find_each)
       report.rows
     end
-    
+
     it "should support instance level batch size" do
       grid = test_report do
         scope {Entry}
@@ -340,7 +350,7 @@ describe Datagrid::Columns do
       expect(row.name).to eq("Hello")
       expect {
         row.actions
-      }.to raise_error
+      }.to raise_error(RuntimeError)
     end
   end
 
@@ -371,7 +381,7 @@ describe Datagrid::Columns do
       end
       grid.column(:name)
       grid
-    end 
+    end
 
     let(:basic_grid) { modified_grid.class.new }
     let!(:entry) { Entry.create!(:name => "Hello", :category => 'first') }
@@ -392,11 +402,16 @@ describe Datagrid::Columns do
       expect(basic_grid.rows).to eq([[entry.id]])
     end
 
-    it "should support possitioning" do
+    it "should support :before column name" do
       modified_grid.column(:category, :before => :name)
       expect(modified_grid.header).to eq(["Id", "Category", "Name"])
     end
 
+    it "should support :before all" do
+      modified_grid.column(:category, :before => true)
+      expect(modified_grid.header).to eq(["Category", "Id", "Name"])
+    end
+
     it "should support columns block" do
       modified_grid.column(:category) do
         category.capitalize
@@ -432,7 +447,7 @@ describe Datagrid::Columns do
   describe 'dynamic helper' do
     it "should work" do
       grid = test_report do
-        scope {Entry} 
+        scope {Entry}
         column(:id)
         dynamic {
           column(:name)

data/spec/datagrid/drivers/active_record_spec.rb

@@ -21,6 +21,18 @@ describe Datagrid::Drivers::ActiveRecord do
     expect(scope.to_sql.strip).to eq('SELECT "entries".*, sum(entries.group_id) AS sum_group_id FROM "entries"')
   end
 
+  describe "Arel" do
+    subject do
+      test_report(:order => :test, :descending => true) do
+        scope { Entry }
+        column(:test, order: Arel::Nodes::Count.new(["entries.group_id"]))
+      end.assets
+    end
+
+    it "should support ordering by Arel columns" do
+      expect(subject.to_sql.strip).to include "ORDER BY COUNT('entries.group_id') DESC"
+    end
+  end
 
   describe "gotcha #datagrid_where_by_timestamp" do
 
@@ -50,4 +62,18 @@ describe Datagrid::Drivers::ActiveRecord do
       )
     end
   end
+
+  describe "batches usage" do
+
+    it "should be incompatible with scope with limit" do
+      report = test_report do
+        scope {Entry.limit(5)}
+        self.batch_size = 20
+        column(:id)
+      end
+      expect { report.data }.to raise_error(Datagrid::ConfigurationError)
+    end
+  end
+
+
 end

data/spec/datagrid/filters/base_filter_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Datagrid::Filters::BaseFilter do
+  
+
+  it "should support default option as block" do
+    report = test_report do
+      scope {Entry}
+      filter(:name, :string, :default => :name_default)
+      def name_default
+        'hello'
+      end
+    end
+    expect(report.assets).to include(Entry.create!(:name => "hello"))
+    expect(report.assets).not_to include(Entry.create!(:name => "world"))
+    expect(report.assets).not_to include(Entry.create!(:name => ""))
+  end
+
+end

data/spec/datagrid/form_builder_spec.rb

@@ -109,7 +109,7 @@ describe Datagrid::FormBuilder do
         )}
       end
       context "with only left bound" do
-        
+
         let(:_range) { [10, nil]}
         it { should equal_to_dom(
           '<input class="group_id integer_filter from" multiple name="report[group_id][]" size="30" type="text" value="10"/>' +
@@ -151,7 +151,7 @@ describe Datagrid::FormBuilder do
         it { should equal_to_dom(
           '<input class="group_id integer_filter from" multiple name="report[group_id][]" size="30" type="text"><span class="separator integer"> - </span><input class="group_id integer_filter to" multiple name="report[group_id][]" size="30" type="text">'
         ) }
-        
+
       end
 
       context "when deprecated format translation specified" do
@@ -207,7 +207,7 @@ describe Datagrid::FormBuilder do
         end
       }
       context "with only left bound" do
-        
+
         let(:_range) { ["2012-01-03", nil]}
         it { should equal_to_dom(
           '<input class="created_at date_filter from" multiple name="report[created_at][]" size="30" type="text" value="2012-01-03"/>' +
@@ -230,7 +230,7 @@ describe Datagrid::FormBuilder do
         )}
       end
       context "with only right bound" do
-        
+
         let(:_range) { [nil, "2012-01-03"]}
         it { should equal_to_dom(
           '<input class="created_at date_filter from" multiple name="report[created_at][]" size="30" type="text"/>' +
@@ -280,7 +280,7 @@ describe Datagrid::FormBuilder do
 
       context "when block is given" do
         before(:each) do
-          pending("not supported by rails < 4.1") if Rails.version < '4.1'
+          skip("not supported by rails < 4.1") if Rails.version < '4.1'
         end
         let(:_filter_block ) { proc { template.content_tag(:option, 'block option', :value => 'block_value') }}
         it { should equal_to_dom(
@@ -463,7 +463,7 @@ describe Datagrid::FormBuilder do
           column(:id)
           column(:name)
           column(:category)
-        end       
+        end
       end
       let(:_filter) { :column_names }
       let(:expected_html) do
@@ -494,7 +494,7 @@ describe Datagrid::FormBuilder do
           column(:id)
           column(:name)
           column(:category)
-        end       
+        end
       end
       let(:_filter) { :column_names }
       let(:expected_html) do
@@ -514,7 +514,7 @@ DOM
       let(:filter_options) do
         {}
       end
-      
+
       let(:_grid) do
         options = filter_options
         test_report do

data/spec/datagrid/stylesheet_spec.rb

@@ -2,7 +2,11 @@ require 'spec_helper'
 
 describe "Datagrid stylesheet" do
 
-  pending "should work correctly" do
-    Rails.application.assets.find_asset("datagrid")
+  it "should work correctly" do
+
+    if Rails.application.assets.respond_to?(:find_asset)
+      asset = Rails.application.assets.find_asset("datagrid")
+      asset
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -142,56 +142,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.1.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.1.7
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: bson
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
 description: This allows you to easily build datagrid aka data tables with sortable
   columns and filters
 email: agresso@gmail.com
@@ -267,6 +267,7 @@ files:
 - spec/datagrid/drivers/mongo_mapper_spec.rb
 - spec/datagrid/drivers/mongoid_spec.rb
 - spec/datagrid/drivers/sequel_spec.rb
+- spec/datagrid/filters/base_filter_spec.rb
 - spec/datagrid/filters/boolean_enum_filter_spec.rb
 - spec/datagrid/filters/composite_filters_spec.rb
 - spec/datagrid/filters/date_filter_spec.rb
@@ -326,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby gem to create datagrids