datagrid 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ddccc0241fe7be8d5b6cce9fc48cdf20a5d9d29
-  data.tar.gz: d6f33446081c20970effc047a14a1b147dd17e55
+  metadata.gz: bd9359f7f58b34ec6625249fc8d7d13cbb405316
+  data.tar.gz: 6dbf5745b7f3135743ef3ed1b23fe630dc100b5b
 SHA512:
-  metadata.gz: 5120028296554128bae6a4614a1ac7a021a6c14cb4c107f55d01efb2b11493fe96db1cf9db1e589a6e9318e966ca7ba09aa628d7ba2467594d08d1a6daa333da
-  data.tar.gz: 4b23c861a07ded0fb42a89a6a5142e6e17372d55581e8f3b527a95060f8c397eeb5b17266c5a527341c3f070db7a4c359869fb1eb04f4202fc26969eafea5551
+  metadata.gz: 77117b5608b994d9d67eace4a2b0e05ae9b1c02fa4786f7d21ca7ad748c1c0048a2ae98867570e7cabb2e2b32071b7b07cfb3d4948e7d13d5a5eb931e78c2f90
+  data.tar.gz: a3cd49749291d88682cb943e738a30ff525f700d49a15cd8364c3dcadf8325043b2f94b44c61dc612bb3daddaaa344dd2f84c29119d45a76e62127162d50a042

data/Gemfile

@@ -18,7 +18,7 @@ group :development do
   gem "sqlite3"
 
   group :mongo do
-    gem "mongoid", "2.2.2"
+    gem "mongoid", "3.1.6"
     gem "mongo_mapper", ">=0.11.0"
     gem "bson", "1.4.0"
     gem "bson_ext", "1.4.0"

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

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

@@ -2,7 +2,7 @@
   <% grid.html_columns(*options[:columns]).each do |column| %>
     <th class="<%= datagrid_column_classes(grid, column) %>">
       <%= column.header %>
-      <%= datagrid_order_for(grid, column, options) if column.order && options[:order]%>
+      <%= datagrid_order_for(grid, column, options) if column.supports_order? && options[:order]%>
     </th>
   <% end %>
 </tr>

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.1 ruby lib
+# stub: datagrid 1.3.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   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-08-21"
+  s.date = "2014-10-27"
   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 = [
@@ -135,7 +135,7 @@ Gem::Specification.new do |s|
       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"])
+      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"])
@@ -150,7 +150,7 @@ Gem::Specification.new do |s|
       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"])
+      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"])
@@ -166,7 +166,7 @@ Gem::Specification.new do |s|
     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"])
+    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"])

data/lib/datagrid/columns/column.rb

@@ -106,7 +106,7 @@ class Datagrid::Columns::Column
   end
 
   def inspect
-    "#<Datagird::Columns::Column #{grid_class}##{name} #{options.inspect}>"
+    "#<Datagrid::Columns::Column #{grid_class}##{name} #{options.inspect}>"
   end
 
   def to_s

data/lib/datagrid/drivers/mongo_mapper.rb

@@ -24,7 +24,7 @@ module Datagrid
       end
 
       def desc(scope, order)
-        scope.sort(order.desc)
+        scope.sort("#{order} desc")
       end
 
       def default_order(scope, column_name)

data/lib/datagrid/filters/float_filter.rb

@@ -1,4 +1,7 @@
 class Datagrid::Filters::FloatFilter < Datagrid::Filters::BaseFilter
+
+  include RangedFilter
+
   def parse(value)
     return nil if value.blank?
     value.to_f

data/lib/datagrid/form_builder.rb

@@ -4,10 +4,10 @@ module Datagrid
   module FormBuilder
 
     # Returns a form input html for the corresponding filter name
-    def datagrid_filter(filter_or_attribute, options = {})
+    def datagrid_filter(filter_or_attribute, options = {}, &block)
       filter = datagrid_get_filter(filter_or_attribute)
       options = add_html_classes(options, filter.name, datagrid_filter_html_class(filter))
-      self.send(filter.form_builder_helper_name, filter, options)
+      self.send(filter.form_builder_helper_name, filter, options, &block)
     end
 
     # Returns a form label html for the corresponding filter name
@@ -43,7 +43,7 @@ module Datagrid
       text_field filter.name, options.reverse_merge(:value => object.filter_value_as_string(filter))
     end
 
-    def datagrid_enum_filter(attribute_or_filter, options = {})
+    def datagrid_enum_filter(attribute_or_filter, options = {}, &block)
       filter = datagrid_get_filter(attribute_or_filter)
       if filter.checkboxes?
         options = add_html_classes(options, 'checkboxes')
@@ -60,7 +60,14 @@ module Datagrid
         if !options.has_key?(:multiple) && filter.multiple?
           options[:multiple] = true
         end
-        select filter.name, filter.select(object) || [], {:include_blank => filter.include_blank, :prompt => filter.prompt, :include_hidden => false}, options
+        select(
+          filter.name, 
+          filter.select(object) || [],
+          {:include_blank => filter.include_blank,
+           :prompt => filter.prompt,
+           :include_hidden => false},
+           options, &block
+        )
       end
     end
 
@@ -155,7 +162,7 @@ module Datagrid
     end
 
     def datagrid_float_filter(attribute_or_filter, options = {})
-      datagrid_default_filter(attribute_or_filter, options)
+      datagrid_range_filter(:float, attribute_or_filter, options)
     end
 
     def datagrid_get_attribute(attribute_or_filter)

data/lib/datagrid/locale/en.yml

@@ -19,6 +19,9 @@ en:
       datetime:
         range_format:
           "%{from_input}<span class=\"separator datetime\"> - </span>%{to_input}"
+      float:
+        range_format:
+          "%{from_input}<span class=\"separator float\"> - </span>%{to_input}"
 
       eboolean:
         "yes": "Yes"

data/lib/datagrid/scaffold.rb

@@ -8,6 +8,9 @@ class Datagrid::Scaffold < Rails::Generators::NamedBase
     template "controller.rb.erb", "app/controllers/#{grid_controller_name.underscore}.rb"
     template "index.html.erb", "app/views/#{grid_controller_short_name}/index.html.erb"
     route("resources :#{grid_controller_short_name}")
+    unless defined?(::Kaminari) || defined?(::WillPaginate)
+      gem 'kaminari'
+    end
     in_root do
       {
         "css" => " *= require datagrid",
@@ -43,20 +46,15 @@ class Datagrid::Scaffold < Rails::Generators::NamedBase
   end
 
   def paginate_code
-    if defined?(::Kaminari) || defined?(::WillPaginate)
-      "page(params[:page])"
-    else
-      "paginate_somehow"
-    end
+    "page(params[:page])"
   end
 
   def pagination_helper_code
-    if defined?(::Kaminari)
-      "paginate(@grid.assets)"
-    elsif defined?(::WillPaginate)
+    if defined?(::WillPaginate)
       "will_paginate(@grid.assets)"
     else
-      "some_pagination_helper(@grid.assets)"
+      # Kaminari is default
+      "paginate(@grid.assets)"
     end
 
   end

data/spec/datagrid/drivers/mongo_mapper_spec.rb

@@ -1,3 +1,5 @@
+require "spec_helper"
+
 describe Datagrid::Drivers::MongoMapper, :mongomapper do
 
   describe ".match?" do

data/spec/datagrid/filters/date_time_filter_spec.rb

@@ -27,7 +27,7 @@ describe Datagrid::Filters::DateTimeFilter do
           let(:_created_at) { [DateTime.now.beginning_of_day, DateTime.now.end_of_day] }
           it { should include(entry_dated(1.second.ago))}
           it { should include(entry_dated(Date.today.to_datetime))}
-          it { should include(entry_dated(Date.today.end_of_day.to_datetime))}
+          it { should include(entry_dated(DateTime.now.end_of_day.to_datetime))}
           it { should_not include(entry_dated(Date.yesterday.end_of_day))}
           it { should_not include(entry_dated(Date.tomorrow.beginning_of_day))}
         end

data/spec/datagrid/form_builder_spec.rb

@@ -25,10 +25,11 @@ describe Datagrid::FormBuilder do
     end
 
     subject do
-      view.datagrid_filter(_filter, _filter_options)
+      view.datagrid_filter(_filter, _filter_options, &_filter_block)
     end
 
     let(:_filter_options) { {} }
+    let(:_filter_block) { nil }
     context "with default filter type" do
       let(:_grid) {
         test_report do
@@ -152,6 +153,21 @@ describe Datagrid::FormBuilder do
         )}
       end
     end
+    context "with float filter type and range option" do
+      let(:_filter) { :rating }
+      let(:_grid) {
+        test_report(:rating => _range) do
+          scope {Group}
+          filter(:rating, :float, :range => true)
+        end
+      }
+      let(:_range) { [1.5,2.5]}
+      it { should equal_to_dom(
+        '<input class="rating float_filter from" multiple name="report[rating][]" size="30" type="text" value="1.5"/>' +
+        '<span class="separator float"> - </span>' +
+        '<input class="rating float_filter to" multiple name="report[rating][]" size="30" type="text" value="2.5"/>'
+      )}
+    end
 
 
     context "with date filter type and range option" do
@@ -233,6 +249,16 @@ describe Datagrid::FormBuilder do
        <option value="first">first</option>
        <option value="second">second</option></select>'
       )}
+
+      context "when block is given" do
+        before(:each) do
+          pending("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(
+          '<select class="category enum_filter" id="report_category" name="report[category]"><option value=\"block_value\">block option</option></select>'
+        )}
+      end
       context "when first option is selected" do
         before(:each) do
           _grid.category = "first"

data/spec/datagrid/helper_spec.rb

@@ -382,6 +382,7 @@ describe Datagrid::Helper do
 </div>
       HTML
     end
+
   end
   describe ".datagrid_form_for" do
     it 'returns namespaced partial if partials options is passed' do
@@ -517,5 +518,28 @@ describe Datagrid::Helper do
       expect(data_row.random2).to_not eq(html_row.random2)
       expect(data_row.random2).to_not eq(html_row.random1)
     end
+  
+  end
+
+  describe ".datagrid_header" do
+    
+    it "should support order_by_value colums" do
+      grid = test_report(:order => "category") do
+        scope { Entry }
+        column(:category, :order => false, :order_by_value => true)
+
+        def param_name
+          'grid'
+        end
+      end
+      expect(subject.datagrid_header(grid)).to equal_to_dom(<<HTML)
+<tr><th class="category ordered asc">Category<div class="order">
+<a href="/location?grid%5Bdescending%5D=false&amp;grid%5Border%5D=category" class="asc">&uarr;</a><a href="/location?grid%5Bdescending%5D=true&amp;grid%5Border%5D=category" class="desc">&darr;</a>
+</div>
+</th></tr>
+HTML
+    end
   end
+
 end
+

data/spec/datagrid/scaffold_spec.rb

@@ -5,13 +5,13 @@ describe Datagrid::Scaffold do
 
   describe '.paginate_code' do
     it 'should fall through options successfully' do
-      expect(subject.paginate_code).to eql('paginate_somehow')
+      expect(subject.paginate_code).to eql('page(params[:page])')
     end
   end
 
   describe '.pagination_helper_code' do
     it 'should fall through options successfully' do
-      expect(subject.pagination_helper_code).to eql('some_pagination_helper(@grid.assets)')
+      expect(subject.pagination_helper_code).to eql('paginate(@grid.assets)')
     end
 
     context "when Kaminari exists" do

data/spec/spec_helper.rb

@@ -42,11 +42,17 @@ TEST_LOGGER = Logger.new('spec.log')
 NO_MONGO = ENV['NO_MONGO']
 
 begin
-  Mongoid.from_hash({
-    "host" => "localhost",
-    "database" =>"datagrid_mongoid",
-    "autocreate_indexes" => true,
-    "logger" => nil,
+  Mongoid.load_configuration({
+    "sessions" =>
+    {
+      "default" => 
+      {
+        "hosts" => ["localhost:27017"],
+        "database" =>"datagrid_mongoid",
+        "autocreate_indexes" => true,
+        "logger" => nil,
+      }
+    }
   })
   MongoMapper.connection = Mongo::Connection.new('localhost', 27017)
   MongoMapper.database = "datagrid_mongo_mapper"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 3.1.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 3.1.6
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
   requirement: !ruby/object:Gem::Requirement