mongoid_embedded_helper 0.2.3 → 0.2.5

data/Gemfile

@@ -1,6 +1,7 @@
 source :gemcutter
 
-gem 'mongoid' 
+gem 'mongoid', '>=2.0.0.beta.14'
+gem "mongoid_adjust", ">= 0.1.1"
 gem 'bson_ext', '>=1.0.1'
 
 group :test do

data/Gemfile.lock

@@ -0,0 +1,47 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activesupport (3.0.0.rc)
+    bson (1.0.4)
+    bson_ext (1.0.4)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    i18n (0.4.1)
+    mocha (0.9.8)
+      rake
+    mongo (1.0.6)
+      bson (>= 1.0.4)
+    mongoid (2.0.0.beta.15)
+      activemodel (= 3.0.0.rc)
+      bson (= 1.0.4)
+      mongo (= 1.0.6)
+      tzinfo (= 0.3.22)
+      will_paginate (~> 3.0.pre)
+    mongoid_adjust (0.1.1)
+      bson (>= 1.0.3)
+      mongoid (>= 2.0.0.beta.14)
+    rake (0.8.7)
+    rspec (2.0.0.beta.19)
+      rspec-core (= 2.0.0.beta.19)
+      rspec-expectations (= 2.0.0.beta.19)
+      rspec-mocks (= 2.0.0.beta.19)
+    rspec-core (2.0.0.beta.19)
+    rspec-expectations (2.0.0.beta.19)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.19)
+    tzinfo (0.3.22)
+    will_paginate (3.0.pre2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bson_ext (>= 1.0.1)
+  mocha
+  mongoid (>= 2.0.0.beta.14)
+  mongoid_adjust (>= 0.1.1)
+  rspec (>= 2.0.0.beta.15)

data/Rakefile

@@ -10,10 +10,11 @@ begin
     gem.email = "kmandrup@gmail.com"
     gem.homepage = "http://github.com/kristianmandrup/mongoid_embedded_helper"
     gem.authors = ["Kristian Mandrup"]
-    gem.add_dependency("mongoid", "<= 2.0.0")
-    gem.add_dependency("bson", ">= 1.0.3")
+    gem.add_dependency "mongoid",         ">= 2.0.0.beta.14"
+    gem.add_dependency "mongoid_adjust",  ">= 0.1.1"
+    gem.add_dependency "bson_ext",        ">= 1.0.3"
 
-    gem.add_development_dependency "rspec", ">=2.0.0.beta.12"
+    gem.add_development_dependency "rspec", ">=2.0.0.beta.15"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.5

data/lib/mongoid/embedded_helper.rb

@@ -59,92 +59,4 @@ module Mongoid
   end
 end
 
-class NilClass
-  def integer?
-    false
-  end
-end
-
-module Mongoid::Extensions::Array
-  module Mutators
-    def adjust!(attrs = {})
-      attrs.each_pair do |key, value|
-        self.each do |doc|
-          doc.adjust!(attrs)
-        end
-      end
-      self
-    end  
-  end
-end
-
-module Mongoid
-  class Criteria
-    def adjust!(attrs = {})
-      to_a.adjust!(attrs)
-    end  
-  end
-end
-     
-module Mongoid::Document 
-         
-  def present? key
-    respond_to? key    
-  end
-  
-  def adjust!(attrs = {})         
-    (attrs || {}).each_pair do |key, value|
-      next if !present? key # only add to properties already present!
-      adjust_by_proc!(key, value) if value.kind_of?(Proc)
-      adjust_by_symbol!(key, value) if value.kind_of?(Symbol) || value.kind_of?(String)
-      adjust_by_number!(key, value) if value.kind_of?(Numeric) # only add integer values     
-    end
-    self
-  end  
-
-  private 
 
-  def adjust_by_proc! key, proc
-    if set_allowed?(key)
-      current_val = @attributes[key.to_s]
-      @attributes[key.to_s] = proc.call(current_val)
-    elsif write_allowed?(key)
-      current_val = send("#{key}")
-      send("#{key}=", proc.call(current_val))
-    end     
-  end
-
-  def adjust_by_symbol! key, name
-    method = name.to_sym
-    if set_allowed?(key)
-      current_val = @attributes[key.to_s]
-      @attributes[key.to_s] = current_val.send(method)
-    elsif write_allowed?(key)
-      current_val = send("#{key}")
-      send("#{key}=", current_val.send(method))
-    end     
-  end
-
-  
-  def adjust_by_number! key, value
-    if set_allowed?(key)
-      current_val = @attributes[key.to_s] || 0
-
-      if current_val.kind_of? Numeric
-        @attributes[key.to_s] = current_val + value 
-      end
-
-    elsif write_allowed?(key)
-      current_val = send("#{key}") || 0
-
-      if current_val.kind_of? Numeric
-        send("#{key}=", current_val + value) 
-      end
-    end 
-  end
-    
-end
-
-class Array
-  include Mongoid::Extensions::Array::Mutators
-end

data/mongoid_embedded_helper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_embedded_helper}
-  s.version = "0.2.3"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-07-06}
+  s.date = %q{2010-08-08}
   s.description = %q{Facilitates performing queries on collections in embedded Mongoid documents by performing query from the root node}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitignore",
      "Gemfile",
+     "Gemfile.lock",
      "MITLICENSE",
      "README.markdown",
      "Rakefile",
@@ -26,9 +27,11 @@ Gem::Specification.new do |s|
      "lib/mongoid/embedded_helper.rb",
      "lib/mongoid_embedded_helper.rb",
      "mongoid_embedded_helper.gemspec",
+     "rspec.options",
+     "spec/model/list.rb",
+     "spec/model/person_list.rb",
      "spec/mongoid/embedded_helper_spec.rb",
      "spec/mongoid/more_embedded_helper_spec.rb",
-     "spec/rspec.options",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/kristianmandrup/mongoid_embedded_helper}
@@ -37,7 +40,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Facilitates performing queries on collections in embedded Mongoid documents}
   s.test_files = [
-    "spec/mongoid/embedded_helper_spec.rb",
+    "spec/model/list.rb",
+     "spec/model/person_list.rb",
+     "spec/mongoid/embedded_helper_spec.rb",
      "spec/mongoid/more_embedded_helper_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -47,18 +52,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, ["<= 2.0.0"])
-      s.add_runtime_dependency(%q<bson>, [">= 1.0.3"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.12"])
+      s.add_runtime_dependency(%q<mongoid>, [">= 2.0.0.beta.14"])
+      s.add_runtime_dependency(%q<mongoid_adjust>, [">= 0.1.1"])
+      s.add_runtime_dependency(%q<bson_ext>, [">= 1.0.3"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.15"])
     else
-      s.add_dependency(%q<mongoid>, ["<= 2.0.0"])
-      s.add_dependency(%q<bson>, [">= 1.0.3"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.12"])
+      s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.14"])
+      s.add_dependency(%q<mongoid_adjust>, [">= 0.1.1"])
+      s.add_dependency(%q<bson_ext>, [">= 1.0.3"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.15"])
     end
   else
-    s.add_dependency(%q<mongoid>, ["<= 2.0.0"])
-    s.add_dependency(%q<bson>, [">= 1.0.3"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.12"])
+    s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.14"])
+    s.add_dependency(%q<mongoid_adjust>, [">= 0.1.1"])
+    s.add_dependency(%q<bson_ext>, [">= 1.0.3"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.15"])
   end
 end
 

data/spec/model/list.rb

@@ -0,0 +1,29 @@
+class SimpleList
+  include Mongoid::Document
+  field :pos, :type => Integer  
+  field :name, :type => String
+  embeds_many :simple_items     
+end
+
+
+class SimpleItem
+  include Mongoid::Document      
+  include Mongoid::EmbeddedHelper
+  field :pos, :type => Integer  
+  field :number, :type => Integer  
+  field :name, :type => String   
+  field :assoc, :type => Symbol
+
+  embedded_in :simple_list, :inverse_of => :simple_items 
+
+  field :assimilated, :type => Boolean, :default => false  
+  field :parentized, :type => Boolean, :default => false  
+  
+  def after_parentize
+    self.parentized = true    
+  end  
+  
+  def after_assimilate
+    self.assimilated = true
+  end  
+end

data/spec/model/person_list.rb

@@ -0,0 +1,42 @@
+class Person
+  include Mongoid::Document
+  include Mongoid::EmbeddedHelper
+  field :name, :type => String
+  embeds_many :lists 
+  
+  # after_update :do_it    
+  # def do_it
+  #   puts "hello"
+  # end
+end  
+
+class PosPerson
+  include Mongoid::Document
+  include Mongoid::EmbeddedHelper
+  field :pos, :type => Integer
+  field :name, :type => String
+  embeds_many :lists   
+end  
+
+
+class List
+  include Mongoid::Document
+  include Mongoid::EmbeddedHelper
+  field :pos, :type => Integer  
+  field :name, :type => String
+  embedded_in :person, :inverse_of => :lists
+  
+  embeds_many :items     
+end
+
+
+class Item
+  include Mongoid::Document      
+  include Mongoid::EmbeddedHelper
+  field :pos, :type => Integer  
+  field :number, :type => Integer  
+  field :name, :type => String  
+  field :assoc, :type => Symbol
+  embedded_in :list, :inverse_of => :items   
+end        
+   

data/spec/mongoid/embedded_helper_spec.rb

@@ -1,48 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-Mongoid.configure.master = Mongo::Connection.new.db('acts_as_list-test')
-
-class Person
-  include Mongoid::Document
-  include Mongoid::EmbeddedHelper
-  field :name, :type => String
-  embeds_many :lists 
-  
-  # after_update :do_it    
-  # def do_it
-  #   puts "hello"
-  # end
-end  
-
-class PosPerson
-  include Mongoid::Document
-  include Mongoid::EmbeddedHelper
-  field :pos, :type => Integer
-  field :name, :type => String
-  embeds_many :lists   
-end  
-
-
-class List
-  include Mongoid::Document
-  include Mongoid::EmbeddedHelper
-  field :pos, :type => Integer  
-  field :name, :type => String
-  embedded_in :person, :inverse_of => :lists
-  
-  embeds_many :items     
-end
-
-
-class Item
-  include Mongoid::Document      
-  include Mongoid::EmbeddedHelper
-  field :pos, :type => Integer  
-  field :number, :type => Integer  
-  
-  field :assoc, :type => Symbol
-  embedded_in :list, :inverse_of => :items   
-end    
+require 'model/person_list'
 
 describe 'Mongoid Embedded Helper' do
 
@@ -81,75 +38,6 @@ describe 'Mongoid Embedded Helper' do
       result = @person.lists[0].items[0].in_collection.where(:number.gt => 1).to_a  
       result.size.should == 2
     end
-  end
-  
-  describe '#adjust! numeric' do                            
-    context 'on an array' do
-      it "should add 1 to all positions greater than 1" do
-        result = @person.lists[0].items.where(:pos.gt => 1).to_a.adjust!(:pos => 1)
-        result.map(&:pos).should == [3, 4]
-      end
-    end
-
-    context 'on a criteria' do
-      it "should add 1 to all positions greater than 1" do
-        result = @person.lists[0].items.where(:pos.gt => 1).adjust!(:pos => 1)
-        result.map(&:pos).should == [3, 4]
-      end
-    end
-
-    context 'on a document with a pos' do           
-      it "should add 1 to the position" do      
-        result = @pos_person.adjust!(:pos => 1)
-        result.pos.should == 1
-      end
-    end
-
-    context 'on a document without a pos field' do           
-      it "should NOT add 1 to the position" do      
-        result = @person.adjust!(:pos => 1)
-        lambda {result.pos}.should raise_error
-      end
-    end  
-  end
-
-  describe '#adjust! by proc' do
-    context 'on an array' do
-      it "should times all positions (greater than 1) by 2" do
-        result = @person.lists[0].items.where(:pos.gt => 1).to_a.adjust!(:pos => lambda {|e| e * 2})
-        result.map(&:pos).should == [4, 6]
-      end
-    end
-
-    context 'on a criteria' do
-      it "should times all positions (greater than 1) by 2" do
-        result = @person.lists[0].items.where(:pos.gt => 1).adjust!(:pos => lambda {|e| e * 2})
-        result.map(&:pos).should == [4, 6]
-      end
-    end
-
-    context 'on a document with a name field' do           
-      it "should upcase the name" do      
-        result = @person.adjust!(:name => lambda {|e| e.upcase })
-        result.name.should == 'Kristian'.upcase
-      end
-    end            
-  end          
-  
-  describe '#adjust! by symbol and string' do
-    context 'on a document with a name field' do           
-      it "should upcase the name - using string arg" do      
-        result = @person.adjust!(:name => 'upcase')
-        result.name.should == 'Kristian'.upcase
-      end
-    end            
-
-    context 'on a document with a name field' do           
-      it "should upcase the name - using symbol arg" do      
-        result = @person.adjust!(:name => :upcase)
-        result.name.should == 'Kristian'.upcase
-      end
-    end            
-  end
+  end 
 end
 

data/spec/mongoid/more_embedded_helper_spec.rb

@@ -1,44 +1,13 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-Mongoid.configure.master = Mongo::Connection.new.db('acts_as_list-test')
-
-class List
-  include Mongoid::Document
-  field :pos, :type => Integer  
-  field :name, :type => String
-  embeds_many :items     
-end
-
-
-class Item
-  include Mongoid::Document      
-  include Mongoid::EmbeddedHelper
-  field :pos, :type => Integer  
-  field :number, :type => Integer  
-  field :name, :type => String   
-  field :assoc, :type => Symbol
-
-  field :assimilated, :type => Boolean, :default => false  
-  field :parentized, :type => Boolean, :default => false  
-
-  embedded_in :list, :inverse_of => :items 
-  
-  def after_parentize
-    self.parentized = true    
-  end  
-
-  def after_assimilate
-    self.assimilated = true
-  end  
-end    
+require 'model/list'
 
 describe 'Mongoid Embedded Helper' do
   before :each do
-    @list = List.create! :pos => 1, :name => 'My list'
+    @list = SimpleList.create! :pos => 1, :name => 'My list'
     item_names = ('A'..'C').to_a
     (1..3).each do |counter|
-      item = Item.new :pos => counter, :number => counter, :name => item_names[counter-1]
-      @list.items << item  
+      item = SimpleItem.new :pos => counter, :number => counter, :name => item_names[counter-1]
+      @list.simple_items << item  
     end
     @list.save!
   end
@@ -51,21 +20,21 @@ describe 'Mongoid Embedded Helper' do
      
   describe '#in_collection' do    
     it "should handle query from leaf node without List (non-embedded root node) includes Embedded::Helper" do
-      result = @list.items[0].in_collection.where(:pos => 2).to_a.first  
+      result = @list.simple_items[0].in_collection.where(:pos => 2).to_a.first  
       result.pos.should == 2
       result.number.should == 2
       result.name.should == 'B'      
     end
-  end  
+  end
   
-  describe 'new callbacks' do    
+  describe 'extra callbacks' do    
     context 'item with callbacks added to parent' do
       it "should call :after_parentize callback" do
-        @list.items[0].parentized.should be_true
+        @list.simple_items[0].parentized.should be_true
       end
       
       it "should NOT call :after_assimilate callback" do
-        @list.items[0].assimilated.should be_false
+        @list.simple_items[0].assimilated.should be_false
       end
     end
   end  

data/spec/spec_helper.rb

@@ -8,3 +8,4 @@ RSpec.configure do |config|
   # config.mock_with :mocha
 end
 
+Mongoid.configure.master = Mongo::Connection.new.db('acts_as_list-test')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 +02:00
+date: 2010-08-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,19 +23,36 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <=
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 2
         - 0
         - 0
-        version: 2.0.0
+        - beta
+        - 14
+        version: 2.0.0.beta.14
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bson
+  name: mongoid_adjust
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 1
+        version: 0.1.1
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bson_ext
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -46,11 +63,11 @@ dependencies:
         - 3
         version: 1.0.3
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -60,10 +77,10 @@ dependencies:
         - 0
         - 0
         - beta
-        - 12
-        version: 2.0.0.beta.12
+        - 15
+        version: 2.0.0.beta.15
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: Facilitates performing queries on collections in embedded Mongoid documents by performing query from the root node
 email: kmandrup@gmail.com
 executables: []
@@ -75,6 +92,7 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - MITLICENSE
 - README.markdown
 - Rakefile
@@ -83,9 +101,11 @@ files:
 - lib/mongoid/embedded_helper.rb
 - lib/mongoid_embedded_helper.rb
 - mongoid_embedded_helper.gemspec
+- rspec.options
+- spec/model/list.rb
+- spec/model/person_list.rb
 - spec/mongoid/embedded_helper_spec.rb
 - spec/mongoid/more_embedded_helper_spec.rb
-- spec/rspec.options
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/kristianmandrup/mongoid_embedded_helper
@@ -120,6 +140,8 @@ signing_key:
 specification_version: 3
 summary: Facilitates performing queries on collections in embedded Mongoid documents
 test_files: 
+- spec/model/list.rb
+- spec/model/person_list.rb
 - spec/mongoid/embedded_helper_spec.rb
 - spec/mongoid/more_embedded_helper_spec.rb
 - spec/spec_helper.rb