make_taggable 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7988c41c462a75321cf31cb13888a01d87a4dec964b13d2bb8c94876d7291d2a
-  data.tar.gz: 76c39347c15e44dd9bad00317aa4e27f4ef58aadd638507340a74fe6bd5bbbd3
+  metadata.gz: 99cb64f83f0cef74cc21f3fc09a341e62db5a2248b8c88ef5d720de4b9446abb
+  data.tar.gz: c3c08be5a20df6100567523555be2394dc32665770f6c65226e0fe91b3be5652
 SHA512:
-  metadata.gz: 89496e3b067d1c4707580b30b4ad1a1be0701e8aa03f1e7de30d2c229b4eec96afd82eec4675e89c32cf5e8f0b3ccf28d7afb0ffcf4a7ada5b9ef2169232dcc2
-  data.tar.gz: bbeef557e819249bc1d13668ec6437401dfcfbe3d995874535c86d5b86747ff46d5e0bb3383905343057c2f773c0658766eed9580f6173789e288571a516f0bb
+  metadata.gz: ad8701479ff9565786acebff64af05fe5aaa88eddbcfc660f88778e4ca885a0d26438677754cfa3072dd54e3eef6374ebed4f1e4de6a70fe911824050cb0b19e
+  data.tar.gz: 47804d66800ff4df491f3b7037ba5e82c131fbaf4c9eb8442a650ed6ecbf1772483d2ae2237c5437cb8ffefca831d107744a3ffacb2c517cb65a161063bc6d0e

data/CHANGELOG.md

@@ -5,6 +5,33 @@ All notable changes to this project are documented here.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project
 adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.2.1] - 2026-08-23
+
+### Fixed
+
+- `tagged_with(..., exclude: true)` raised on any model whose primary key is not `id`. The exclude
+  strategy built its `NOT IN` predicate against a hardcoded `id` column, where the other two
+  strategies already used the model's primary key.
+
+- `tagged_with(..., on: <context>, exclude: true)` ignored the context entirely, gathering taggings
+  from every context, so a record tagged in one context was excluded from a query about another.
+
+- `tagged_with([], exclude: true)` returned nothing rather than everything. Excluding no tags rules
+  nothing out, so the whole scope now stands. This restores the property that `tagged_with(list)`
+  and `tagged_with(list, exclude: true)` partition the scope between them for any list.
+
+- A tag context whose name cannot become a Ruby method name -- one starting with a digit, say --
+  raised `SyntaxError` while the model was loading, from inside Active Record's association
+  builder. Since `SyntaxError` is not a `StandardError` it slipped past application rescues.
+  Contexts are now checked as they are declared and rejected with an `ArgumentError` naming the
+  context. Non-ASCII context names keep working.
+
+### Internal
+
+- The suite's schema teardown no longer depends on the order `connection.tables` returns. MySQL
+  ignores `DROP TABLE ... CASCADE` for foreign keys, so it only worked because `taggings` happens
+  to sort before `tags`.
+
 ## [1.2.0] - 2026-08-23
 
 ### Fixed

data/docs/contexts.md

@@ -40,6 +40,23 @@ user.skill_list_change            # => [["jogging"], ["diving"]]
 user.will_save_change_to_skill_list?
 ```
 
+### Naming a context
+
+Because the context becomes part of every name in the table above, it has to be usable as a Ruby
+method and instance variable name. A context starting with a digit, or containing a hyphen or a
+space, is rejected when the model declares it:
+
+```ruby
+class Book < ActiveRecord::Base
+  make_taggable :"1categories"
+end
+# => ArgumentError: :"1categories" cannot be used as a tag context: make_taggable generates
+#    methods and instance variables from it, and "1categories_list" is not a valid Ruby name.
+```
+
+Validity is decided by asking Ruby, not by a pattern, so anything that makes a legal method name is
+allowed — non-ASCII context names included.
+
 ## Adding contexts later
 
 Calling `make_taggable` again adds contexts rather than replacing them, which is what lets a

data/docs/querying.md

@@ -28,12 +28,20 @@ empty relation rather than every record — worth knowing when the tags come fro
 | `:exclude` | Match records carrying none of the tags |
 | `:match_all` | Match records carrying only these tags and no others |
 | `:wild` | Match tags *containing* the given text, i.e. `%sci%` |
-| `:on` | Restrict to one context |
+| `:on` | Restrict to one context. Honoured by every option, `:exclude` included |
 | `:owned_by` | Restrict to tags applied by one tagger |
 | `:order_by_matching_tag_count` | With `:any`, order by how many tags matched, most first |
 | `:start_at` | Only tags applied after this time |
 | `:end_at` | Only tags applied before this time |
 
+An empty tag list means "nothing matches" for the matching options and "nothing is ruled out" for
+`:exclude`, so the two always partition the scope between them:
+
+```ruby
+Book.tagged_with([])                  # => none
+Book.tagged_with([], exclude: true)   # => every book
+```
+
 `:wild` combines with `:any` or `:exclude`:
 
 ```ruby

data/lib/make_taggable/taggable/core.rb

@@ -129,7 +129,8 @@ module MakeTaggable::Taggable
       # @option options [Symbol, String] :on only tags applied in this context
       # @option options [Time, Date] :start_at only tags applied after this time
       # @option options [Time, Date] :end_at only tags applied before this time
-      # @return [ActiveRecord::Relation] empty when no tags are given
+      # @return [ActiveRecord::Relation] empty when no tags are given, except under `:exclude`,
+      #   where excluding no tags leaves the whole scope standing
       #
       # @example Every tag
       #   User.tagged_with(["awesome", "cool"])
@@ -144,7 +145,9 @@ module MakeTaggable::Taggable
         tag_list = MakeTaggable.default_parser.new(tags).parse
         options = options.dup
 
-        return none if tag_list.empty?
+        # Asking for no tags matches nothing, but *excluding* no tags rules
+        # nothing out, so the whole scope stands.
+        return options[:exclude].present? ? all : none if tag_list.empty?
 
         ::MakeTaggable::Taggable::TaggedWithQuery.build(self, MakeTaggable::Tag, MakeTaggable::Tagging, tag_list, options)
       end

data/lib/make_taggable/taggable/tagged_with_query/exclude_tags_query.rb

@@ -20,15 +20,21 @@ module MakeTaggable::Taggable::TaggedWithQuery
     private
 
     def tags_not_in_list
-      taggable_arel_table[:id].not_in(
+      on_condition = tagging_arel_table[:tag_id].eq(tag_arel_table[:id])
+        .and(tagging_arel_table[:taggable_type].eq(taggable_model.base_class.name))
+        .and(tags_match_type)
+
+      # Without this the subquery gathers taggings from every context, so a
+      # record tagged in one context is excluded from a query about another.
+      if options[:on].present?
+        on_condition = on_condition.and(tagging_arel_table[:context].eq(options[:on]))
+      end
+
+      taggable_arel_table[taggable_model.primary_key].not_in(
         tagging_arel_table
           .project(tagging_arel_table[:taggable_id])
           .join(tag_arel_table)
-          .on(
-            tagging_arel_table[:tag_id].eq(tag_arel_table[:id])
-            .and(tagging_arel_table[:taggable_type].eq(taggable_model.base_class.name))
-            .and(tags_match_type)
-          )
+          .on(on_condition)
       )
 
       # FIXME: missing time scope, this is also missing in the original implementation

data/lib/make_taggable/taggable.rb

@@ -69,6 +69,7 @@ module MakeTaggable
     #
     def taggable_on(preserve_tag_order, *tag_types)
       tag_types = tag_types.to_a.flatten.compact.map(&:to_sym)
+      tag_types.each { |tag_type| validate_tag_context!(tag_type) }
 
       if taggable?
         self.tag_types = (self.tag_types + tag_types).uniq
@@ -97,5 +98,31 @@ module MakeTaggable
       include Ownership
       include Related
     end
+
+    # Rejects a context that cannot become the methods and instance variables the
+    # library generates from it.
+    #
+    # A context is interpolated straight into generated source -- `#{context}_list`,
+    # `#{context}_taggings`, `@#{context}_list`. A name that is not a valid identifier
+    # produces source Ruby cannot parse, and the resulting SyntaxError descends from
+    # ScriptError rather than StandardError, so it slips past an application's own
+    # rescue and takes the boot down pointing at Active Record's association builder
+    # rather than at the offending declaration.
+    #
+    # Validity is decided by asking Ruby rather than by pattern, so a context is
+    # accepted on exactly the terms the generated code needs -- non-ASCII names
+    # included, since those make perfectly good method names.
+    #
+    # @param tag_type [Symbol] the context being declared
+    # @return [void]
+    # @raise [ArgumentError] when the context cannot become an identifier
+    def validate_tag_context!(tag_type)
+      Object.new.instance_variable_defined?(:"@#{tag_type}_list")
+    rescue NameError
+      raise ArgumentError,
+        "#{tag_type.inspect} cannot be used as a tag context: " \
+        "make_taggable generates methods and instance variables from it, and " \
+        "\"#{tag_type}_list\" is not a valid Ruby name."
+    end
   end
 end

data/lib/make_taggable/version.rb

@@ -6,5 +6,5 @@ module MakeTaggable
   #
   # @return [String]
   #
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: make_taggable
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Matthew Kennedy