needle_in_a_haystack 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcc57ef8ef5c022fd98794c87852be14133a293b05b765f5b1152384dbf4b944
-  data.tar.gz: 67a37aa74001245538ba6e467e28bd3a1a23117a1452dcd1af8b5c68e6ef8ad0
+  metadata.gz: af267c9afbbd079edbdcb7ac293721697491a7e47dac4d19963ad9af83fbd60d
+  data.tar.gz: e100eff5dfe19e038ffb8c6e8086b96eb1a034f87d3de1b66861ac91a05493b6
 SHA512:
-  metadata.gz: bd9bfdf36861ad29009088e358833bca69a1612e078229d8cd4205a57386459bfaff8325cb967e474e7cc83b3df70b62586a8a9768ab8fb12c7ad3bb8176b40b
-  data.tar.gz: b752e74b8f878ed842691f85cb4bd6e89cfe116e880769447a92ab3107daf2be6f979acd349d1e72cff9352d7e5177dd3005a513deabbec31ccdd6ca32b9c183
+  metadata.gz: d2870fbe87246fe0e39b6818fcd2ebffb5767af2a39a1d0b3636c2f93b8fc069ebdda4a4b0c7f15ae4af878fa5507571db6d29f367213510857a8f64d0d5f214
+  data.tar.gz: 6e49496b73f7d4bee5ee41e1bcc34e8e322eae66ac5af71419516c8532e7b79a2066827679dcce59680d3627cd9af4c2c968501cd9c14d07a299adb628fe72fa

data/lib/needle_in_a_haystack/concerns/base_factory.rb

@@ -0,0 +1,13 @@
+class BaseFactory
+  def create_tag(name, description)
+    raise NotImplementedError, "Subclasses must implement a create_tag-method"
+  end
+
+  def create_tagging(tag, taggable)
+    raise NotImplementedError, "Subclasses must implement a create_tagging-method"
+  end
+
+  def find_or_create_tag(name, attributes = {})
+    raise NotImplementedError, "Subclasses must implement a find_or_create_tag-method"
+  end
+end

data/lib/needle_in_a_haystack/concerns/base_tag.rb

@@ -0,0 +1,31 @@
+class BaseTag < ApplicationRecord
+  self.abstract_class = true
+
+  def full_path
+    raise NotImplementedError, "Subclasses must implement a full_path-method"
+  end
+
+  def prevent_circular_reference
+    raise NotImplementedError, "Subclasses must implement a prevent_circular_reference-method"
+  end
+
+  def ancestors
+    raise NotImplementedError, "Subclasses must implement an ancestors-method"
+  end
+
+  def descendants
+    raise NotImplementedError, "Subclasses must implement a descendants-method"
+  end
+
+  def siblings
+    raise NotImplementedError, "Subclasses must implement a siblings-method"
+  end
+
+  def root?
+    raise NotImplementedError, "Subclasses must implement a root?-method"
+  end
+
+  def leaf?
+    raise NotImplementedError, "Subclasses must implement a leaf?-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_ontology.rb → models/haystack_ontology.rb}

@@ -48,19 +48,25 @@ class HaystackOntology < ApplicationRecord
       tag = HaystackTag.find_or_create_by(name: name.to_s)
       tag.update(description: data["description"], parent_tag_id: parent_tag&.id, haystack_marker: data["marker"])
 
-      Rails.logger.info("Created tag: #{tag.name}, Parent: #{parent_tag&.name}")
+      Rails.logger.info("Created tag: #{tag.name}, Parent: #{parent_tag&.name}, Parent ID: #{parent_tag&.id}")
 
-      create_tag_hierarchy(data["children"], tag) if data["children"]
+      if data["children"]
+        Rails.logger.info("Processing children for tag: #{tag.name}")
+        create_tag_hierarchy(data["children"], tag)
+      end
     end
   end
 
   def self.find_or_create_tag(name)
+    factory = HaystackFactory.new
     tag_data = find_tag(name)
     return nil if tag_data.nil?
 
-    tag = HaystackTag.find_or_create_by(name: name)
-    tag.update(description: tag_data["description"], haystack_marker: tag_data["marker"])
-    Rails.logger.info("Tag aangemaakt of gevonden: #{tag.name}")
-    tag
+    attributes = { description: tag_data["description"], haystack_marker: tag_data["marker"] }
+    factory.find_or_create_tag(name, attributes)
+  end
+
+  def self.import_full_ontology
+    create_tags
   end
 end

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

@@ -1,10 +1,10 @@
-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
 
@@ -18,23 +18,26 @@ class HaystackTag < ApplicationRecord
     ancestors
   end
 
+  def full_path
+    ancestors.reverse.map(&:name).join(" > ") + " > " + name
+  end
+
   def self.find_by_path(path)
     keys = path.split(".")
     current = nil
     keys.each do |key|
-      current = current ? current.child_tags.find_by(name: key) : find_by(name: key)
+      current = current ? current.children.find_by(name: key) : find_by(name: key)
       return nil unless current
     end
     current
   end
 
   def descendants
-    children = child_tags
     children + children.flat_map(&:descendants)
   end
 
   def siblings
-    parent_tag ? parent_tag.child_tags.where.not(id: id) : self.class.where(parent_tag_id: nil).where.not(id: id)
+    parent_tag ? parent_tag.children.where.not(id: id) : self.class.where(parent_tag_id: nil).where.not(id: id)
   end
 
   def root?
@@ -42,7 +45,7 @@ class HaystackTag < ApplicationRecord
   end
 
   def leaf?
-    child_tags.empty?
+    children.empty?
   end
 
   def depth
@@ -52,6 +55,6 @@ class HaystackTag < ApplicationRecord
   def prevent_circular_reference
     return unless parent_tag == self || ancestors.include?(self)
 
-    errors.add(:parent_tag, "kan geen circulaire referentie bevatten")
+    errors.add(:parent_tag, "cannot contain a circular reference")
   end
 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/services/haystack_factory.rb

@@ -0,0 +1,15 @@
+class HaystackFactory < BaseFactory
+  def create_tag(name, description)
+    HaystackTag.create(name: name, description: description)
+  end
+
+  def create_tagging(tag, taggable)
+    HaystackTagging.create(haystack_tag: tag, taggable: taggable)
+  end
+
+  def find_or_create_tag(name, attributes = {})
+  tag = HaystackTag.find_or_create_by(name: name)
+  tag.update(attributes)
+  tag
+  end
+end

data/lib/needle_in_a_haystack/version.rb

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

data/lib/needle_in_a_haystack.rb

@@ -2,8 +2,14 @@ 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/concerns/base_factory"
+
+require "needle_in_a_haystack/models/haystack_ontology"
+require "needle_in_a_haystack/models/haystack_tag"
+require "needle_in_a_haystack/models/haystack_tagging"
+require "needle_in_a_haystack/services/haystack_factory"
 
 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.4
 platform: ruby
 authors:
 - Frans Verberne
@@ -275,14 +275,18 @@ 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_factory.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/services/haystack_factory.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