contentdm_api 0.3.11 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1091e4cac477eae6eb4b55d3ef21439e96bac753
-  data.tar.gz: 6f842e4a860ab125cb457533ca5379123b25eb7c
+SHA256:
+  metadata.gz: '09e9d240768cafbc4e4ea26c4ae4f044d27b50760cf68b9ca95037ab634a763f'
+  data.tar.gz: 5d6dc41cd3b9a2ddebc049c43ef8dfc64d455cebeef870683d4797161ef5da0d
 SHA512:
-  metadata.gz: d5a3aed8e06a2123112c03ec2feb4e15d8e1efe02fb6e934c52ef99cf38f041189b4bd56c3cbebe4bd5211c8c76bc11721225a3e50fcbca561c34f95aff92190
-  data.tar.gz: d713927f824498d0702a51ede9c946e6b5ae2c956448c564146ceeebcc625574bd6970734b4828887a785b99851e04e5952f7a9796b45cabb95f3e63df204b1e
+  metadata.gz: d88357e27ad803be09e1390de563bf351f2f52b327fc81dea85f608899887b1fdf89a23c2846ffa02a9f3062a7c2c03776907b1152792e4ea99cc655d87c869b
+  data.tar.gz: d4e7d566a2bc8fe3b94c8acf4730cbb42ff461cd67360fa02bd016f6c5ab3ac16fa57faa6f6f57934cf45888fddee0f5fa576464a3c6553c95503fefeb05d1a8

data/contentdm_api.gemspec

@@ -17,10 +17,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "http", "~> 4.0.3"
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency 'webmock', '~> 1.24', '>= 1.24.0'
-  spec.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.1'
   spec.add_development_dependency "yard", "~> 0.9.0"
 end

data/lib/contentdm_api/item.rb

@@ -42,14 +42,29 @@ module CONTENTdmAPI
     # dmGetCompoundObjectInfo functions
     def metadata
       if with_compound
-        result_with_id.merge('page' => compounds(page))
+        result_with_id.merge('page' => compounds_to_h)
       else
         result_with_id.merge('page' => [])
       end
     end
 
+    def compounds_to_h
+      [page].flatten.map do |compound|
+        block_given? ? yield(compound(compound)) : compound(compound)
+      end
+    end
+
     private
 
+    def compound(compound)
+      # API gives inconsistent results
+      return {} unless compound.is_a?(Hash)
+      compound.merge(self.class.new(base_url: base_url,
+                                    collection: collection,
+                                    id: compound['pageptr'],
+                                    with_compound: false).metadata)
+    end
+
     def page
       result.fetch('page', [])
     end
@@ -62,17 +77,6 @@ module CONTENTdmAPI
       values.first.merge('page' => values.last.fetch('page', []))
     end
 
-    def compounds(page)
-      [page].flatten.map do |compound|
-        # API gives inconsistent results
-        return {} unless compound.is_a?(Hash)
-        compound.merge(self.class.new(base_url: base_url,
-                                      collection: collection,
-                                      id: compound['pageptr'],
-                                      with_compound: false).metadata)
-      end
-    end
-
     def remove_errors(value)
       value['code'] != '-2' ? value : {}
     end

data/lib/contentdm_api/request.rb

@@ -1,4 +1,5 @@
-require 'net/http'
+require 'http'
+
 module CONTENTdmAPI
   # Form requests to the ContentDM API
   class Request
@@ -10,7 +11,7 @@ module CONTENTdmAPI
     #  params and format to request of the CONTENTdm API
     #
     # @return [Void]
-    def initialize(base_url: '', client: Net::HTTP, service: Service.new)
+    def initialize(base_url: '', client: HTTP, service: Service.new)
       @base_url = base_url
       @client   = client
       @service  = service
@@ -20,25 +21,7 @@ module CONTENTdmAPI
     #
     # @return [String] either XML or JSON
     def fetch
-      request.body
-    end
-
-    def uri
-      @uri = URI.parse(unencoded_url)
-    end
-
-    private
-
-    def http
-      http = client.new(uri.host, uri.port)
-      http.read_timeout = 1200
-      http.open_timeout = 120
-      http.use_ssl = (uri.scheme == "https")
-      http
-    end
-
-    def request
-      http.request(client::Get.new(uri.request_uri))
+      client.get(unencoded_url).to_s
     end
 
     # A URL for a given service

data/lib/contentdm_api/version.rb

@@ -1,3 +1,3 @@
 module CONTENTdmAPI
-  VERSION = '0.3.11'.freeze
+  VERSION = '0.4.1'.freeze
 end

metadata

@@ -1,97 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: contentdm_api
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.4.1
 platform: ruby
 authors:
 - Chad Fennell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: 4.0.3
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the CONTENTdm API