origin 1.0.11 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1f7f42f517c065e2637b932e5119de41a5cfa9a8
+  data.tar.gz: 98564f55e804ec82becb6c0a55de3f6170e237e9
+SHA512:
+  metadata.gz: e5d21e8cd4fc5bb3fe58753e8f5b2e5595c265580d99fe1a818c5bd2bc29ef0a16467cb4ac2324ab6e7b09669f3b2c960688f53c00752f6e29f7411ddf7aaaf4
+  data.tar.gz: 0f1af6aac4824259221d9866379efd3f1e1dd1cc0eaad11bc532e0411e611b604b5887ce960b60513bdffc389e45f679a8df443a471a37e3926e9b5dec0e5c8c

data/CHANGELOG.md

@@ -2,10 +2,22 @@
 
 ## 1.1.0 (branch: master)
 
-### New Features
-
 ### Resolved Issues
 
+* \#77 Arrays can now be expanded when complex keys are preset.
+  (Timersha Ziganshin)
+
+* \#76 Hashes with nested values multiple levels are now expanded properly.
+  (Timersha Ziganshin)
+
+* \#75 Merging strategies now expand nested criteria properly.
+  (Timersha Ziganshin)
+
+* \#73 Negation now properly works for $gt/$lt etc queries.
+  (Arthur Neves)
+
+* \#62 Fixed time with zone require. (Julien Boyer)
+
 ## 1.0.11
 
 ### Resolved Issues

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2012 Durran Jordan
+Copyright (c) 2011-2013 Durran Jordan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -8,6 +8,7 @@ Project Tracking
 
 * [Mongoid Google Group](http://groups.google.com/group/mongoid)
 * [Origin Website and Documentation](http://mongoid.org/en/origin/)
+* [Origin Code Climate](https://codeclimate.com/github/mongoid/origin)
 
 Compatibility
 -------------
@@ -23,7 +24,7 @@ the Origin section: [mongoid.org](http://mongoid.org/en/origin/)
 License
 -------
 
-Copyright (c) 2011-2012 Durran Jordan
+Copyright (c) 2011-2013 Durran Jordan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/origin/extensions.rb

@@ -4,6 +4,9 @@ unless defined?(Boolean)
 end
 
 if defined?(ActiveSupport)
+  unless defined?(ActiveSupport::TimeWithZone)
+    require "active_support/time_with_zone"
+  end
   require "origin/extensions/time_with_zone"
 end
 

data/lib/origin/extensions/array.rb

@@ -55,6 +55,20 @@ module Origin
         map { |value| value.__evolve_date__ }
       end
 
+      # Get the object as expanded.
+      #
+      # @example Get the object expanded.
+      #   obj.__expand_complex__
+      #
+      # @return [ Array ] The expanded array.
+      #
+      # @since 1.1.0
+      def __expand_complex__
+        map do |value|
+          value.__expand_complex__
+        end
+      end
+
       # Evolve the array to an array of times.
       #
       # @example Evolve the array to times.

data/lib/origin/extensions/hash.rb

@@ -146,7 +146,7 @@ module Origin
       def __expand_complex__
         replacement = {}
         each_pair do |key, value|
-          replacement.merge!(key.specify(value))
+          replacement.merge!(key.specify(value.__expand_complex__))
         end
         replacement
       end

data/lib/origin/key.rb

@@ -83,5 +83,17 @@ module Origin
       { name => operator }
     end
     alias :__sort_pair__ :__sort_option__
+
+    # Convert the key to a string.
+    #
+    # @example Convert the key to a string.
+    #   key.to_s
+    #
+    # @return [ String ] The key as a string.
+    #
+    # @since 1.1.0
+    def to_s
+      @name.to_s
+    end
   end
 end

data/lib/origin/mergeable.rb

@@ -131,7 +131,7 @@ module Origin
           next unless expr
           criteria = sel[operator] || []
           normalized = expr.inject({}) do |hash, (field, value)|
-            hash.merge!(field.specify(value))
+            hash.merge!(field.specify(value.__expand_complex__))
             hash
           end
           sel.store(operator, criteria.push(normalized))
@@ -154,8 +154,8 @@ module Origin
     # @since 1.0.0
     def __override__(criterion, operator)
       selection(criterion) do |selector, field, value|
+        expression = prepare(field, operator, value)
         existing = selector[field]
-        expression = { operator => prepare(field, operator, value) }
         if existing.respond_to?(:merge!)
           selector.store(field, existing.merge!(expression))
         else
@@ -181,26 +181,6 @@ module Origin
       with_strategy(:__union__, criterion, operator)
     end
 
-    # Prepare the value for merging.
-    #
-    # @api private
-    #
-    # @example Prepare the value.
-    #   mergeable.prepare("field", 10)
-    #
-    # @param [ String ] field The name of the field.
-    # @param [ Object ] value The value.
-    #
-    # @return [ Object ] The serialized value.
-    #
-    # @since 1.0.0
-    def prepare(field, operator, value)
-      return value if operator =~ /exists|type|size/
-      value = value.__expand_complex__
-      serializer = serializers[field]
-      serializer ? serializer.evolve(value) : value
-    end
-
     # Use the named strategy for the next operation.
     #
     # @api private
@@ -237,25 +217,31 @@ module Origin
       selection(criterion) do |selector, field, value|
         selector.store(
           field,
-          selector[field].send(strategy, prepared(field, operator, value))
+          selector[field].send(strategy, prepare(field, operator, value))
         )
       end
     end
 
-    # Get the selection as a prepared selection.
+    # Prepare the value for merging.
     #
-    # @example Get the prepared selection.
-    #   mergeable.prepared("name", "$all", [ 1, 2 ])
+    # @api private
     #
-    # @param [ String, Symbol ] field The name of the field.
-    # @param [ String ] operator The operator.
+    # @example Prepare the value.
+    #   mergeable.prepare("field", "$gt", 10)
+    #
+    # @param [ String ] field The name of the field.
     # @param [ Object ] value The value.
     #
-    # @return [ Hash ] The prepared selection.
+    # @return [ Object ] The serialized value.
     #
     # @since 1.0.0
-    def prepared(field, operator, value)
-      selection = { operator => prepare(field, operator, value) }
+    def prepare(field, operator, value)
+      unless operator =~ /exists|type|size/
+        value = value.__expand_complex__
+        serializer = serializers[field]
+        value = serializer ? serializer.evolve(value) : value
+      end
+      selection = { operator => value }
       negating? ? { "$not" => selection } : selection
     end
   end

data/lib/origin/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Origin
-  VERSION = "1.0.11"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,96 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: origin
 version: !ruby/object:Gem::Version
-  version: 1.0.11
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Durran Jordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-24 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: tzinfo
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.22
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.22
+date: 2013-04-25 00:00:00.000000000 Z
+dependencies: []
 description: Origin is a simple DSL for generating MongoDB selectors and options
 email:
 - durran@gmail.com
@@ -133,29 +52,25 @@ files:
 - Rakefile
 homepage: http://mongoid.org
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3828253959999818789
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: origin
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple DSL for MongoDB query generation
 test_files: []