plucky 0.6.3 → 0.8.0

data/lib/plucky/extensions/symbol.rb

@@ -73,6 +73,14 @@ class SymbolOperator
       field.to_s <=> other.field.to_s
     end
   end
+  
+  def hash
+    field.hash + operator.hash
+  end
+  
+  def eql?(other)
+    self == other
+  end
 
   def ==(other)
     other.class == self.class && field == other.field && operator == other.operator

data/lib/plucky/normalizers/criteria_hash_value.rb

@@ -1,10 +1,12 @@
+require 'set'
+
 module Plucky
   module Normalizers
     class CriteriaHashValue
 
       # Internal: Used by normalized_value to determine if we need to run the
       # value through another criteria hash to normalize it.
-      NestingOperators = [:$or, :$and, :$nor]
+      NestingOperators = Set[:$or, :$and, :$nor]
 
       def initialize(criteria_hash)
         @criteria_hash = criteria_hash

data/lib/plucky/normalizers/fields_value.rb

@@ -11,12 +11,12 @@ module Plucky
             if value.size == 1 && value.first.is_a?(Hash)
               value.first
             else
-              value.flatten
+              value.flatten.inject({}) {|acc, field| acc.merge(field => 1)}
             end
           when Symbol
-            [value]
+            {value => 1}
           when String
-            value.split(',').map { |v| v.strip }
+            value.split(',').inject({}) { |acc, v| acc.merge(v.strip => 1) }
           else
             value
         end

data/lib/plucky/normalizers/hash_key.rb

@@ -0,0 +1,19 @@
+module Plucky
+  module Normalizers
+    class HashKey
+
+      def initialize(keys)
+        @keys = keys
+      end
+
+      # Public: Normalizes an options hash key
+      #
+      # key - The key to normalize
+      #
+      # Returns a Symbol.
+      def call(key)
+        @keys.fetch key.to_sym, key
+      end
+    end
+  end
+end

data/lib/plucky/normalizers/options_hash_value.rb

@@ -5,9 +5,9 @@ require 'plucky/normalizers/sort_value'
 module Plucky
   module Normalizers
     class OptionsHashValue
-
-      # Public: Initialize an OptionsHashValue.
-      #
+
+      # Public: Initialize an OptionsHashValue.
+      #
       # args - The hash of arguments (default: {})
       #        :key_normalizer - The key normalizer to use, must respond to call
       #        :value_normalizers - Hash where key is name of options hash key
@@ -34,7 +34,7 @@ module Plucky
         }
 
         @value_normalizers = {
-          :fields => default_fields_value_normalizer,
+          :projection => default_fields_value_normalizer,
           :sort   => default_sort_value_normalizer,
           :limit  => default_limit_value_normalizer,
           :skip   => default_skip_value_normalizer,
@@ -66,9 +66,7 @@ module Plucky
 
       # Private
       def default_sort_value_normalizer
-        Normalizers::SortValue.new({
-          :key_normalizer => @key_normalizer,
-        })
+        Normalizers::SortValue.new(:key_normalizer => Normalizers::HashKey.new({:id => :_id}))
       end
 
       # Private

data/lib/plucky/normalizers/sort_value.rb

@@ -21,7 +21,7 @@ module Plucky
             if value.size == 1 && value[0].is_a?(String)
               normalized_sort_piece(value[0])
             else
-              value.compact.map { |v| normalized_sort_piece(v).flatten }
+              value.compact.inject({}) { |acc, v| acc.merge(normalized_sort_piece(v)) }
             end
           else
             normalized_sort_piece(value)
@@ -32,13 +32,15 @@ module Plucky
       def normalized_sort_piece(value)
         case value
           when SymbolOperator
-            [normalized_direction(value.field, value.operator)]
+            normalized_direction(value.field, value.operator)
           when String
-            value.split(',').map do |piece|
-              normalized_direction(*piece.split(' '))
+            value.split(',').inject({}) do |acc, piece|
+              acc.merge(normalized_direction(*piece.split(' ')))
             end
           when Symbol
-            [normalized_direction(value)]
+            normalized_direction(value)
+          when Array
+            Hash[*value]
           else
             value
         end
@@ -48,7 +50,7 @@ module Plucky
       def normalized_direction(field, direction=nil)
         direction ||= 'ASC'
         direction = direction.upcase == 'ASC' ? 1 : -1
-        [@key_normalizer.call(field).to_s, direction]
+        {@key_normalizer.call(field).to_s => direction}
       end
     end
   end

data/lib/plucky/options_hash.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'plucky/normalizers/options_hash_key'
+require 'plucky/normalizers/hash_key'
 require 'plucky/normalizers/options_hash_value'
 
 module Plucky
@@ -55,7 +55,7 @@ module Plucky
 
     # Public
     def fields?
-      !self[:fields].nil?
+      !self[:projection].nil?
     end
 
     # Public
@@ -82,7 +82,13 @@ module Plucky
     # Private
     def key_normalizer
       @key_normalizer ||= @options.fetch(:key_normalizer) {
-        Normalizers::OptionsHashKey.new
+        Normalizers::HashKey.new({
+          :order  => :sort,
+          :select => :projection,
+          :fields => :projection,
+          :offset => :skip,
+          :id     => :_id,
+        })
       }
     end
 

data/lib/plucky/pagination.rb

@@ -1,4 +1,4 @@
-require 'plucky/pagination/decorator'
+require 'plucky/pagination/collection'
 require 'plucky/pagination/paginator'
 
 module Plucky

data/lib/plucky/pagination/{decorator.rb → collection.rb}

@@ -1,7 +1,7 @@
 require 'forwardable'
 module Plucky
   module Pagination
-    module Decorator
+    class Collection < Array
       extend Forwardable
 
       def_delegators  :@paginator,
@@ -11,6 +11,15 @@ module Plucky
                       :skip,          :limit,
                       :offset,        :out_of_bounds?
 
+      def initialize(records, paginator)
+        replace records
+        @paginator = paginator
+      end
+
+      def method_missing(method, *args)
+        @paginator.send method, *args
+      end
+
       # Public
       def paginator(p=nil)
         return @paginator if p.nil?

data/lib/plucky/query.rb

@@ -9,11 +9,12 @@ module Plucky
 
     # Private
     OptionKeys = Set[
-      :select, :offset, :order,                         # MM
-      :fields, :skip, :limit, :sort, :hint, :snapshot,  # Ruby Driver
+      :select, :offset, :order, :transformer,                        # MM
+      :projection, :fields, :skip, :limit, :sort, :hint, :snapshot,  # Ruby Driver
       :batch_size, :timeout, :max_scan, :return_key,    # Ruby Driver
-      :transformer, :show_disk_loc, :comment, :read,    # Ruby Driver
+      :show_disk_loc, :comment, :read,    # Ruby Driver
       :tag_sets, :acceptable_latency,                   # Ruby Driver
+      :max_time_ms, :no_cursor_timeout, :collation, :modifiers
     ]
 
     attr_reader    :criteria, :options, :collection
@@ -61,26 +62,26 @@ module Plucky
           :skip  => paginator.skip,
         }).all
 
-        docs.extend(Pagination::Decorator)
-        docs.paginator(paginator)
-        docs
+        Pagination::Collection.new(docs, paginator)
       end
 
       def find_each(opts={})
         query = clone.amend(opts)
-        cursor = query.cursor
 
         if block_given?
-          cursor.each { |doc| yield doc }
-          cursor.rewind!
+          enumerator = query.enumerator
+          enumerator.each do |doc|
+            yield doc
+          end
+          enumerator
+        else
+          query.enumerator
         end
-
-        cursor
       end
 
       def find_one(opts={})
-        query = clone.amend(opts)
-        query.collection.find_one(query.criteria_hash, query.options_hash)
+        query = clone.amend(opts.merge(limit: -1))
+        query.enumerator.first
       end
 
       def find(*ids)
@@ -107,12 +108,12 @@ module Plucky
 
       def remove(opts={}, driver_opts={})
         query = clone.amend(opts)
-        query.collection.remove(query.criteria_hash, driver_opts)
+        query.collection.find(query.criteria_hash, driver_opts).delete_many
       end
 
       def count(opts={})
         query = clone.amend(opts)
-        cursor = query.cursor
+        cursor = query.view
         cursor.count
       end
 
@@ -121,8 +122,8 @@ module Plucky
         query.collection.distinct(key, query.criteria_hash)
       end
 
-      def fields(*args)
-        clone.tap { |query| query.options[:fields] = *args }
+      def projection(*args)
+        clone.tap { |query| query.options[:projection] = *args }
       end
 
       def ignore(*args)
@@ -176,12 +177,27 @@ module Plucky
       alias_method :exist?, :exists?
       alias_method :filter, :where
       alias_method :to_a,   :all
+      alias_method :fields, :projection
     end
     include DSL
 
     def update(document, driver_opts={})
       query = clone
-      query.collection.update(query.criteria_hash, document, driver_opts)
+      if driver_opts[:multi]
+        query.collection.find(query.criteria_hash).update_many(document, driver_opts)
+      else
+        query.collection.find(query.criteria_hash).update_one(document, driver_opts)
+      end
+    end
+
+    def insert(document_or_array, driver_opts={})
+      query = clone
+
+      if document_or_array.is_a?(Array)
+        query.collection.insert_many(document_or_array, driver_opts)
+      else
+        query.collection.insert_one(document_or_array, driver_opts)
+      end
     end
 
     def amend(opts={})
@@ -230,8 +246,27 @@ module Plucky
       @options.to_hash
     end
 
-    def cursor
-      @collection.find(criteria_hash, options_hash)
+    def view
+      driver_opts = options_hash.dup
+      driver_opts.delete :transformer
+      case driver_opts[:read]
+      when Hash
+        driver_opts[:read] = Mongo::ServerSelector.get(driver_opts[:read])
+      when Symbol
+        driver_opts[:read] = Mongo::ServerSelector.get(mode: driver_opts[:read])
+      else
+        raise "Unexpected read options: #{driver_opts[:read]} - expected hash or symbol"
+      end if driver_opts.has_key?(:read)
+
+      @collection.find(criteria_hash, driver_opts)
+    end
+
+    def enumerator
+      if transformer = options_hash[:transformer]
+        Transformer.new(view, transformer).to_enum
+      else
+        view.to_enum
+      end
     end
 
   private
@@ -259,7 +294,7 @@ module Plucky
     def set_field_inclusion(fields, value)
       fields_option = {}
       fields.each { |field| fields_option[symbolized_key(field)] = value }
-      clone.tap { |query| query.options[:fields] = fields_option }
+      clone.tap { |query| query.options[:projection] = fields_option }
     end
   end
 end

data/lib/plucky/transformer.rb

@@ -0,0 +1,14 @@
+module Plucky
+  class Transformer
+    def initialize(view, transformer)
+      @view = view
+      @transformer = transformer
+    end
+
+    def each
+      @view.each do |doc|
+        yield @transformer.call(doc)
+      end
+    end
+  end
+end

data/lib/plucky/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module Plucky
-  Version = '0.6.3'
+  Version = '0.8.0'
 end

data/plucky.gemspec

@@ -3,12 +3,11 @@ require File.expand_path('../lib/plucky/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name         = 'plucky'
-  s.homepage     = 'http://github.com/jnunemaker/plucky'
+  s.homepage     = 'http://github.com/mongomapper/plucky'
   s.summary      = 'Thin layer over the ruby driver that allows you to quickly grab hold of your data (pluck it!).'
   s.require_path = 'lib'
-  s.homepage    = 'http://jnunemaker.github.com/plucky/'
-  s.authors      = ['John Nunemaker']
-  s.email        = ['nunemaker@gmail.com']
+  s.authors      = ['John Nunemaker', 'Chris Heald', 'Scott Taylor']
+  s.email        = ['nunemaker@gmail.com', 'cheald@gmail.com', 'scott@railsnewbie.com']
   s.version      = Plucky::Version
   s.platform     = Gem::Platform::RUBY
 
@@ -17,5 +16,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'mongo', '~> 1.5'
+  s.add_dependency 'mongo', '~> 2.0'
 end

data/script/bootstrap

@@ -0,0 +1,21 @@
+#!/bin/sh
+#/ Usage: bootstrap [bundle options]
+#/
+#/ Bundle install the dependencies.
+#/
+#/ Examples:
+#/
+#/   bootstrap
+#/   bootstrap --local
+#/
+
+set -e
+cd $(dirname "$0")/..
+
+[ "$1" = "--help" -o "$1" = "-h" -o "$1" = "help" ] && {
+    grep '^#/' <"$0"| cut -c4-
+    exit 0
+}
+
+rm -rf .bundle/{binstubs,config}
+bundle install --binstubs .bundle/binstubs --path .bundle --quiet "$@"

data/script/release

@@ -0,0 +1,42 @@
+#!/bin/sh
+#/ Usage: release
+#/
+#/ Tag the version in the repo and push the gem.
+#/
+
+set -e
+cd $(dirname "$0")/..
+
+[ "$1" = "--help" -o "$1" = "-h" -o "$1" = "help" ] && {
+    grep '^#/' <"$0"| cut -c4-
+    exit 0
+}
+
+gem_name=plucky
+
+# Build a new gem archive.
+rm -rf $gem_name-*.gem
+gem build -q $gem_name.gemspec
+
+# Make sure we're on the master branch.
+(git branch | grep -q '* master') || {
+  echo "Only release from the master branch."
+  exit 1
+}
+
+# Figure out what version we're releasing.
+tag=v`ls $gem_name-*.gem | sed "s/^$gem_name-\(.*\)\.gem$/\1/"`
+
+echo "Releasing $tag"
+
+# Make sure we haven't released this version before.
+git fetch -t origin
+
+(git tag -l | grep -q "$tag") && {
+  echo "Whoops, there's already a '${tag}' tag."
+  exit 1
+}
+
+# Tag it and bag it.
+gem push $gem_name-*.gem && git tag "$tag" &&
+  git push origin master && git push origin "$tag"