plucky 0.2.1 → 0.3.0

data/README.rdoc

@@ -2,8 +2,6 @@
 
 Thin layer over the ruby driver that allows you to quickly grab hold of your data (pluck it!).
 
-*Still rough around the edges and changing rapidly.*
-
 == Install
 
   $ gem install plucky

data/lib/plucky/criteria_hash.rb

@@ -13,7 +13,7 @@ module Plucky
       @options = @options.dup
       @source  = @source.dup
       each do |key, value|
-        self[key] = value.dup if value.is_a?(Array) || value.is_a?(Hash)
+        self[key] = value.clone if value.duplicable?
       end
     end
 

data/lib/plucky/extensions.rb

@@ -1,30 +1,3 @@
 # encoding: UTF-8
-class SymbolOperator
-  include Comparable
-
-  attr_reader :field, :operator
-
-  def initialize(field, operator, options={})
-    @field, @operator = field, operator
-  end unless method_defined?(:initialize)
-  
-  def <=>(other)
-    if field == other.field
-      operator <=> other.operator
-    else
-      field.to_s <=> other.field.to_s
-    end
-  end
-  
-  def ==(other)
-    field == other.field && operator == other.operator
-  end
-end
-
-class Symbol
-  %w(gt lt gte lte ne in nin mod all size exists asc desc).each do |operator|
-    define_method(operator) do
-      SymbolOperator.new(self, operator)
-    end unless method_defined?(operator)
-  end
-end
+require 'plucky/extensions/duplicable'
+require 'plucky/extensions/symbol'

data/lib/plucky/extensions/duplicable.rb

@@ -0,0 +1,86 @@
+# Copyright (c) 2005-2010 David Heinemeier Hansson
+# 
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Most objects are cloneable, but not all. For example you can't dup +nil+:
+#
+#   nil.dup # => TypeError: can't dup NilClass
+#
+# Classes may signal their instances are not duplicable removing +dup+/+clone+
+# or raising exceptions from them. So, to dup an arbitrary object you normally
+# use an optimistic approach and are ready to catch an exception, say:
+#
+#   arbitrary_object.dup rescue object
+#
+# Rails dups objects in a few critical spots where they are not that arbitrary.
+# That rescue is very expensive (like 40 times slower than a predicate), and it
+# is often triggered.
+#
+# That's why we hardcode the following cases and check duplicable? instead of
+# using that rescue idiom.
+class Object
+  # Can you safely .dup this object?
+  # False for nil, false, true, symbols, numbers, class and module objects; true otherwise.
+  def duplicable?
+    true
+  end
+end
+
+class NilClass #:nodoc:
+  def duplicable?
+    false
+  end
+end
+
+class FalseClass #:nodoc:
+  def duplicable?
+    false
+  end
+end
+
+class TrueClass #:nodoc:
+  def duplicable?
+    false
+  end
+end
+
+class Symbol #:nodoc:
+  def duplicable?
+    false
+  end
+end
+
+class Numeric #:nodoc:
+  def duplicable?
+    false
+  end
+end
+
+class Class #:nodoc:
+  def duplicable?
+    false
+  end
+end
+
+class Module #:nodoc:
+  def duplicable?
+    false
+  end
+end

data/lib/plucky/extensions/symbol.rb

@@ -0,0 +1,84 @@
+# encoding: UTF-8
+module Plucky
+  module Extensions
+    module Symbol
+      def gt
+        SymbolOperator.new(self, 'gt')
+      end
+
+      def lt
+        SymbolOperator.new(self, 'lt')
+      end
+
+      def gte
+        SymbolOperator.new(self, 'gte')
+      end
+
+      def lte
+        SymbolOperator.new(self, 'lte')
+      end
+
+      def ne
+        SymbolOperator.new(self, 'ne')
+      end
+
+      def in
+        SymbolOperator.new(self, 'in')
+      end
+
+      def nin
+        SymbolOperator.new(self, 'nin')
+      end
+
+      def mod
+        SymbolOperator.new(self, 'mod')
+      end
+
+      def all
+        SymbolOperator.new(self, 'all')
+      end
+
+      def size
+        SymbolOperator.new(self, 'size')
+      end unless Symbol.instance_methods.include?(:size) # Ruby 1.9 defines symbol size
+
+      def exists
+        SymbolOperator.new(self, 'exists')
+      end
+
+      def asc
+        SymbolOperator.new(self, 'asc')
+      end
+
+      def desc
+        SymbolOperator.new(self, 'desc')
+      end
+    end
+  end
+end
+
+class SymbolOperator
+  include Comparable
+
+  attr_reader :field, :operator
+
+  def initialize(field, operator, options={})
+    @field, @operator = field, operator
+  end unless method_defined?(:initialize)
+
+  def <=>(other)
+    if field == other.field
+      operator <=> other.operator
+    else
+      field.to_s <=> other.field.to_s
+    end
+  end
+
+  def ==(other)
+    field == other.field && operator == other.operator
+  end
+end
+
+class Symbol
+  include Plucky::Extensions::Symbol
+end

data/lib/plucky/options_hash.rb

@@ -12,7 +12,7 @@ module Plucky
       super
       @source = @source.dup
       each do |key, value|
-        self[key] = value.dup if value.is_a?(Array) || value.is_a?(Hash)
+        self[key] = value.clone if value.duplicable?
       end
     end
 

data/lib/plucky/query.rb

@@ -2,16 +2,18 @@
 require 'forwardable'
 module Plucky
   class Query
-    extend Forwardable
+    include Enumerable
+    extend  Forwardable
 
     OptionKeys = [
       :select, :offset, :order,                                              # MM
       :fields, :skip, :limit, :sort, :hint, :snapshot, :batch_size, :timeout # Ruby Driver
     ]
 
-    attr_reader   :criteria, :options, :collection
-    def_delegator :criteria, :simple?
-    def_delegator :options,  :fields?
+    attr_reader    :criteria, :options, :collection
+    def_delegator  :criteria, :simple?
+    def_delegator  :options,  :fields?
+    def_delegators :to_a, :each
 
     def initialize(collection, opts={})
       @collection, @options, @criteria = collection, OptionsHash.new, CriteriaHash.new
@@ -50,7 +52,7 @@ module Plucky
       end
     end
 
-    def find_many(opts={})
+    def find_each(opts={})
       query = clone.update(opts)
       query.collection.find(query.criteria.to_hash, query.options.to_hash)
     end
@@ -70,7 +72,7 @@ module Plucky
     end
 
     def all(opts={})
-      find_many(opts).to_a
+      find_each(opts).to_a
     end
 
     def first(opts={})
@@ -87,7 +89,11 @@ module Plucky
     end
 
     def count(opts={})
-      find_many(opts).count
+      find_each(opts).count
+    end
+
+    def size
+      count
     end
 
     def update(opts={})
@@ -125,6 +131,14 @@ module Plucky
       end
     end
 
+    def empty?
+      count.zero?
+    end
+
+    def to_a
+      all
+    end
+
     def [](key)
       key = key.to_sym if key.respond_to?(:to_sym)
       if OptionKeys.include?(key)

data/lib/plucky/version.rb

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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - John Nunemaker
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-30 00:00:00 -04:00
+date: 2010-06-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,6 +84,8 @@ extra_rdoc_files: []
 
 files: 
 - lib/plucky/criteria_hash.rb
+- lib/plucky/extensions/duplicable.rb
+- lib/plucky/extensions/symbol.rb
 - lib/plucky/extensions.rb
 - lib/plucky/options_hash.rb
 - lib/plucky/pagination/decorator.rb