locabulary 0.6.2 → 0.7.1

data/data/spec.json

@@ -2,23 +2,23 @@
   "predicate_name": "spec",
   "values": [
     {
-      "predicate_name": "spec",
-      "term_label": "Active Item",
-      "default_presentation_sequence": 3,
-      "activated_on": "2015-07-22"
-    },
-    {
-      "predicate_name": "spec",
       "term_label": "Deactive Item",
+      "term_uri": "item:deactive",
       "default_presentation_sequence": 1,
       "activated_on": "2015-07-22",
       "deactivated_on": "2016-07-01"
     },
     {
-      "predicate_name": "spec",
       "term_label": "Alternate Item",
+      "term_uri": "item:alternate",
       "default_presentation_sequence": 2,
       "activated_on": "2015-07-22"
+    },
+    {
+      "term_label": "Active Item",
+      "term_uri": "item:active",
+      "default_presentation_sequence": 3,
+      "activated_on": "2015-07-22"
     }
   ]
 }

data/data/underclass_level.json

@@ -1,24 +1,30 @@
 {
   "predicate_name": "underclass_level",
-  "values": [{
-    "term_label": "First Year",
-    "default_presentation_sequence": 1,
-    "activated_on": "2015-01-01"
-  },{
-    "term_label": "Sophomore",
-    "default_presentation_sequence": 2,
-    "activated_on": "2015-01-01"
-  },{
-    "term_label": "Junior",
-    "default_presentation_sequence": 3,
-    "activated_on": "2015-01-01"
-  },{
-    "term_label": "Senior",
-    "default_presentation_sequence": 4,
-    "activated_on": "2015-01-01"
-  },{
-    "term_label": "5th Year",
-    "default_presentation_sequence": 5,
-    "activated_on": "2015-01-01"
-  }]
+  "values": [
+    {
+      "term_label": "First Year",
+      "default_presentation_sequence": 1,
+      "activated_on": "2015-01-01"
+    },
+    {
+      "term_label": "Sophomore",
+      "default_presentation_sequence": 2,
+      "activated_on": "2015-01-01"
+    },
+    {
+      "term_label": "Junior",
+      "default_presentation_sequence": 3,
+      "activated_on": "2015-01-01"
+    },
+    {
+      "term_label": "Senior",
+      "default_presentation_sequence": 4,
+      "activated_on": "2015-01-01"
+    },
+    {
+      "term_label": "5th Year",
+      "default_presentation_sequence": 5,
+      "activated_on": "2015-01-01"
+    }
+  ]
 }

data/data/work_patent_strategy.json

@@ -1,30 +1,37 @@
 {
   "predicate_name": "work_patent_strategy",
-  "values": [{
-    "term_label": "going_to_patent",
-    "default_presentation_sequence": 1,
-    "activated_on": "2015-01-01"
-  },{
-    "term_label": "will_not_patent",
-    "default_presentation_sequence": 2,
-    "activated_on": "2015-01-01"
-  },{
-    "term_label": "already_patented",
-    "default_presentation_sequence": 3,
-    "activated_on": "2015-01-01",
-    "deactivated_on": "2015-07-06"
-  },{
-    "term_label": "do_not_know",
-    "default_presentation_sequence": 4,
-    "activated_on": "2015-01-01",
-    "deactivated_on": "2015-07-06"
-  },{
-    "term_label": "non_provisional_patent_filed",
-    "default_presentation_sequence": 5,
-    "activated_on": "2015-07-06"
-  },{
-    "term_label": "material_already_published",
-    "default_presentation_sequence": 6,
-    "activated_on": "2015-07-06"
-  }]
+  "values": [
+    {
+      "term_label": "going_to_patent",
+      "default_presentation_sequence": 1,
+      "activated_on": "2015-01-01"
+    },
+    {
+      "term_label": "will_not_patent",
+      "default_presentation_sequence": 2,
+      "activated_on": "2015-01-01"
+    },
+    {
+      "term_label": "already_patented",
+      "default_presentation_sequence": 3,
+      "activated_on": "2015-01-01",
+      "deactivated_on": "2015-07-06"
+    },
+    {
+      "term_label": "do_not_know",
+      "default_presentation_sequence": 4,
+      "activated_on": "2015-01-01",
+      "deactivated_on": "2015-07-06"
+    },
+    {
+      "term_label": "non_provisional_patent_filed",
+      "default_presentation_sequence": 5,
+      "activated_on": "2015-07-06"
+    },
+    {
+      "term_label": "material_already_published",
+      "default_presentation_sequence": 6,
+      "activated_on": "2015-07-06"
+    }
+  ]
 }

data/data/work_publication_strategy.json

@@ -1,20 +1,25 @@
 {
   "predicate_name": "work_publication_strategy",
-  "values": [{
-    "term_label": "going_to_publish",
-    "default_presentation_sequence": 1,
-    "activated_on": "2015-01-01"
-  },{
-    "term_label": "will_not_publish",
-    "default_presentation_sequence": 2,
-    "activated_on": "2015-01-01"
-  },{
-    "term_label": "already_published",
-    "default_presentation_sequence": 3,
-    "activated_on": "2015-01-01"
-  },{
-    "term_label": "do_not_know",
-    "default_presentation_sequence": 4,
-    "activated_on": "2015-01-01"
-  }]
+  "values": [
+    {
+      "term_label": "going_to_publish",
+      "default_presentation_sequence": 1,
+      "activated_on": "2015-01-01"
+    },
+    {
+      "term_label": "will_not_publish",
+      "default_presentation_sequence": 2,
+      "activated_on": "2015-01-01"
+    },
+    {
+      "term_label": "already_published",
+      "default_presentation_sequence": 3,
+      "activated_on": "2015-01-01"
+    },
+    {
+      "term_label": "do_not_know",
+      "default_presentation_sequence": 4,
+      "activated_on": "2015-01-01"
+    }
+  ]
 }

data/lib/locabulary.rb

@@ -29,7 +29,7 @@ module Locabulary
   # @api public
   # @since 0.1.0
   #
-  # Responsible for extracting a non-hierarchical sorted array of Locabulary::Items::Base objects for the given predicate_name.
+  # Responsible for extracting a non-hierarchical sorted array of active Locabulary::Items::Base objects for the given predicate_name.
   #
   # @param [Hash] options
   # @option options [String] :predicate_name
@@ -41,6 +41,20 @@ module Locabulary
     Services.call(:active_items_for, options)
   end
 
+  # @api public
+  # @since 0.7.0
+  #
+  # Responsible for extracting a non-hierarchical sorted array of Locabulary::Items::Base objects for the given predicate_name.
+  #
+  # @param [Hash] options
+  # @option options [String] :predicate_name
+  # @return [Array<Locabulary::Items::Base>]
+  #
+  # @see Locabulary::Services
+  def self.all_items_for(options = {})
+    Services.call(:all_items_for, options)
+  end
+
   # @api public
   # @since 0.4.0
   #

data/lib/locabulary/item.rb

@@ -43,7 +43,7 @@ module Locabulary
       predicate_name = options.fetch(:predicate_name)
       possible_class_name_for_predicate_name = predicate_name.singularize.classify
       begin
-        Items.const_get(possible_class_name_for_predicate_name)
+        "Locabulary::Items::#{possible_class_name_for_predicate_name}".constantize
       rescue NameError
         Items::Base
       end

data/lib/locabulary/services.rb

@@ -3,6 +3,7 @@ require 'locabulary/services/build_ordered_hierarchical_tree_service'
 require 'locabulary/services/active_items_for_service'
 require 'locabulary/services/active_hierarchical_roots_service'
 require 'locabulary/services/item_for_service'
+require 'locabulary/services/all_items_for_service'
 
 # :nodoc:
 module Locabulary
@@ -22,8 +23,9 @@ module Locabulary
     # @param command_name [Symbol]
     # @param options [Hash]
     def self.call(command_name, options = {})
-      command_class = "#{command_name}_service".classify
-      const_get(command_class).call(options)
+      command_class_name = "#{command_name}_service".classify
+      klass = "Locabulary::Services::#{command_class_name}".constantize
+      klass.call(options)
     end
   end
   private_constant :Services

data/lib/locabulary/services/active_items_for_service.rb

@@ -7,7 +7,7 @@ module Locabulary
   module Services
     # @api private
     #
-    # Responsible for extracting a non-hierarchical sorted array of Locabulary::Item for the given predicate_name
+    # Responsible for extracting a non-hierarchical sorted array of active Locabulary::Item for the given predicate_name
     #
     # @see Locabulary::Item
     class ActiveItemsForService

data/lib/locabulary/services/all_items_for_service.rb

@@ -0,0 +1,56 @@
+require 'date'
+require 'locabulary/item'
+require 'locabulary/utility'
+
+module Locabulary
+  # :nodoc:
+  module Services
+    # @api private
+    #
+    # Responsible for extracting a non-hierarchical sorted array of Locabulary::Item for the given predicate_name
+    #
+    # @see Locabulary::Item
+    class AllItemsForService
+      def self.cache
+        @cache ||= {}
+      end
+      private_class_method :cache
+
+      # @api private
+      # @since 0.7.0
+      def self.reset_cache!
+        @cache = {}
+      end
+
+      # @api private
+      # @since 0.7.0
+      #
+      # @param options [Hash]
+      # @option options [String] :predicate_name
+      def self.call(options = {})
+        predicate_name = options.fetch(:predicate_name)
+        cache[predicate_name] ||= new(options).call
+      end
+
+      private_class_method :new
+
+      def initialize(options = {})
+        @predicate_name = options.fetch(:predicate_name)
+        @builder = Item.builder_for(predicate_name: predicate_name)
+      end
+
+      def call
+        collector = []
+        Utility.with_extraction_for(predicate_name) do |data|
+          collector << builder.call(data.merge('predicate_name' => predicate_name))
+        end
+        collector.sort
+      end
+
+      private
+
+      attr_reader :predicate_name, :as_of, :builder
+    end
+    private_constant :ActiveItemsForService
+  end
+end

data/lib/locabulary/version.rb

@@ -1,3 +1,3 @@
 module Locabulary
-  VERSION = '0.6.2'.freeze
+  VERSION = '0.7.1'.freeze
 end

data/locabulary.gemspec

@@ -31,14 +31,15 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "dry-monads", "~> 0.1.1"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rspec-its"
+  spec.add_development_dependency "rspec", '3.5.0'
+  spec.add_development_dependency "rspec-its", '1.2.0'
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency 'google_drive'
-  spec.add_development_dependency 'highline'
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "codeclimate-test-reporter"
-  spec.add_development_dependency "fasterer"
-  spec.add_development_dependency "shoulda-matchers"
+  spec.add_development_dependency 'google_drive', "2.1.2"
+  spec.add_development_dependency 'highline', '1.7.8'
+  spec.add_development_dependency "rubocop", '~> 0.46.0'
+  spec.add_development_dependency "simplecov", '0.12.0'
+  spec.add_development_dependency "codeclimate-test-reporter", '1.0.3'
+  spec.add_development_dependency "fasterer", '0.3.2'
+  spec.add_development_dependency "shoulda-matchers", '3.1.1'
+  spec.add_development_dependency "nokogiri", '~> 1.6.8.1'
 end

data/script/close-issue

@@ -6,12 +6,10 @@
 #
 #*******************************************************************************
 
-CONFIG_KEYS = [:REMOTE, :REPOSITORY_PATH, :STARTED_ISSUES_FILE].freeze
+CONFIG_KEYS = [:REPOSITORY_PATH, :STARTED_ISSUES_FILE].freeze
 
 REPOSITORY_PATH = ENV.fetch('REPOSITORY_PATH') { File.expand_path(File.join(File.dirname(__FILE__), '../')) }
-REMOTE = ENV.fetch('REMOTE', 'origin')
 
-# TODO: Retrieve the dasherized issue from Github's API
 STARTED_ISSUES_FILE = ENV.fetch('STARTED_ISSUES_FILE', '.started-issues')
 
 #*******************************************************************************
@@ -41,7 +39,7 @@ if ARGV.grep(/-h/i).size == 1
   $stdout.puts "ENV variable."
   $stdout.puts ""
   $stdout.puts "Example:"
-  $stdout.puts "$ REMOTE=origin ./scripts/#{File.basename(__FILE__)}"
+  $stdout.puts "$ REPOSITORY_PATH=.. ./scripts/#{File.basename(__FILE__)}"
   exit(0)
 end
 
@@ -63,10 +61,15 @@ end
 end
 
 # Guard that I know what the issue number is
-current_branch = `cd #{REPOSITORY_PATH} && git branch | grep '^*'`.sub(/^\*\s*/, '').strip
-
-if current_branch =~ /^(\d+)[^\d]/
-  ISSUE_NUMBER = $1.to_i
+current_branch = `cd #{REPOSITORY_PATH} && git branch | grep '^[*]'`.sub(/^\*\s*/, '').strip
+
+issue_source = :unknown
+if current_branch =~ /^(\w+-\d+)\D/  # jira issue
+  ISSUE_NUMBER = $1
+  issue_source = :jira
+elsif current_branch =~ /^(\d+)\D/   # github issue
+  ISSUE_NUMBER = $1
+  issue_source = :github
 else
   $stderr.puts "Expected to be able to determine issue number from branch #{current_branch} name @ #{REPOSITORY_PATH}.\n\n"
   $stderr.puts "See help for more information.\n\n"
@@ -96,7 +99,7 @@ started_issues_file_lines = File.read(File.join(REPOSITORY_PATH, STARTED_ISSUES_
 
 File.open(STARTED_ISSUES_FILE, 'w+') do |file|
   started_issues_file_lines.each do |line|
-    file.puts line unless line.to_i == ISSUE_NUMBER.to_i
+    file.puts line unless line.strip.downcase == ISSUE_NUMBER.downcase
   end
 end
 
@@ -107,8 +110,10 @@ begin
   File.open(path_to_commit_message, 'w+') do |file|
     file.puts "Closing issue #{ISSUE_NUMBER}"
     file.puts ""
-    file.puts "Closes ##{ISSUE_NUMBER}"
-    file.puts ""
+    if issue_source == :github
+      file.puts "Closes ##{ISSUE_NUMBER}"
+      file.puts ""
+    end
 
     message = "$ ./script/#{File.basename(__FILE__)} #{ISSUE_NUMBER}"
     CONFIG_KEYS.each_with_object(message) do |key, mem|
@@ -123,3 +128,9 @@ begin
 ensure
   File.unlink(path_to_commit_message) rescue true
 end
+
+# update jira and mark this issue as finished
+if issue_source == :jira
+  system("jira transition qa #{ISSUE_NUMBER} --noedit")
+  exit!(5) unless $?.success?
+end

data/script/sort_json.rb

@@ -0,0 +1,25 @@
+GEM_ROOT = File.expand_path('../../', __FILE__)
+$LOAD_PATH.unshift File.join(GEM_ROOT, 'lib')
+require 'json'
+require 'locabulary'
+
+Dir.glob(File.join(GEM_ROOT, 'data/*.json')).each do |filename|
+  predicate_name = File.basename(filename, '.json')
+  next if predicate_name == 'administrative_units'
+
+  sorted_values = []
+  Locabulary.all_items_for(predicate_name: predicate_name).each do |sorted_item|
+    hash = sorted_item.to_h
+    hash.delete('predicate_name')
+    sorted_values << hash
+  end
+
+  json_doc = JSON.pretty_generate(
+    {
+      "predicate_name" => predicate_name,
+      "values" => sorted_values
+    }
+  )
+
+  File.open(filename, 'w+') { |file| file.puts(json_doc) }
+end