datagrid 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd9359f7f58b34ec6625249fc8d7d13cbb405316
-  data.tar.gz: 6dbf5745b7f3135743ef3ed1b23fe630dc100b5b
+  metadata.gz: e7dd21661c0b7829a023451513b73670d0b0be11
+  data.tar.gz: 4b2b5bb748791497da883b6c24ad8f19c7ce3c81
 SHA512:
-  metadata.gz: 77117b5608b994d9d67eace4a2b0e05ae9b1c02fa4786f7d21ca7ad748c1c0048a2ae98867570e7cabb2e2b32071b7b07cfb3d4948e7d13d5a5eb931e78c2f90
-  data.tar.gz: a3cd49749291d88682cb943e738a30ff525f700d49a15cd8364c3dcadf8325043b2f94b44c61dc612bb3daddaaa344dd2f84c29119d45a76e62127162d50a042
+  metadata.gz: 7d33aa9a4a8eceaacad1ff76ee91ba9dc3b9e312d2158f70998e7eaef707877042ace5218df8de47a28373dce7d92f6886e4fdf7be70ea27bf90baa6246f763c
+  data.tar.gz: d19b2234cbaba7712206f4b9ed7159cdcf2fd44ec320ff0c3a937a4ea3f03caf237499b4d2a594a0f76a84526fe28cbf23132279e0072a3eaf0535334179692c

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.3.3

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

@@ -0,0 +1,11 @@
+<%# 
+Indent in this file may cause extra space to appear.
+You can add indent if whitespace doesn't matter for you
+%>
+<%- elements.each do |value, text, checked| -%>
+<%- id = [form.object_name, filter.name, value].join('_').underscore -%>
+<%= form.label filter.name, options.merge(:for => id) do -%>
+<%= form.check_box(filter.name, form.datagrid_extra_checkbox_options.merge(:multiple => true, :id => id, :checked => checked), value.to_s, nil) -%>
+<%= text -%>
+<%- end -%>
+<%- end -%>

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.2 ruby lib
+# stub: datagrid 1.3.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "1.3.2"
+  s.version = "1.3.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-10-27"
+  s.date = "2014-11-12"
   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 = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "Readme.markdown",
     "VERSION",
     "app/assets/stylesheets/datagrid.css.sass",
+    "app/views/datagrid/_enum_checkboxes.html.erb",
     "app/views/datagrid/_form.html.erb",
     "app/views/datagrid/_head.html.erb",
     "app/views/datagrid/_order_for.html.erb",

data/lib/datagrid/core.rb

@@ -27,7 +27,7 @@ module Datagrid
           end
 
           define_method :"#{name}=" do |value|
-            instance_variable_set("@#{name}", block.call(value))
+            instance_variable_set("@#{name}", instance_exec(value, &block))
           end
         end
       end

data/lib/datagrid/filters/base_filter.rb

@@ -108,6 +108,15 @@ class Datagrid::Filters::BaseFilter #:nodoc:
     options[:dummy]
   end
 
+  def type
+    Datagrid::Filters::FILTER_TYPES.each do |type, klass|
+      if is_a?(klass)
+        return type
+      end
+    end
+    raise "wtf is #{inspect}"
+  end
+
   protected
 
   def default_filter_where(driver, scope, value)

data/lib/datagrid/filters/boolean_enum_filter.rb

@@ -10,4 +10,8 @@ class Datagrid::Filters::BooleanEnumFilter < Datagrid::Filters::EnumFilter #:nod
     super(report, attribute, options, &block)
   end
 
+
+  def checkbox_id(value)
+    [object_name, name, value].join('_').underscore 
+  end
 end

data/lib/datagrid/form_builder.rb

@@ -17,6 +17,10 @@ module Datagrid
       label(filter.name, text, options, &block)
     end
 
+    def datagrid_extra_checkbox_options
+      ::ActionPack::VERSION::MAJOR >= 4 ? {:include_hidden => false} : {}
+    end
+
     protected
     def datagrid_boolean_enum_filter(attribute_or_filter, options = {})
       datagrid_enum_filter(attribute_or_filter, options)
@@ -44,18 +48,25 @@ module Datagrid
     end
 
     def datagrid_enum_filter(attribute_or_filter, options = {}, &block)
+      options = options.clone
       filter = datagrid_get_filter(attribute_or_filter)
       if filter.checkboxes?
         options = add_html_classes(options, 'checkboxes')
-        filter.select(object).map do |element|
+        partials_path = options.delete(:partials) || 'datagrid' 
+        elements = filter.select(object).map do |element|
           text, value = @template.send(:option_text_and_value, element)
-          id = [object_name, filter.name, value].join('_').underscore
-          html_options = datagrid_extra_checkbox_options.reverse_merge(
-            :id => id, :multiple => true, :checked => enum_checkbox_checked?(filter, value)
-          )
-          input = check_box(filter.name, html_options, value.to_s, nil)
-          label(filter.name, input + text, options.reverse_merge(:for => id))
-        end.join("\n").html_safe
+          checked = enum_checkbox_checked?(filter, value)
+          [value, text, checked]
+        end
+        @template.render(
+          :partial => File.join(partials_path, 'enum_checkboxes'),
+          :locals => {
+            :elements => elements, 
+            :form => self, 
+            :filter => filter,
+            :options => options,
+          } 
+        )
       else
         if !options.has_key?(:multiple) && filter.multiple?
           options[:multiple] = true
@@ -186,10 +197,6 @@ module Datagrid
       Datagrid::Utils.add_html_classes(options, *classes)
     end
 
-    def datagrid_extra_checkbox_options
-      ::ActionPack::VERSION::MAJOR >= 4 ? {:include_hidden => false} : {}
-    end
-
     class Error < StandardError
     end
 

data/lib/datagrid/ordering.rb

@@ -15,10 +15,10 @@ module Datagrid
             value = value.to_sym
             column = column_by_name(value)
             unless column 
-              order_unsupported(value, "no column #{value} in #{self.class}")
+              self.class.order_unsupported(value, "no column #{value} in #{self.class}")
             end
             unless column.supports_order?
-              order_unsupported(column.name, "column don't support order" ) 
+              self.class.order_unsupported(column.name, "column don't support order" ) 
             end
             value
           else

data/spec/datagrid/filters_spec.rb

@@ -191,4 +191,17 @@ describe Datagrid::Filters do
     expect(grid.class.filters.map(&:name)).to eq([:id, :name])
 
   end
+
+
+  describe "#filter_by_name" do
+    it "should return filter object" do
+      r = test_report do
+        scope {Entry}
+        filter(:id, :integer)
+      end
+
+      object = r.filter_by_name(:id)
+      expect(object.type).to eq(:integer)
+    end
+  end
 end

data/spec/datagrid/form_builder_spec.rb

@@ -12,7 +12,12 @@ end
 
 describe Datagrid::FormBuilder do
 
-  let(:template) { ActionView::Base.new}
+  let(:template) do
+    ActionView::Base.new.tap do |v|
+      v.view_paths << File.expand_path("../../../app/views", __FILE__)
+      v.view_paths << File.expand_path("../../support/test_partials", __FILE__)
+    end
+  end
   let(:view) { ActionView::Helpers::FormBuilder.new(:report, _grid, template, {}, Proc.new {|f| })}
 
 

data/spec/datagrid/ordering_spec.rb

@@ -106,4 +106,19 @@ describe Datagrid::Ordering do
     expect(report.assets).to eq([second, first, third])
   end
 
+  it "should work correctly with inherited classes" do
+    class OrderInheritenceBase
+      include Datagrid
+      scope { Entry }
+    end
+
+    class OrderInheritenceChild < OrderInheritenceBase
+      column(:name)
+    end
+
+    grid = OrderInheritenceChild.new(order: 'name')
+    expect(grid.assets).to eq([first, second, third])
+    grid.descending = true
+    expect(grid.assets).to eq([third, second, first])
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -223,6 +223,7 @@ files:
 - Readme.markdown
 - VERSION
 - app/assets/stylesheets/datagrid.css.sass
+- app/views/datagrid/_enum_checkboxes.html.erb
 - app/views/datagrid/_form.html.erb
 - app/views/datagrid/_head.html.erb
 - app/views/datagrid/_order_for.html.erb