mongoid-simple-tags 0.0.6 → 0.0.7

data/.gitignore

@@ -1,48 +1,5 @@
-# rcov generated
-coverage
-
-# rdoc generated
-rdoc
-
-# yard generated
-doc
-.yardoc
-
-# bundler
+*.gem
 .bundle
-
-# jeweler generated
-pkg
-
-# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
-#
-# * Create a file at ~/.gitignore
-# * Include files you want ignored
-# * Run: git config --global core.excludesfile ~/.gitignore
-#
-# After doing this, these files will be ignored in all your git projects,
-# saving you from having to 'pollute' every project you touch with them
-#
-# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
-#
-# For MacOS:
-#
-#.DS_Store
-
-# For TextMate
-#*.tmproj
-#tmtags
-
-# For emacs:
-#*~
-#\#*
-#.\#*
-
-# For vim:
-*.swp
-
-# For redcar:
-#.redcar
-
-# For rubinius:
-#*.rbc
+.rvmrc
+Gemfile.lock
+pkg/*

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.9.3
+
+script: rake spec

data/Gemfile.lock

@@ -3,15 +3,15 @@ PATH
   specs:
     mongoid-simple-tags (0.0.6)
       bson_ext (~> 1.6)
-      mongoid (~> 2.4)
+      mongoid (~> 3.0.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
+    activemodel (3.2.7)
+      activesupport (= 3.2.7)
       builder (~> 3.0.0)
-    activesupport (3.2.6)
+    activesupport (3.2.7)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     bson (1.6.4)
@@ -20,13 +20,14 @@ GEM
     builder (3.0.0)
     diff-lcs (1.1.3)
     i18n (0.6.0)
-    mongo (1.6.2)
-      bson (~> 1.6.2)
-    mongoid (2.4.11)
+    mongoid (3.0.3)
       activemodel (~> 3.1)
-      mongo (<= 1.6.2)
+      moped (~> 1.1)
+      origin (~> 1.0)
       tzinfo (~> 0.3.22)
+    moped (1.2.0)
     multi_json (1.3.6)
+    origin (1.0.4)
     rspec (2.10.0)
       rspec-core (~> 2.10.0)
       rspec-expectations (~> 2.10.0)

data/README.rdoc

@@ -1,11 +1,13 @@
-= mongoid-simple-tags
+= mongoid-simple-tags {<img src="https://secure.travis-ci.org/chebyte/mongoid-simple-tags.png"/>}[http://travis-ci.org/chebyte/mongoid-simple-tags]
 
 mongoid-simple-tags is a basic and simple tagging system for mongoid using map-reduce function
+(no backwards compatibility with mongoid v2!)
 
 == Install
+
   Add the following to Gemfile:
   
-    gem "mongoid-simple-tags", "0.0.6"
+    gem "mongoid-simple-tags", "0.0.7"
 
 == Usage
  
@@ -18,10 +20,9 @@ mongoid-simple-tags is a basic and simple tagging system for mongoid using map-r
 
 === Console
 
-  u = User.new(:name => "Tuquito")
-  u.tag_list = "linux, tucuman, free software"      
+  u = User.create(:name => "Tuquito", tag_list: "linux, tucuman, free software")
+
   u.tags     # => ["linux","tucuman","free software"]
-  u.save
 
   User.tagged_with("linux") # => u
   User.tagged_with(["tucuman", "free software"]) # => u
@@ -32,7 +33,7 @@ mongoid-simple-tags is a basic and simple tagging system for mongoid using map-r
 
   User.tagged_with("linux") # => [u, u2]
 
-  #using map-reduce function
+  # using map-reduce function
   
   User.all_tags #=>[{:name=>"free software", :count=>1}, {:name=>"linux", :count=>2}, {:name=>"tucuman", :count=>1}] 
 
@@ -41,4 +42,3 @@ mongoid-simple-tags is a basic and simple tagging system for mongoid using map-r
 
 Copyright (c) 2011 chebyte(mauro torres). See LICENSE.txt for
 further details.
-

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/mongoid-simple-tags.rb

@@ -4,9 +4,7 @@ module Mongoid
       def self.included(base)
         base.class_eval do |klass|
           klass.field :tags, :type => Array    
-          klass.index :tags      
-          
-          klass.send :after_save, :rebuild_tags
+          klass.index({ tags: 1 }, { background: true })
         
           include InstanceMethods
           extend ClassMethods
@@ -22,59 +20,42 @@ module Mongoid
         def tag_list
           self.tags.join(", ") if tags
         end
-        
-        protected
-          def rebuild_tags
-            self.collection.map_reduce(
-              "function() { if(this.tags) this.tags.forEach(function(t){ emit(t, 1); }); }",
-              "function(key,values) { var count = 0; values.forEach(function(v){ count += v; }); return count; }",
-              { :out => 'tags' }
-            )
-          end
       end
  
 
       module ClassMethods
-        
-        def all_tags(opts={})
-          tags = Mongoid.master.collection('tags')
-          opts.merge(:sort => ["_id", :desc]) unless opts[:sort]
-          tags.find({}, opts).to_a.map!{|item| { :name => item['_id'], :count => item['value'].to_i } }
-        end
 
-        def scoped_tags(options={})
-          map = <<-MAP
-            function() { 
-              if(this.tags) {
-                this.tags.forEach( function(t) {
-                    emit(t, 1)
-                })
-              } 
+        def all_tags(scope = {})
+          map = %Q{
+            function() {
+              if(this.tags){
+                this.tags.forEach(function(tag){
+                  emit(tag, 1)
+                });
+              }
             }
-          MAP
+          }
 
-          reduce = <<-REDUCE
-            function(key,values) { 
-              var count = 0 
-              values.forEach(function(v){ 
-                count += v
-              }) 
-              return count
+          reduce = %Q{
+            function(key, values) {
+              var tag_count = 0 ;
+              values.forEach(function(value) {
+                tag_count += value;
+              });
+              return tag_count;
             }
-          REDUCE
+          }
 
-          scope = {}
-          options.each do |key, value|
-            scope[key] = {'$in' => [value]} 
-          end
-          
-          results = self.collection.map_reduce(
-            map,
-            reduce,
-            :out => "scoped_tags",
-            :query => scope
-          )
-          results.find().to_a.map{ |item| { :name => item['_id'], :count => item['value'].to_i } }
+          tags = self
+          tags = tags.where(scope) if scope.present?
+
+          results = tags.map_reduce(map, reduce).out(inline: true)
+          results.to_a.map!{ |item| { :name => item['_id'], :count => item['value'].to_i } }
+        end
+
+        def scoped_tags(scope = {})
+          warn "[DEPRECATION] `scoped_tags` is deprecated.  Please use `all_tags` instead."
+          all_tags(scope)
         end
         
         def tagged_with(tags)

data/mongoid-simple-tags.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "mongoid-simple-tags"
-  s.version     = "0.0.6"
+  s.version     = "0.0.7"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["chebyte"]
   s.email       = ["maurotorres@gmail.com"]
@@ -17,6 +17,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.add_development_dependency "rspec", "~> 2.10.0"
-  s.add_dependency "mongoid", "~> 2.4"
-  s.add_dependency "bson_ext", "~> 1.6"  
+  s.add_dependency "mongoid", "~> 3.0.3"
+  s.add_dependency "bson_ext", "~> 1.6"
 end

data/mongoid.yml

@@ -0,0 +1,6 @@
+test:
+  sessions:
+    default:
+      database: mongoid-simple-tags
+      hosts:
+        - localhost:27017

data/spec/mongoid-simple-tags_spec.rb

@@ -1,114 +1,113 @@
 require 'spec_helper'
 
 class User
-	include Mongoid::Document
-	include Mongoid::Document::Taggable
-	field :name
-	belongs_to :organization
+  include Mongoid::Document
+  include Mongoid::Document::Taggable
+  field :name
+  belongs_to :organization
 end
 
 class Organization
-	include Mongoid::Document
-	field :name
-	has_many :users
+  include Mongoid::Document
+  field :name
+  has_many :users
 end
 
+
 describe "A Taggable model" do
-	before do
-		@user = User.new(name: 'Tuquito')
-	end
-
-	it "should have a tag_list method" do
-		@user.respond_to?(:tag_list)	
-	end
-
-	it "should be able to update a tag list" do
-		tag_list = "linux, tucuman, free software"
-		tags = tag_list.split(',').map{ |tag| tag.strip}.flatten
-		@user.tag_list = tag_list
-		tags.should == @user.tags
-	end
+
+  let(:user) { User.new(name: 'Tuquito') }
+
+  it "should have a tag_list method" do
+    user.respond_to?(:tag_list)  
+  end
+
+  it "should be able to update a tag list" do
+    tag_list = "linux, tucuman, free software"
+    tags = tag_list.split(',').map{ |tag| tag.strip}.flatten
+    
+    user.tag_list = tag_list
+    user.tags.should == tags
+  end
 end
 
+
 describe "A Taggable model with tags assigned" do
-	before do 
-		@tag_list = "linux, tucuman, free software"
-		@user = User.new(name: 'Tuquito')
-		@user.tag_list = @tag_list
-		@user.save
-	end
-
-	it "should be able to find tagged_with objects" do 
-		@user.should == User.tagged_with('linux').first
-		@user.should == User.tagged_with(['tucuman', 'free software']).first
-	end
-
-	it "should be able to find tagged_with objects if more than one object is present" do
-					user2 = User.new(name: 'ubuntu')
-					user2.tag_list = "linux"
-					user2.save
-					tagged_with_list = User.tagged_with('linux')
-					tagged_with_list.include?(@user).should be_true
-					tagged_with_list.include?(user2).should be_true
-	end
-
-	it "should return all_tags per Model class" do
-					user2 = User.create(name: 'ubuntu', tag_list: 'linux')
-					all_tags_for_users = User.all_tags
-					expected_tag_list = [ {:name=>"free software", :count=>1},
-								 								{:name=>"linux", :count=>2},
-															 	{:name=>"tucuman", :count=>1}
-															]
-					expected_tag_list.should == all_tags_for_users
-	end
-
-	after do 
-		cleanup_database
-	end
+
+  before(:each) do
+    @user = User.create!(name: 'Tuquito', tag_list: "linux, tucuman, free software")
+  end
+  
+  it "should be able to find tagged_with objects" do 
+    User.tagged_with('linux').first.should == @user
+    User.tagged_with(['tucuman', 'free software']).first.should == @user
+  end
+
+  it "should be able to find tagged_with objects if more than one object is present" do
+    user_2 = User.create!(name: 'ubuntu', tag_list: 'linux')
+    
+    tagged_with_list = User.tagged_with('linux')
+    tagged_with_list.include?(@user).should be_true
+    tagged_with_list.include?(user_2).should be_true
+  end
+
+  it "should return all_tags per Model class" do
+    User.create(name: 'ubuntu', tag_list: 'linux')
+
+    expected_tag_list = [ 
+      {:name => "free software",  :count => 1},
+      {:name => "linux",          :count => 2},
+      {:name => "tucuman",        :count => 1}
+    ]
+    User.all_tags.should == expected_tag_list
+  end
+
 end
 
 describe "A Taggable model with scope" do
-	before do 
-		@organization_1 = Organization.create(name: 'Qualica')
-		@user_1 = @organization_1.users.create(name: 'User1', tag_list: "ubuntu, linux, tucuman")
-		@user_2 = @organization_1.users.create(name: 'User2', tag_list: "ubuntu, linux, tucuman")
-		@organization_2 = Organization.create(name: 'Microsoft')
-		@user_3 = @organization_2.users.create(name: 'User3', tag_list: 'microsoft, windows, tucuman')
-		@user_4 = @organization_2.users.create(name: 'User4', tag_list: 'ubuntu, linux, tucuman')
-	end
-
-	it "should return scoped tags when passing one option" do 
-		results = User.scoped_tags(organization_id: @organization_1.id)
-		results.empty?.should be_false
-
-		results.include?( {:name => "linux", :count => 2 } ).should be_true
-		results.include?( {:name => "ubuntu", :count => 2 } ).should be_true
-		results.include?( {:name => "tucuman", :count => 2 } ).should be_true
-		
-		results = User.scoped_tags(organization_id: @organization_2.id)
-		results.empty?.should be_false
-		results.include?( {:name =>"linux", :count => 1 } ).should be_true
-		results.include?( {:name => "microsoft", :count => 1 } ).should be_true
-		results.include?( {:name => "windows", :count => 1 } ).should be_true
-		results.include?( {:name => "tucuman", :count => 2 } ).should be_true
-	end
-
-	it "should return scoped tags when passing more than one option" do
-		results = User.scoped_tags(organization_id: @organization_1.id, name: @user_1.name)
-		results.empty?.should be_false
-		results.include?( {:name => "linux", :count => 1 } ).should be_true
-		results.include?( {:name => "ubuntu", :count => 1 } ).should be_true
-		results.include?( {:name => "tucuman", :count => 1 } ).should be_true
-	end
-
-	after do
-		cleanup_database
-	end
 
-end
+  before(:each) do 
+    @organization_1 = Organization.create(name: 'Qualica')
+    @user_1 = @organization_1.users.create(name: 'User1', tag_list: "ubuntu, linux, tucuman")
+    @user_2 = @organization_1.users.create(name: 'User2', tag_list: "ubuntu, linux, tucuman")
+
+    @organization_2 = Organization.create(name: 'Microsoft')
+    @user_3 = @organization_2.users.create(name: 'User3', tag_list: 'microsoft, windows, tucuman')
+    @user_4 = @organization_2.users.create(name: 'User4', tag_list: 'ubuntu, linux, tucuman')
+  end
+
+  it "should return scoped tags when passing one option" do 
+    results = User.all_tags(organization_id: @organization_1.id)
+    results.empty?.should be_false
+
+    results.include?( {:name => "linux", :count => 2 } ).should be_true
+    results.include?( {:name => "ubuntu", :count => 2 } ).should be_true
+    results.include?( {:name => "tucuman", :count => 2 } ).should be_true
+    
+    results = User.all_tags(organization_id: @organization_2.id)
+    results.empty?.should be_false
+    results.include?( {:name =>"linux", :count => 1 } ).should be_true
+    results.include?( {:name => "microsoft", :count => 1 } ).should be_true
+    results.include?( {:name => "windows", :count => 1 } ).should be_true
+    results.include?( {:name => "tucuman", :count => 2 } ).should be_true
+  end
+
+  it "should return scoped tags when passing more than one option" do
+    results = User.all_tags(organization_id: @organization_1.id, name: @user_1.name)
+    
+    results.empty?.should be_false
+    results.include?( {:name => "linux", :count => 1 } ).should be_true
+    results.include?( {:name => "ubuntu", :count => 1 } ).should be_true
+    results.include?( {:name => "tucuman", :count => 1 } ).should be_true
+  end
+
+  it "should return scoped tags when calling deprecated scoped_tags method" do 
+    results = User.all_tags(organization_id: @organization_1.id)
+    
+    results.empty?.should be_false
+    results.include?( {:name => "linux", :count => 2 } ).should be_true
+    results.include?( {:name => "ubuntu", :count => 2 } ).should be_true
+    results.include?( {:name => "tucuman", :count => 2 } ).should be_true
+  end
 
-def cleanup_database
-	Mongoid.database.collections.each do |collection|
-		collection.remove if collection.name !=~ /^system\./ 
-	end
-end
+end

data/spec/spec_helper.rb

@@ -1,8 +1,10 @@
 require 'mongoid'
 require 'mongoid-simple-tags'
 
-Mongoid.configure do |config|
-	config.master = Mongo::Connection.new.db("mongoid_simple_tags_test")
-end
-
+Mongoid.load!("mongoid.yml", :test)
 
+RSpec.configure do |config|
+  config.after(:each) do
+    Mongoid::Config.purge!
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-simple-tags
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +68,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -76,6 +77,7 @@ files:
 - VERSION
 - lib/mongoid-simple-tags.rb
 - mongoid-simple-tags.gemspec
+- mongoid.yml
 - spec/mongoid-simple-tags_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/chebyte/mongoid-simple-tags