datagrid 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/datagrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2012-01-03"
+  s.date = "2012-01-26"
   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 = [
@@ -79,7 +79,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.11"
+  s.rubygems_version = "1.8.10"
   s.summary = "Ruby gem to create datagrids"
 
   if s.respond_to? :specification_version then

data/lib/datagrid/columns.rb

@@ -1,8 +1,7 @@
 require "datagrid/utils"
 
 module Datagrid
-  
-  
+
   module Columns
     require "datagrid/columns/column"
 

data/lib/datagrid/drivers/abstract_driver.rb

@@ -17,7 +17,37 @@ module Datagrid
       end
 
 
-      #TODO api declaration
+      def self.match?(scope)
+        raise NotImplementedError
+      end
+
+      def to_scope(scope)
+        raise NotImplementedError
+      end
+
+      def where(scope, condition)
+        raise NotImplementedError
+      end
+
+      def asc(scope, order)
+        raise NotImplementedError
+      end
+
+      def desc(scope, order)
+        raise NotImplementedError
+      end
+
+      def default_order(scope, column_name)
+        raise NotImplementedError
+      end
+
+      def greater_equal(scope, field, value)
+        raise NotImplementedError
+      end
+
+      def less_equal(scope, field, value)
+        raise NotImplementedError
+      end
       
     end
   end

data/lib/datagrid/drivers/active_record.rb

@@ -29,13 +29,17 @@ module Datagrid
         scope.reorder(order).reverse_order
       end
 
-      def table_name(scope)
-        scope.table_name
-      end
-
       def default_order(scope, column_name)
         scope.column_names.include?(column_name.to_s) ? [scope.table_name, column_name].join(".") : nil
       end
+
+      def greater_equal(scope, field, value)
+        scope.where(["#{field} >= ?", value])
+      end
+
+      def less_equal(scope, field, value)
+        scope.where(["#{field} <= ?", value])
+      end
     end
   end
 end

data/lib/datagrid/drivers/mongoid.rb

@@ -31,6 +31,13 @@ module Datagrid
         column_name
       end
 
+      def greater_equal(scope, field, value)
+        scope.where(field => {"$gte" => value})
+      end
+
+      def less_equal(scope, field, value)
+        scope.where(field => {"$lte" => value})
+      end
     end
   end
 end

data/lib/datagrid/filters/composite_filters.rb

@@ -11,29 +11,41 @@ module Datagrid
       end # self.included
 
       module ClassMethods
-        #TODO: decide what to do with cross-orm
 
-        def date_range_filters(field, from_name = :"from_#{field}", to_name = :"to_#{field}")
-          filter(from_name, :date) do |date|
-            self.scoped(:conditions => ["#{field} >= ?", date])
+        def date_range_filters(field, from_options = {}, to_options = {})
+          from_options = normalize_composite_filter_options(from_options, field)
+          to_options = normalize_composite_filter_options(to_options, field)
+
+          filter(from_options[:name] || :"from_#{field}", :date) do |date|
+            driver.greater_equal(self, field, date)
           end
-          filter(to_name, :date) do |date|
-            self.scoped(:conditions => ["#{field} <= ?", date])
+          filter(to_options[:name] || :"to_#{field}", :date) do |date|
+            driver.less_equal(self, field, date)
           end
         end
 
-        def integer_range_filters(field, from_name = :"from_#{field}", to_name = :"to_#{field}")
-          filter(from_name, :integer) do |value|
-            self.scoped(:conditions => "#{field} >= #{value}")
+        def integer_range_filters(field, from_options = {}, to_options = {})
+          from_options = normalize_composite_filter_options(from_options, field)
+          to_options = normalize_composite_filter_options(to_options, field)
+          filter(from_options[:name] || :"from_#{field}", :integer) do |value|
+            driver.greater_equal(self, field, value)
           end
-          filter(to_name, :integer) do |value|
-            self.scoped(:conditions => "#{field} <= #{value}")
+          filter(to_options[:name] || :"to_#{field}", :integer) do |value|
+            driver.less_equal(self, field, value)
           end
         end
+
+        def normalize_composite_filter_options(options, field)
+          if options.is_a?(String) || options.is_a?(Symbol)
+            options = {:name => options}
+          end
+          options
+        end
       end # ClassMethods
 
       module InstanceMethods
 
+
       end # InstanceMethods
 
     end

data/lib/datagrid/filters/filter_eval.rb

@@ -2,7 +2,7 @@
 # We can not call instance_eval on ActiveRecord::Relation class
 # because it will automatically convert it to an array because #instance_eval
 # is not included in the method list that do not cause force result loading
-# That is why we need thi helper class
+# That is why we need this helper class
 class Datagrid::Filters::FilterEval
 
   attr_accessor :filter, :scope, :value
@@ -17,6 +17,10 @@ class Datagrid::Filters::FilterEval
     instance_exec @value, &(@filter.block)
   end
 
+  def driver
+    @filter.grid.driver
+  end
+
   def method_missing(meth, *args, &blk)
     if @scope.respond_to?(meth)
       @scope.send(meth, *args, &blk)

data/spec/datagrid/drivers/mongoid_spec.rb

@@ -43,9 +43,9 @@ describe Datagrid::Drivers::Mongoid do
 
 
     describe "when some filters specified" do
-      let(:_attributes) { {:group_id => 2} }
-      its(:assets) {should include(first)}
-      its(:assets) {should_not include(second)}
+      let(:_attributes) { {:from_group_id => 3} }
+      its(:assets) {should_not include(first)}
+      its(:assets) {should include(second)}
     end
 
     describe "when reverse ordering is specified" do

data/spec/support/mongoid.rb

@@ -34,9 +34,7 @@ class MongoidGrid
   end
 
   filter :name
-  filter :group_id do |value|
-    where(:group_id => value)
-  end
+  integer_range_filters(:group_id, {:default => 0}, {:default => 100})
   filter :disabled, :eboolean
 
   column :name

metadata

@@ -1,256 +1,189 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: datagrid
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.5.1
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  prerelease: false
+date: 2012-01-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &75484050 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
   prerelease: false
+  version_requirements: *75484050
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  requirement: &75483760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *75483760
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &75483430 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  prerelease: false
-  name: bundler
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *75483430
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &75483070 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.6.0
-  prerelease: false
-  name: jeweler
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
+  version_requirements: *75483070
+- !ruby/object:Gem::Dependency
   name: ruby-debug
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &75482550 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *75482550
+- !ruby/object:Gem::Dependency
   name: mocha
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &75481780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
-        version: 2.6.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *75481780
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &75481530 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+  type: :development
   prerelease: false
+  version_requirements: *75481530
+- !ruby/object:Gem::Dependency
   name: accept_values_for
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &75481140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *75481140
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &75480800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *75480800
+- !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &75480480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 2
-        - 3
-        - 15
-        version: 2.3.15
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *75480480
+- !ruby/object:Gem::Dependency
   name: will_paginate
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &75480110 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 2
-        - 2
-        version: 2.2.2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 2.3.15
+  type: :development
   prerelease: false
+  version_requirements: *75480110
+- !ruby/object:Gem::Dependency
   name: mongoid
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &75479780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
-        version: 1.4.0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+  type: :development
   prerelease: false
+  version_requirements: *75479780
+- !ruby/object:Gem::Dependency
   name: bson
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &75479190 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.4.0
+  type: :development
   prerelease: false
+  version_requirements: *75479190
+- !ruby/object:Gem::Dependency
   name: bson_ext
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &75478930 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :development
   prerelease: false
+  version_requirements: *75478930
+- !ruby/object:Gem::Dependency
   name: fastercsv
-  version_requirements: *id015
-description: This allows you to easily build datagrid aka data tables with sortable columns and filters
+  requirement: &75478570 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *75478570
+description: This allows you to easily build datagrid aka data tables with sortable
+  columns and filters
 email: agresso@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -311,37 +244,31 @@ files:
 - spec/support/simple_report.rb
 - spec/support/test_partials/_actions.html.erb
 homepage: http://github.com/bogdan/datagrid
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -141785713
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby gem to create datagrids
 test_files: []
-