RubyGems - wice_grid_mongoid - Versions diffs - 6.0.10 → 6.1.0 - Mend

wice_grid_mongoid 6.0.10 → 6.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

data/VERSION +1 -1
data/lib/filter_conditions_generators.rb +14 -13
data/lib/mongoid_field.rb +13 -26
data/lib/wice_grid.rb +5 -3
data/wice_grid_mongoid.gemspec +91 -94
metadata +91 -25
data/.gitignore +0 -11

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 6.0~~.10~~
1	+ 6.1.0

data/lib/filter_conditions_generators.rb CHANGED Viewed

@@ -2,11 +2,12 @@ module Wice
   class FilterConditionsGenerator   #:nodoc:
     cattr_accessor :handled_type
+    attr_reader    :criteria
     @@handled_type = HashWithIndifferentAccess.new
-    def initialize(field, criteria)   #:nodoc:
+    def initialize(field, klass)   #:nodoc:
       @field = field
-      @criteria = criteria
+      @criteria = Mongoid::Criteria.new(klass)
     end
     def generate_conditions(opts)
@@ -14,10 +15,9 @@ module Wice
     end
   end
-  class FilterConditionsGeneratorCustomFilter < FilterConditionsGenerator #:nodoc:
+#   class FilterConditionsGeneratorCustomFilter < FilterConditionsGenerator #:nodoc:
-    def generate_conditions(opts)   #:nodoc:
-      return false # should be implemented
+#     def generate_conditions(opts)   #:nodoc:
 #       if opts.empty?
 #         Wice.log "empty parameters for the grid custom filter"
 #         return false
@@ -49,8 +49,9 @@ module Wice
 #           [" #{@field.alias_or_table_name(table_alias)}.#{@field.name} = ?", opts]
 #         end
 #       end
-     end
-  end
+#     end
+#   end
   class FilterConditionsGeneratorBoolean < FilterConditionsGenerator  #:nodoc:
     @@handled_type[Boolean] = self
@@ -60,7 +61,7 @@ module Wice
         Wice.log "invalid parameters for the grid boolean filter - must be an one item array: #{opts.inspect}"
         return false
       end
-      @criteria.where(opts[0] == 't' ? {@field.name => true} : {@field.name.to_sym.ne => true})
+      @criteria = @criteria.where(opts[0] == 't' ? {@field.name => true} : {@field.name.to_sym.ne => true})
       return true
     end
   end
@@ -90,7 +91,7 @@ module Wice
         string_fragment = string_fragment.gsub( /([\|\(\)\[\]\{\}\+\^\\\$\*\?\.])/ )  { |s| '\\' + s}
       end
-      @criteria.where(@field.name.to_s => /#{string_fragment}/i)
+      @criteria = @criteria.where(@field.name.to_s => /#{string_fragment}/i)
       return true
     end
@@ -114,8 +115,8 @@ module Wice
       end
       from = parse_number(opts[:fr])
       to = parse_number(opts[:to])
-      @criteria.where(@field.name.to_sym.gte => from)
-      @criteria.where(@field.name.to_sym.lte => to)
+      @criteria = @criteria.where(@field.name.to_sym.gte => from)
+      @criteria = @criteria.where(@field.name.to_sym.lte => to)
       return true
     end
@@ -139,8 +140,8 @@ module Wice
     @@handled_type[Time] = self
     def generate_conditions(opts)   #:nodoc:
-      @criteria.where(@field.name.to_sym.gte => opts[:fr]) if opts[:fr]
-      @criteria.where(@field.name.to_sym.lte => opts[:to]) if opts[:to]
+      @criteria = @criteria.where(@field.name.to_sym.gte => opts[:fr]) if opts[:fr]
+      @criteria = @criteria.where(@field.name.to_sym.lte => opts[:to]) if opts[:to]
       opts[:fr] || opts[:to]
     end
   end

data/lib/mongoid_field.rb CHANGED Viewed

@@ -3,37 +3,22 @@ require 'filter_conditions_generators'
 module Wice
   # to be mixed in into Mongoid::Field
   module MongoidField
-    def wice_add_filter_criteria(all_filter_params, criteria, custom_filter_active)  #:nodoc:
+    def wice_add_filter_criteria(all_filter_params, klass, custom_filter_active)  #:nodoc:
       request_params = all_filter_params ? all_filter_params[name] : nil
-      return nil unless request_params
+      return [nil,nil] unless request_params
       # Preprocess incoming parameters for datetime, if what's coming in is
       # a datetime (with custom_filter it can be anything else, and not
       # the datetime hash {"fr" => ..., "to" => ...})
-      if (self.type == Time)
-        if request_params.is_a?(Hash)
-          ["fr", "to"].each do |sym|
-            if request_params[sym]
-              if request_params[sym].is_a?(String)
-                request_params[sym] = Time.parse(Wice::Defaults::DATETIME_PARSER.call(request_params[sym]).to_s)
-              elsif request_params[sym].is_a?(Hash)
-                request_params[sym] = Time.parse(::Wice::GridTools.params_2_datetime(request_params[sym]).to_s)
-              end
+      if (self.type == Time) && request_params.is_a?(Hash)
+        ["fr", "to"].each do |sym|
+          if request_params[sym]
+            if request_params[sym].is_a?(String)
+              request_params[sym] = Time.parse(Wice::Defaults::DATETIME_PARSER.call(request_params[sym]).to_s)
+            elsif request_params[sym].is_a?(Hash)
+              request_params[sym] = Time.parse(::Wice::GridTools.params_2_datetime(request_params[sym]).to_s)
             end
           end
-        elsif request_params.is_a?(Array) && request_params.size == 1
-          ago = request_params.first
-          today = Time.now.beginning_of_day
-          agos = {'1 day' => today - 24.hours,
-            '1 week' => today - 7.days,
-            '1 month' => today - 1.month,
-            'ever' => Time.parse("2000-01-01")}
-          if agos.keys.include?(ago)
-            request_params = {}
-            #regular filtering viea 'fr', 'to' field
-            request_params[:fr] = agos[ago]
-            custom_filter_active = nil
-          end
         end
       end
@@ -56,9 +41,11 @@ module Wice
       processor_klass = ::Wice::FilterConditionsGenerator.handled_type[self.type] unless processor_klass
       unless processor_klass
         Wice.log("No processor for database type #{self.type}!!!")
-        return nil
+        return [nil,nil]
       end
-      processor_klass.new(self, criteria).generate_conditions(request_params)
+      processor = processor_klass.new(self, klass)
+      added = processor.generate_conditions(request_params)
+      [added, processor.criteria]
     end
   end

data/lib/wice_grid.rb CHANGED Viewed

@@ -136,7 +136,7 @@ module Wice
     def add_criteria(extra)
       @extra_filter = extra
-      @criteria.merge(extra)
+      @criteria = @criteria.merge(extra)
     end
     def has_any_filter_criteria?
@@ -197,7 +197,9 @@ module Wice
       field = @klass.fields[field_name]
       raise WiceGridArgumentError.new("Model #{@klass.name} does not have field '#{field_name}'.! ") unless field
-      criteria_added = field.wice_add_filter_criteria(@status[:f], @criteria, custom_filter_active)
+      criteria_added, criteria = field.wice_add_filter_criteria(@status[:f], @klass, custom_filter_active)
+      @criteria = @criteria.merge(criteria) if criteria
       @status[:f].delete(field_name) if @status[:f] && !criteria_added
       @has_any_filter_criteria ||= criteria_added
@@ -223,7 +225,7 @@ module Wice
       if !opts[:skip_ordering] && @status[:order]
         order_by = @status[:order].to_sym.send( @status[:order_direction].to_sym )
-        @criteria.order_by(order_by)
+        @criteria = @criteria.order_by(order_by)
       end
       @criteria.limit(@status[:per_page].to_i)

data/wice_grid_mongoid.gemspec CHANGED Viewed

@@ -1,124 +1,121 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name = %q{wice_grid_mongoid}
-  s.version = "6.0.10"
+  s.version = "6.1.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yuri Leikind", "Aleksandr Furmanov"]
-  s.date = %q{2011-01-28}
+  s.date = %q{2011-05-11}
   s.description = %q{A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters }
   s.email = %q{aleksandr.furmanov@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "CHANGELOG",
-     "Gemfile",
-     "Gemfile.lock",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "SAVED_QUERIES_HOWTO.rdoc",
-     "VERSION",
-     "lib/filter_conditions_generators.rb",
-     "lib/generators/wice_grid/templates/calendarview.css",
-     "lib/generators/wice_grid/templates/calendarview.js",
-     "lib/generators/wice_grid/templates/icons/arrow_down.gif",
-     "lib/generators/wice_grid/templates/icons/arrow_up.gif",
-     "lib/generators/wice_grid/templates/icons/calendar_view_month.png",
-     "lib/generators/wice_grid/templates/icons/delete.png",
-     "lib/generators/wice_grid/templates/icons/expand.png",
-     "lib/generators/wice_grid/templates/icons/page_white_excel.png",
-     "lib/generators/wice_grid/templates/icons/page_white_find.png",
-     "lib/generators/wice_grid/templates/icons/table.png",
-     "lib/generators/wice_grid/templates/icons/table_refresh.png",
-     "lib/generators/wice_grid/templates/icons/tick_all.png",
-     "lib/generators/wice_grid/templates/icons/untick_all.png",
-     "lib/generators/wice_grid/templates/wice_grid.css",
-     "lib/generators/wice_grid/templates/wice_grid.yml",
-     "lib/generators/wice_grid/templates/wice_grid_config.rb",
-     "lib/generators/wice_grid/templates/wice_grid_jquery.js",
-     "lib/generators/wice_grid/templates/wice_grid_prototype.js",
-     "lib/generators/wice_grid/wice_grid_assets_jquery_generator.rb",
-     "lib/generators/wice_grid/wice_grid_assets_prototype_generator.rb",
-     "lib/grid_output_buffer.rb",
-     "lib/grid_renderer.rb",
-     "lib/helpers/js_calendar_helpers.rb",
-     "lib/helpers/wice_grid_misc_view_helpers.rb",
-     "lib/helpers/wice_grid_serialized_queries_view_helpers.rb",
-     "lib/helpers/wice_grid_view_helpers.rb",
-     "lib/js_adaptors/jquery_adaptor.rb",
-     "lib/js_adaptors/js_adaptor.rb",
-     "lib/js_adaptors/prototype_adaptor.rb",
-     "lib/mongoid_field.rb",
-     "lib/tasks/wice_grid_tasks.rake",
-     "lib/view_columns.rb",
-     "lib/views/create.rjs",
-     "lib/views/delete.rjs",
-     "lib/wice_grid.rb",
-     "lib/wice_grid_controller.rb",
-     "lib/wice_grid_core_ext.rb",
-     "lib/wice_grid_misc.rb",
-     "lib/wice_grid_serialized_queries_controller.rb",
-     "lib/wice_grid_serialized_query.rb",
-     "lib/wice_grid_spreadsheet.rb",
-     "mongoid_wice_grid.gemspec",
-     "test/.gitignore",
-     "test/blueprint.rb",
-     "test/database.yml",
-     "test/public/javascripts/jquery-1.4.2.min.js",
-     "test/public/javascripts/wice_grid.js",
-     "test/rails_mongoid_test.rb",
-     "test/rails_test_app.rb",
-     "test/require_gems.rb",
-     "test/schema.rb",
-     "test/spec_helper.rb",
-     "test/test_helper.rb",
-     "test/views/projects_and_people_grid.html.erb",
-     "test/views/projects_and_people_grid_invalid.html.erb",
-     "test/views/simple_projects_grid.html.erb",
-     "test/wice_grid_core_ext_test.rb",
-     "test/wice_grid_functional_test.rb",
-     "test/wice_grid_initializer.rb",
-     "test/wice_grid_misc_test.rb",
-     "test/wice_grid_test.rb",
-     "test/wice_grid_view_helper_test.rb",
-     "wice_grid_mongoid.gemspec"
+    "CHANGELOG",
+    "Gemfile",
+    "Gemfile.lock",
+    "MIT-LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "SAVED_QUERIES_HOWTO.rdoc",
+    "VERSION",
+    "lib/filter_conditions_generators.rb",
+    "lib/generators/wice_grid/templates/calendarview.css",
+    "lib/generators/wice_grid/templates/calendarview.js",
+    "lib/generators/wice_grid/templates/icons/arrow_down.gif",
+    "lib/generators/wice_grid/templates/icons/arrow_up.gif",
+    "lib/generators/wice_grid/templates/icons/calendar_view_month.png",
+    "lib/generators/wice_grid/templates/icons/delete.png",
+    "lib/generators/wice_grid/templates/icons/expand.png",
+    "lib/generators/wice_grid/templates/icons/page_white_excel.png",
+    "lib/generators/wice_grid/templates/icons/page_white_find.png",
+    "lib/generators/wice_grid/templates/icons/table.png",
+    "lib/generators/wice_grid/templates/icons/table_refresh.png",
+    "lib/generators/wice_grid/templates/icons/tick_all.png",
+    "lib/generators/wice_grid/templates/icons/untick_all.png",
+    "lib/generators/wice_grid/templates/wice_grid.css",
+    "lib/generators/wice_grid/templates/wice_grid.yml",
+    "lib/generators/wice_grid/templates/wice_grid_config.rb",
+    "lib/generators/wice_grid/templates/wice_grid_jquery.js",
+    "lib/generators/wice_grid/templates/wice_grid_prototype.js",
+    "lib/generators/wice_grid/wice_grid_assets_jquery_generator.rb",
+    "lib/generators/wice_grid/wice_grid_assets_prototype_generator.rb",
+    "lib/grid_output_buffer.rb",
+    "lib/grid_renderer.rb",
+    "lib/helpers/js_calendar_helpers.rb",
+    "lib/helpers/wice_grid_misc_view_helpers.rb",
+    "lib/helpers/wice_grid_serialized_queries_view_helpers.rb",
+    "lib/helpers/wice_grid_view_helpers.rb",
+    "lib/js_adaptors/jquery_adaptor.rb",
+    "lib/js_adaptors/js_adaptor.rb",
+    "lib/js_adaptors/prototype_adaptor.rb",
+    "lib/mongoid_field.rb",
+    "lib/tasks/wice_grid_tasks.rake",
+    "lib/view_columns.rb",
+    "lib/views/create.rjs",
+    "lib/views/delete.rjs",
+    "lib/wice_grid.rb",
+    "lib/wice_grid_controller.rb",
+    "lib/wice_grid_core_ext.rb",
+    "lib/wice_grid_misc.rb",
+    "lib/wice_grid_serialized_queries_controller.rb",
+    "lib/wice_grid_serialized_query.rb",
+    "lib/wice_grid_spreadsheet.rb",
+    "mongoid_wice_grid.gemspec",
+    "test/.gitignore",
+    "test/blueprint.rb",
+    "test/database.yml",
+    "test/public/javascripts/jquery-1.4.2.min.js",
+    "test/public/javascripts/wice_grid.js",
+    "test/rails_mongoid_test.rb",
+    "test/rails_test_app.rb",
+    "test/require_gems.rb",
+    "test/schema.rb",
+    "test/spec_helper.rb",
+    "test/test_helper.rb",
+    "test/views/projects_and_people_grid.html.erb",
+    "test/views/projects_and_people_grid_invalid.html.erb",
+    "test/views/simple_projects_grid.html.erb",
+    "test/wice_grid_core_ext_test.rb",
+    "test/wice_grid_functional_test.rb",
+    "test/wice_grid_initializer.rb",
+    "test/wice_grid_misc_test.rb",
+    "test/wice_grid_test.rb",
+    "test/wice_grid_view_helper_test.rb",
+    "wice_grid_mongoid.gemspec"
   ]
   s.homepage = %q{http://github.com/afurmanov/wice_grid}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{Rails Grid Plugin}
-  s.test_files = [
-    "test/blueprint.rb",
-     "test/rails_mongoid_test.rb",
-     "test/rails_test_app.rb",
-     "test/require_gems.rb",
-     "test/schema.rb",
-     "test/spec_helper.rb",
-     "test/test_helper.rb",
-     "test/wice_grid_core_ext_test.rb",
-     "test/wice_grid_functional_test.rb",
-     "test/wice_grid_initializer.rb",
-     "test/wice_grid_misc_test.rb",
-     "test/wice_grid_test.rb",
-     "test/wice_grid_view_helper_test.rb"
-  ]
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rails>, ["= 3.0.1"])
+      s.add_runtime_dependency(%q<bson_ext>, ["= 1.0.4"])
+      s.add_runtime_dependency(%q<mongo>, ["= 1.0.7"])
+      s.add_runtime_dependency(%q<mongo_ext>, [">= 0"])
+      s.add_runtime_dependency(%q<mongoid>, ["= 2.0.0.beta.17"])
     else
+      s.add_dependency(%q<rails>, ["= 3.0.1"])
+      s.add_dependency(%q<bson_ext>, ["= 1.0.4"])
+      s.add_dependency(%q<mongo>, ["= 1.0.7"])
+      s.add_dependency(%q<mongo_ext>, [">= 0"])
+      s.add_dependency(%q<mongoid>, ["= 2.0.0.beta.17"])
     end
   else
+    s.add_dependency(%q<rails>, ["= 3.0.1"])
+    s.add_dependency(%q<bson_ext>, ["= 1.0.4"])
+    s.add_dependency(%q<mongo>, ["= 1.0.7"])
+    s.add_dependency(%q<mongo_ext>, [">= 0"])
+    s.add_dependency(%q<mongoid>, ["= 2.0.0.beta.17"])
   end
 end

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: wice_grid_mongoid
 version: !ruby/object:Gem::Version
-  hash: 59
-  prerelease: false
+  hash: 43
+  prerelease:
   segments:
   - 6
+  - 1
   - 0
-  - 10
-  version: 6.0.10
+  version: 6.1.0
 platform: ruby
 authors:
 - Yuri Leikind
@@ -16,10 +16,89 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-01-28 00:00:00 -08:00
+date: 2011-05-11 00:00:00 -07:00
 default_executable:
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  version_requirements: &id001 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - "="
+      - !ruby/object:Gem::Version
+        hash: 5
+        segments:
+        - 3
+        - 0
+        - 1
+        version: 3.0.1
+  prerelease: false
+  type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  version_requirements: &id002 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - "="
+      - !ruby/object:Gem::Version
+        hash: 31
+        segments:
+        - 1
+        - 0
+        - 4
+        version: 1.0.4
+  prerelease: false
+  type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency
+  name: mongo
+  version_requirements: &id003 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - "="
+      - !ruby/object:Gem::Version
+        hash: 25
+        segments:
+        - 1
+        - 0
+        - 7
+        version: 1.0.7
+  prerelease: false
+  type: :runtime
+  requirement: *id003
+- !ruby/object:Gem::Dependency
+  name: mongo_ext
+  version_requirements: &id004 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  prerelease: false
+  type: :runtime
+  requirement: *id004
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  version_requirements: &id005 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - "="
+      - !ruby/object:Gem::Version
+        hash: 62196417
+        segments:
+        - 2
+        - 0
+        - 0
+        - beta
+        - 17
+        version: 2.0.0.beta.17
+  prerelease: false
+  type: :runtime
+  requirement: *id005
 description: "A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters "
 email: aleksandr.furmanov@gmail.com
 executables: []
@@ -29,7 +108,6 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .gitignore
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
@@ -107,8 +185,8 @@ homepage: http://github.com/afurmanov/wice_grid
 licenses: []
 post_install_message:
-rdoc_options:
-- --charset=UTF-8
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -132,21 +210,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubyforge_project:
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key:
 specification_version: 3
 summary: Rails Grid Plugin
-test_files:
-- test/blueprint.rb
-- test/rails_mongoid_test.rb
-- test/rails_test_app.rb
-- test/require_gems.rb
-- test/schema.rb
-- test/spec_helper.rb
-- test/test_helper.rb
-- test/wice_grid_core_ext_test.rb
-- test/wice_grid_functional_test.rb
-- test/wice_grid_initializer.rb
-- test/wice_grid_misc_test.rb
-- test/wice_grid_test.rb
-- test/wice_grid_view_helper_test.rb
+test_files: []

data/.gitignore DELETED Viewed

@@ -1,11 +0,0 @@
-.DS_Store
-cand
-GPATH
-GRTAGS
-GSYMS
-GTAGS
-doc/
-log/
-pkg/
-./test/public/capybara-*