plucky 0.6.3 → 0.8.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: e6482980490f769425d02c3e26483021ce5d22839f733c9d46fcfb30eb762928
+  data.tar.gz: 0564b1238d7cb08823fedaadc7d3090349580967942750f5021dfd7b24f28cc8
+SHA512:
+  metadata.gz: 033bfdd0c0bee0b7b25ece80fa54d4bf8f229deec703b63bdcff772a7a0d82cd8b1f3d6e83c6f773f9100bccf655cf5d5da165a58dc276ae78ac5dcb5fe7883d
+  data.tar.gz: b83627ae90f345dac4587654d8b74434a384473caddf3512f0c2de978a08997e2778b489b3217905ac5c2e5c2ef4ab05b29b1b5b18834719d01d952a0da77d7f

data/.gitignore

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

data/.rspec

@@ -0,0 +1 @@
+--color

data/.ruby-version

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

data/.travis.yml

@@ -1,9 +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'
 gem 'rake'
 
-group :performance do
-  gem 'perftools.rb', :require => 'perftools'
-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/Rakefile

@@ -1,6 +1,3 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new
 

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

@@ -77,58 +77,9 @@ module Plucky
       @source
     end
 
-    # Public and completely disgusting
+    # Public
     def merge(other)
-      target = @source.dup
-      other.source.each_key do |key|
-        value, other_value = target[key], other[key]
-        target[key] =
-          if target.key?(key)
-            value_is_hash = value.is_a?(Hash)
-            other_is_hash = other_value.is_a?(Hash)
-
-            if value_is_hash && other_is_hash
-              value.update(other_value) do |key, old_value, new_value|
-                if old_value.is_a?(Hash) && new_value.is_a?(Hash)
-                  self.class.new(old_value).merge(self.class.new(new_value)).to_hash
-                else
-                  merge_values_into_array(old_value, new_value)
-                end
-              end
-            elsif value_is_hash && !other_is_hash
-              if modifier_key = value.keys.detect { |k| Plucky.modifier?(k) }
-                current_value = value[modifier_key]
-                value[modifier_key] = current_value.concat(array(other_value)).uniq
-              else
-                # kaboom! Array(value).concat(Array(other_value)).uniq
-              end
-            elsif other_is_hash && !value_is_hash
-              if modifier_key = other_value.keys.detect { |k| Plucky.modifier?(k) }
-                current_value = other_value[modifier_key]
-                other_value[modifier_key] = current_value.concat(array(value)).uniq
-              else
-                # kaboom! Array(value).concat(Array(other_value)).uniq
-              end
-            else
-              merge_values_into_array(value, other_value)
-            end
-          else
-            other_value
-          end
-      end
-      self.class.new(target)
-    end
-
-    # Private
-    def merge_values_into_array(value, other_value)
-      array(value).concat(array(other_value)).uniq
-    end
-
-    # Private: Array(BSON::ObjectId) returns the byte array or what not instead
-    # of the object id. This makes sure it is an array of object ids, not the
-    # guts of the object id.
-    def array(value)
-      value.is_a?(BSON::ObjectId) ? [value] : Array(value)
+      self.class.new hash_merge(@source, other.source)
     end
 
     # Public
@@ -139,17 +90,6 @@ module Plucky
       self
     end
 
-    # Private
-    def object_ids
-      @options[:object_ids] ||= []
-    end
-
-    # Private
-    def object_ids=(value)
-      raise ArgumentError unless value.is_a?(Array)
-      @options[:object_ids] = value.flatten
-    end
-
     # Public: The definition of simple is querying by only _id or _id and _type.
     # If this is the case, you can use IdentityMap in library to not perform
     # query and instead just return from map.
@@ -165,6 +105,82 @@ module Plucky
       object_ids.include?(key.to_sym)
     end
 
+    # Private
+    def object_ids
+      @options[:object_ids] ||= []
+    end
+
+    # Private
+    def object_ids=(value)
+      raise ArgumentError unless value.is_a?(Array)
+      @options[:object_ids] = value.flatten
+    end
+
+    private
+
+    # Private
+    def hash_merge(oldhash, newhash)
+      merge_compound_or_clauses!(oldhash, newhash)
+      oldhash.merge(newhash) do |key, oldval, newval|
+        old_is_hash = oldval.instance_of? Hash
+        new_is_hash = newval.instance_of? Hash
+
+        if oldval == newval
+          oldval
+        elsif old_is_hash && new_is_hash
+          hash_merge(oldval, newval)
+        elsif old_is_hash
+          modifier_merge(oldval, newval)
+        elsif new_is_hash
+          modifier_merge(newval, oldval)
+        else
+          merge_values_into_array(oldval, newval)
+        end
+      end
+    end
+
+    def merge_compound_or_clauses!(oldhash, newhash)
+      old_or = oldhash[:$or]
+      new_or = newhash[:$or]
+      if old_or && new_or
+        oldhash[:$and] ||= []
+        oldhash[:$and] << {:$or => oldhash.delete(:$or)}
+        oldhash[:$and] << {:$or => newhash.delete(:$or)}
+      elsif new_or && oldhash[:$and]
+        if oldhash[:$and].any? {|v| v.key? :$or }
+          oldhash[:$and] << {:$or => newhash.delete(:$or)}
+        end
+      elsif old_or && newhash[:$and]
+        if newhash[:$and].any? {|v| v.key? :$or }
+          newhash[:$and] << {:$or => oldhash.delete(:$or)}
+        end
+      end
+    end
+
+    # Private
+    def modifier_merge(hash, value)
+      if modifier_key = hash.keys.detect { |k| Plucky.modifier?(k) }
+        hash[modifier_key].concat( array(value) ).uniq
+      end
+    end
+
+    # Private
+    def merge_values_into_array(value, other_value)
+      array(value).concat(array(other_value)).uniq
+    end
+
+    # Private: Array(BSON::ObjectId) returns the byte array or what not instead
+    # of the object id. This makes sure it is an array of object ids, not the
+    # guts of the object id.
+    def array(value)
+      case value
+      when nil, BSON::ObjectId
+        [value]
+      else
+        Array(value)
+      end
+    end
+
     # Private
     def normalized_key(key)
       key_normalizer.call(key)