rocket_tag 0.5.5 → 0.5.6

data/Gemfile

@@ -8,6 +8,7 @@ gem "squeel", '~> 1.0.0', :require => false
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem "pg"
   gem "rspec", "~> 2.10.0"
   gem "yard", "~> 0.6.0"
   gem "bundler", "~> 1.1.0"

data/Gemfile.lock

@@ -22,6 +22,7 @@ GEM
       git (>= 1.2.5)
       rake
     multi_json (1.3.6)
+    pg (0.14.0)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     rake (0.9.2.2)
@@ -33,7 +34,7 @@ GEM
     rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.10.1)
-    sqlite3 (1.3.5)
+    sqlite3 (1.3.6)
     squeel (1.0.6)
       activerecord (~> 3.0)
       activesupport (~> 3.0)
@@ -48,6 +49,7 @@ DEPENDENCIES
   activerecord (>= 3.2.0)
   bundler (~> 1.1.0)
   jeweler (~> 1.6.4)
+  pg
   rake
   rspec (~> 2.10.0)
   sqlite3

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/lib/rocket_tag/tag.rb

@@ -10,6 +10,9 @@ module RocketTag
       joins{taggings}.where{taggings.taggable_type == type.to_s}
     end
 
+    def tags_count
+      self[:tags_count].to_i
+    end
 
   end
 end

data/lib/rocket_tag/taggable.rb

@@ -70,6 +70,7 @@ module RocketTag
     end
 
     module InstanceMethods
+
       def reload_with_tags(options = nil)
         self.class.rocket_tag.contexts.each do |context|
           write_context context, []
@@ -177,7 +178,7 @@ module RocketTag
       def tagged_with tags_list, options = {}
 
         # Grab table name
-        t = self.to_s
+        t = self.table_name
 
         q = joins{taggings.tag}
 
@@ -203,8 +204,8 @@ module RocketTag
         end
 
         q = q.group_by_all_columns.
-          select{count(tags.id).as(tags_count)}.
-          select('*').
+          select{count(tags.id).as( tags_count)}.
+          select{"#{t}.*"}.
           order("tags_count desc")
 
         # Isolate the aggregate uery by wrapping it as
@@ -242,7 +243,7 @@ module RocketTag
           where(with_tag_context(options.delete(:on))). # Restrict by context
           group_by_all_columns.
           select{count(tags.id).as(tags_count)}.
-          select('*').
+          select('tags.*').
           order("tags_count desc")
 
         # Isolate the aggregate query by wrapping it as
@@ -342,6 +343,12 @@ module RocketTag
               end
             end
 
+            # This is to compensate for a rails bug that returns
+            # a string for postgres
+            def tags_count
+              self[:tags_count].to_i
+            end
+
             # Return an array of RocketTag::Tags for the context
             define_method "#{context}" do
               cache_tags

data/rocket_tag.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rocket_tag"
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brad Phelan"]
-  s.date = "2012-07-02"
+  s.date = "2012-07-11"
   s.description = ""
   s.email = "bradphelan@xtargets.com"
   s.extra_rdoc_files = [
@@ -51,6 +51,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 3.2.0"])
       s.add_runtime_dependency(%q<squeel>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<pg>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.10.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
@@ -60,6 +61,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<activerecord>, [">= 3.2.0"])
       s.add_dependency(%q<squeel>, ["~> 1.0.0"])
+      s.add_dependency(%q<pg>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.10.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.1.0"])
@@ -70,6 +72,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<activerecord>, [">= 3.2.0"])
     s.add_dependency(%q<squeel>, ["~> 1.0.0"])
+    s.add_dependency(%q<pg>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.10.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.1.0"])

data/spec/database.yml

@@ -5,15 +5,15 @@ sqlite3:
 mysql:
   adapter: mysql2
   hostname: localhost
-  username: root
+  username: rails
   password:
-  database: acts_as_taggable_on
+  database: rocket_tag
   charset: utf8
   
 postgresql:
   adapter: postgresql
   hostname: localhost
-  username: postgres
+  username: rails
   password:
-  database: acts_as_taggable_on
+  database: rocket_tag
   encoding: utf8

data/spec/rocket_tag/taggable_spec.rb

@@ -31,7 +31,7 @@ describe TaggableModel do
       @model.languages = ["x", "y"]
       @model.save
       @model.reload
-      @model.languages.should == ["x", "y"]
+      @model.languages.sort.should == ["x", "y"]
     end
 
     it "validates the model wrt to the context" do
@@ -206,7 +206,7 @@ describe TaggableModel do
         similar[2].tags_count.should == 1
 
         # ----
-        similar = @t00.tagged_similar(:on => :languages).all
+        similar = @t00.tagged_similar(:on => :languages).all.sort
         similar[0].id.should == @t01.id
         similar[1].id.should == @t10.id
         similar[2].id.should == @t21.id

metadata

@@ -2,7 +2,7 @@
 name: rocket_tag
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Brad Phelan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-02 00:00:00 Z
+date: 2012-07-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -35,8 +35,19 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: pg
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -44,10 +55,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -55,10 +66,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,10 +77,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,10 +88,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -88,10 +99,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -99,7 +110,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 description: ""
 email: bradphelan@xtargets.com
 executables: []
@@ -144,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -401049524358643574
+      hash: -669736319260482617
       segments: 
       - 0
       version: "0"