needle_in_a_haystack 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af267c9afbbd079edbdcb7ac293721697491a7e47dac4d19963ad9af83fbd60d
-  data.tar.gz: e100eff5dfe19e038ffb8c6e8086b96eb1a034f87d3de1b66861ac91a05493b6
+  metadata.gz: d0d636da24994074ca2e0d360e34eb2cbb71b18fd5a7af9b5940357069c2c99c
+  data.tar.gz: 04c8d8ef066aede9ef052a1aa5a619959a3b40927d89699912e462a919ce91e5
 SHA512:
-  metadata.gz: d2870fbe87246fe0e39b6818fcd2ebffb5767af2a39a1d0b3636c2f93b8fc069ebdda4a4b0c7f15ae4af878fa5507571db6d29f367213510857a8f64d0d5f214
-  data.tar.gz: 6e49496b73f7d4bee5ee41e1bcc34e8e322eae66ac5af71419516c8532e7b79a2066827679dcce59680d3627cd9af4c2c968501cd9c14d07a299adb628fe72fa
+  metadata.gz: e46870a3a6ffa25cdd61dec219bbfcd520e27a991ad8e38ba63deb69082394226e50060dae345151cbc264590a9d88cf5337509d94694e942759fe9f96ec1a89
+  data.tar.gz: f6ec23b578c01343a147493622f9f4e32d16dee03f92359b9fba0815dda00b04f2084b8391a96d0cc673380f452603d8811120d4652a69c1c7ad5a6c6b6b53bf

data/lib/needle_in_a_haystack/factories/haystack_factory.rb

@@ -0,0 +1,38 @@
+class HaystackFactory < BaseFactory
+  attr_accessor :tag_strategy
+
+  def initialize(tag_strategy = DefaultTagStrategy.new)
+    super()
+    @tag_strategy = tag_strategy
+  end
+
+  def create_tag(name, description)
+    @tag_strategy.create_tag(name, 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_strategy.update_tag(tag, attributes)
+    tag
+  end
+
+  def create_tags(tag_hash, parent_tag = nil)
+    tag_hash.each do |name, data|
+      next if %w[description children].include?(name)
+
+      tag = find_or_create_tag(name, description: data["description"], haystack_marker: data["marker"])
+      tag.update(parent_tag_id: parent_tag&.id)
+
+      Rails.logger.info("Created tag: #{tag.name}, Parent: #{parent_tag&.name}, Parent ID: #{parent_tag&.id}")
+
+      if data["children"]
+        Rails.logger.info("Processing children for tag: #{tag.name}")
+        create_tags(data["children"], tag)
+      end
+    end
+  end
+end

data/lib/needle_in_a_haystack/models/haystack_ontology.rb

@@ -38,27 +38,12 @@ class HaystackOntology < ApplicationRecord
   end
 
   def self.create_tags
-    create_tag_hierarchy(tags)
-  end
-
-  def self.create_tag_hierarchy(tag_hash, parent_tag = nil)
-    tag_hash.each do |name, data|
-      next if %w[description children].include?(name)
-
-      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}, Parent ID: #{parent_tag&.id}")
-
-      if data["children"]
-        Rails.logger.info("Processing children for tag: #{tag.name}")
-        create_tag_hierarchy(data["children"], tag)
-      end
-    end
+    factory = HaystackFactory.new(OntologyTagStrategy.new)
+    factory.create_tags(tags)
   end
 
   def self.find_or_create_tag(name)
-    factory = HaystackFactory.new
+    factory = HaystackFactory.new(OntologyTagStrategy.new)
     tag_data = find_tag(name)
     return nil if tag_data.nil?
 

data/lib/needle_in_a_haystack/models/haystack_tag.rb

@@ -2,7 +2,7 @@ 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
+  has_many :taggables, through: :haystack_taggings, source: :taggable
 
   validates :name, presence: true, uniqueness: true
   validates :description, presence: true
@@ -12,6 +12,7 @@ class HaystackTag < BaseTag
     ancestors = []
     current = self
     while current.parent_tag
+      break if ancestors.include?(current.parent_tag) # Voorkom oneindige lus
       ancestors << current.parent_tag
       current = current.parent_tag
     end
@@ -25,7 +26,7 @@ class HaystackTag < BaseTag
   def self.find_by_path(path)
     keys = path.split(".")
     current = nil
-    keys.each do |key|
+      keys.each do |key|
       current = current ? current.children.find_by(name: key) : find_by(name: key)
       return nil unless current
     end
@@ -52,9 +53,11 @@ class HaystackTag < BaseTag
     ancestors.size
   end
 
-  def prevent_circular_reference
-    return unless parent_tag == self || ancestors.include?(self)
+  private
 
-    errors.add(:parent_tag, "cannot contain a circular reference")
+  def prevent_circular_reference
+    if parent_tag == self || ancestors.include?(self)
+      errors.add(:parent_tag, "kan geen circulaire referentie bevatten")
+    end
   end
 end

data/lib/needle_in_a_haystack/strategies/default_tag_strategy.rb

@@ -0,0 +1,9 @@
+class DefaultTagStrategy < TagStrategy
+  def create_tag(name, description)
+    HaystackTag.create(name: name, description: description)
+  end
+
+  def update_tag(tag, attributes)
+    tag.update(attributes)
+  end
+end

data/lib/needle_in_a_haystack/strategies/find_by_tag_strategy.rb

@@ -0,0 +1,11 @@
+class FindByTagsStrategy < QueryStrategy
+  def initialize(model, tags)
+    super()
+    @model = model
+    @tags = tags
+  end
+
+  def execute
+    @model.joins(:haystack_tags).where(haystack_tags: { id: @tags.map(&:id) })
+  end
+end

data/lib/needle_in_a_haystack/strategies/find_point_by_tag_strategy.rb

@@ -0,0 +1,11 @@
+class FindPointsWithTagStrategy < QueryStrategy
+  def initialize(model, tag)
+    super()
+    @model = model
+    @tag = tag
+  end
+
+  def execute
+    @model.joins(:haystack_tags).where(haystack_tags: { id: @tag.id })
+  end
+end

data/lib/needle_in_a_haystack/strategies/find_points_with_multiple_tags_strategy.rb

@@ -0,0 +1,14 @@
+class FindPointsWithMultipleTagsStrategy < QueryStrategy
+  def initialize(model, tags)
+    super()
+    @model = model
+    @tags = tags
+  end
+
+  def execute
+    @model.joins(:haystack_tags)
+          .where(haystack_tags: { id: @tags.map(&:id) })
+          .group("#{@model.table_name}.id")
+          .having("COUNT(haystack_tags.id) = ?", @tags.size)
+  end
+end

data/lib/needle_in_a_haystack/strategies/ontology_tag_strategy.rb

@@ -0,0 +1,11 @@
+class OntologyTagStrategy < TagStrategy
+  def create_tag(name, description)
+    HaystackTag.find_or_create_by(name: name).tap do |tag|
+      tag.update(description: description)
+    end
+  end
+
+  def update_tag(tag, attributes)
+    tag.update(attributes)
+  end
+end

data/lib/needle_in_a_haystack/strategies/query_context.rb

@@ -0,0 +1,9 @@
+class QueryContext
+  def initialize(strategy)
+    @strategy = strategy
+  end
+
+  def execute
+    @strategy.execute
+  end
+end

data/lib/needle_in_a_haystack/strategies/query_strategy.rb

@@ -0,0 +1,5 @@
+class QueryStrategy
+  def execute
+    raise NotImplementedError, "Subclasses must implement the execute method"
+  end
+end

data/lib/needle_in_a_haystack/strategies/tag_strategy.rb

@@ -0,0 +1,9 @@
+class TagStrategy
+  def create_tag(name, description)
+    raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
+  end
+
+  def update_tag(tag, attributes)
+    raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
+  end
+end

data/lib/needle_in_a_haystack/version.rb

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

data/lib/needle_in_a_haystack.rb

@@ -4,12 +4,20 @@ require "needle_in_a_haystack/application_record"
 require "needle_in_a_haystack/configuration"
 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/factories/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"
+require "needle_in_a_haystack/factories/haystack_factory"
+require "needle_in_a_haystack/strategies/query_context"
+require "needle_in_a_haystack/strategies/query_strategy"
+require "needle_in_a_haystack/strategies/find_by_tag_strategy"
+require "needle_in_a_haystack/strategies/find_point_by_tag_strategy"
+require "needle_in_a_haystack/strategies/find_points_with_multiple_tags_strategy"
+require "needle_in_a_haystack/strategies/tag_strategy"
+require "needle_in_a_haystack/strategies/default_tag_strategy"
+require "needle_in_a_haystack/strategies/ontology_tag_strategy"
 
 module NeedleInAHaystack
   class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: needle_in_a_haystack
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Frans Verberne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-28 00:00:00.000000000 Z
+date: 2024-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
@@ -277,16 +277,24 @@ files:
 - config/locales/en.yml
 - 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/factories/base_factory.rb
+- lib/needle_in_a_haystack/factories/haystack_factory.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/strategies/default_tag_strategy.rb
+- lib/needle_in_a_haystack/strategies/find_by_tag_strategy.rb
+- lib/needle_in_a_haystack/strategies/find_point_by_tag_strategy.rb
+- lib/needle_in_a_haystack/strategies/find_points_with_multiple_tags_strategy.rb
+- lib/needle_in_a_haystack/strategies/ontology_tag_strategy.rb
+- lib/needle_in_a_haystack/strategies/query_context.rb
+- lib/needle_in_a_haystack/strategies/query_strategy.rb
+- lib/needle_in_a_haystack/strategies/tag_strategy.rb
 - lib/needle_in_a_haystack/version.rb
 - lib/tasks/location_create.rake
 - spec/factories/haystack_tags.rb

data/lib/needle_in_a_haystack/services/haystack_factory.rb

@@ -1,15 +0,0 @@
-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