datagrid 0.4.0 → 0.4.1

data/Gemfile

@@ -21,8 +21,9 @@ group :development do
   gem "sqlite3-ruby"
   gem 'will_paginate', '2.3.15'
 
-  gem "mongoid", "2.2.3"
-  gem "bson_ext"
+  gem "mongoid", "2.2.2"
+  gem "bson", "1.4.0"
+  gem "bson_ext", "1.4.0"
 
   gem "fastercsv", :platform => "mri_18"
 end

data/Gemfile.lock

@@ -32,8 +32,8 @@ GEM
       activesupport (= 3.0.7)
     activesupport (3.0.7)
     arel (2.0.10)
-    bson (1.4.1)
-    bson_ext (1.4.1)
+    bson (1.4.0)
+    bson_ext (1.4.0)
     builder (2.1.2)
     columnize (0.3.2)
     diff-lcs (1.1.2)
@@ -54,9 +54,9 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.16)
     mocha (0.9.12)
-    mongo (1.4.1)
-      bson (= 1.4.1)
-    mongoid (2.2.3)
+    mongo (1.4.0)
+      bson (= 1.4.0)
+    mongoid (2.2.2)
       activemodel (~> 3.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
@@ -108,12 +108,13 @@ PLATFORMS
 
 DEPENDENCIES
   accept_values_for
-  bson_ext
+  bson (= 1.4.0)
+  bson_ext (= 1.4.0)
   bundler (~> 1.0.0)
   fastercsv
   jeweler (~> 1.6.0)
   mocha
-  mongoid (= 2.2.3)
+  mongoid (= 2.2.2)
   nokogiri
   rails (>= 3.0)
   rake

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/datagrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2011-11-03"
+  s.date = "2011-12-06"
   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 = [
@@ -54,6 +54,7 @@ Gem::Specification.new do |s|
     "spec/datagrid/columns_spec.rb",
     "spec/datagrid/drivers/active_record_spec.rb",
     "spec/datagrid/drivers/mongoid_spec.rb",
+    "spec/datagrid/filters/boolean_enum_filter_spec.rb",
     "spec/datagrid/filters/composite_filters_spec.rb",
     "spec/datagrid/filters/enum_filter_spec.rb",
     "spec/datagrid/filters_spec.rb",
@@ -88,8 +89,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<nokogiri>, [">= 0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_development_dependency(%q<will_paginate>, ["= 2.3.15"])
-      s.add_development_dependency(%q<mongoid>, ["= 2.2.3"])
-      s.add_development_dependency(%q<bson_ext>, [">= 0"])
+      s.add_development_dependency(%q<mongoid>, ["= 2.2.2"])
+      s.add_development_dependency(%q<bson>, ["= 1.4.0"])
+      s.add_development_dependency(%q<bson_ext>, ["= 1.4.0"])
       s.add_development_dependency(%q<fastercsv>, [">= 0"])
     else
       s.add_dependency(%q<rails>, [">= 3.0"])
@@ -103,8 +105,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_dependency(%q<will_paginate>, ["= 2.3.15"])
-      s.add_dependency(%q<mongoid>, ["= 2.2.3"])
-      s.add_dependency(%q<bson_ext>, [">= 0"])
+      s.add_dependency(%q<mongoid>, ["= 2.2.2"])
+      s.add_dependency(%q<bson>, ["= 1.4.0"])
+      s.add_dependency(%q<bson_ext>, ["= 1.4.0"])
       s.add_dependency(%q<fastercsv>, [">= 0"])
     end
   else
@@ -119,8 +122,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     s.add_dependency(%q<will_paginate>, ["= 2.3.15"])
-    s.add_dependency(%q<mongoid>, ["= 2.2.3"])
-    s.add_dependency(%q<bson_ext>, [">= 0"])
+    s.add_dependency(%q<mongoid>, ["= 2.2.2"])
+    s.add_dependency(%q<bson>, ["= 1.4.0"])
+    s.add_dependency(%q<bson_ext>, ["= 1.4.0"])
     s.add_dependency(%q<fastercsv>, [">= 0"])
   end
 end

data/lib/datagrid/columns/column.rb

@@ -1,4 +1,3 @@
-
 class Datagrid::Columns::Column
 
   attr_accessor :grid, :options, :block, :name
@@ -34,7 +33,7 @@ class Datagrid::Columns::Column
 
   def header
     self.options[:header] || 
-      I18n.translate(self.name, :scope => "reports.#{self.grid.param_name}.columns", :default => self.name.to_s.humanize )
+      I18n.translate(self.name, :scope => "datagrid.#{self.grid.param_name}.columns", :default => self.name.to_s.humanize )
   end
 
   def order

data/lib/datagrid/filters.rb

@@ -69,7 +69,7 @@ module Datagrid
         check_scope_defined!("Scope should be defined before filters")
         grid = self
         lambda do |value|
-          grid.driver.where(grid.scope, attribute => value)
+          grid.driver.where(scope, attribute => value)
         end
       end
 

data/lib/datagrid/filters/filter_eval.rb

@@ -5,6 +5,8 @@
 # That is why we need thi helper class
 class Datagrid::Filters::FilterEval
 
+  attr_accessor :filter, :scope, :value
+
   def initialize(filter, scope, value)
     @filter = filter
     @scope = scope

data/lib/datagrid/helper.rb

@@ -5,8 +5,9 @@ module Datagrid
 
     def datagrid_format_value(report, column, asset)
       value = column.value(asset, report)
-      if column.options[:url]
-        link_to(value, column.options[:url].call(asset))
+      url = column.options[:url] && column.options[:url].call(asset)
+      if url
+        link_to(value, url)
       else
         case column.format
         when :url

data/spec/datagrid/filters/boolean_enum_filter_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Datagrid::Filters::BooleanEnumFilter do
+  
+end

data/spec/datagrid/filters/enum_filter_spec.rb

@@ -16,4 +16,13 @@ describe Datagrid::Filters::EnumFilter do
     end.class.filter_by_name(:group_id).select.should == [1,2]
   end
   
+  it "should stack with other filters" do
+    Entry.create(:name => "ZZ", :category => "first")
+    report = test_report(:name => "Pop", :category => "first") do
+      scope  { Entry }
+      filter(:name)
+      filter(:category, :enum, :select => ["first", "second"])
+    end
+    report.assets.should be_empty
+  end
 end

data/spec/datagrid/helper_spec.rb

@@ -52,6 +52,24 @@ HTML
 </th>
 </tr>
 
+<tr>
+<td class="group">Pop</td>
+<td class="name">Star</td>
+</tr>
+</table>
+HTML
+    end
+    it "should support giving assets implicitly" do
+      other_entry = Entry.create!(entry.attributes)
+      subject.datagrid_table(grid, [entry]).should equal_to_dom(<<-HTML)
+<table class="datagrid">
+<tr>
+<th class="group">Group<div class="order"></div>
+</th>
+<th class="name">Name<div class="order"></div>
+</th>
+</tr>
+
 <tr>
 <td class="group">Pop</td>
 <td class="name">Star</td>
@@ -66,6 +84,25 @@ HTML
 <td class="group">Pop</td>
 <td class="name">Star</td>
 </tr>
+HTML
+    end
+
+    it "should support urls" do
+      rp = test_report do
+        scope { Entry }
+        column(:name, :url => lambda {|model| model.name})
+      end
+      subject.datagrid_rows(rp, [entry], {}).should equal_to_dom(<<-HTML)
+<tr><td class="name"><a href="Star">Star</a></td></tr>
+HTML
+    end
+    it "should support conditional urls" do
+      rp = test_report do
+        scope { Entry }
+        column(:name, :url => lambda {false})
+      end
+      subject.datagrid_rows(rp, [entry], {}).should equal_to_dom(<<-HTML)
+<tr><td class="name">Star</td></tr>
 HTML
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: datagrid
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Bogdan Gusiev
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-03 00:00:00 Z
+date: 2011-12-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -187,12 +187,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 3
         segments: 
         - 2
         - 2
-        - 3
-        version: 2.2.3
+        - 2
+        version: 2.2.2
   prerelease: false
   name: mongoid
   version_requirements: *id012
@@ -201,18 +201,36 @@ dependencies:
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
+        - 1
+        - 4
         - 0
-        version: "0"
+        version: 1.4.0
   prerelease: false
-  name: bson_ext
+  name: bson
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  prerelease: false
+  name: bson_ext
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -223,7 +241,7 @@ dependencies:
         version: "0"
   prerelease: false
   name: fastercsv
-  version_requirements: *id014
+  version_requirements: *id015
 description: This allows you to easily build datagrid aka data tables with sortable columns and filters
 email: agresso@gmail.com
 executables: []
@@ -271,6 +289,7 @@ files:
 - spec/datagrid/columns_spec.rb
 - spec/datagrid/drivers/active_record_spec.rb
 - spec/datagrid/drivers/mongoid_spec.rb
+- spec/datagrid/filters/boolean_enum_filter_spec.rb
 - spec/datagrid/filters/composite_filters_spec.rb
 - spec/datagrid/filters/enum_filter_spec.rb
 - spec/datagrid/filters_spec.rb