datagrid 0.5.3 → 0.5.4

data/Gemfile

@@ -7,14 +7,14 @@ gem "rails", ">= 3.0"
 group :development do
 
   gem "rake"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler", "~> 1.1.0"
   gem "jeweler", "~> 1.6.0"
 
   gem "ruby-debug", :platform => "mri_18"
   #gem "ruby-debug19", :platform => "mri_19"
 
   gem "mocha"
-  gem "rspec", "2.6.0"
+  gem "rspec"
   gem "accept_values_for"
   gem "nokogiri" # used to test html output
 

data/Gemfile.lock

@@ -101,14 +101,14 @@ GEM
     rbx-require-relative (0.0.5)
     rdoc (3.11)
       json (~> 1.4)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -136,7 +136,7 @@ DEPENDENCIES
   accept_values_for
   bson (= 1.4.0)
   bson_ext (= 1.4.0)
-  bundler (~> 1.0.0)
+  bundler (~> 1.1.0)
   fastercsv
   jeweler (~> 1.6.0)
   mocha
@@ -145,7 +145,7 @@ DEPENDENCIES
   nokogiri
   rails (>= 3.0)
   rake
-  rspec (= 2.6.0)
+  rspec
   ruby-debug
   sqlite3-ruby
   will_paginate (= 2.3.15)

data/Readme.markdown

@@ -12,7 +12,7 @@ Ruby library that helps you to build and represent table-like data with:
 
 * ActiveRecord
 * Mongoid
-* MongoMapper (beta)
+* MongoMapper
 
 [Create an issue](https://github.com/bogdan/datagrid/issues/new) if you want more.
 

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

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

@@ -1,7 +1,5 @@
 <tr class="<%= options[:cycle] && cycle(*options[:cycle]) %>">
   <% grid.columns.each do |column| %>
-    <td class="<%= datagrid_column_classes(grid, column) %>">
-      <%= datagrid_format_value(grid, column, asset) %>
-    </td>
+    <td class="<%= datagrid_column_classes(grid, column) %>"><%= datagrid_format_value(grid, column, asset) %></td>
   <% end %>
 </tr>

data/datagrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2012-02-13"
+  s.date = "2012-04-11"
   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 = [
@@ -82,7 +82,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/bogdan/datagrid"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.11"
   s.summary = "Ruby gem to create datagrids"
 
   if s.respond_to? :specification_version then
@@ -91,11 +91,11 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["= 2.6.0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<accept_values_for>, [">= 0"])
       s.add_development_dependency(%q<nokogiri>, [">= 0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
@@ -108,11 +108,11 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<rails>, [">= 3.0"])
       s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["= 2.6.0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<accept_values_for>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
@@ -126,11 +126,11 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rails>, [">= 3.0"])
     s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["= 2.6.0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<accept_values_for>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])

data/lib/datagrid/active_model.rb

@@ -19,7 +19,7 @@ module Datagrid
     module ClassMethods
   
       def param_name
-        self.to_s.underscore.split('/').last
+        self.to_s.underscore.tr('/', '_')
       end
 
 

data/lib/datagrid/core.rb

@@ -90,6 +90,7 @@ module Datagrid
       end
 
       def paginate(*args, &block)
+        ::Datagrid::Utils.warn_once("#paginate is deprecated. Call it like object.assets.paginate(...).")
         self.assets.paginate(*args, &block)
       end
 

data/lib/datagrid/filters/enum_filter.rb

@@ -2,7 +2,7 @@ class Datagrid::Filters::EnumFilter < Datagrid::Filters::BaseFilter
 
   def initialize(*args)
     super(*args)
-    raise Datagrid::ConfigurationError, ":select option not specified" unless select
+    raise Datagrid::ConfigurationError, ":select option not specified" unless options[:select]
   end
 
   def format(value)

data/lib/datagrid/renderer.rb

@@ -12,7 +12,7 @@ module Datagrid
     end
 
     def format_value(grid, column, asset)
-      value = column.html? ? @template.instance_exec(asset, &column.block) : column.value(asset, grid)
+      value = column.html? ? @template.instance_exec(asset, grid, &column.block) : column.value(asset, grid)
       url = column.options[:url] && column.options[:url].call(asset)
       if url
         @template.link_to(value, url)
@@ -32,7 +32,10 @@ module Datagrid
       options[:html][:class] ||= "datagrid #{grid.class.to_s.underscore.demodulize}"
       assets = args.any? ? args.shift : grid.assets
       paginate = options[:paginate]
-      assets = assets.paginate(paginate) if paginate 
+      if paginate 
+        ::Datagrid::Utils.warn_once(":paginate option is deprecated. Looks to https://github.com/bogdan/datagrid/wiki/Frontend.")
+        assets = assets.paginate(paginate)
+      end
 
       @template.render :partial => "datagrid/table", :locals => {:grid => grid, :options => options, :assets => assets}
     end

data/spec/datagrid/active_model_spec.rb

@@ -6,6 +6,12 @@ describe Datagrid::ActiveModel do
     include Datagrid::ActiveModel
   end
 
+  module Grid
+    class ActiveReport
+      include Datagrid::ActiveModel
+    end
+  end
+
   describe ".model_name" do
     it "should be generate from class name " do
       ActiveReport.model_name.should == "ActiveReport"
@@ -15,5 +21,13 @@ describe Datagrid::ActiveModel do
     end
   end
 
-  
+  describe ".param_name" do
+    it "should make right param key from simple class name" do
+      ActiveReport.param_name.should == 'active_report'
+    end
+    it "should make right param key from class of module" do
+      Grid::ActiveReport.param_name.should == 'grid_active_report'
+    end
+  end
+
 end

data/spec/datagrid/filters/enum_filter_spec.rb

@@ -16,4 +16,11 @@ describe Datagrid::Filters::EnumFilter do
     end.class.filter_by_name(:group_id).select.should == [1,2]
   end
   
+  it "should initialize select option only on instanciation" do
+    class ReportWithLazySelect
+      include Datagrid
+      scope {Entry}
+      filter(:group_id, :enum, :select => proc { raise 'hello' })
+    end
+  end
 end

data/spec/datagrid/helper_spec.rb

@@ -125,6 +125,19 @@ describe Datagrid::Helper do
           "tr td.name span" => "Star"
         )
       end
+
+      it "should render html columns with double arguments for column" do
+        rp = test_report do
+          scope { Entry }
+          column(:name, :html => true) do |model, grid|
+            content_tag(:span, "#{model.name}-#{grid.assets.klass}" )
+          end
+        end
+        subject.datagrid_rows(rp, [entry]).should match_css_pattern(
+          "tr td.name span" => "Star-Entry"
+        )
+      end
+
     end
 
     describe ".datagrid_order_for" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000 Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &12512220 !ruby/object:Gem::Requirement
+  requirement: &9639800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *12512220
+  version_requirements: *9639800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12510700 !ruby/object:Gem::Requirement
+  requirement: &9638360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12510700
+  version_requirements: *9638360
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &12509940 !ruby/object:Gem::Requirement
+  requirement: &9637320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *12509940
+  version_requirements: *9637320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &12509440 !ruby/object:Gem::Requirement
+  requirement: &9636560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *12509440
+  version_requirements: *9636560
 - !ruby/object:Gem::Dependency
   name: ruby-debug
-  requirement: &12508760 !ruby/object:Gem::Requirement
+  requirement: &9634860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12508760
+  version_requirements: *9634860
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &12508120 !ruby/object:Gem::Requirement
+  requirement: &9632840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,21 +76,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12508120
+  version_requirements: *9632840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12507580 !ruby/object:Gem::Requirement
+  requirement: &9647700 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12507580
+  version_requirements: *9647700
 - !ruby/object:Gem::Dependency
   name: accept_values_for
-  requirement: &12506900 !ruby/object:Gem::Requirement
+  requirement: &9644920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12506900
+  version_requirements: *9644920
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &12522440 !ruby/object:Gem::Requirement
+  requirement: &9642560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12522440
+  version_requirements: *9642560
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &12519640 !ruby/object:Gem::Requirement
+  requirement: &9641040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12519640
+  version_requirements: *9641040
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &12518180 !ruby/object:Gem::Requirement
+  requirement: &9656640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -131,10 +131,10 @@ dependencies:
         version: 2.3.15
   type: :development
   prerelease: false
-  version_requirements: *12518180
+  version_requirements: *9656640
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &12516820 !ruby/object:Gem::Requirement
+  requirement: &9655700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -142,10 +142,10 @@ dependencies:
         version: 2.2.2
   type: :development
   prerelease: false
-  version_requirements: *12516820
+  version_requirements: *9655700
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &12515720 !ruby/object:Gem::Requirement
+  requirement: &9655180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 0.11.0
   type: :development
   prerelease: false
-  version_requirements: *12515720
+  version_requirements: *9655180
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &12531000 !ruby/object:Gem::Requirement
+  requirement: &9654520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -164,10 +164,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *12531000
+  version_requirements: *9654520
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &12530120 !ruby/object:Gem::Requirement
+  requirement: &9653580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -175,10 +175,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *12530120
+  version_requirements: *9653580
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &12526640 !ruby/object:Gem::Requirement
+  requirement: &9652580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12526640
+  version_requirements: *9652580
 description: This allows you to easily build datagrid aka data tables with sortable
   columns and filters
 email: agresso@gmail.com
@@ -272,7 +272,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1153933139173478709
+      hash: -2917374290940836838
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Ruby gem to create datagrids