needle_in_a_haystack 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e365c25451da6fb9d1ab929ece76bfea7e5753544818eb5e8650642ed5d10b6
-  data.tar.gz: d926c7e2ad775dc46d5c38a48b352dfd1ffd369196f3c3aab7aabe40c915d142
+  metadata.gz: 47f3b28b275f615fb0cbfabb20d76cf70ef0adbf63875c6a2aae2c0b19e27e39
+  data.tar.gz: 9807a09a01410b9f299a268c828880df1e5fbbcf9cf6c7c16769b29da1fbb366
 SHA512:
-  metadata.gz: 6cfd26955113913e7ef3f5f24435485f45d83dac53f54b92d10cc7199f6c48358c1aa8072cdd911bc4e700acbd184ccdab808a987775addd438654e88218c363
-  data.tar.gz: 20f66d4f920165380f95fd2f981207131034f96a14b86d6019e62f9c77cc83127669bae046ef02c599a7dd210c716d9a6510582d4f6157fb5b34317e0bd40796
+  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,25 +1,27 @@
-class HaystackTag < ApplicationRecord
-  belongs_to :parent_tag, class_name: "NeedleInAHaystack::HaystackTag", optional: true
-  has_many :children, class_name: "NeedleInAHaystack::HaystackTag", foreign_key: "parent_tag_id", dependent: :destroy, inverse_of: :parent_tag
+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
 
-  if NeedleInAHaystack.respond_to?(:configuration) && NeedleInAHaystack.configuration&.taggable_models
-    NeedleInAHaystack.configuration.taggable_models.each do |model|
-      has_many "taggable_#{model.name.underscore.pluralize}".to_sym, through: :haystack_taggings, source: :taggable, source_type: model.name
-    end
-  end
-
-  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_tag = self
-    while current_tag.parent_tag
-      ancestors << current_tag.parent_tag
-      current_tag = current_tag.parent_tag
+    current = self
+    while current.parent_tag
+      ancestors << current.parent_tag
+      current = current.parent_tag
     end
     ancestors
   end

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.1".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.1
+  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