dor-services 6.1.3 → 6.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee1324635039f51430c984fbf50331973fc89261810d36a124d4b4849edd6e44
-  data.tar.gz: 15d29a0a7c8f2be0c010496ba07728f07762391e7898c2bd8653a8fa635c8c2d
+  metadata.gz: 25c75875d6443deb7fc40a1644effe631000cc7be137f1a549d6de32b4ac1a3b
+  data.tar.gz: c7fd6a8c0f0b78568afc9826c24a26192975b88abb8927fde90007ec13749938
 SHA512:
-  metadata.gz: 65fce8ba7e1f269bd4754853080377d442aa99e42bd598336e33c55e5c3c303f3f0a9ec2a7d73e86c2e97e72fcbe3064efa256094e8adf9b943c498d27ae8be1
-  data.tar.gz: fc63d82c99dc4d21f552c9c4c8c0dafe47ca8caa921799405536026359f43e5519b7d3c6ac3049887ca70bf02d478ae2e4e0d156896c322768d422add149e20c
+  metadata.gz: dc6cbc5b5c7266727388196e65e111173562b1322cd97bc70fd63fd93bd54db3a268cd7430136157355110f700d6b461cf5e883915a573fc54b6d19361ec78a1
+  data.tar.gz: 46df7c712fc4aa2f04c307d7cf8fd47c6fa8793ef17b13448e3b7b61c18bfd1e25f14004018f7130ce1124680b2a80bfd4e7637660a889c0f251701ce38e87f1

data/lib/dor/services/ontology.rb

@@ -5,31 +5,46 @@ module Dor
     extend Deprecation
     self.deprecation_horizon = 'dor-services version 7.0.0'
 
-    def self.[](key)
-      @data[key]
-    end
-    deprecation_deprecate :[] => 'Use property() instead'
+    class << self
+      def [](key)
+        Deprecation.warn(self, "#{self}.[] is deprecated and will be removed in #{Dor::Ontology.deprecation_horizon}. Use `property' instead.")
+        @data[key]
+      end
 
-    def self.key?(key)
-      @data.key?(key)
-    end
+      def key?(key)
+        @data.key?(key)
+      end
 
-    def self.include?(key)
-      @data.include?(key)
-    end
-    deprecation_deprecate include?: 'Use key? instead'
+      def include?(key)
+        Deprecation.warn(self, "#{self}.include? is deprecated and will be removed in #{Dor::Ontology.deprecation_horizon}. Use `key?' instead.")
+        @data.include?(key)
+      end
 
-    def self.property(key)
-      Term.new(@data[key])
+      def map(&block)
+        Deprecation.warn(self, "#{self}.map is deprecated and will be removed in #{Dor::Ontology.deprecation_horizon}. Use `options' instead.")
+        @data.map(&block)
+      end
+
+      # Yields each term to the block provided
+      def options
+        @data.map do |k, _v|
+          yield property(k)
+        end
+      end
+
+      def property(key)
+        Term.new(@data[key])
+      end
     end
 
     class Term
-      def initialize(uri:, human_readable:)
+      def initialize(uri:, human_readable:, deprecation_warning: nil)
         @label = human_readable
         @uri = uri
+        @deprecation_warning = deprecation_warning
       end
 
-      attr_reader :label, :uri
+      attr_reader :label, :uri, :deprecation_warning
     end
   end
 end

data/lib/dor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dor
-  VERSION = '6.1.3'
+  VERSION = '6.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 6.1.3
+  version: 6.1.4
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-21 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora