plucky 0.6.3 → 0.6.4

data/.gitignore

@@ -4,3 +4,4 @@ log
 Gemfile.lock
 bin
 vendor
+.bundle

data/Rakefile

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

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/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)
+        @query.send method, *args
+      end
+
       # Public
       def paginator(p=nil)
         return @paginator if p.nil?

data/lib/plucky/query.rb

@@ -61,21 +61,23 @@ 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!
+          result = nil
+          query.cursor do |cursor|
+            result = cursor
+            cursor.each { |doc| yield doc }
+            cursor.rewind!
+          end
+          result
+        else
+          query.cursor
         end
-
-        cursor
       end
 
       def find_one(opts={})
@@ -230,8 +232,8 @@ module Plucky
       @options.to_hash
     end
 
-    def cursor
-      @collection.find(criteria_hash, options_hash)
+    def cursor(&block)
+      @collection.find(criteria_hash, options_hash, &block)
     end
 
   private

data/lib/plucky/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module Plucky
-  Version = '0.6.3'
+  Version = '0.6.4'
 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"

data/script/test

@@ -0,0 +1,20 @@
+#!/bin/sh
+#/ Usage: test
+#/
+#/ Bootstrap and run all tests.
+#/
+#/ Examples:
+#/
+#/   # run all tests
+#/   test
+#/
+
+set -e
+cd $(dirname "$0")/..
+
+[ "$1" = "--help" -o "$1" = "-h" -o "$1" = "help" ] && {
+    grep '^#/' <"$0"| cut -c4-
+    exit 0
+}
+
+script/bootstrap && bundle exec rake

data/spec/helper.rb

@@ -17,7 +17,8 @@ Log = Logger.new(File.join(log_dir, 'test.log'))
 
 LogBuddy.init :logger => Log
 
-connection = Mongo::MongoClient.new('127.0.0.1', 27017, :logger => Log)
+port = ENV.fetch "GH_MONGODB_PORT", 27017
+connection = Mongo::MongoClient.new('127.0.0.1', port.to_i, :logger => Log)
 DB = connection.db('test')
 
 RSpec.configure do |config|

data/spec/plucky/pagination/{decorator_spec.rb → collection_spec.rb}

@@ -1,15 +1,13 @@
 require 'helper'
 
-describe Plucky::Pagination::Decorator do
-  context "Object decorated with Decorator with paginator set" do
+describe Plucky::Pagination::Collection do
+  context "Object decorated with Collection with paginator set" do
     before do
       @object    = [1, 2, 3, 4]
       @object_id = @object.object_id
       @paginator = Plucky::Pagination::Paginator.new(20, 2, 10)
-      @object.extend(described_class)
-      @object.paginator(@paginator)
     end
-    subject { @object }
+    subject { Plucky::Pagination::Collection.new(@object, @paginator) }
 
     it "knows paginator" do
       subject.paginator.should == @paginator

data/spec/symbol_operator_spec.rb

@@ -34,7 +34,24 @@ describe SymbolOperator do
         SymbolOperator.new(:foo, 'in').should_not == 'foo.in'
       end
     end
-
+    
+    context "hash" do
+      
+      it 'returns sum of operator and hash field' do
+        SymbolOperator.new(:foo, 'in').hash.should == :foo.hash + 'in'.hash
+      end
+      
+    end
+    
+    context 'eql?' do
+      
+      it 'uses #== for equality comparison' do
+        subject.should_receive(:"==").with("dummy_value")
+        subject.eql?("dummy_value")
+      end
+      
+    end
+    
     context "<=>" do
       it "returns string comparison of operator for same field, different operator" do
         (SymbolOperator.new(:foo, 'in') <=> SymbolOperator.new(:foo, 'all')).should ==  1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plucky
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -58,12 +58,15 @@ files:
 - lib/plucky/normalizers/sort_value.rb
 - lib/plucky/options_hash.rb
 - lib/plucky/pagination.rb
-- lib/plucky/pagination/decorator.rb
+- lib/plucky/pagination/collection.rb
 - lib/plucky/pagination/paginator.rb
 - lib/plucky/query.rb
 - lib/plucky/version.rb
 - plucky.gemspec
+- script/bootstrap
 - script/criteria_hash.rb
+- script/release
+- script/test
 - spec/helper.rb
 - spec/plucky/criteria_hash_spec.rb
 - spec/plucky/normalizers/criteria_hash_key_spec.rb
@@ -74,7 +77,7 @@ files:
 - spec/plucky/normalizers/options_hash_value_spec.rb
 - spec/plucky/normalizers/sort_value_spec.rb
 - spec/plucky/options_hash_spec.rb
-- spec/plucky/pagination/decorator_spec.rb
+- spec/plucky/pagination/collection_spec.rb
 - spec/plucky/pagination/paginator_spec.rb
 - spec/plucky/query_spec.rb
 - spec/plucky_spec.rb
@@ -93,18 +96,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2311334578269732837
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2311334578269732837
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -123,7 +120,7 @@ test_files:
 - spec/plucky/normalizers/options_hash_value_spec.rb
 - spec/plucky/normalizers/sort_value_spec.rb
 - spec/plucky/options_hash_spec.rb
-- spec/plucky/pagination/decorator_spec.rb
+- spec/plucky/pagination/collection_spec.rb
 - spec/plucky/pagination/paginator_spec.rb
 - spec/plucky/query_spec.rb
 - spec/plucky_spec.rb