locabulary 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c1e85110e906091033981d644e5a147c001eab2
-  data.tar.gz: 1cf448e30e0d19469afafee922ac3f3a5d01f025
+  metadata.gz: d6860e6b46a871aa5f6fa44d61e4a71549fe997d
+  data.tar.gz: 8e45a3991ac5fac5b35944094db338ac8d484c0a
 SHA512:
-  metadata.gz: 105285fc4f39faa1f49d78a5245a67fbb975c31656f62f430e831d256a0f6adb1810936695a068c015ce16674e5ffa503d8f3745624a97265515e94453201772
-  data.tar.gz: d0337a83c1248bb28b87494350e59770ddf9834480b4284a39bbb57289d9af24c3389fb831407a258b7d3709b72ce7e9e21ee6d633f0a2a2309c91ec49b306d3
+  metadata.gz: d0934da270aa054be0eae9d1dea2db1739d1fdabc79142f6845efe944b0b332816330b0ab74712c4c165f1526747d1f82d563e4e43d0734d0191ca6d0fea4cd8
+  data.tar.gz: 4e137b994cc4d406e2a5787ac565e20eeca0b2aa7325707c2bf7d536a5e4543fe353fbdc05f19fcd04eb20dd2575b108dbc8e52bfcb7ce1838448ac7777fc65e

data/README.md

@@ -14,3 +14,5 @@ robust options.
 ## Testing
 
 The full test suite is run via `bundle exec rake`.
+
+If you are interested in running each file in isolation - a good thing for unit tests - use `./bin/rspec_isolated`.

data/bin/rspec_isolated

@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# Run each spec in isolation
+# http://www.andywaite.com/2015/10/11/accidental-rails-coupling/
+find . -name "*_spec.rb" -print | xargs -n 1 bundle exec rspec

data/lib/locabulary/commands/active_hierarchical_roots_command.rb

@@ -1,6 +1,6 @@
 require 'set'
 require 'date'
-require 'locabulary/items'
+require 'locabulary/item'
 require 'locabulary/exceptions'
 
 module Locabulary

data/lib/locabulary/commands/active_items_for_command.rb

@@ -1,6 +1,5 @@
 require 'date'
-require 'json'
-require 'locabulary/items'
+require 'locabulary/item'
 require 'locabulary/utility'
 
 module Locabulary

data/lib/locabulary/commands/build_ordered_hierarchical_tree_command.rb

@@ -13,9 +13,10 @@ module Locabulary
       # @since 0.5.0
       #
       # @param options [Hash]
-      # @option predicate_name [String]
-      # @option faceted_items [Array<#hits, #value>]
-      # @option faceted_item_hierarchy_delimiter [String]
+      # @option options [String] :predicate_name
+      # @option options [Array<#hits, #value>] :faceted_items
+      # @option options [String] :faceted_item_hierarchy_delimiter
+      #                          For any given item in faceted_items how is the hierarchy encoded in the :value?
       #
       # @return [Array<FacetWrapperForItem>]
       def self.call(options = {})
@@ -26,7 +27,7 @@ module Locabulary
         @predicate_name = options.fetch(:predicate_name)
         @faceted_items = options.fetch(:faceted_items)
         @faceted_item_hierarchy_delimiter = options.fetch(:faceted_item_hierarchy_delimiter)
-        @builder = Item.builder_for(predicate_name: predicate_name)
+        @locabulary_item_class = Item.class_to_instantiate(predicate_name: predicate_name)
       end
 
       def call
@@ -45,7 +46,7 @@ module Locabulary
 
       private
 
-      attr_reader :builder, :predicate_name, :faceted_items, :faceted_item_hierarchy_delimiter
+      attr_reader :locabulary_item_class, :predicate_name, :faceted_items, :faceted_item_hierarchy_delimiter
 
       def associate_parents_and_childrens_for(hierarchy_graph_keys, items)
         items.each do |item|
@@ -58,7 +59,7 @@ module Locabulary
       end
 
       def build_item(faceted_node)
-        term_label = faceted_node.value
+        term_label = convert_faceted_node_value_to_term_label(faceted_node.value)
         locabulary_item = find_locabulary_item(predicate_name: predicate_name, term_label: term_label)
         if locabulary_item
           FacetWrapperForItem.build_for_faceted_node_and_locabulary_item(faceted_node: faceted_node, locabulary_item: locabulary_item)
@@ -75,6 +76,14 @@ module Locabulary
         # that we want to consider a developer notification but not abort the whole process.
         nil
       end
+
+      # Responsible for converting the hierarchy delimiter of the facet item to the hierarchy delimiter of the Locabulary::Item.
+      def convert_faceted_node_value_to_term_label(value)
+        value.gsub(
+          /(?<!#{faceted_item_hierarchy_delimiter})#{faceted_item_hierarchy_delimiter}(?!#{faceted_item_hierarchy_delimiter})/,
+          locabulary_item_class.hierarchy_delimiter
+        )
+      end
     end
   end
 end

data/lib/locabulary/facet_wrapper_for_item.rb

@@ -1,5 +1,6 @@
 require 'forwardable'
 require 'delegate'
+require 'locabulary/item'
 
 module Locabulary
   # A wrapper for a Locabulary::Items::Base that includes information from
@@ -22,7 +23,7 @@ module Locabulary
       predicate_name = options.fetch(:predicate_name)
       faceted_node = options.fetch(:faceted_node)
       term_label = options.fetch(:term_label)
-      locabulary_item = Locabulary::Item.build(predicate_name: predicate_name, term_label: term_label, default_presentation_sequence: nil)
+      locabulary_item = Item.build(predicate_name: predicate_name, term_label: term_label, default_presentation_sequence: nil)
       new(faceted_node: faceted_node, locabulary_item: locabulary_item)
     end
 
@@ -34,7 +35,7 @@ module Locabulary
     # @see Locabulary::FacetedHierarchicalTreeSorter
     # @param options [Hash]
     # @option predicate_name [String]
-    # @option faceted_node [#qvalue, #value, #hits]
+    # @option faceted_node [#value, #hits]
     # @option term_label [String]
     # @return Locabulary::FacetWrapperForItem
     def self.build_for_faceted_node_and_locabulary_item(options = {})
@@ -53,6 +54,6 @@ module Locabulary
     attr_reader :__faceted_node__, :__locabulary_item__
 
     extend Forwardable
-    def_delegators :__faceted_node__, :qvalue, :value, :hits
+    def_delegators :__faceted_node__, :value, :hits
   end
 end

data/lib/locabulary/item.rb

@@ -15,11 +15,12 @@ module Locabulary
     # @see Locabulary::Items
     def self.build(attributes = {})
       predicate_name = attributes.fetch(:predicate_name) { attributes.fetch('predicate_name') }
-      builder_for(predicate_name: predicate_name).call(attributes)
+      class_to_instantiate(predicate_name: predicate_name).new(attributes)
     end
 
     # @api public
     # @since 0.2.1
+    # @deprecated 0.6.0 Prefer instead class_to_instantiate
     #
     # Responsible for finding the appropriate Factory method for building a Locabulary::Item
     #
@@ -27,14 +28,25 @@ module Locabulary
     # @option predicate_name [String] Used for lookup of the correct Locabulary::Item type
     # @return [#call] A builder method (`.new` for the given constant)
     def self.builder_for(options = {})
+      class_to_instantiate(options).method(:new)
+    end
+
+    # @api public
+    # @since 0.5.1
+    #
+    # Responsible for finding the appropriate class that will be instantiated
+    #
+    # @param options [Hash]
+    # @option options [String] :predicate_name Used for lookup of the correct Locabulary::Item type
+    # @return [Locabulary::Items::Base]
+    def self.class_to_instantiate(options = {})
       predicate_name = options.fetch(:predicate_name)
       possible_class_name_for_predicate_name = predicate_name.singularize.classify
-      klass = begin
+      begin
         Items.const_get(possible_class_name_for_predicate_name)
       rescue NameError
         Items::Base
       end
-      klass.method(:new)
     end
   end
 end

data/lib/locabulary/version.rb

@@ -1,3 +1,3 @@
 module Locabulary
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.1'.freeze
 end

data/lib/locabulary.rb

@@ -108,10 +108,4 @@ module Locabulary
   def self.active_labels_for(options = {})
     active_items_for(options).map(&:term_label)
   end
-
-  # @api private
-  def self.reset_active_cache!
-    Commands::ActiveItemsForCommand.reset_cache!
-    Commands::ActiveHierarchicalRootsCommand.reset_cache!
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locabulary
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jeremy Friesen
@@ -240,6 +240,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/rspec_isolated
 - config/client_secrets.example.yml
 - data/administrative_units.json
 - data/affiliation.json