datagrid 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/datagrid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{datagrid}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]

data/lib/datagrid/core.rb

@@ -44,6 +44,11 @@ module Datagrid
         self.to_s.underscore.split('/').last
       end
 
+      # Required for ActionView form builder
+      def model_name
+        self.param_name
+      end
+
       protected
       def check_scope_defined!(message = "Scope not defined")
         raise(Datagrid::ConfigurationError, message) unless @scope
@@ -100,9 +105,15 @@ module Datagrid
         self.class.param_name
       end
 
+      # Required for ActionView form builder
       def to_key
         [self.class.param_name]
       end
+
+      # Required for ActionView form builder
+      def persisted?
+        false
+      end
       
       protected
 

data/lib/datagrid/form_builder.rb

@@ -7,8 +7,13 @@ module Datagrid
       filter = get_filter(filter_or_attribute)
       options[:class] ||= ""
       options[:class] += " " unless options[:class].blank?
-      options[:class] += "#{filter.name} #{datagrid_filter_class(filter.class)}"
-      self.send(:"datagrid_#{filter.class.to_s.underscore.split('/').last}", filter, options)
+      options[:class] += "#{filter.name} #{datagrid_html_class(filter.class)}"
+      self.send(datagrid_filter_method(filter), filter, options)
+    end
+
+    def datagrid_label(filter_or_attribute, options = {})
+      filter = get_filter(filter_or_attribute)
+      self.label(filter.name, filter.header, options = {})
     end
 
     protected
@@ -43,12 +48,24 @@ module Datagrid
     end
 
     def get_filter(attribute_or_filter)
-      attribute_or_filter.is_a?(Symbol) ? object.class.filter_by_name(attribute_or_filter) : attribute_or_filter
+      if attribute_or_filter.is_a?(Symbol) 
+        object.class.filter_by_name(attribute_or_filter) || 
+          raise(Error, "filter #{attribute_or_filter} not found")
+      else
+        attribute_or_filter
+      end
     end
 
-    def datagrid_filter_class(klass)
+    def datagrid_html_class(klass)
       klass.to_s.split("::").last.underscore
     end
+
+    def datagrid_filter_method(filter)
+      :"datagrid_#{filter.class.to_s.underscore.split('/').last}"
+    end
+
+    class Error < StandardError
+    end
   end
 end
 

data/lib/datagrid/helper.rb

@@ -30,11 +30,11 @@ module Datagrid
 
     protected
 
-    def datagrid_header(grid, options)
+    def datagrid_header(grid, options = {})
       header = empty_string
       grid.columns.each do |column|
         data = _safe(column.header)
-        if column.order
+        if options[:order] && column.order
           data << datagrid_order_for(grid, column)
         end
         header << content_tag(:th, data)

data/spec/datagrid/form_builder_spec.rb

@@ -61,6 +61,14 @@ describe Datagrid::FormBuilder do
       )}
     end
   end
+
+  describe ".datagrid_label" do
+    it "should generate label for filter" do
+      view.datagrid_label(:name).should equal_to_dom(
+        '<label for="report_name">Name</label>'
+      )
+    end
+  end
 end
 
 

data/spec/support/equal_to_dom.rb

@@ -20,7 +20,7 @@ class IncludeDom
   end
 
   def failure_message
-    "Expected dom #{@matcher} to include #{@expectation}, but it wasn't"
+    "Expected dom #{@matcher.inspect} to include #{@expectation.inspect}, but it wasn't"
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: datagrid
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Bogdan Gusiev