culturecode-acts_as_taggable 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10a06d3f044e44dff881a3e5c813aa5f0340aca850e4e2a8e9ab0bada47a3bb9
-  data.tar.gz: 41edad26dc5435161722c087e6e7fe54562fac49facf132d88b7733a171de0e6
+  metadata.gz: e5542053f236dded1fb60a50f75013139f44adda70305773ccdbef7079f4dff5
+  data.tar.gz: 32650c5441140e92be4b2a81bca37a63996b753fce5d26b2195169f7822f8512
 SHA512:
-  metadata.gz: 3d56e39b3deb691d67f3c4abb7fbf70dac0f7f7a856ac3eef09ae7965390d14425ef358d59ee2059cd17d93cecda979f3f3c8819f9720afc8264e90b6e271a64
-  data.tar.gz: 6d1ea09a57b7c9aa70fca6f4a65ed0db03579037f9c20618f7010efb2319d185601ace6790486940f52ce3e68bdade1ad76c632cb884e149de2f6dd04a24b998
+  metadata.gz: fced802f4a5b4a6a172fdd9999a3f037022711b7dc5a488d92c0c1212cc300d55dab940233b40b7ac1869164e12e91a84ed6cd9bd8a82f68031d1552c345520c
+  data.tar.gz: 3d7351ede1fbc029e162e9ae3f8bdcaa3127d794971efa5cbc145b6459c7182bbf24e9125b9c4efe47cd47582b79a31d142924024030c5d02da3e6639517f726

data/Rakefile

@@ -14,21 +14,14 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
-
-
-
-
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
+begin
+  require 'rspec/core/rake_task'
 
+  RSpec::Core::RakeTask.new(:spec)
 
-task default: :test
+  task :default => :spec
+rescue LoadError
+  # no rspec available
+end

data/lib/acts_as_taggable/acts_as_taggable.rb

@@ -14,7 +14,7 @@ module ActsAsTaggable
       include InstanceMethods
 
       self.acts_as_taggable_options[:types].each do |tag_type|
-        has_many :"#{tag_type}_taggings", -> { joins(:tag).order("#{Tagging.table_name}.id").where(Tag.table_name => {:tag_type => tag_type}) }, :as => :taggable, :after_remove => :delete_tag_if_necessary, :class_name => 'ActsAsTaggable::Tagging'
+        has_many :"#{tag_type}_taggings", -> { joins(:tag).order("#{Tagging.table_name}.id").where(Tag.table_name => {:tag_type => tag_type}) }, :as => :taggable, :after_add => :reset_associations, :after_remove => :delete_tag_if_necessary, :class_name => 'ActsAsTaggable::Tagging'
         has_many :"#{tag_type}_tags", -> { where(:tag_type => tag_type) }, :through => :taggings, :source => :tag, :class_name => 'ActsAsTaggable::Tag', :after_add => :reset_associations
 
         metaclass = class << self; self; end
@@ -31,7 +31,7 @@ module ActsAsTaggable
       return none if tags.empty?
 
       table_alias = "alias_#{tags.hash.abs}"
-      scope = all.uniq.select "#{table_name}.*"
+      scope = all.distinct.select "#{table_name}.*"
       scope = scope.joins "JOIN #{Tagging.table_name} AS #{table_alias} ON #{table_alias}.taggable_id = #{table_name}.id"
       scope = scope.where "#{table_alias}.tag_id" => tags
 
@@ -42,7 +42,7 @@ module ActsAsTaggable
       tags = find_tags(tags)
       return none if tags.empty?
 
-      tags.inject(all.uniq) do |scope, tag|
+      tags.inject(all.distinct) do |scope, tag|
         scope = scope.joins "LEFT OUTER JOIN #{Tagging.table_name} AS alias_#{tag.id} ON alias_#{tag.id}.taggable_id = #{table_name}.id"
         scope = scope.where "alias_#{tag.id}.tag_id" => tag
       end
@@ -78,14 +78,21 @@ module ActsAsTaggable
         HelperMethods.filter_tags_by_current_tag_scope([input])
       when String
         tags.where(:name => input.split(acts_as_taggable_options[:delimiter]).collect {|tag_name| tag_name.strip}).to_a
+        tags.where(:name => input.split(acts_as_taggable_options[:delimiter]).collect {|tag_name| sanitize_tag_name(tag_name) }).to_a
       when Array
         input.flat_map {|tag| find_tags(tag)}.select(&:present?).uniq
       when ActiveRecord::Relation
-        input.uniq.to_a
+        input.distinct.to_a
       else
         []
       end
     end
+
+    def sanitize_tag_name(tag_name)
+      sanitized_tag_name = tag_name.to_s.squish
+      sanitized_tag_name.downcase! if acts_as_taggable_options[:downcase]
+      sanitized_tag_name
+    end
   end
 
   module InstanceMethods
@@ -114,25 +121,31 @@ module ActsAsTaggable
     end
 
     def tag_names=(names)
-      send HelperMethods.scoped_association_assignment_name, names.select(&:present?).collect {|tag_name| self.class.create_tag(tag_name) }
+      tag_objects = names.select(&:present?).collect {|tag_name| self.class.create_tag(tag_name) }.uniq
+      send HelperMethods.scoped_association_assignment_name, tag_objects
     end
 
     private
 
     def delete_tag_if_necessary(tagging)
+      if tagging.tag.tag_type
+        reset_associations(tagging.tag)
+      else
+        reset_scoped_associations(tagging.tag)
+      end
       self.class.tags.where(:id => tagging.tag_id).destroy_all if acts_as_taggable_options[:remove_tag_if_empty] && tagging.tag.taggings.count == 0
     end
 
-    def reset_scoped_associations(record)
-      return unless record.tag_type
-      send("#{record.tag_type}_taggings").reset
-      send("#{record.tag_type}_tags").reset
-    end
-
-    def reset_associations(record)
+    def reset_associations(_)
       send(:taggings).reset
       send(:tags).reset
     end
+
+    def reset_scoped_associations(tag)
+      return unless tag.tag_type
+      send("#{tag.tag_type}_taggings").reset
+      send("#{tag.tag_type}_tags").reset
+    end
   end
 
   module HelperMethods

data/lib/acts_as_taggable/tag.rb

@@ -24,9 +24,7 @@ module ActsAsTaggable
     private
 
     def sanitize_name
-      name = self.name.to_s.squish
-      name.downcase! if taggable_class.acts_as_taggable_options[:downcase]
-      self.name = name
+      self.name = taggable_class.sanitize_tag_name(name)
     end
   end
 end

data/lib/acts_as_taggable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTaggable
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/lib/generators/schema.rb

@@ -1,4 +1,4 @@
-class ActsAsTaggableTable < ActiveRecord::Migration
+class ActsAsTaggableTable < ActiveRecord::Migration[4.2]
   def change
     create_table :acts_as_taggable_tags do |t|
       t.string :name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: culturecode-acts_as_taggable
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -9,36 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2024-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -87,8 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.3.23
 signing_key: 
 specification_version: 4
 summary: Simple record tagging