origin 1.0.0.beta → 1.0.0.rc

data/Rakefile

@@ -27,9 +27,4 @@ RSpec::Core::RakeTask.new("spec") do |spec|
   spec.pattern = "spec/**/*_spec.rb"
 end
 
-RSpec::Core::RakeTask.new("spec:progress") do |spec|
-  spec.rspec_opts = %w(--format progress)
-  spec.pattern = "spec/**/*_spec.rb"
-end
-
 task :default => :spec

data/lib/origin/mergeable.rb

@@ -154,7 +154,13 @@ module Origin
     # @since 1.0.0
     def __override__(criterion, operator)
       selection(criterion) do |selector, field, value|
-        selector.store(field, { operator => 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
+          selector.store(field, expression)
+        end
       end
     end
 

data/lib/origin/optional.rb

@@ -256,9 +256,15 @@ module Origin
     #
     # @since 1.0.0
     def add_sort_option(options, field, direction)
-      sorting = (options[:sort] || {}).dup
-      sorting[field] = direction
-      options.store(:sort, sorting)
+      if driver == :mongo
+        sorting = (options[:sort] || []).dup
+        sorting.push([ field, direction ])
+        options.store(:sort, sorting)
+      else
+        sorting = (options[:sort] || {}).dup
+        sorting[field] = direction
+        options.store(:sort, sorting)
+      end
     end
 
     # Take the provided criterion and store it as an option in the query

data/lib/origin/options.rb

@@ -5,6 +5,54 @@ module Origin
   # such as skip, limit, and sorting criteria.
   class Options < Smash
 
+    # Convenience method for getting the field options.
+    #
+    # @example Get the fields options.
+    #   options.fields
+    #
+    # @return [ Hash ] The fields options.
+    #
+    # @since 1.0.0
+    def fields
+      self[:fields]
+    end
+
+    # Convenience method for getting the limit option.
+    #
+    # @example Get the limit option.
+    #   options.limit
+    #
+    # @return [ Integer ] The limit option.
+    #
+    # @since 1.0.0
+    def limit
+      self[:limit]
+    end
+
+    # Convenience method for getting the skip option.
+    #
+    # @example Get the skip option.
+    #   options.skip
+    #
+    # @return [ Integer ] The skip option.
+    #
+    # @since 1.0.0
+    def skip
+      self[:skip]
+    end
+
+    # Convenience method for getting the sort options.
+    #
+    # @example Get the sort options.
+    #   options.sort
+    #
+    # @return [ Hash ] The sort options.
+    #
+    # @since 1.0.0
+    def sort
+      self[:sort]
+    end
+
     # Store the value in the options for the provided key. The options will
     # handle all necessary serialization and localization in this step.
     #

data/lib/origin/queryable.rb

@@ -23,8 +23,9 @@ module Origin
     include Optional
 
     # @attribute [r] aliases The aliases.
+    # @attribute [r] driver The Mongo driver being used.
     # @attribute [r] serializers The serializers.
-    attr_reader :aliases, :serializers
+    attr_reader :aliases, :driver, :serializers
 
     # Is this queryable equal to another object? Is true if the selector and
     # options are equal.
@@ -48,11 +49,13 @@ module Origin
     # @example Initialize the queryable.
     #   Origin::Queryable.new
     #
+    # @param [ Hash ] aliases The optional field aliases.
     # @param [ Hash ] serializers The optional field serializers.
+    # @param [ Symbol ] driver The driver being used.
     #
     # @since 1.0.0
-    def initialize(aliases = {}, serializers = {})
-      @aliases, @serializers = aliases, serializers
+    def initialize(aliases = {}, serializers = {}, driver = :moped)
+      @aliases, @driver, @serializers = aliases, driver.to_sym, serializers
       @options, @selector =
         Options.new(aliases, serializers), Selector.new(aliases, serializers)
       yield(self) if block_given?

data/lib/origin/selector.rb

@@ -55,7 +55,7 @@ module Origin
           serializer = serializers[name]
           [ normalized_key(name, serializer), evolve(serializer, _value) ]
         end]
-      end
+      end.uniq
     end
 
     # Evolve a single key selection with various types of values.

data/lib/origin/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Origin
-  VERSION = "1.0.0.beta"
+  VERSION = "1.0.0.rc"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: origin
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta
+  version: 1.0.0.rc
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000 Z
+date: 2012-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -293711780185043147
+      hash: -4419291883979862477
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: origin
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple DSL for MongoDB query generation