plucky 0.7.0 → 0.8.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjkzYmEyZjI0NmViZjk3Nzc0N2JlODc5Y2JiZmZiNzhhOWQ4ZTY1OA==
-  data.tar.gz: !binary |-
-    MmNmOGM2N2RmYmRmYjllN2Q2MjRjZjQyNzAwYzhkMmZjMzZiN2JkYw==
+SHA256:
+  metadata.gz: e6482980490f769425d02c3e26483021ce5d22839f733c9d46fcfb30eb762928
+  data.tar.gz: 0564b1238d7cb08823fedaadc7d3090349580967942750f5021dfd7b24f28cc8
 SHA512:
-  metadata.gz: !binary |-
-    MzNiMDVhYTk0MDBmMzI0NmM5ZGNiMzcwZTkwNDEwZGQ3N2E1NTlhMWM3YjMz
-    NmNjNDliOTc0OTUxNzFmNDU5YWE4N2Q0NDc1ODMyMjMxZDljOWJmNWRiN2Mw
-    ZmUwNTQ4NTA5ZGFlYWFmZTA5M2E5ZGFjYTA4ZjRkMDcxZGIxNDk=
-  data.tar.gz: !binary |-
-    NjExZmVhZjMyNDE2MTk2ODY1ZmRhMTdhYzdkNTliNDk1NmNkZTY3M2NkMTIy
-    OTgwNjZiNDE0NDUyYzc3YzdmYWQ1MmE4NWU5MDFiZWJiNzkxYjFjYjAxNjFk
-    YWVlOTA0YjA0NjI1YTkwMTJkNThjZmI1NTQ0MDI1OTYwNGM0OWU=
+  metadata.gz: 033bfdd0c0bee0b7b25ece80fa54d4bf8f229deec703b63bdcff772a7a0d82cd8b1f3d6e83c6f773f9100bccf655cf5d5da165a58dc276ae78ac5dcb5fe7883d
+  data.tar.gz: b83627ae90f345dac4587654d8b74434a384473caddf3512f0c2de978a08997e2778b489b3217905ac5c2e5c2ef4ab05b29b1b5b18834719d01d952a0da77d7f

data/.gitignore

@@ -1,7 +1,4 @@
 *.project
 log
 *.gem
-Gemfile.lock
-bin
-vendor
-.bundle
+.byebug_history

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.7.1

data/.travis.yml

@@ -1,10 +1,12 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - ree
-  - 1.9.3
   - jruby-19mode
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
 notifications:
-  email: false
+  email:
+    - scott@railsnewbie.com
 bundler_args: --without debug guard performance
 services: mongodb

data/Gemfile

@@ -1,16 +1,17 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'bson_ext', '~> 1.5', :platform => :mri
 gem 'rake'
 
-group :performance  do
-  gem 'perftools.rb', :require => 'perftools', :platform => :mri
-end
-
 group(:test) do
   gem 'rspec'
   gem 'log_buddy'
+
+  if RUBY_ENGINE == "ruby" && RUBY_VERSION >= '2.3'
+    platforms :mri do
+      gem 'byebug'
+    end
+  end
 end
 
 group(:guard) do

data/Gemfile.lock

@@ -0,0 +1,84 @@
+PATH
+  remote: .
+  specs:
+    plucky (0.8.0)
+      mongo (~> 2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    bson (4.10.0)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    diff-lcs (1.4.4)
+    ffi (1.13.1)
+    formatador (0.2.5)
+    guard (2.16.2)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-bundler (3.0.0)
+      bundler (>= 2.1, < 3)
+      guard (~> 2.2)
+      guard-compat (~> 1.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    log_buddy (0.7.0)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    mongo (2.13.0)
+      bson (>= 4.8.2, < 5.0.0)
+    nenv (0.3.0)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.0.1)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    shellany (0.0.1)
+    thor (1.0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  byebug
+  guard
+  guard-bundler
+  guard-rspec
+  log_buddy
+  plucky!
+  rake
+  rb-fsevent
+  rspec
+
+BUNDLED WITH
+   2.1.4

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 John Nunemaker
+Copyright (c) 2010-2020 MongoMapper: John Nunemaker, Chris Heald, Scott Taylor
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,6 +1,8 @@
 # Plucky
 
-Thin layer over the ruby driver that allows you to quickly grab hold of your data (pluck it!).
+A thin layer over the ruby driver that allows you to quickly grab hold of your data (pluck it!).
+
+Used as a query selector inside of MongoMapper.
 
 ## Install
 
@@ -10,79 +12,7 @@ gem install plucky
 
 ## Examples
 
-```ruby
-connection = Mongo::MongoClient.new
-db = connection.db('test')
-collection = db['users']
-collection.remove # clear out the collection
-
-collection.insert({'_id' => 'chris', 'age' => 26, 'name' => 'Chris'})
-collection.insert({'_id' => 'steve', 'age' => 29, 'name' => 'Steve'})
-collection.insert({'_id' => 'john',  'age' => 28, 'name' => 'John'})
-
-# initialize query with collection
-query = Plucky::Query.new(collection)
-
-puts 'Querying'
-pp query.where(:name => 'John').first
-pp query.first(:name => 'John')
-pp query.where(:name => 'John').all
-pp query.all(:name => 'John')
-
-puts 'Find by _id'
-pp query.find('chris')
-pp query.find('chris', 'steve')
-pp query.find(['chris', 'steve'])
-
-puts 'Sort'
-pp query.sort(:age).all
-pp query.sort(:age.asc).all # same as above
-pp query.sort(:age.desc).all
-pp query.sort(:age).last # steve
-
-puts 'Counting'
-pp query.count # 3
-pp query.size # 3
-pp query.count(:name => 'John')       # 1
-pp query.where(:name => 'John').count # 1
-pp query.where(:name => 'John').size  # 1
-
-puts 'Distinct'
-pp query.distinct(:age) # [26, 29, 28]
-
-puts 'Select only certain fields'
-pp query.fields(:age).find('chris')   # {"_id"=>"chris", "age"=>26}
-pp query.only(:age).find('chris')     # {"_id"=>"chris", "age"=>26}
-pp query.ignore(:name).find('chris')  # {"_id"=>"chris", "age"=>26}
-
-puts 'Pagination, yeah we got that'
-pp query.sort(:age).paginate(:per_page => 1, :page => 2)
-pp query.sort(:age).per_page(1).paginate(:page => 2)
-
-pp query.sort(:age).limit(2).to_a           # [chris, john]
-pp query.sort(:age).skip(1).limit(2).to_a   # [john, steve]
-pp query.sort(:age).offset(1).limit(2).to_a # [john, steve]
-
-puts 'Using a cursor'
-cursor = query.find_each(:sort => :age) do |doc|
-  pp doc
-end
-pp cursor
-
-puts 'Symbol Operators'
-pp query.where(:age.gt => 28).count       # 1 (steve)
-pp query.where(:age.lt => 28).count       # 1 (chris)
-pp query.where(:age.in => [26, 28]).to_a  # [chris, john]
-pp query.where(:age.nin => [26, 28]).to_a  # [steve]
-
-puts 'Removing'
-query.remove(:name => 'John')
-pp query.count # 2
-query.where(:name => 'Chris').remove
-pp query.count # 1
-query.remove
-pp query.count # 0
-```
+See `examples/query.rb`.
 
 ## Help
 
@@ -98,4 +28,16 @@ https://groups.google.com/forum/#!forum/mongomapper
 
 ## Copyright
 
-Copyright (c) 2010 John Nunemaker. See LICENSE for details.
+Copyright (c) 2010-2020 MongoMapper. See LICENSE for details.
+
+## Contributors
+
+MongoMapper/Plucky is:
+
+* John Nunemaker
+* Chris Heald
+* Scott Taylor
+
+With contributions from:
+
+* Frederick Cheung

data/examples/query.rb

@@ -7,18 +7,19 @@ lib_path  = root_path.join('lib')
 $:.unshift(lib_path)
 require 'plucky'
 
-connection = Mongo::MongoClient.new
-db = connection.db('test')
+connection = Mongo::Client.new(["127.0.0.1"], :logger => Logger.new('/dev/null'))
+db = connection.use('test').database
 collection = db['users']
-collection.remove # clear out the collection
-
-collection.insert({'_id' => 'chris', 'age' => 26, 'name' => 'Chris'})
-collection.insert({'_id' => 'steve', 'age' => 29, 'name' => 'Steve'})
-collection.insert({'_id' => 'john',  'age' => 28, 'name' => 'John'})
 
 # initialize query with collection
 query = Plucky::Query.new(collection)
 
+query.remove # clear out the collection
+
+query.insert({'_id' => 'chris', 'age' => 26, 'name' => 'Chris'})
+query.insert({'_id' => 'steve', 'age' => 29, 'name' => 'Steve'})
+query.insert({'_id' => 'john',  'age' => 28, 'name' => 'John'})
+
 puts 'Querying'
 pp query.where(:name => 'John').first
 pp query.first(:name => 'John')

data/lib/plucky.rb

@@ -5,6 +5,7 @@ require 'plucky/extensions'
 require 'plucky/criteria_hash'
 require 'plucky/options_hash'
 require 'plucky/query'
+require 'plucky/transformer'
 require 'plucky/pagination'
 
 module Plucky

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/options_hash_value.rb

@@ -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,

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

@@ -55,7 +55,7 @@ module Plucky
 
     # Public
     def fields?
-      !self[:fields].nil?
+      !self[:projection].nil?
     end
 
     # Public
@@ -84,7 +84,8 @@ module Plucky
       @key_normalizer ||= @options.fetch(:key_normalizer) {
         Normalizers::HashKey.new({
           :order  => :sort,
-          :select => :fields,
+          :select => :projection,
+          :fields => :projection,
           :offset => :skip,
           :id     => :_id,
         })

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
@@ -68,21 +69,19 @@ module Plucky
         query = clone.amend(opts)
 
         if block_given?
-          result = nil
-          query.cursor do |cursor|
-            result = cursor
-            cursor.each { |doc| yield doc }
-            cursor.rewind!
+          enumerator = query.enumerator
+          enumerator.each do |doc|
+            yield doc
           end
-          result
+          enumerator
         else
-          query.cursor
+          query.enumerator
         end
       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)
@@ -109,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
 
@@ -123,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)
@@ -178,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={})
@@ -232,8 +246,27 @@ module Plucky
       @options.to_hash
     end
 
-    def cursor(&block)
-      @collection.find(criteria_hash, options_hash, &block)
+    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
@@ -261,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.7.0'
+  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/spec/functional/options_hash_spec.rb

@@ -6,18 +6,18 @@ describe Plucky::OptionsHash do
   describe "#[]=" do
     it "changes order to sort" do
       subject[:order] = "foo asc"
-      subject[:sort].should == [["foo", 1]]
+      subject[:sort].should == {"foo" => 1}
       subject[:order].should be_nil
     end
 
     it "changes sort(id) to sort(_id)" do
       subject[:sort] = "id asc"
-      subject[:sort].should == [["_id", 1]]
+      subject[:sort].should == {"_id" => 1}
     end
 
     it "changes select to fields" do
       subject[:select] = [:foo]
-      subject[:fields].should == [:foo]
+      subject[:projection].should == {:foo => 1}
       subject[:select].should be_nil
     end
 
@@ -35,7 +35,7 @@ describe Plucky::OptionsHash do
 
     it "does not change the sort field" do
       subject[:order] = :order.asc
-      subject[:sort].should == [["order", 1]]
+      subject[:sort].should == {"order" => 1}
     end
   end
 end

data/spec/helper.rb

@@ -11,6 +11,10 @@ require 'fileutils'
 require 'logger'
 require 'pp'
 
+if RUBY_ENGINE == "ruby" && RUBY_VERSION >= '2.3'
+  require 'byebug'
+end
+
 log_dir = File.expand_path('../../log', __FILE__)
 FileUtils.mkdir_p(log_dir)
 Log = Logger.new(File.join(log_dir, 'test.log'))
@@ -18,8 +22,8 @@ Log = Logger.new(File.join(log_dir, 'test.log'))
 LogBuddy.init :logger => Log
 
 port = ENV.fetch "BOXEN_MONGODB_PORT", 27017
-connection = Mongo::MongoClient.new('127.0.0.1', port.to_i, :logger => Log)
-DB = connection.db('test')
+connection = Mongo::Client.new(["127.0.0.1:#{port.to_i}"], :logger => Log)
+DB = connection.use('test').database
 
 RSpec.configure do |config|
   config.filter_run :focused => true
@@ -27,16 +31,19 @@ RSpec.configure do |config|
   config.alias_example_to :xit, :pending => true
   config.run_all_when_everything_filtered = true
 
+  config.expect_with(:rspec) { |c| c.syntax = :should }
+  config.mock_with(:rspec) { |c| c.syntax = :should }
+
   config.before(:suite) do
     DB.collections.reject { |collection|
       collection.name =~ /system\./
-    }.map(&:drop_indexes)
+    }.each { |collection| collection.indexes.drop_all}
   end
 
   config.before(:each) do
     DB.collections.reject { |collection|
       collection.name =~ /system\./
-    }.map(&:remove)
+    }.map(&:drop)
   end
 end
 

data/spec/plucky/criteria_hash_spec.rb

@@ -37,9 +37,9 @@ describe Plucky::CriteriaHash do
     end
 
     it "raises argument error if not array" do
-      expect { described_class.new.object_ids = {} }.to raise_error(ArgumentError)
-      expect { described_class.new.object_ids = nil }.to raise_error(ArgumentError)
-      expect { described_class.new.object_ids = 'foo' }.to raise_error(ArgumentError)
+      lambda { described_class.new.object_ids = {} }.should raise_error(ArgumentError)
+      lambda { described_class.new.object_ids = nil }.should raise_error(ArgumentError)
+      lambda { described_class.new.object_ids = 'foo' }.should raise_error(ArgumentError)
     end
   end
 

data/spec/plucky/normalizers/fields_value_spec.rb

@@ -15,7 +15,7 @@ describe Plucky::Normalizers::FieldsValue do
   end
 
   it "works with array" do
-    subject.call(['one', 'two']).should eq(['one', 'two'])
+    subject.call(['one', 'two']).should eq({'one' => 1, 'two' => 1})
   end
 
   # Ruby 1.9.x was sending array [{:age => 20}], instead of hash.
@@ -24,15 +24,15 @@ describe Plucky::Normalizers::FieldsValue do
   end
 
   it "flattens multi-dimensional array" do
-    subject.call([[:one, :two]]).should eq([:one, :two])
+    subject.call([[:one, :two]]).should eq({:one => 1, :two => 1})
   end
 
   it "works with symbol" do
-    subject.call(:one).should eq([:one])
+    subject.call(:one).should eq({:one => 1})
   end
 
   it "works with array of symbols" do
-    subject.call([:one, :two]).should eq([:one, :two])
+    subject.call([:one, :two]).should eq({:one => 1, :two => 1})
   end
 
   it "works with hash" do
@@ -40,6 +40,6 @@ describe Plucky::Normalizers::FieldsValue do
   end
 
   it "converts comma separated list to array" do
-    subject.call('one, two').should eq(['one', 'two'])
+    subject.call('one, two').should eq({'one' => 1, 'two' => 1})
   end
 end

data/spec/plucky/normalizers/options_hash_value_spec.rb

@@ -26,9 +26,9 @@ describe Plucky::Normalizers::OptionsHashValue do
   }
 
   it "raises exception if missing key normalizer" do
-    expect {
+    lambda {
       described_class.new
-    }.to raise_error(ArgumentError, "Missing required key :key_normalizer")
+    }.should raise_error(ArgumentError, "Missing required key :key_normalizer")
   end
 
   it "allows injecting a new value normalizer" do

data/spec/plucky/normalizers/sort_value_spec.rb

@@ -13,9 +13,9 @@ describe Plucky::Normalizers::SortValue do
   }
 
   it "raises exception if missing key normalizer" do
-    expect {
+    lambda {
       described_class.new
-    }.to raise_error(ArgumentError, "Missing required key :key_normalizer")
+    }.should raise_error(ArgumentError, "Missing required key :key_normalizer")
   end
 
   it "defaults to nil" do
@@ -31,68 +31,68 @@ describe Plucky::Normalizers::SortValue do
   end
 
   it "converts single ascending field (string)" do
-    subject.call('foo asc').should eq([['foo', 1]])
-    subject.call('foo ASC').should eq([['foo', 1]])
+    subject.call('foo asc').should eq({'foo' => 1})
+    subject.call('foo ASC').should eq({'foo' => 1})
   end
 
   it "converts single descending field (string)" do
-    subject.call('foo desc').should eq([['foo', -1]])
-    subject.call('foo DESC').should eq([['foo', -1]])
+    subject.call('foo desc').should eq({'foo' => -1})
+    subject.call('foo DESC').should eq({'foo' => -1})
   end
 
   it "converts multiple fields (string)" do
-    subject.call('foo desc, bar asc').should eq([['foo', -1], ['bar', 1]])
+    subject.call('foo desc, bar asc').should eq({'foo' => -1, 'bar' => 1})
   end
 
   it "converts multiple fields and default no direction to ascending (string)" do
-    subject.call('foo desc, bar, baz').should eq([['foo', -1], ['bar', 1], ['baz', 1]])
+    subject.call('foo desc, bar, baz').should eq({'foo' => -1, 'bar' => 1, 'baz' => 1})
   end
 
   it "converts symbol" do
-    subject.call(:name).should eq([['name', 1]])
+    subject.call(:name).should eq({'name' => 1})
   end
 
   it "converts operator" do
-    subject.call(:foo.desc).should eq([['foo', -1]])
+    subject.call(:foo.desc).should eq({'foo' => -1})
   end
 
   it "converts array of operators" do
-    subject.call([:foo.desc, :bar.asc]).should eq([['foo', -1], ['bar', 1]])
+    subject.call([:foo.desc, :bar.asc]).should eq({'foo' => -1, 'bar' => 1})
   end
 
   it "converts array of symbols" do
-    subject.call([:first_name, :last_name]).should eq([['first_name', 1], ['last_name', 1]])
+    subject.call([:first_name, :last_name]).should eq({'first_name' => 1, 'last_name' => 1})
   end
 
   it "works with array and one string element" do
-    subject.call(['foo, bar desc']).should eq([['foo', 1], ['bar', -1]])
+    subject.call(['foo, bar desc']).should eq({'foo' => 1, 'bar' => -1})
   end
 
   it "works with array of single array" do
-    subject.call([['foo', -1]]).should eq([['foo', -1]])
+    subject.call([['foo', -1]]).should eq({'foo' => -1})
   end
 
   it "works with array of multiple arrays" do
-    subject.call([['foo', -1], ['bar', 1]]).should eq([['foo', -1], ['bar', 1]])
+    subject.call([['foo', -1], ['bar', 1]]).should eq({'foo' => -1, 'bar' => 1})
   end
 
   it "compacts nil values in array" do
-    subject.call([nil, :foo.desc]).should eq([['foo', -1]])
+    subject.call([nil, :foo.desc]).should eq({'foo' => -1})
   end
 
   it "converts array with mix of values" do
-    subject.call([:foo.desc, 'bar']).should eq([['foo', -1], ['bar', 1]])
+    subject.call([:foo.desc, 'bar']).should eq({'foo' => -1, 'bar' => 1})
   end
 
   it "converts keys based on key normalizer" do
-    subject.call([:id.asc]).should eq([['_id', 1]])
+    subject.call([:id.asc]).should eq({'_id' => 1})
   end
 
   it "doesn't convert keys like :sort to :order via key normalizer" do
-    subject.call(:order.asc).should eq([['order', 1]])
+    subject.call(:order.asc).should eq({'order' => 1})
   end
 
   it "converts string with $natural correctly" do
-    subject.call('$natural desc').should eq([['$natural', -1]])
+    subject.call('$natural desc').should eq({'$natural' => -1})
   end
 end

data/spec/plucky/options_hash_spec.rb

@@ -3,7 +3,7 @@ require 'helper'
 describe Plucky::OptionsHash do
   describe "#initialize_copy" do
     before do
-      @original = described_class.new(:fields => {:name => true}, :sort => :name, :limit => 10)
+      @original = described_class.new(:projection => {:name => true}, :sort => :name, :limit => 10)
       @cloned   = @original.clone
     end
 
@@ -12,7 +12,7 @@ describe Plucky::OptionsHash do
     end
 
     it "clones duplicable? values" do
-      @cloned[:fields].should_not equal(@original[:fields])
+      @cloned[:projection].should_not equal(@original[:projection])
       @cloned[:sort].should_not equal(@original[:sort])
     end
   end

data/spec/plucky/query_spec.rb

@@ -2,13 +2,13 @@ require 'helper'
 
 describe Plucky::Query do
   before do
-    @chris      = BSON::OrderedHash['_id', 'chris', 'age', 26, 'name', 'Chris']
-    @steve      = BSON::OrderedHash['_id', 'steve', 'age', 29, 'name', 'Steve']
-    @john       = BSON::OrderedHash['_id', 'john',  'age', 28, 'name', 'John']
+    @chris      = Hash['_id', 'chris', 'age', 26, 'name', 'Chris']
+    @steve      = Hash['_id', 'steve', 'age', 29, 'name', 'Steve']
+    @john       = Hash['_id', 'john',  'age', 28, 'name', 'John']
     @collection = DB['users']
-    @collection.insert(@chris)
-    @collection.insert(@steve)
-    @collection.insert(@john)
+    @collection.insert_one(@chris)
+    @collection.insert_one(@steve)
+    @collection.insert_one(@john)
   end
 
   context "#initialize" do
@@ -57,7 +57,7 @@ describe Plucky::Query do
   context "#find_each" do
     it "returns a cursor" do
       cursor = described_class.new(@collection).find_each
-      cursor.should be_instance_of(Mongo::Cursor)
+      cursor.should be_instance_of(Enumerator)
     end
 
     it "works with and normalize criteria" do
@@ -78,8 +78,8 @@ describe Plucky::Query do
 
     it "is Ruby-like and returns a reset cursor if a block is given" do
       cursor = described_class.new(@collection).find_each {}
-      cursor.should be_instance_of(Mongo::Cursor)
-      cursor.next.should be_instance_of(BSON::OrderedHash)
+      cursor.should be_instance_of(Enumerator)
+      cursor.next.should be_kind_of(Hash)
     end
   end
 
@@ -128,7 +128,7 @@ describe Plucky::Query do
     end
 
     it "normalizes if using object id" do
-      id = @collection.insert(:name => 'Frank')
+      id = @collection.insert_one(:name => 'Frank').inserted_id
       @query.object_ids([:_id])
       doc = @query.find(id.to_s)
       doc['name'].should == 'Frank'
@@ -203,6 +203,27 @@ describe Plucky::Query do
     end
   end
 
+  context "#view" do
+    it 'returns a mongo::collection::view' do
+      described_class.new(@collection).view.should be_a(Mongo::Collection::View)
+    end
+
+    it 'converts criteria into the view' do
+      view = described_class.new(@collection).where(:name => "bob").view
+      view.filter.should == {"name" => "bob"}
+    end
+
+    it "converts read option symbol to a server selector" do
+      view = described_class.new(@collection, :read => :secondary_preferred).view
+      view.read.should be_a(Mongo::ServerSelector::SecondaryPreferred)
+    end
+
+    it "converts read option hash to a server selector" do
+      view = described_class.new(@collection, :read => {:mode =>:secondary_preferred}).view
+      view.read.should be_a(Mongo::ServerSelector::SecondaryPreferred)
+    end
+  end
+
   context "#all" do
     it "works with no arguments" do
       docs = described_class.new(@collection).all
@@ -279,6 +300,10 @@ describe Plucky::Query do
       query.count(:name => 'Steve')
       query[:name].should be_nil
     end
+
+    it 'counts the result set and not the enumerator' do
+      described_class.new(@collection).limit(1).count.should == 3
+    end
   end
 
   context "#size" do
@@ -290,8 +315,8 @@ describe Plucky::Query do
   context "#distinct" do
     before do
       # same age as John
-      @mark = BSON::OrderedHash['_id', 'mark', 'age', 28, 'name', 'Mark']
-      @collection.insert(@mark)
+      @mark = Hash['_id', 'mark', 'age', 28, 'name', 'Mark']
+      @collection.insert_one(@mark)
     end
 
     it "works with just a key" do
@@ -489,23 +514,23 @@ describe Plucky::Query do
     end
 
     it "works with symbol operators" do
-      subject.sort(:foo.asc, :bar.desc).options[:sort].should == [['foo', 1], ['bar', -1]]
+      subject.sort(:foo.asc, :bar.desc).options[:sort].should == {"foo" => 1, "bar" => -1}
     end
 
     it "works with string" do
-      subject.sort('foo, bar desc').options[:sort].should == [['foo', 1], ['bar', -1]]
+      subject.sort('foo, bar desc').options[:sort].should == {"foo" => 1, "bar" => -1}
     end
 
     it "works with just a symbol" do
-      subject.sort(:foo).options[:sort].should == [['foo', 1]]
+      subject.sort(:foo).options[:sort].should == {"foo" => 1}
     end
 
     it "works with symbol descending" do
-      subject.sort(:foo.desc).options[:sort].should == [['foo', -1]]
+      subject.sort(:foo.desc).options[:sort].should == {"foo" => -1}
     end
 
     it "works with multiple symbols" do
-      subject.sort(:foo, :bar).options[:sort].should == [['foo', 1], ['bar', 1]]
+      subject.sort(:foo, :bar).options[:sort].should == {"foo" => 1, "bar" => 1}
     end
 
     it "returns new instance of query" do
@@ -515,8 +540,8 @@ describe Plucky::Query do
     end
 
     it "is aliased to order" do
-      subject.order(:foo).options[:sort].should       == [['foo', 1]]
-      subject.order(:foo, :bar).options[:sort].should == [['foo', 1], ['bar', 1]]
+      subject.order(:foo).options[:sort].should       == {"foo" => 1}
+      subject.order(:foo, :bar).options[:sort].should == {"foo" => 1, "bar" => 1}
     end
   end
 
@@ -529,27 +554,27 @@ describe Plucky::Query do
     end
 
     it "does not error if no sort provided" do
-      expect {
+      lambda {
         subject.reverse
-      }.to_not raise_error
+      }.should_not raise_error
     end
 
     it "reverses the sort order" do
       subject.sort('foo asc, bar desc').
-        reverse.options[:sort].should == [['foo', -1], ['bar', 1]]
+        reverse.options[:sort].should == {"foo" => -1, "bar" => 1}
     end
 
     it "returns new instance of query" do
       sorted_query = subject.sort(:name)
       new_query = sorted_query.reverse
       new_query.should_not equal(sorted_query)
-      sorted_query[:sort].should == [['name', 1]]
+      sorted_query[:sort].should == {'name' => 1}
     end
   end
 
   context "#amend" do
     it "normalizes and update options" do
-      described_class.new(@collection).amend(:order => :age.desc).options[:sort].should == [['age', -1]]
+      described_class.new(@collection).amend(:order => :age.desc).options[:sort].should == {'age' => -1}
     end
 
     it "works with simple stuff" do
@@ -611,7 +636,7 @@ describe Plucky::Query do
 
   context "#empty?" do
     it "returns true if empty" do
-      @collection.remove
+      @collection.drop
       described_class.new(@collection).should be_empty
     end
 
@@ -672,7 +697,7 @@ describe Plucky::Query do
     it "returns a working enumerator" do
       query = described_class.new(@collection)
       query.each.methods.map(&:to_sym).include?(:group_by).should be(true)
-      query.each.next.should be_instance_of(BSON::OrderedHash)
+      query.each.next.should be_instance_of(BSON::Document)
     end
   end
 
@@ -737,8 +762,8 @@ describe Plucky::Query do
     end
 
     {
-      :fields     => ['foo'],
-      :sort       => [['foo', 1]],
+      :projection => {'foo' => 1},
+      :sort       => {'foo' => 1},
       :hint       => '',
       :skip       => 0,
       :limit      => 0,
@@ -754,14 +779,14 @@ describe Plucky::Query do
 
     it "knows select is an option and remove it from options" do
       query = described_class.new(@collection, :select => 'foo')
-      query.options[:fields].should == ['foo']
+      query.options[:projection].should == {'foo' => 1}
       query.criteria.keys.should_not include(:select)
       query.options.keys.should_not  include(:select)
     end
 
     it "knows order is an option and remove it from options" do
       query = described_class.new(@collection, :order => 'foo')
-      query.options[:sort].should == [['foo', 1]]
+      query.options[:sort].should == {'foo' => 1}
       query.criteria.keys.should_not include(:order)
       query.options.keys.should_not  include(:order)
     end
@@ -777,15 +802,15 @@ describe Plucky::Query do
       query = described_class.new(@collection, {
         :foo    => 'bar',
         :baz    => true,
-        :sort   => [['foo', 1]],
+        :sort   => {"foo" => 1},
         :fields => ['foo', 'baz'],
         :limit  => 10,
         :skip   => 10,
       })
       query.criteria.source.should eq(:foo => 'bar', :baz => true)
       query.options.source.should eq({
-        :sort   => [['foo', 1]],
-        :fields => ['foo', 'baz'],
+        :sort   => {"foo" => 1},
+        :projection => {'foo' => 1, 'baz' => 1},
         :limit  => 10,
         :skip   => 10,
       })
@@ -815,8 +840,14 @@ describe Plucky::Query do
 
     it "works" do
       explain = subject.where(:age.lt => 28).explain
-      explain['cursor'].should == 'BasicCursor'
-      explain['nscanned'].should == 3
+
+      if explain['cursor']
+        explain['cursor'].should == 'BasicCursor'
+        explain['nscanned'].should == 3
+      elsif explain['executionStats']
+        explain['executionStats']['executionSuccess'].should == true
+        explain['executionStats']['totalDocsExamined'].should == 3
+      end
     end
   end
 
@@ -838,5 +869,31 @@ describe Plucky::Query do
         result.should be_instance_of(@user_class)
       end
     end
+
+    it "works with block form of find_each" do
+      results = []
+      @query.find_each do |doc|
+        results << doc
+      end
+      results.each do |result|
+        result.should be_instance_of(@user_class)
+      end
+    end
+  end
+
+  describe "insert" do
+    before  { @query = described_class.new(@collection) }
+    subject { @query }
+
+    it "should be able to insert one doc" do
+      subject.insert({ foo: 'bar' })
+      subject.count({ foo: 'bar' }).should == 1
+    end
+
+    it "should be able to insert multiple" do
+      subject.insert([{ foo: 'bar' }, { baz: 'quxx' }])
+      subject.count({ foo: 'bar' }).should == 1
+      subject.count({ baz: 'quxx' }).should == 1
+    end
   end
 end

data/spec/plucky_spec.rb

@@ -56,7 +56,7 @@ describe Plucky do
         :where, :filter,
         :sort, :order, :reverse,
         :paginate, :per_page, :limit, :skip, :offset,
-        :fields, :ignore, :only,
+        :fields, :projection, :ignore, :only,
         :each, :find_each, :find_one, :find,
         :count, :size, :distinct,
         :last, :first, :all, :to_a,

metadata

@@ -1,40 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: plucky
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - John Nunemaker
-autorequire: 
+- Chris Heald
+- Scott Taylor
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2020-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-description: 
+        version: '2.0'
+description:
 email:
 - nunemaker@gmail.com
+- cheald@gmail.com
+- scott@railsnewbie.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md
@@ -59,10 +65,10 @@ files:
 - lib/plucky/pagination/collection.rb
 - lib/plucky/pagination/paginator.rb
 - lib/plucky/query.rb
+- lib/plucky/transformer.rb
 - lib/plucky/version.rb
 - plucky.gemspec
 - script/bootstrap
-- script/criteria_hash.rb
 - script/release
 - script/test
 - spec/functional/options_hash_spec.rb
@@ -83,27 +89,26 @@ files:
 - spec/symbol_operator_spec.rb
 - spec/symbol_spec.rb
 - specs.watchr
-homepage: http://jnunemaker.github.com/plucky/
+homepage: http://github.com/mongomapper/plucky
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.0
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Thin layer over the ruby driver that allows you to quickly grab hold of your
   data (pluck it!).

data/script/criteria_hash.rb

@@ -1,21 +0,0 @@
-require 'pp'
-require 'pathname'
-require 'benchmark'
-require 'rubygems'
-require 'bundler'
-
-Bundler.require :default, :performance
-
-root_path = Pathname(__FILE__).dirname.join('..').expand_path
-lib_path  = root_path.join('lib')
-$:.unshift(lib_path)
-require 'plucky'
-
-criteria = Plucky::CriteriaHash.new(:foo => 'bar')
-
-PerfTools::CpuProfiler.start("/tmp/criteria_hash") do
-  1_000_000.times { criteria[:foo] = 'bar' }
-end
-
-puts system "pprof.rb --gif /tmp/criteria_hash > /tmp/criteria_hash.gif"
-puts system "open /tmp/criteria_hash.gif"