pupa 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 796eaf63778076cbe361cae74186cdef026f88b2
-  data.tar.gz: d90a3bccc968f958b137254817c548e7b1b11a5b
+  metadata.gz: 6deee32d18def9fda78da75c183a4bee5b67c00e
+  data.tar.gz: 5fd982a4e5445d3c25df91f161d7f41fbc6e5772
 SHA512:
-  metadata.gz: 5a42c57c20190b0678e60bb17832525b911e4f33253212be5dbf27475816f567e23f98be870173793bd11681d510ae760912cacbb1916c671c81bad75ad5ab81
-  data.tar.gz: b307018aecc3d92fa976c9c3a6c2a7fafb548a4a3a57aa3b2a6aa5c4c7fd029c64ebfb9de6947e6202dc223ca3806893e921146188a9a839c3c7993711b4053d
+  metadata.gz: 962075b24c71d2f46648c691b211619a32a96a9edf35bfcb68699c3cf98eeb93681c38c52a69e8ce99bf1bbe1723ec11ca5af33cc1489233cd66365eb6f00502
+  data.tar.gz: cbf8b00824dab5ae285bd225057ebd86a355722761f5c362d807184f8e43a384277cf26915c889108ea3d901643586c8666580ceac4355ea9601a8f06745d5a8

data/lib/pupa/models/concerns/identifiable.rb

@@ -5,7 +5,14 @@ module Pupa
       extend ActiveSupport::Concern
 
       included do
-        attr_accessor :identifiers
+        attr_reader :identifiers
+      end
+
+      # Sets the identifiers.
+      #
+      # @param [Array] identifiers a list of identifiers
+      def identifiers=(identifiers)
+        @identifiers = IdentifierList.new(identifiers)
       end
 
       # Adds an issued identifier.

data/lib/pupa/models/contact_detail_list.rb

@@ -15,8 +15,10 @@ module Pupa
       find_by_type('email')
     end
 
-  private
-
+    # Returns the value of the first contact detail matching the type.
+    #
+    # @param [String] a type
+    # @return [String,nil] a value
     def find_by_type(type)
       find{|contact_detail|
         contact_detail[:type] == type

data/lib/pupa/models/identifier_list.rb

@@ -0,0 +1,16 @@
+module Pupa
+  # A list of identifiers.
+  class IdentifierList < Array
+    # Returns the first identifier matching the scheme.
+    #
+    # @param [String] scheme a scheme
+    # @return [String,nil] an identifier
+    def find_by_scheme(scheme)
+      find{|identifier|
+        identifier[:scheme] == scheme
+      }.try{|identifier|
+        identifier[:identifier]
+      }
+    end
+  end
+end

data/lib/pupa/processor.rb

@@ -17,7 +17,7 @@ module Pupa
     class_attribute :tasks
     self.tasks = []
 
-    attr_reader :report
+    attr_reader :report, :client, :options
 
     def_delegators :@logger, :debug, :info, :warn, :error, :fatal
 
@@ -54,7 +54,7 @@ module Pupa
         end
       end
 
-      @client.get(url, params).body
+      client.get(url, params).body
     end
 
     # Retrieves and parses a document with a POST request.
@@ -63,7 +63,7 @@ module Pupa
     # @param [String,Hash] params query string parameters
     # @return a parsed document
     def post(url, params = {})
-      @client.post(url, params).body
+      client.post(url, params).body
     end
 
     # Adds a scraping task to Pupa.rb.
@@ -277,6 +277,8 @@ module Pupa
     # @return [Hash] a mapping from an object ID to the ID of its duplicate
     def build_losers_to_winners_map(objects)
       {}.tap do |map|
+        # We don't need to iterate on the last item in the hash, but skipping
+        # the last item is more effort than running the last item.
         objects.each_with_index do |(id1,object1),index|
           unless map.key?(id1) # Don't search for duplicates of duplicates.
             objects.drop(index + 1).each do |id2,object2|

data/lib/pupa/version.rb

@@ -1,3 +1,3 @@
 module Pupa
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/pupa.rb

@@ -19,6 +19,7 @@ require 'pupa/models/concerns/timestamps'
 
 require 'pupa/models/base'
 require 'pupa/models/contact_detail_list'
+require 'pupa/models/identifier_list'
 require 'pupa/models/membership'
 require 'pupa/models/organization'
 require 'pupa/models/person'

data/spec/models/concerns/identifiable_spec.rb

@@ -11,6 +11,13 @@ describe Pupa::Concerns::Identifiable do
     klass.new
   end
 
+  describe '#identifiers=' do
+    it 'should use coerce to a IdentifierList' do
+      object.identifiers = [{identifier: '123456789', scheme: 'DUNS'}]
+      object.identifiers.should be_a(Pupa::IdentifierList)
+    end
+  end
+
   describe '#add_identifier' do
     it 'should add an identifier' do
       object.add_identifier('123456789', scheme: 'duns')

data/spec/models/contact_detail_list_spec.rb

@@ -19,6 +19,10 @@ describe Pupa::ContactDetailList do
         type: 'email',
         value: 'second',
       },
+      {
+        type: 'custom',
+        value: 'content',
+      },
     ])
   end
 
@@ -41,4 +45,14 @@ describe Pupa::ContactDetailList do
       Pupa::ContactDetailList.new.email.should == nil
     end
   end
+
+  describe '#find_by_type' do
+    it 'should return the value of the first contact detail matching the type' do
+      object.find_by_type('custom').should == 'content'
+    end
+
+    it 'should return nil if no contact detail matches the type' do
+      Pupa::ContactDetailList.new.find_by_type('custom').should == nil
+    end
+  end
 end

data/spec/models/identifier_list_spec.rb

@@ -0,0 +1,26 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Pupa::IdentifierList do
+  let :object do
+    Pupa::IdentifierList.new([
+      {
+        identifier: '123456789',
+        scheme: 'DUNS',
+      },
+      {
+        identifier: 'US0123456789',
+        scheme: 'ISIN',
+      },
+    ])
+  end
+
+  describe '#find_by_scheme' do
+    it 'should return the first identifier matching the scheme' do
+      object.find_by_scheme('ISIN').should == 'US0123456789'
+    end
+
+    it 'should return nil if no identifier matches the scheme' do
+      Pupa::IdentifierList.new.find_by_scheme('ISIN').should == nil
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pupa
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Open North
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -232,6 +232,7 @@ files:
 - lib/pupa/models/concerns/sourceable.rb
 - lib/pupa/models/concerns/timestamps.rb
 - lib/pupa/models/contact_detail_list.rb
+- lib/pupa/models/identifier_list.rb
 - lib/pupa/models/membership.rb
 - lib/pupa/models/organization.rb
 - lib/pupa/models/person.rb
@@ -272,6 +273,7 @@ files:
 - spec/models/concerns/sourceable_spec.rb
 - spec/models/concerns/timestamps_spec.rb
 - spec/models/contact_detail_list_spec.rb
+- spec/models/identifier_list_spec.rb
 - spec/models/membership_spec.rb
 - spec/models/organization_spec.rb
 - spec/models/person_spec.rb
@@ -326,6 +328,7 @@ test_files:
 - spec/models/concerns/sourceable_spec.rb
 - spec/models/concerns/timestamps_spec.rb
 - spec/models/contact_detail_list_spec.rb
+- spec/models/identifier_list_spec.rb
 - spec/models/membership_spec.rb
 - spec/models/organization_spec.rb
 - spec/models/person_spec.rb