mongoid_magic_counter_cache 0.0.2 → 0.1.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.1.1
+
+* Multiple Merge requests to improve functionality and version support
+
 ## v0.0.1
 
 * Initial Release

data/README.md

@@ -56,9 +56,8 @@ If you do not wish to use the `model_count` naming convention, you can override
 
 ## TODO
 
-  1. Thoroughly Test embedded associations
-  2. Add additional options parameters
-  3. Simplify syntax (I.E. including MagicCounterCache will add counts for all `belongs_to` associations on a document 
+  1. Add additional options parameters
+  2. Simplify syntax (I.E. including MagicCounterCache will add counts for all `belongs_to` associations on a document
 
 
 

data/lib/mongoid/magic-counter-cache/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module MagicCounterCache
-    VERSION = "0.0.2"
+    VERSION = "0.1.1"
   end
 end

data/lib/mongoid/magic_counter_cache.rb

@@ -1,5 +1,4 @@
 require 'mongoid'
-require 'pry'
 module Mongoid #:nodoc:
 
   # The Counter Cache will yada yada
@@ -51,7 +50,7 @@ module Mongoid #:nodoc:
         if options[:field]
           counter_name = "#{options[:field].to_s}"
         else
-          counter_name = "#{model_name.downcase}_count"
+          counter_name = "#{model_name.demodulize.underscore}_count"
         end
         after_create  do |doc|
           if doc.embedded?

data/lib/mongoid_magic_counter_cache/version.rb

@@ -1,3 +1,3 @@
 module MongoidMagicCounterCache
-  VERSION = "0.0.2"
+  VERSION = "0.1.1"
 end

data/mongoid_magic_counter_cache.gemspec

@@ -19,9 +19,7 @@ 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("mongoid", "~> 2.0") 
+  s.add_dependency("mongoid", ">= 2.2", "<= 3.0")
   s.add_dependency("rake")
-  s.add_dependency("bson_ext","~> 1.5")
   s.add_development_dependency "rspec"
-  s.add_development_dependency "pry"
 end

data/spec/models/book.rb

@@ -3,9 +3,11 @@ class Book
   include Mongoid::MagicCounterCache
 
   belongs_to :library
+  embeds_many :foreign_publications, :class_name => "Book::ForeignPublication"
   embeds_many :pages
 
   field :title
+  field :foreign_publication_count, :type => Integer, :default => 0
   field :page_count, :type => Integer, :default => 0
 
   counter_cache :library

data/spec/models/book/foreign_publication.rb

@@ -0,0 +1,9 @@
+class Book
+  class ForeignPublication
+    include Mongoid::Document
+    include Mongoid::MagicCounterCache
+
+    belongs_to :book, :inverse_of => :foreign_publications
+    counter_cache :book
+  end
+end

data/spec/mongoid/magic_counter_cache_spec.rb

@@ -74,6 +74,13 @@ module Mongoid
           library.book_count.should == library.books.entries.size
         end
 
+        it "should by default use demodulized and underscored model names for the count field" do
+          book = library.books.last
+          book.foreign_publication_count.should == 0
+          book.foreign_publications.push( Book::ForeignPublication.new )
+          book.foreign_publication_count.should == 1
+        end
+
         context "when the referenced document has an embedded document" do
 
           let(:page) do
@@ -81,6 +88,7 @@ module Mongoid
           end
 
           before do
+            book.save
             book.pages.create(:title => "it was a long and stormy night")
             library.books << book
           end
@@ -126,6 +134,7 @@ module Mongoid
         end
 
         before do
+          album.save
           album.songs.create(:title => "create you a song")
         end
 

data/spec/spec_helper.rb

@@ -2,19 +2,18 @@ require "rubygems"
 require "mongoid"
 require "bundler/setup"
 require "rspec"
-require "pry"
 require File.expand_path("../../lib/mongoid_magic_counter_cache", __FILE__)
 
 Mongoid.configure do |config|
     name = "mongoid_magic_counter_cache_test"
-    config.master = Mongo::Connection.new.db(name)
+    config.respond_to?(:connect_to) ? config.connect_to(name) : config.master = Mongo::Connection.new.db(name)
 end
 
-Dir["#{File.dirname(__FILE__)}/models/*.rb"].each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/models/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |c|
     c.mock_with :rspec
     c.before(:each) do
-          Mongoid.master.collections.select {|c| c.name !~ /system/ }.each(&:drop)
+          Mongoid::Config.respond_to?(:purge!) ? Mongoid::Config.purge! : Mongoid.master.collections.select {|c| c.name !~ /system/ }.each(&:drop)
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_magic_counter_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70293416288280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - <=
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70293416288280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - <=
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70293416287600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +43,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70293416287600
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: &70293416286720 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70293416286720
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70293416285820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,18 +59,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293416285820
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: &70293416285240 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70293416285240
 description: A quick and easy way to add counter cache functionality to model/document
   associations in Mongoid
 email:
@@ -82,7 +81,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/mongoid/.DS_Store
 - lib/mongoid/magic-counter-cache/version.rb
 - lib/mongoid/magic_counter_cache.rb
 - lib/mongoid_magic_counter_cache.rb
@@ -90,6 +88,7 @@ files:
 - mongoid_magic_counter_cache.gemspec
 - spec/models/album.rb
 - spec/models/book.rb
+- spec/models/book/foreign_publication.rb
 - spec/models/feeling.rb
 - spec/models/library.rb
 - spec/models/page.rb
@@ -117,13 +116,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongoid_magic_counter_cache
-rubygems_version: 1.8.17
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Setup Counter Caches in Mongoid Documents
 test_files:
 - spec/models/album.rb
 - spec/models/book.rb
+- spec/models/book/foreign_publication.rb
 - spec/models/feeling.rb
 - spec/models/library.rb
 - spec/models/page.rb