cowtech-rails 2.0.0.2 → 2.1.0.1

data/app/helpers/cowtech/ruby_on_rails/helpers/application_helper.rb

@@ -13,18 +13,23 @@ module Cowtech
           @application_info
         end
 
+        def full_controller_name(css = false)
+          rv = self.controller_path
+          !css ? rv : rv.gsub("/", "_")
+        end
+        
         def location_name(action = nil, controller = nil)
-          controller = self.controller_name if !controller
+          controller = self.full_controller_name if !controller
           action = self.action_name if !action
           "#{controller}##{action}"
         end
 
         def additional_tag(what = :js, *args)
           if what == :js then
-            args.insert(0, "app/#{self.controller_name}.js")
+            args.insert(0, "app/#{self.full_controller_name}.js")
             javascript_include_tag(*args)
           elsif what == :css then
-            args.insert(0, "app/#{self.controller_name}.css")
+            args.insert(0, "app/#{self.full_controller_name}.css")
             stylesheet_link_tag(*args)
           end
         end

data/app/helpers/cowtech/ruby_on_rails/helpers/mongoid_crud_helper.rb

@@ -66,7 +66,15 @@ module Cowtech
 
         def mongo_add_query_conditions(args = {})
           (args[:conditions] || []).ensure_array.each do |condition|
-            @mongo_query = @mongo_query.where(condition) if condition.is_a?(Hash)
+            if condition.is_a?(Hash) then
+              condition.each_pair do |key, val|
+                if key == "$or" then
+                  @mongo_query = @mongo_query.any_of(val)
+                else
+                  @mongo_query = @mongo_query.where({key => val})
+                end                 
+              end
+            end
           end
 
           @mongo_query = yield(@mongo_query) if block_given?
@@ -109,7 +117,7 @@ module Cowtech
           parameter = args[:parameter] || :search
 
           # Get the query
-          search_query = params[parameter]
+          search_query = args[:query] || params[parameter]
           if search_query.present? then
             expr = self.mongo_parse_search(search_query)
 

data/lib/cowtech/version.rb

@@ -8,9 +8,9 @@ module Cowtech
   module Rails
     module Version
       MAJOR = 2
-      MINOR = 0
+      MINOR = 1
       PATCH = 0
-      BUILD = 2
+      BUILD = 1
 
       STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cowtech-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.2
+  version: 2.1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-13 00:00:00.000000000Z
+date: 2011-09-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cowtech-extensions
-  requirement: &70308086256600 !ruby/object:Gem::Requirement
+  requirement: &70285157001040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308086256600
+  version_requirements: *70285157001040
 description: A general purpose Rails utility plugin.
 email: shogun_panda@me.com
 executables: []