needle_in_a_haystack 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcc57ef8ef5c022fd98794c87852be14133a293b05b765f5b1152384dbf4b944
-  data.tar.gz: 67a37aa74001245538ba6e467e28bd3a1a23117a1452dcd1af8b5c68e6ef8ad0
+  metadata.gz: 47f3b28b275f615fb0cbfabb20d76cf70ef0adbf63875c6a2aae2c0b19e27e39
+  data.tar.gz: 9807a09a01410b9f299a268c828880df1e5fbbcf9cf6c7c16769b29da1fbb366
 SHA512:
-  metadata.gz: bd9bfdf36861ad29009088e358833bca69a1612e078229d8cd4205a57386459bfaff8325cb967e474e7cc83b3df70b62586a8a9768ab8fb12c7ad3bb8176b40b
-  data.tar.gz: b752e74b8f878ed842691f85cb4bd6e89cfe116e880769447a92ab3107daf2be6f979acd349d1e72cff9352d7e5177dd3005a513deabbec31ccdd6ca32b9c183
+  metadata.gz: a940a2d003014274c368e4daf453f1ab35711057eaec59a465d61ff3b319395806486fa95d3d19c7e4071f6c2e0e49cc6514079ce14b7921df722345ba9c651b
+  data.tar.gz: 29b755d8403392d44cb9561d2a119b1c5b61bb3ebbb269ea4b7f78c241280e396c34c52bb4a1d895e5474d9cf90bae4a74945214f31803724d4734b318a28239

data/lib/needle_in_a_haystack/concerns/base_tag.rb

@@ -0,0 +1,11 @@
+class BaseTag < ApplicationRecord
+  self.abstract_class = true
+
+  def name
+    raise NotImplementedError, "Subclasses must implement a name-method"
+  end
+
+  def description
+    raise NotImplementedError, "Subclasses must implement a description-method"
+  end
+end

data/lib/needle_in_a_haystack/concerns/base_tagging.rb

@@ -0,0 +1,11 @@
+class BaseTagging < ApplicationRecord
+  self.abstract_class = true
+
+  def tag
+    raise NotImplementedError, "Subclasses must implement a tag-method"
+  end
+
+  def taggable
+    raise NotImplementedError, "Subclasses must implement a taggable-method"
+  end
+end

data/lib/{concerns → needle_in_a_haystack/concerns}/taggable.rb

@@ -1,4 +1,3 @@
-# app/models/concerns/taggable.rb
 module Taggable
   extend ActiveSupport::Concern
 

data/lib/needle_in_a_haystack/{haystack_tag.rb → models/haystack_tag.rb}

@@ -1,13 +1,21 @@
-class HaystackTag < ApplicationRecord
+class HaystackTag < BaseTag
   belongs_to :parent_tag, class_name: "HaystackTag", optional: true
   has_many :children, class_name: "HaystackTag", foreign_key: "parent_tag_id", dependent: :destroy, inverse_of: :parent_tag
   has_many :haystack_taggings, dependent: :destroy
   has_many :taggables, through: :haystack_taggings
 
-  validates :name, presence: true
+  validates :name, presence: true, uniqueness: true
   validates :description, presence: true
   validate :prevent_circular_reference
 
+  def name
+    self[:name]
+  end
+
+  def description
+    self[:description]
+  end
+
   def ancestors
     ancestors = []
     current = self

data/lib/needle_in_a_haystack/models/haystack_tagging.rb

@@ -0,0 +1,4 @@
+class HaystackTagging < BaseTagging
+  belongs_to :haystack_tag, class_name: "HaystackTag"
+  belongs_to :taggable, polymorphic: true
+end

data/lib/needle_in_a_haystack/version.rb

@@ -1 +1 @@
-VERSION = "1.0.2".freeze
+VERSION = "1.0.3".freeze

data/lib/needle_in_a_haystack.rb

@@ -2,8 +2,12 @@ require "needle_in_a_haystack/version"
 require "needle_in_a_haystack/engine"
 require "needle_in_a_haystack/application_record"
 require "needle_in_a_haystack/configuration"
-require "needle_in_a_haystack/haystack_tag"
-require "needle_in_a_haystack/haystack_tagging"
+require "needle_in_a_haystack/concerns/base_tagging"
+require "needle_in_a_haystack/concerns/base_tag"
+
+require "needle_in_a_haystack/models/haystack_ontology"
+require "needle_in_a_haystack/models/haystack_tag"
+require "needle_in_a_haystack/models/haystack_tagging"
 
 module NeedleInAHaystack
   class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: needle_in_a_haystack
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Frans Verberne
@@ -275,14 +275,16 @@ files:
 - config/initializers/redis.rb
 - config/initializers/wrap_parameters.rb
 - config/locales/en.yml
-- lib/concerns/taggable.rb
 - lib/needle_in_a_haystack.rb
 - lib/needle_in_a_haystack/application_record.rb
+- lib/needle_in_a_haystack/concerns/base_tag.rb
+- lib/needle_in_a_haystack/concerns/base_tagging.rb
+- lib/needle_in_a_haystack/concerns/taggable.rb
 - lib/needle_in_a_haystack/configuration.rb
 - lib/needle_in_a_haystack/engine.rb
-- lib/needle_in_a_haystack/haystack_ontology.rb
-- lib/needle_in_a_haystack/haystack_tag.rb
-- lib/needle_in_a_haystack/haystack_tagging.rb
+- lib/needle_in_a_haystack/models/haystack_ontology.rb
+- lib/needle_in_a_haystack/models/haystack_tag.rb
+- lib/needle_in_a_haystack/models/haystack_tagging.rb
 - lib/needle_in_a_haystack/version.rb
 - lib/tasks/location_create.rake
 - spec/factories/haystack_tags.rb

data/lib/needle_in_a_haystack/haystack_tagging.rb

@@ -1,4 +0,0 @@
-class HaystackTagging < ApplicationRecord
-  belongs_to :haystack_tag
-  belongs_to :taggable, polymorphic: true
-end