datagrid 0.6.2 → 0.6.3

data/Gemfile

@@ -10,7 +10,7 @@ group :development do
   gem "bundler", "~> 1.1.0"
   gem "jeweler", "~> 1.6.0"
 
-  gem "debugger"
+  gem "debugger", :platform => "ruby_19"
 
   gem "rspec"
   gem "accept_values_for"

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

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

@@ -1,5 +1,5 @@
 <tr>
-  <% grid.columns.each do |column| %>
+  <% grid.columns(*options[:columns]).each do |column| %>
     <th class="<%= datagrid_column_classes(grid, column) %>">
       <%= column.header %>
       <%= datagrid_order_for(grid, column) if column.order && options[:order]%>

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

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

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

@@ -9,6 +9,10 @@ Local variables:
     <%= datagrid_header(grid, options) %>
   </thead>
   <tbody>
+    <% if grid.rows.empty? %>
+    <tr><td class="noresults" colspan="100%"><%= I18n.t 'datagrid.no_results', :default => '&mdash;&mdash;'.html_safe %></td></tr>
+    <% else %>
     <%= datagrid_rows(grid, assets, options) %>
+    <% end %>
   </tbody>
 <% end %>

data/datagrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2012-06-22"
+  s.date = "2012-08-28"
   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 = [

data/lib/datagrid/columns.rb

@@ -1,4 +1,5 @@
 require "datagrid/utils"
+require "active_support/core_ext/class/attribute"
 
 module Datagrid
 
@@ -10,6 +11,8 @@ module Datagrid
       base.class_eval do
 
         include Datagrid::Core
+        class_attribute :columns_array
+        self.columns_array = []
 
       end
       base.send :include, InstanceMethods
@@ -17,9 +20,12 @@ module Datagrid
 
     module ClassMethods
 
-      def columns(options = {})
-        (@columns ||= []).reject do |column|
-          options[:data] && column.html?
+      def columns(*args)
+        options = args.extract_options!
+        args.compact!
+        args.map!(&:to_sym)
+        columns_array.select do |column|
+          (!options[:data] || column.data?) && (args.empty? || args.include?(column.name))
         end
       end
 
@@ -28,8 +34,7 @@ module Datagrid
         block ||= lambda do |model|
           model.send(name)
         end
-        @columns ||= []
-        @columns << Datagrid::Columns::Column.new(self, name, options, &block)
+        columns_array << Datagrid::Columns::Column.new(self, name, options, &block)
       end
 
       def column_by_name(name)
@@ -37,6 +42,12 @@ module Datagrid
           col.name.to_sym == name.to_sym
         end
       end
+
+      def inherited(child_class)
+        super(child_class)
+        child_class.columns_array = self.columns_array.clone
+      end
+
     end # ClassMethods
 
     module InstanceMethods
@@ -62,16 +73,19 @@ module Datagrid
         result
       end
 
+      # Returns Array of Arrays with data for each row in datagrid assets without header.
       def rows
         self.assets.map do |asset|
           self.row_for(asset)
         end
       end
 
+      # Returns Array of Arrays with data for each row in datagrid assets with header.
       def data
         self.rows.unshift(self.header)
       end
 
+      # Return Array of Hashes where keys are column names and values are column values for each row in datagrid <tt>#assets</tt>
       def data_hash
         self.assets.map do |asset|
           hash_for(asset)
@@ -95,8 +109,8 @@ module Datagrid
         end
       end
 
-      def columns(options ={})
-        self.class.columns(options)
+      def columns(*args)
+        self.class.columns(*args)
       end
 
       def data_columns

data/lib/datagrid/columns/column.rb

@@ -52,10 +52,12 @@ class Datagrid::Columns::Column
     self.options[:order_desc]  
   end
 
-
   def html?
     !! self.options[:html]
   end
   
+  def data?
+    !html?
+  end
 
 end

data/lib/datagrid/core.rb

@@ -1,4 +1,5 @@
 require "datagrid/drivers"
+require "active_support/core_ext/class/attribute"
 
 module Datagrid
   module Core
@@ -6,7 +7,9 @@ module Datagrid
     def self.included(base)
       base.extend         ClassMethods
       base.class_eval do
-
+        class_attribute :scope_value
+        class_attribute :datagrid_attributes
+        self.datagrid_attributes = []
       end
       base.send :include, InstanceMethods
     end # self.included
@@ -29,16 +32,12 @@ module Datagrid
         end
       end
 
-      def datagrid_attributes
-        @datagrid_attributes ||= []
-      end
-
       def scope(&block)
         if block
-          @scope = block
+          self.scope_value = block
         else
           check_scope_defined!
-          @scope.call
+          scope_value.call
         end
       end
 
@@ -47,8 +46,14 @@ module Datagrid
       end
 
       protected
-      def check_scope_defined!(message = "Scope not defined")
-        raise(Datagrid::ConfigurationError, message) unless @scope
+      def check_scope_defined!(message = nil)
+        message ||= "Scope not defined"
+        raise(Datagrid::ConfigurationError, message) unless scope_value
+      end
+
+      def inherited(child_class)
+        super(child_class)
+        child_class.datagrid_attributes = self.datagrid_attributes.clone
       end
 
     end # ClassMethods
@@ -65,7 +70,7 @@ module Datagrid
 
       def attributes
         result = {}
-        self.class.datagrid_attributes.each do |name|
+        self.datagrid_attributes.each do |name|
           result[name] = self[name]
         end
         result
@@ -96,9 +101,10 @@ module Datagrid
 
       def scope(&block)
         if block_given?
-          @current_scope = block
+          self.scope_value = block
         else
-          @current_scope ? @current_scope.call : self.class.scope
+          check_scope_defined!
+          scope_value.call
         end
       end
 
@@ -106,8 +112,8 @@ module Datagrid
         self.class.driver
       end
 
-      def check_scope_defined!(message)
-        self.class.check_scope_defined!(message)
+      def check_scope_defined!(message = nil)
+        self.class.send :check_scope_defined!, message
       end
 
     end # InstanceMethods

data/lib/datagrid/drivers/abstract_driver.rb

@@ -49,6 +49,9 @@ module Datagrid
         raise NotImplementedError
       end
       
+      def has_column?(scope, column_name)
+        raise NotImplementedError
+      end
     end
   end
 end

data/lib/datagrid/drivers/active_record.rb

@@ -30,7 +30,7 @@ module Datagrid
       end
 
       def default_order(scope, column_name)
-        scope.column_names.include?(column_name.to_s) ? [scope.table_name, column_name].join(".") : nil
+        has_column?(scope, column_name) ? [scope.table_name, column_name].join(".") : nil
       end
 
       def greater_equal(scope, field, value)
@@ -40,6 +40,12 @@ module Datagrid
       def less_equal(scope, field, value)
         scope.where(["#{field} <= ?", value])
       end
+
+      def has_column?(scope, column_name)
+        scope.column_names.include?(column_name.to_s)
+      rescue ::ActiveRecord::StatementInvalid
+        false
+      end
     end
   end
 end

data/lib/datagrid/drivers/mongo_mapper.rb

@@ -28,7 +28,7 @@ module Datagrid
       end
 
       def default_order(scope, column_name)
-        scope.key?(column_name) ? column_name : nil
+        has_column?(scope, column_name) ? column_name : nil
       end
 
       def greater_equal(scope, field, value)
@@ -38,6 +38,10 @@ module Datagrid
       def less_equal(scope, field, value)
         scope.where(field => {"$lte" => value})
       end
+
+      def has_column?(scope, column_name)
+        scope.key?(column_name)
+      end
     end
   end
 end

data/lib/datagrid/drivers/mongoid.rb

@@ -28,7 +28,7 @@ module Datagrid
       end
 
       def default_order(scope, column_name)
-        to_scope(scope).klass.fields.keys.include?(column_name.to_s) ? column_name : nil
+        has_column?(scope, column_name) ? column_name : nil
       end
 
       def greater_equal(scope, field, value)
@@ -38,6 +38,10 @@ module Datagrid
       def less_equal(scope, field, value)
         scope.where(field => {"$lte" => value})
       end
+
+      def has_column?(scope, column_name)
+        to_scope(scope).klass.fields.keys.include?(column_name.to_s)
+      end
     end
   end
 end

data/lib/datagrid/filters.rb

@@ -1,3 +1,5 @@
+require "active_support/core_ext/class/attribute"
+
 module Datagrid
   module Filters
 
@@ -29,6 +31,8 @@ module Datagrid
 
         include Datagrid::Core
         include Datagrid::Filters::CompositeFilters
+        class_attribute :filters
+        self.filters = []
 
       end
       base.send :include, InstanceMethods
@@ -36,17 +40,12 @@ module Datagrid
 
     module ClassMethods
 
-      def filters
-        @filters ||= []
-      end
-
       def filter_by_name(attribute)
         self.filters.find do |filter|
           filter.name.to_sym == attribute.to_sym
         end
       end
 
-
       def filter(attribute, *args, &block)
         options = args.extract_options!
         type = args.shift || :default
@@ -68,11 +67,22 @@ module Datagrid
       protected
       def default_filter(attribute)
         check_scope_defined!("Scope should be defined before filters")
-        lambda do |value, scope, grid|
-          grid.driver.where(scope, attribute => value)
+        if !driver.has_column?(scope, attribute) && driver.to_scope(scope).respond_to?(attribute)
+          lambda do |value, scope, grid|
+            grid.driver.to_scope(scope).send(attribute, value)
+          end
+        else
+          lambda do |value, scope, grid|
+            grid.driver.where(scope, attribute => value)
+          end
         end
       end
 
+      def inherited(child_class)
+        super(child_class)
+        child_class.filters = self.filters.clone
+      end
+
     end # ClassMethods
 
     module InstanceMethods

data/lib/datagrid/filters/boolean_enum_filter.rb

@@ -2,21 +2,20 @@ class Datagrid::Filters::BooleanEnumFilter < Datagrid::Filters::EnumFilter
 
   YES = "YES"
   NO = "NO"
-  VALUES = ActiveSupport::OrderedHash.new
-  VALUES[YES] = YES
-  VALUES[NO] = NO
 
   def initialize(report, attribute, options = {}, &block)
-    options[:select] = VALUES.keys
+    options[:select] = [YES, NO].map do |key, value|
+      [I18n.t("datagrid.filters.eboolean.#{key.downcase}", :default => key.humanize), key]
+    end
     super(report, attribute, options, &block)
   end
 
   def apply(grid_object, scope, value)
-    super(grid_object, scope, to_boolean(value))
+    super(grid_object, scope, value)
   end
 
   def to_boolean(value)
-    VALUES[value]
+    #TODO decide what to do with conversion
   end
 
 end

data/spec/datagrid/columns_spec.rb

@@ -60,5 +60,20 @@ describe Datagrid::Columns do
     report.rows.last.first.should be_false
   end
 
+  it "should inherit columns correctly" do
+    parent = Class.new do
+      include Datagrid
+      scope { Entry }
+      column(:name)
+    end
+
+    child = Class.new(parent) do
+      column(:group_id)
+    end
+    parent.column_by_name(:name).should_not be_nil
+    parent.column_by_name(:group_id).should be_nil
+    child.column_by_name(:name).should_not be_nil
+    child.column_by_name(:group_id).should_not be_nil
+  end
 
 end

data/spec/datagrid/filters/boolean_enum_filter_spec.rb

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

data/spec/datagrid/filters_spec.rb

@@ -33,7 +33,7 @@ describe Datagrid::Filters do
     report = test_report do
       scope {Entry}
       filter(:group_id, :integer) do |value, scope|
-        scope.where(group_id: value)
+        scope.where(:group_id => value)
       end
     end
     lambda {
@@ -55,6 +55,19 @@ describe Datagrid::Filters do
     TheReport.new(:name => 'hello')
   end
 
+  it "should support inheritence" do
+    parent = Class.new do
+      include Datagrid
+      scope {Entry}
+      filter(:name)
+    end
+    child = Class.new(parent) do
+      filter(:group_id)
+    end
+    parent.filters.size.should == 1
+    child.filters.size.should == 2
+  end
+
   describe "allow_blank and allow_nil options" do
 
     def check_performed(value, result, options)
@@ -87,4 +100,17 @@ describe Datagrid::Filters do
       check_performed(nil, true, :allow_nil => true, :allow_blank => false)
     end
   end
+
+  describe "default filter as scope" do
+    it "should create default filter if scope respond to filter name method" do
+      Entry.create!
+      Entry.create!
+      grid = test_report(:limit => 1) do
+        scope {Entry}
+        filter(:limit)
+      end
+      grid.assets.to_a.size.should == 1
+    end
+    
+  end
 end

data/spec/datagrid/form_builder_spec.rb

@@ -21,7 +21,7 @@ describe Datagrid::FormBuilder do
 
     it "should work for every filter type" do
       Datagrid::Filters::FILTER_TYPES.each do |type, klass|
-        Datagrid::FormBuilder.instance_methods.should include(klass.form_builder_helper_name)
+        Datagrid::FormBuilder.instance_methods.map(&:to_sym).should include(klass.form_builder_helper_name)
       end
     end
 
@@ -103,8 +103,8 @@ describe Datagrid::FormBuilder do
       end
       it { should equal_to_dom(
         '<select class="disabled boolean_enum_filter" id="report_disabled" name="report[disabled]"><option value=""></option>
-       <option value="YES">YES</option>
-       <option value="NO">NO</option></select>'
+       <option value="YES">Yes</option>
+       <option value="NO">No</option></select>'
       )}
     end
     context "with string filter" do

data/spec/datagrid/helper_spec.rb

@@ -26,6 +26,22 @@ describe Datagrid::Helper do
   ) }
   let(:grid) { SimpleReport.new }
 
+  context "when grid has no records" do
+    let(:grid) do
+      test_report do
+        scope { Entry.where("1 != 1") }
+      end
+    end
+
+    it "should show an empty table with dashes" do
+      datagrid_table = subject.datagrid_table(grid)
+
+      datagrid_table.should match_css_pattern(
+        "table.datagrid tr td.noresults" => 1
+      )
+    end
+  end
+
   describe ".datagrid_table" do
     it "should have grid class as html class on table" do
       subject.datagrid_table(grid).should match_css_pattern(
@@ -71,6 +87,15 @@ describe Datagrid::Helper do
       subject.datagrid_table(grid, [entry], :order => false).should match_css_pattern("table.datagrid th .order" => 0)
     end
 
+    it "should support columns option" do
+      subject.datagrid_table(grid, [entry], :columns => [:name]).should match_css_pattern(
+        "table.datagrid th.name" => 1,
+        "table.datagrid td.name" => 1,
+        "table.datagrid th.group" => 0,
+        "table.datagrid td.group" => 0
+      )
+    end
+
     describe ".datagrid_rows" do
 
       it "should support urls" do
@@ -137,6 +162,20 @@ describe Datagrid::Helper do
         )
       end
 
+      it "should support columns option" do
+        rp = test_report do
+          scope { Entry }
+          column(:name)
+          column(:category)
+        end
+        subject.datagrid_rows(rp, [entry], :columns => [:name]).should match_css_pattern(
+          "tr td.name" => "Star"
+        )
+        subject.datagrid_rows(rp, [entry], :columns => [:name]).should match_css_pattern(
+          "tr td.category" => 0
+        )
+      end
+
     end
 
     describe ".datagrid_order_for" do

data/spec/support/matchers.rb

@@ -27,6 +27,7 @@ class IncludeDom
   def failure_message
     "Expected dom \n#{@matcher.inspect}\n to include \n#{@expectation.inspect}\n, but it wasn't"
   end
+  
 end
 
 
@@ -90,4 +91,7 @@ class CssPattern
     end 
   end
 
+  def negative_failure_message
+    "Expected do not match dom pattern. But it was"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &18401700 !ruby/object:Gem::Requirement
+  requirement: &19221460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *18401700
+  version_requirements: *19221460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &18399960 !ruby/object:Gem::Requirement
+  requirement: &19219460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18399960
+  version_requirements: *19219460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &18397320 !ruby/object:Gem::Requirement
+  requirement: &19214100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *18397320
+  version_requirements: *19214100
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &18408680 !ruby/object:Gem::Requirement
+  requirement: &19239940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *18408680
+  version_requirements: *19239940
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &18403120 !ruby/object:Gem::Requirement
+  requirement: &19235660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18403120
+  version_requirements: *19235660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18416100 !ruby/object:Gem::Requirement
+  requirement: &19248680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18416100
+  version_requirements: *19248680
 - !ruby/object:Gem::Dependency
   name: accept_values_for
-  requirement: &18414260 !ruby/object:Gem::Requirement
+  requirement: &19245240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18414260
+  version_requirements: *19245240
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &18411420 !ruby/object:Gem::Requirement
+  requirement: &19268860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18411420
+  version_requirements: *19268860
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &18426080 !ruby/object:Gem::Requirement
+  requirement: &19277160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18426080
+  version_requirements: *19277160
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &18424960 !ruby/object:Gem::Requirement
+  requirement: &19299280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +120,10 @@ dependencies:
         version: 2.2.2
   type: :development
   prerelease: false
-  version_requirements: *18424960
+  version_requirements: *19299280
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &18423880 !ruby/object:Gem::Requirement
+  requirement: &19317860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 0.11.0
   type: :development
   prerelease: false
-  version_requirements: *18423880
+  version_requirements: *19317860
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &18421380 !ruby/object:Gem::Requirement
+  requirement: &19315320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -142,10 +142,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *18421380
+  version_requirements: *19315320
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &18433540 !ruby/object:Gem::Requirement
+  requirement: &19313340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -153,10 +153,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *18433540
+  version_requirements: *19313340
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &18429580 !ruby/object:Gem::Requirement
+  requirement: &19334040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18429580
+  version_requirements: *19334040
 description: This allows you to easily build datagrid aka data tables with sortable
   columns and filters
 email: agresso@gmail.com
@@ -251,7 +251,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -28109512857849373
+      hash: 717556836869026164
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: