datagrid 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a33a74ea728f66eb12ea5cc90b17d9be026ac0c1
-  data.tar.gz: fa60a6ba1ff9812693f313604a6e35a39ad0b84c
+  metadata.gz: 8edc6a25bb802b852ce81f90623d3fca8b6fc5e4
+  data.tar.gz: 8ee50cd8e1a3f759fc5344262c73fc054a47e4d9
 SHA512:
-  metadata.gz: cb4e447b826333a3034cbcf6fc44a95e3ff3fa4266c9868295aa12bc0222391bdb458e8ea45568970b85363fd28944dfe4ed2f3550c60c0faa34c7749aacdd52
-  data.tar.gz: 2f1bcbe542567a33be0583b8f6c285d249e0c3d9fd88d0e9fa9a0ea1e573f51ba2050954d0cd4b8a6e2e334f8c152f0fdefacf205665cf019c7d6134972b288a
+  metadata.gz: 294214bffac7241ea3f36a40bdb20df4b9efbd9a80b908e352129faf1ca98721d5b9e32d3c857c2e00538d19efbd0a7ded3a08376587647502faa2244a08731e
+  data.tar.gz: a733509325684ddadd94e9feab83c3e475c8b00a577812da0b7b7d7a394df692f9790b1d87fc713df7b370afcdb7770de955aaa8baa83f47b264bcbf853f3f9c

data/Readme.markdown

@@ -159,9 +159,9 @@ create  app/grids/skills_grid.rb
 create  app/controllers/skills_controller.rb
 create  app/views/skills/index.html.erb
 route  resources :skills
+insert  app/assets/stylesheet/application.css
 ```
 
-
 ### Customize Built-in partials
 
 In order to get a control on datagrid built-in partials run:

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/datagrid.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: datagrid 1.0.4 ruby lib
+# stub: datagrid 1.0.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]

data/lib/datagrid/form_builder.rb

@@ -11,15 +11,17 @@ module Datagrid
     end
 
     # Returns a form label html for the corresponding filter name
-    def datagrid_label(filter_or_attribute, options = {}, &block)
+    def datagrid_label(filter_or_attribute, options_or_text = {}, options = {}, &block)
       filter = datagrid_get_filter(filter_or_attribute)
-      label(filter.name, filter.header, options, &block)
+      text, options = options_or_text.is_a?(Hash) ? [filter.header, options_or_text] : [options_or_text, options]
+      label(filter.name, text, options, &block)
     end
 
     protected
     def datagrid_boolean_enum_filter(attribute_or_filter, options = {})
       datagrid_enum_filter(attribute_or_filter, options)
     end
+
     def datagrid_extended_boolean_filter(attribute_or_filter, options = {})
       datagrid_enum_filter(attribute_or_filter, options)
     end

data/lib/datagrid/scaffold.rb

@@ -9,7 +9,16 @@ class Datagrid::Scaffold < Rails::Generators::NamedBase
     template "index.html.erb", "app/views/#{grid_controller_short_name}/index.html.erb"
     route("resources :#{grid_controller_short_name}")
     in_root do
-      inject_into_file "app/assets/stylesheets/application.css", " *= require datagrid", {:before => %r{require_self}} # before all
+      {
+        "css" => " *= require datagrid",
+        "css.sass" => " *= require datagrid",
+        "css.scss" => " *= require datagrid",
+      }.each do |extension, string|
+        file = "app/assets/stylesheets/application.#{extension}"
+        if File.exists?(Rails.root.join(file))
+          inject_into_file file, string + "\n", {:before => %r{.*require_self}} # before all
+        end
+      end
     end
   end
 

data/spec/datagrid/form_builder_spec.rb

@@ -473,5 +473,10 @@ describe Datagrid::FormBuilder do
         '<label class="foo" for="report_name">The Name</label>'
       )
     end
+    it "should support explicit label" do
+      view.datagrid_label(:name, "The Name").should equal_to_dom(
+        '<label for="report_name">The Name</label>'
+      )
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Bogdan Gusiev