mm-commentable 1.1.0 → 1.2.0

data/Gemfile

@@ -1,16 +1,10 @@
 source "http://rubygems.org"
 
-
 group :development do
-
-  gem 'mongo', '1.1.2'
-  gem 'bson_ext', '1.1.2'
-  gem 'mongo_ext'
-  gem 'mongo_mapper'
+  gem 'bson_ext', '1.3.0'
+  gem 'mongo_mapper', '0.9.0'
   gem 'i18n'
   
-  gem 'log_buddy'
-  
   gem 'ruby-debug'
   gem "rspec", "~> 2.1.0"
   gem "yard", "~> 0.6.0"

data/Gemfile.lock

@@ -1,29 +1,30 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.1)
-    bson (1.1.2)
-    bson_ext (1.1.2)
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activesupport (3.0.6)
+    bson (1.3.0)
+    bson_ext (1.3.0)
+    builder (2.1.2)
     columnize (0.3.2)
     diff-lcs (1.1.2)
     git (1.2.5)
-    i18n (0.4.2)
-    jeweler (1.5.1)
+    i18n (0.5.0)
+    jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    jnunemaker-validatable (1.8.4)
-      activesupport (>= 2.3.4)
     linecache (0.43)
-    log_buddy (0.5.0)
-    mongo (1.1.2)
-      bson (>= 1.1.1)
-    mongo_ext (0.19.3)
-    mongo_mapper (0.8.6)
-      activesupport (>= 2.3.4)
-      jnunemaker-validatable (~> 1.8.4)
+    mongo (1.3.0)
+      bson (>= 1.3.0)
+    mongo_mapper (0.9.0)
+      activemodel (~> 3.0.0)
+      activesupport (~> 3.0.0)
       plucky (~> 0.3.6)
-    plucky (0.3.6)
+    plucky (0.3.7)
       mongo (~> 1.1)
     rake (0.8.7)
     rcov (0.9.9)
@@ -40,20 +41,17 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    yard (0.6.2)
+    yard (0.6.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bson_ext (= 1.1.2)
+  bson_ext (= 1.3.0)
   bundler (~> 1.0.0)
   i18n
   jeweler (~> 1.5.1)
-  log_buddy
-  mongo (= 1.1.2)
-  mongo_ext
-  mongo_mapper
+  mongo_mapper (= 0.9.0)
   rcov
   rspec (~> 2.1.0)
   ruby-debug

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/mongo_mapper/plugins/commentable.rb

@@ -4,14 +4,15 @@ module MongoMapper
   module Plugins
     module Commentable
       
-      def self.configure(model)
-        model.class_eval do
-          key :comments_count, Integer, :default => 0
-          many :comments
-        end
+      extend ActiveSupport::Concern
+
+      included do
+        key :comments_count, Integer, :default => 0
+        many :comments
       end
       
       module InstanceMethods
+        
         def commentable?; true; end
 
         def add_comment!(comment_body, commentor)

data/mm-commentable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mm-commentable}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luke Cunningham"]
-  s.date = %q{2011-02-26}
+  s.date = %q{2011-04-14}
   s.description = %q{A very simple mongomapper plugin to make you models commentable}
   s.email = %q{luke@icaruswings.com}
   s.extra_rdoc_files = [
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/icaruswings/mm-commentable}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{A very simple mongomapper plugin to make you models commentable}
   s.test_files = [
     "spec/mm-commentable_spec.rb",
@@ -45,16 +45,12 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<mongo>, ["= 1.1.2"])
-      s.add_development_dependency(%q<bson_ext>, ["= 1.1.2"])
-      s.add_development_dependency(%q<mongo_ext>, [">= 0"])
-      s.add_development_dependency(%q<mongo_mapper>, [">= 0"])
+      s.add_development_dependency(%q<bson_ext>, ["= 1.3.0"])
+      s.add_development_dependency(%q<mongo_mapper>, ["= 0.9.0"])
       s.add_development_dependency(%q<i18n>, [">= 0"])
-      s.add_development_dependency(%q<log_buddy>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.1.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
@@ -62,12 +58,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<mongo>, ["= 1.1.2"])
-      s.add_dependency(%q<bson_ext>, ["= 1.1.2"])
-      s.add_dependency(%q<mongo_ext>, [">= 0"])
-      s.add_dependency(%q<mongo_mapper>, [">= 0"])
+      s.add_dependency(%q<bson_ext>, ["= 1.3.0"])
+      s.add_dependency(%q<mongo_mapper>, ["= 0.9.0"])
       s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<log_buddy>, [">= 0"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.1.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
@@ -76,12 +69,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<mongo>, ["= 1.1.2"])
-    s.add_dependency(%q<bson_ext>, ["= 1.1.2"])
-    s.add_dependency(%q<mongo_ext>, [">= 0"])
-    s.add_dependency(%q<mongo_mapper>, [">= 0"])
+    s.add_dependency(%q<bson_ext>, ["= 1.3.0"])
+    s.add_dependency(%q<mongo_mapper>, ["= 0.9.0"])
     s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<log_buddy>, [">= 0"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.1.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])

data/spec/mm-commentable_spec.rb

@@ -81,7 +81,7 @@ describe "Comment" do
     @comment.should respond_to(:commentor_type=)
     @comment.should respond_to(:commentor_type)
     
-    @comment.commentor.association.should be_belongs_to
+    @comment.associations[:commentor].should be_a(MongoMapper::Plugins::Associations::BelongsToAssociation)
   end
   
 end

data/spec/spec_helper.rb

@@ -4,10 +4,6 @@ require 'bundler/setup'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require 'fileutils'
-require 'ostruct'
-require 'log_buddy'
-
 require 'rspec'
 
 require 'mm-commentable'
@@ -16,16 +12,9 @@ require 'mm-commentable'
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-log_dir = File.expand_path('../../log', __FILE__)
-FileUtils.mkdir_p(log_dir) unless File.exist?(log_dir)
-
-logger = Logger.new(log_dir + '/test.log')
-LogBuddy.init(:logger => logger)
-
-MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017, :logger => logger)
+MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017)
 MongoMapper.database = "mm-test-#{RUBY_VERSION.gsub('.', '-')}"
 MongoMapper.database.collections.each { |c| c.drop_indexes }
 
-
 RSpec.configure do |config|
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mm-commentable
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Luke Cunningham
@@ -15,72 +15,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-26 00:00:00 +11:00
+date: 2011-04-14 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
-        version: 1.1.2
-  name: mongo
-  requirement: *id001
   type: :development
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 27
         segments: 
         - 1
-        - 1
-        - 2
-        version: 1.1.2
+        - 3
+        - 0
+        version: 1.3.0
   name: bson_ext
-  requirement: *id002
-  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: mongo_ext
-  requirement: *id003
   type: :development
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 59
         segments: 
         - 0
-        version: "0"
+        - 9
+        - 0
+        version: 0.9.0
   name: mongo_mapper
-  requirement: *id004
-  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -90,25 +63,11 @@ dependencies:
         - 0
         version: "0"
   name: i18n
-  requirement: *id005
-  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: log_buddy
-  requirement: *id006
   type: :development
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -118,11 +77,11 @@ dependencies:
         - 0
         version: "0"
   name: ruby-debug
-  requirement: *id007
-  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -134,11 +93,11 @@ dependencies:
         - 0
         version: 2.1.0
   name: rspec
-  requirement: *id008
-  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -150,11 +109,11 @@ dependencies:
         - 0
         version: 0.6.0
   name: yard
-  requirement: *id009
-  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -166,11 +125,11 @@ dependencies:
         - 0
         version: 1.0.0
   name: bundler
-  requirement: *id010
-  type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -182,11 +141,11 @@ dependencies:
         - 1
         version: 1.5.1
   name: jeweler
-  requirement: *id011
-  type: :development
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -196,8 +155,7 @@ dependencies:
         - 0
         version: "0"
   name: rcov
-  requirement: *id012
-  type: :development
+  version_requirements: *id009
 description: A very simple mongomapper plugin to make you models commentable
 email: luke@icaruswings.com
 executables: []
@@ -253,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A very simple mongomapper plugin to make you models commentable