puree 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2678f284947384cb88da1511bbdedf6cbc00314
-  data.tar.gz: 7d8435e7e07d5e98aa8240e1e736456503457a7f
+  metadata.gz: 86f3775fc9747a946a2d480bd0621971d4e8ecd2
+  data.tar.gz: e565564db8ce6ae7af9c1d68e99f4cada1474f1f
 SHA512:
-  metadata.gz: fe6494c3ac14f9f20811268c5b3c65b2cd5b5f888a94113cf2f887729c3ea1998d73883193bdc0db740659f8f099f354f6767e30a0c75b00c182496cba18b13a
-  data.tar.gz: 1d9cf4abce07487bcf45881ebec3bbf7f6c1ab241002e1c91c0891cee3220dfccf1f82f2c65eac2e3cd19b7bc3eff6eccca0b9aa806b049d198a1bd496df39a8
+  metadata.gz: 7787556f42cf0ec6c39658200e827561a085d71164b11b60c7ea99ae3ce11c40bb73364252ac955696d7dbdeced7fc892de7c1f8e97db439bc8e6298f142d2de
+  data.tar.gz: fa50727a5235c18815aa667a53474faf022563c9decede02e2bec591c1c7656d525d2b492c40f2bbd2d8c9d37f765df0a6a42bc0731278a0669ba34a08f77a14

data/CHANGELOG.md

@@ -3,10 +3,18 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
-- Metadata: clipping?, externalPerson?, journal?, publisher?
+- Metadata: activity?, clipping?, externalPerson?
 - Factory to make resource objects?
 - Make ALL dates ISO 8601 YYYY-MM-DD, rather than mirror varying formats from Pure?
 
+## 0.19.0 - 2016-09-21
+### Added
+- Journal - issn, publisher.
+- Publisher - name.
+
+### Changed
+- Collection - simpler api for count of records available.
+
 ## 0.18.0 - 2016-09-20
 ### Added
 - Collection - count of records available.

data/lib/puree/collection.rb

@@ -118,14 +118,7 @@ module Puree
         query['rendering'] = @options['rendering']
       end
 
-      # @response = HTTParty.get(build_url, query: query, headers: headers)
-
       begin
-        # p self.inspect
-        # p build_url
-        # p query
-        # p headers
-        # @response = HTTParty.get(build_url, query: query, headers: headers, timeout: 120)
         url = build_url
         req = HTTP.headers accept: 'application/xml'
         if @options[:basic_auth]
@@ -136,10 +129,6 @@ module Puree
         @doc.remove_namespaces!
 
         @count = extract_count
-        # code = @response.code
-        # body = @response.body
-        # puts "#{self.class.name} #{code}"
-          # puts "#{self.class.name} #{body}"
 
       rescue HTTP::Error => e
         puts 'HTTP::Error '+ e.message
@@ -164,11 +153,16 @@ module Puree
     #
     # @return [Integer]
     def count
-      @count
+      @count ||= get_count
     end
 
     private
 
+    def get_count
+      find limit: 0
+      extract_count
+    end
+
     def extract_count
       path = '//count'
       xpath_query_for_single_value(path).to_i

data/lib/puree/journal.rb

@@ -16,6 +16,26 @@ module Puree
             basic_auth: basic_auth)
     end
 
+    # ISSN
+    #
+    # @return [String]
+    def issn
+      @metadata['issn']
+    end
+
+    # Publisher
+    #
+    # @return [String]
+    def publisher
+      @metadata['publisher']
+    end
+
+    # Title
+    #
+    # @return [String]
+    def title
+      @metadata['title']
+    end
 
     # All metadata
     #
@@ -27,8 +47,26 @@ module Puree
 
     private
 
+    def extract_issn
+      path = '/issns/issn/string'
+      xpath_query_for_single_value path
+    end
+
+    def extract_publisher
+      path = '/publisher/name'
+      xpath_query_for_single_value path
+    end
+
+    def extract_title
+      path = '/titles/title/string'
+      xpath_query_for_single_value path
+    end
+
     def combine_metadata
       o = super
+      o['issn'] = extract_issn
+      o['publisher'] = extract_publisher
+      o['title'] = extract_title
       @metadata = o
     end
 

data/lib/puree/publisher.rb

@@ -16,6 +16,21 @@ module Puree
             basic_auth: basic_auth)
     end
 
+    # Name
+    #
+    # @return [String]
+    def name
+      @metadata['name']
+    end
+
+    # Adds no value as value is Publisher
+    # Type
+    #
+    # @return [String]
+    # def type
+    #   @metadata['type']
+    # end
+
     # All metadata
     #
     # @return [Hash]
@@ -26,8 +41,21 @@ module Puree
 
     private
 
+    def extract_name
+      path = '/name'
+      xpath_query_for_single_value path
+    end
+
+    # Adds no value as value is Publisher
+    # def extract_type
+    #   path = '/typeClassification/term/localizedString'
+    #   xpath_query_for_single_value path
+    # end
+
     def combine_metadata
       o = super
+      o['name'] = extract_name
+      # o['type'] = extract_type
       @metadata = o
     end
 

data/lib/puree/version.rb

@@ -1,5 +1,5 @@
 module Puree
   # Semantic version number
   #
-  VERSION = "0.18.0"
+  VERSION = "0.19.0"
 end

data/spec/journal.rb

@@ -32,6 +32,10 @@ describe 'Journal' do
       expect(@p.created).to be_an_instance_of(String)
     end
 
+    it '#issn' do
+      expect(@p.issn).to be_an_instance_of(String)
+    end
+
     it '#metadata' do
       expect(@p.metadata).to be_an_instance_of(Hash)
     end
@@ -40,6 +44,14 @@ describe 'Journal' do
       expect(@p.modified).to be_an_instance_of(String)
     end
 
+    it '#publisher' do
+      expect(@p.publisher).to be_an_instance_of(String)
+    end
+
+    it '#title' do
+      expect(@p.title).to be_an_instance_of(String)
+    end
+
     it '#uuid' do
       expect(@p.uuid).to be_an_instance_of(String)
     end

data/spec/publisher.rb

@@ -40,6 +40,15 @@ describe 'Publisher' do
       expect(@p.modified).to be_an_instance_of(String)
     end
 
+    it '#name' do
+      expect(@p.name).to be_an_instance_of(String)
+    end
+
+    # Adds no value as value is Publisher
+    # it '#type' do
+    #   expect(@p.type).to be_an_instance_of(String)
+    # end
+
     it '#uuid' do
       expect(@p.uuid).to be_an_instance_of(String)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puree
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Adrian Albin-Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http