semantically-taggable 0.1.14 → 0.2.0

data/lib/generators/semantically_taggable/migration/templates/active_record/migration.rb

@@ -7,6 +7,7 @@ class SemanticallyTaggableMigration < ActiveRecord::Migration
       t.string :description
       t.string :delimiter, :limit => 10, :default => ','
       t.boolean :polyhierarchical, :default => false
+      t.boolean :restrict_to_known_tags, :default => false
     end
 
     add_index :schemes, :name, :unique => true

data/lib/semantically_taggable/tag.rb

@@ -68,21 +68,24 @@ module SemanticallyTaggable
 
       scheme = SemanticallyTaggable::Scheme.by_name(scheme_name)
       list = [list].flatten
-
       return [] if list.empty?
 
       existing_tags = scheme.tags.named_any(list).all
-      new_tag_names = list.reject do |name|
-        name = comparable_name(name)
-        existing_tags.any? { |tag| comparable_name(tag.name) == name }
+      if scheme.restrict_to_known_tags
+        created_tags = []
+      else
+        new_tag_names = list.reject do |name|
+          name = comparable_name(name)
+          existing_tags.any? { |tag| comparable_name(tag.name) == name }
+        end
+        created_tags = new_tag_names.map { |name| Tag.create(:name => name) { |tag| tag.scheme = scheme } }
       end
-      created_tags = new_tag_names.map { |name| Tag.create(:name => name) { |tag| tag.scheme = scheme } }
 
       existing_tags + created_tags
     end
 
     def ==(object)
-      super || (object.is_a?(Tag) && name == object.name)
+      super || (object.is_a?(Tag) && name == object.name && scheme == object.scheme)
     end
 
     def to_s

data/spec/database_seeder.rb

@@ -4,7 +4,8 @@ def load_schemes!
       [
           {
               :name => 'dg_topics', :meta_name => 'DC.subject', :meta_scheme => 'Directgov.Topic',
-              :description => 'Directgov taxonomy concept ID taggings', :delimiter => ';', :polyhierarchical => true
+              :description => 'Directgov taxonomy concept ID taggings', :delimiter => ';', :polyhierarchical => true,
+              :restrict_to_known_tags => true
           },
           {
               :name => 'keywords', :meta_name => 'keywords',