tagtools 0.0.1 → 0.0.2

data/CHANGELOG

@@ -1,2 +1,7 @@
+== TagTools 0.0.2
+ * fixed a bug in delete_records for user tag collections
+ * added include? method to all tag collections
+ * the delete method no longer errors out for nil parameters
+ * removed code duplication
 == TagTools 0.0.1
  * folksonomy!

data/README

@@ -28,13 +28,11 @@ schema.
  slashdot_bookmark.user_tags(current_user.id).concat( "geeky", "news", "technology" )
  slashdot_bookmark.tags
  => [ tag:"geeky", tag:"news", tag:"technology" ]
- slashdot_bookmark.user_tags(current_user).delete( "news" )
+ slashdot_bookmark.user_tags(current_user.id).delete( "news" )
  slashdot_bookmark.tags
  => [ tag:"geeky", tag:"technology" ]
- slashdot_bookmark.user_tags(current_user).concat( "technology", "linux" )
+ slashdot_bookmark.user_tags(current_user.id).concat( "technology", "linux" )
  slashdot_bookmark.tags
  => [ tag:"geeky", tag:"technology", tag:"linux" ]
- Bookmark.tag_query( :user_id => current_user, :with_any_tags => ["linux"] )
- => []
  Bookmark.tag_query( :with_any_tags => ["linux"] )
  => [ #<Bookmark:0x77dc54 @attributes={"url"=>"http://slashdot.org"}> ]

data/lib/tagtools.rb

@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-TAG_TOOLS_VERSION = "0.0.1"
+TAG_TOOLS_VERSION = "0.0.2"
 
 $:.unshift(File.dirname(__FILE__))
 $:.unshift(File.dirname(__FILE__) + "/../../activerecord/lib")
@@ -122,6 +122,12 @@ module ActiveRecord #:nodoc:
 
       alias :concat_with_attributes :push_with_attributes
 
+      def include?(raw_tag)
+        actual_tag = get_tag(raw_tag)
+        return false if actual_tag.nil?
+        return @target.include?(actual_tag)
+      end
+
       def size
         count_records
       end
@@ -132,6 +138,7 @@ module ActiveRecord #:nodoc:
         @owner.transaction do
           flatten_deeper(records).each do |record|
             record = create_tag(record)
+            next if self.include?(record)
             callback(:before_add, record)
             result &&= insert_record(record) unless @owner.new_record?
             @target << record
@@ -152,7 +159,13 @@ module ActiveRecord #:nodoc:
           records[index] = create_tag(records[index])
         end
         records.reject! do |record|
-          @target.delete(record) if record.new_record?
+          if record.nil?
+            true
+          elsif record.new_record?
+            @target.delete(record)
+          else
+            false
+          end
         end
         return if records.empty?
 
@@ -168,6 +181,7 @@ module ActiveRecord #:nodoc:
 
     protected
       def create_tag(raw_tag)
+        return nil if raw_tag.nil?
         if raw_tag.kind_of? @tag_class
           return raw_tag
         end
@@ -180,6 +194,15 @@ module ActiveRecord #:nodoc:
         return tag_object
       end
 
+      def get_tag(raw_tag)
+        return nil if raw_tag.nil?
+        if raw_tag.kind_of? @tag_class
+          return raw_tag
+        end
+        tag_object = @tag_class.find_by_name(raw_tag.to_s)
+        return tag_object
+      end
+
       def find_target(sql = @finder_sql)
         records = @tag_class.find_by_sql(sql)
         uniq(records)
@@ -235,18 +258,31 @@ module ActiveRecord #:nodoc:
       end
 
       def construct_sql
-        @finder_sql = 
-          "SELECT t.*, j.* FROM #{@join_table} j, " +
-          "  #{@tag_class.table_name} t " +
-          "WHERE t.#{@tag_class.primary_key} = " +
-          "  j.#{@tag_foreign_key} " +
-          "AND j.#{@item_foreign_key} = " +
-          "  #{@owner.quoted_id} " +
-          "ORDER BY t.name"
+        if @user_id.nil?
+          @finder_sql = 
+            "SELECT t.*, j.* FROM #{@join_table} j, " +
+            "  #{@tag_class.table_name} t " +
+            "WHERE t.#{@tag_class.primary_key} = " +
+            "  j.#{@tag_foreign_key} " +
+            "AND j.#{@item_foreign_key} = " +
+            "  #{@owner.quoted_id} " +
+            "ORDER BY t.name"
+        else
+          @finder_sql = 
+            "SELECT t.*, j.* FROM #{@join_table} j, " +
+            "  #{@tag_class.table_name} t " +
+            "WHERE t.#{@tag_class.primary_key} = " +
+            "  j.#{@tag_foreign_key} " +
+            "AND j.#{@item_foreign_key} = " +
+            "  #{@owner.quoted_id} " +
+            "AND j.#{@user_foreign_key} = " +
+            "  '#{@user_id}' " +
+            "ORDER BY t.name"
+        end
       end
     end
 
-    class UserTagsAssociation < AssociationCollection #:nodoc:
+    class UserTagsAssociation < GlobalTagsAssociation #:nodoc:
       def initialize(owner, user_id, tag_class, user_class, item_class,
           options)
         @owner = owner
@@ -358,16 +394,13 @@ module ActiveRecord #:nodoc:
 
       alias :concat_with_attributes :push_with_attributes
 
-      def size
-        count_records
-      end
-
       def <<(*records)
         result = true
         load_target
         @owner.transaction do
           flatten_deeper(records).each do |record|
             record = create_tag(record)
+            next if self.include?(record)
             callback(:before_add, record)
             result &&= insert_record(record) unless @owner.new_record?
             @target << record
@@ -382,50 +415,7 @@ module ActiveRecord #:nodoc:
       alias_method :push, :<<
       alias_method :concat, :<<
       
-      # Remove +records+ from this association.  Does not destroy +records+.
-      def delete(*records)
-        records = flatten_deeper(records)
-        for index in 0..records.size
-          records[index] = create_tag(records[index])
-        end
-        records.reject! do |record|
-          @target.delete(record) if record.new_record?
-        end
-        return if records.empty?
-
-        @owner.transaction do
-          records.each { |record| callback(:before_remove, record) }
-          delete_records(records)
-          records.each do |record|
-            @target.delete(record)
-            callback(:after_remove, record)
-          end
-        end
-      end
-      
     protected
-      def create_tag(raw_tag)
-        if raw_tag.kind_of? @tag_class
-          return raw_tag
-        end
-        tag_object = @tag_class.find_by_name(raw_tag.to_s)
-        if tag_object.nil?
-          tag_object = @tag_class.new
-          tag_object.name = raw_tag.to_s
-          tag_object.save
-        end
-        return tag_object
-      end
-      
-      def find_target(sql = @finder_sql)
-        records = @tag_class.find_by_sql(sql)
-        uniq(records)
-      end
-
-      def count_records
-        load_target.size
-      end
-      
       def insert_record(record, join_attributes = {})
         if @user_id.nil?
           raise "Cannot insert record if the user id is not set."
@@ -476,34 +466,10 @@ module ActiveRecord #:nodoc:
         sql = "DELETE FROM #{@join_table} " +
           "WHERE #{@item_foreign_key} = " +
           "  #{@owner.quoted_id} " +
-          "AND #{@user_foreign_key} = '#{@user_id.to_s}'"
+          "AND #{@user_foreign_key} = '#{@user_id.to_s}'" +
           "AND #{@tag_foreign_key} IN (#{ids})"
         @owner.connection.execute(sql)
       end
-
-      def construct_sql
-        if @user_id.nil?
-          @finder_sql = 
-            "SELECT t.*, j.* FROM #{@join_table} j, " +
-            "  #{@tag_class.table_name} t " +
-            "WHERE t.#{@tag_class.primary_key} = " +
-            "  j.#{@tag_foreign_key} " +
-            "AND j.#{@item_foreign_key} = " +
-            "  #{@owner.quoted_id} " +
-            "ORDER BY t.name"
-        else
-          @finder_sql = 
-            "SELECT t.*, j.* FROM #{@join_table} j, " +
-            "  #{@tag_class.table_name} t " +
-            "WHERE t.#{@tag_class.primary_key} = " +
-            "  j.#{@tag_foreign_key} " +
-            "AND j.#{@item_foreign_key} = " +
-            "  #{@owner.quoted_id} " +
-            "AND j.#{@user_foreign_key} = " +
-            "  '#{@user_id}' " +
-            "ORDER BY t.name"
-        end
-      end
     end
   end
   

data/rakefile

@@ -7,7 +7,7 @@ require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
 PKG_NAME      = 'tagtools'
-PKG_VERSION   = '0.0.1'
+PKG_VERSION   = '0.0.2'
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"

data/test/global_tags_test.rb

@@ -100,4 +100,46 @@ class GlobalTagsTest < Test::Unit::TestCase
     assert_equal(ruby_on_rails, results.first)
     assert(!results.include?(red_handed))
   end
+  
+  def test_include
+    ruby_on_rails = Image.new
+    ruby_on_rails.url = "http://www.rubyonrails.com/logo.gif"
+    ruby_on_rails.save
+    ruby_on_rails.tags << "ruby"
+    ruby_on_rails.tags << "rails"
+    ruby_on_rails.tags << "framework"
+    assert_equal(true,
+      ruby_on_rails.tags(true).include?("rails"))
+    assert_equal(false,
+      ruby_on_rails.tags(true).include?("notpresent"))
+    assert_equal(true,
+      ruby_on_rails.tags(true).include?(
+        Tag.find_by_name("framework")))
+    assert_equal(false,
+      ruby_on_rails.tags(true).include?(
+        Tag.find_by_name("alsonotpresent")))
+  end
+  
+  def test_size
+    ruby_on_rails = Image.new
+    ruby_on_rails.url = "http://www.rubyonrails.com/logo.gif"
+    ruby_on_rails.save
+    ruby_on_rails.tags << "ruby"
+    ruby_on_rails.tags << "rails"
+    ruby_on_rails.tags << "framework"
+    assert_equal(3,
+      ruby_on_rails.tags(true).size)
+    ruby_on_rails.tags(true) << "rails"
+    assert_equal(3,
+      ruby_on_rails.tags(true).size)
+    ruby_on_rails.tags << "web"
+    assert_equal(4,
+      ruby_on_rails.tags(true).size)
+    ruby_on_rails.tags.delete("framework")
+    assert_equal(3,
+      ruby_on_rails.tags.size)
+    ruby_on_rails.tags.delete("ruby")
+    assert_equal(2,
+      ruby_on_rails.tags(true).size)
+  end
 end

data/test/user_tags_test.rb

@@ -113,4 +113,52 @@ class UserTagsTest < Test::Unit::TestCase
     assert_equal(ruby_on_rails, results.first)
     assert(!results.include?(red_handed))
   end
+  
+  def test_include
+    some_guy = User.new
+    some_guy.name = "Joe Normal"
+    some_guy.save
+    ruby_on_rails = Bookmark.new
+    ruby_on_rails.url = "http://www.rubyonrails.com"
+    ruby_on_rails.save
+    ruby_on_rails.user_tags(some_guy.id) << "ruby"
+    ruby_on_rails.user_tags(some_guy.id) << "rails"
+    ruby_on_rails.user_tags(some_guy.id) << "framework"
+    assert_equal(true,
+      ruby_on_rails.user_tags(some_guy.id, true).include?("rails"))
+    assert_equal(false,
+      ruby_on_rails.user_tags(some_guy.id, true).include?("notpresent"))
+    assert_equal(true,
+      ruby_on_rails.user_tags(some_guy.id, true).include?(
+        Tag.find_by_name("framework")))
+    assert_equal(false,
+      ruby_on_rails.user_tags(some_guy.id, true).include?(
+        Tag.find_by_name("alsonotpresent")))
+  end
+  
+  def test_size
+    some_guy = User.new
+    some_guy.name = "Joe Normal"
+    some_guy.save
+    ruby_on_rails = Bookmark.new
+    ruby_on_rails.url = "http://www.rubyonrails.com"
+    ruby_on_rails.save
+    ruby_on_rails.user_tags(some_guy.id) << "ruby"
+    ruby_on_rails.user_tags(some_guy.id) << "rails"
+    ruby_on_rails.user_tags(some_guy.id) << "framework"
+    assert_equal(3,
+      ruby_on_rails.user_tags(some_guy.id, true).size)
+    ruby_on_rails.user_tags(some_guy.id, true) << "rails"
+    assert_equal(3,
+      ruby_on_rails.user_tags(some_guy.id, true).size)
+    ruby_on_rails.user_tags(some_guy.id) << "web"
+    assert_equal(4,
+      ruby_on_rails.user_tags(some_guy.id, true).size)
+    ruby_on_rails.user_tags(some_guy.id).delete("framework")
+    assert_equal(3,
+      ruby_on_rails.user_tags(some_guy.id).size)
+    ruby_on_rails.user_tags(some_guy.id).delete("ruby")
+    assert_equal(2,
+      ruby_on_rails.user_tags(some_guy.id, true).size)
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: tagtools
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2005-08-28 00:00:00 -04:00
+  version: 0.0.2
+date: 2005-09-09 00:00:00 -04:00
 summary: Folksonomy system for Rails.
 require_paths: 
   - lib