mongoid-simple-tags 0.0.3 → 0.0.5

data/Gemfile

@@ -1,5 +1,7 @@
 source "http://rubygems.org"
-gem "mongoid", ">= 2.0.0"
+gem 'mongoid', '2.2.1'
+gem 'bson_ext', '>= 1.4.0'
+
 group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.2"

data/Gemfile.lock

@@ -1,32 +1,36 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.7)
-    bson (1.3.1)
-    builder (2.1.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    bson (1.4.0)
+    bson_ext (1.4.0)
+    builder (3.0.0)
     git (1.2.5)
-    i18n (0.5.0)
+    i18n (0.6.0)
     jeweler (1.6.2)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     mongo (1.3.1)
       bson (>= 1.3.1)
-    mongoid (2.0.2)
+    mongoid (2.2.1)
       activemodel (~> 3.0)
-      mongo (~> 1.3)
+      mongo (>= 1.3, < 1.4)
       tzinfo (~> 0.3.22)
+    multi_json (1.0.3)
     rake (0.9.2)
-    tzinfo (0.3.27)
+    tzinfo (0.3.30)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bson_ext (>= 1.4.0)
   bundler (~> 1.0.0)
   jeweler (~> 1.6.2)
-  mongoid (>= 2.0.0)
+  mongoid (= 2.2.1)

data/README.rdoc

@@ -5,7 +5,7 @@ mongoid-simple-tags is a basic and simple tagging system for mongoid using map-r
 == Install
   Add the following to Gemfile:
   
-    gem "mongoid-simple-tags", "0.0.2"
+    gem "mongoid-simple-tags", "0.0.5"
 
 == Usage
  

data/Rakefile

@@ -26,4 +26,13 @@ Jeweler::Tasks.new do |gem|
   
 end
 Jeweler::RubygemsDotOrgTasks.new
+                                                                                                              
+
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+#	t.libs.push "lib"
+	t.test_files = FileList['test/*_test.rb']
+	t.verbose = true
+end
+
 

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.5

data/lib/mongoid-simple-tags.rb

@@ -33,6 +33,7 @@ module Mongoid
           end
       end
  
+
       module ClassMethods
         
         def all_tags(opts={})
@@ -40,6 +41,41 @@ module Mongoid
           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)
+                })
+              } 
+            }
+          MAP
+
+          reduce = <<-REDUCE
+            function(key,values) { 
+              var count = 0 
+              values.forEach(function(v){ 
+                count += v
+              }) 
+              return 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 } }
+        end
         
         def tagged_with(tags)
           tags = [tags] unless tags.is_a? Array
@@ -49,4 +85,4 @@ module Mongoid
       
     end
   end
-end
+end

data/mongoid-simple-tags.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid-simple-tags}
-  s.version = "0.0.3"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["chebyte"]
-  s.date = %q{2011-06-15}
+  s.date = %q{2011-11-25}
   s.description = %q{basic and simple tagging system for mongoid}
   s.email = %q{maurotorres@gmail.com}
   s.extra_rdoc_files = [
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
     "lib/mongoid-simple-tags.rb",
     "mongoid-simple-tags.gemspec",
     "test/helper.rb",
-    "test/test_mongoid-simple-tags.rb"
+    "test/mongoid-simple-tags_test.rb"
   ]
   s.homepage = %q{http://github.com/chebyte/mongoid-simple-tags}
   s.licenses = ["MIT"]
@@ -39,18 +39,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<mongoid>, ["= 2.2.1"])
+      s.add_runtime_dependency(%q<bson_ext>, [">= 1.4.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_runtime_dependency(%q<mongoid>, [">= 2.0.0"])
     else
-      s.add_dependency(%q<mongoid>, [">= 2.0.0"])
+      s.add_dependency(%q<mongoid>, ["= 2.2.1"])
+      s.add_dependency(%q<bson_ext>, [">= 1.4.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_dependency(%q<mongoid>, [">= 2.0.0"])
     end
   else
-    s.add_dependency(%q<mongoid>, [">= 2.0.0"])
+    s.add_dependency(%q<mongoid>, ["= 2.2.1"])
+    s.add_dependency(%q<bson_ext>, [">= 1.4.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
     s.add_dependency(%q<mongoid>, [">= 2.0.0"])

data/test/helper.rb

@@ -7,12 +7,16 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
-require 'shoulda'
+require 'minitest/autorun'
+require 'minitest/spec'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'mongoid'
 require 'mongoid-simple-tags'
 
-class Test::Unit::TestCase
+Mongoid.configure do |config|
+	config.master = Mongo::Connection.new.db("mongoid_simple_tags_test")
 end
+
+

data/test/mongoid-simple-tags_test.rb

@@ -0,0 +1,115 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'helper'
+
+class User
+	include Mongoid::Document
+	include Mongoid::Document::Taggable
+	field :name
+	belongs_to :organisation
+end
+
+class Organisation
+	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
+		assert_equal tags, @user.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 
+		assert_equal @user, User.tagged_with('linux').first
+		assert_equal @user, 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')
+					assert tagged_with_list.include? @user
+					assert tagged_with_list.include? user2
+	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}
+															]
+					assert_equal expected_tag_list, all_tags_for_users
+	end
+
+	after do 
+		cleanup_database
+	end
+end
+
+describe "A Taggable model with scope" do
+	before do 
+		@organisation_1 = Organisation.create(name: 'Qualica')
+		@user_1 = @organisation_1.users.create(name: 'User1', tag_list: "ubuntu, linux, tucuman")
+		@user_2 = @organisation_1.users.create(name: 'User2', tag_list: "ubuntu, linux, tucuman")
+		@organisation_2 = Organisation.create(name: 'Microsoft')
+		@user_3 = @organisation_2.users.create(name: 'User3', tag_list: 'microsoft, windows, tucuman')
+		@user_4 = @organisation_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(organisation_id: @organisation_1.id)
+		assert !results.empty?
+
+		assert results.include?( {:name => "linux", :count => 2 } )
+		assert results.include?( {:name => "ubuntu", :count => 2 } )
+		assert results.include?( {:name => "tucuman", :count => 2 } )
+		
+		results = User.scoped_tags(organisation_id: @organisation_2.id)
+		assert !results.empty?
+		assert results.include?( {:name =>"linux", :count => 1 } )
+		assert results.include?( {:name => "microsoft", :count => 1 } )
+		assert results.include?( {:name => "windows", :count => 1 } )
+		assert results.include?( {:name => "tucuman", :count => 2 } )
+	end
+
+	it "should return scoped tags when passing more than one option" do
+		results = User.scoped_tags(organisation_id: @organisation_1.id, name: @user_1.name)
+		assert !results.empty?
+		assert results.include?( {:name => "linux", :count => 1 } )
+		assert results.include?( {:name => "ubuntu", :count => 1 } )
+		assert results.include?( {:name => "tucuman", :count => 1 } )
+	end
+
+	after do
+		cleanup_database
+	end
+
+end
+
+def cleanup_database
+	Mongoid.database.collections.each do |collection|
+		collection.remove if collection.name !=~ /^system\./ 
+	end
+end

metadata

@@ -2,7 +2,7 @@
 name: mongoid-simple-tags
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors: 
 - chebyte
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-15 00:00:00 -03:00
+date: 2011-11-25 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,15 +18,26 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: bson_ext
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -34,10 +45,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,10 +56,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mongoid
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -56,7 +67,7 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 description: basic and simple tagging system for mongoid
 email: maurotorres@gmail.com
 executables: []
@@ -77,7 +88,7 @@ files:
 - lib/mongoid-simple-tags.rb
 - mongoid-simple-tags.gemspec
 - test/helper.rb
-- test/test_mongoid-simple-tags.rb
+- test/mongoid-simple-tags_test.rb
 has_rdoc: true
 homepage: http://github.com/chebyte/mongoid-simple-tags
 licenses: 
@@ -92,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4519926753338870437
+      hash: 100154636351803078
       segments: 
       - 0
       version: "0"

data/test/test_mongoid-simple-tags.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestMongoidSimpleTags < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end