summon 1.2.1 → 1.2.3

data/Changelog.md

@@ -1,3 +1,17 @@
+### 1.2.3
+* 1 major enhancement
+  * authors are now ordered
+
+### 1.2.2 2011-05-22
+
+* 1 minor enhancement:
+  * fixed Search.to_s
+
+### 1.2.1 2011-05-22
+
+* 1 major enhancement:
+  * Ruby 1.9.2 compatibility fixes
+
 ### 1.2.0 2011-04-09
 
 * removed translations

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    summon (1.2.1)
+    summon (1.2.3)
       json (>= 1.2.0)
 
 GEM
@@ -9,15 +9,15 @@ GEM
   specs:
     diff-lcs (1.1.2)
     json (1.5.1)
-    rake (0.8.7)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
+    rake (0.9.1)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.3)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
+    rspec-mocks (2.6.0)
 
 PLATFORMS
   ruby

data/lib/summon/schema/document.rb

@@ -7,7 +7,7 @@ class Summon::Document < Summon::Schema
   attr :publication_series_title
   attr :content_type
 
-  attr :authors, :json_name => "Author"
+  attr :authors, :json_name => "Author_xml"
   attr :corporate_authors, :json_name => "CorporateAuthor"
   attr :publishers, :json_name => "Publisher"
   attr :volume
@@ -89,7 +89,7 @@ class Summon::Document < Summon::Schema
   end
   
   def authors
-    @authors.map {|n| Summon::Author.new(n)}
+    @authors.map {|n| Summon::Author.new(n["fullname"], n["surname"], n["givenname"], n["middlename"])}
   end
   
   def corporate_authors
@@ -110,10 +110,25 @@ class Summon::Document < Summon::Schema
   
 end
 
-class Summon::Author < Struct.new(:name)
-  def name(*args)
+class Summon::Author < Struct.new(:fullname, :surname, :givenname, :middlename)
+  def fullname(*args)
+    if super()
+      super()
+    else
+      [givenname, middlename, surname].compact.join(' ')
+    end
+  end
+  def surname(*args)
+    super()
+  end
+  def givenname(*args)
     super()
   end
+  def middlename(*args)
+    super()
+  end
+  
+  alias_method :name, :fullname
 end
 
 class Summon::LibGuideTab < Struct.new(:name, :uri)

data/lib/summon/schema/search.rb

@@ -33,6 +33,6 @@ class Summon::Search < Summon::Schema
   end          
 
   def to_s(options = {})
-    "<Summon::Search>{records: #{result_count}, pages:#{page_count}, :query_time: #{query.query_time}ms, request_time:#{total_request_time}ms}"
+    "<Summon::Search>{records: #{record_count}, pages: #{page_count}, query_time: #{query_time}ms, request_time: #{total_request_time}ms}"
   end
 end

data/lib/summon/transport/canned.json

@@ -37,6 +37,32 @@
       "Author": [
         "Hunter, Lisa"
       ],
+      "Author_xml": [
+        {
+          "sequence": 1,
+          "fullname": "Liang, Yong X",
+          "surname": "Liang",
+          "givenname": "Yong X"
+        },
+        {
+          "sequence": 2,
+          "fullname": "Gu, Miao N",
+          "surname": "Gu",
+          "givenname": "Miao N"
+        },
+        {
+          "sequence": 3,
+          "fullname": "Wang, Shi D",
+          "surname": "Wang",
+          "givenname": "Shi D"
+        },
+        {
+          "sequence": 4,
+          "fullname": "Chu, Hai C",
+          "surname": "Chu",
+          "givenname": "Hai C"
+        }   
+      ],
       "Genre": [
         "Obituary",
         "Obituary"

data/lib/summon/version.rb

@@ -1,4 +1,4 @@
 
 module Summon
-  VERSION = "1.2.1"
+  VERSION = "1.2.3"
 end

data/spec/summon/schema/document_spec.rb

@@ -23,6 +23,20 @@ describe Summon::Document do
       doc.from_library?.should be(false)
     end
   end
+  
+  describe "authors" do
+    before do
+      document_data = JSON.parse(EXAMPLE_DOCUMENT_JSON)
+      @doc = Summon::Document.new(@service, document_data)
+    end
+    it "should combine givenname, middlename, surname if fullname is missing" do
+      @doc.authors[2].name.should == "Shi Wang"
+      @doc.authors[3].name.should == "Hai C Chu"
+    end
+    it "should preserve order" do
+      @doc.authors.map(&:name).should == ["Liang, Yong X", "Gu, Miao N", "Shi Wang", "Hai C Chu"]
+    end
+  end
     
   EXAMPLE_DOCUMENT_JSON = <<-JSON
 {
@@ -69,6 +83,31 @@ describe Summon::Document do
   "Author": [
     "Hunter, Lisa"
   ],
+  "Author_xml": [
+    {
+      "sequence": 1,
+      "fullname": "Liang, Yong X",
+      "surname": "Liang",
+      "givenname": "Yong X"
+    },
+    {
+      "sequence": 2,
+      "fullname": "Gu, Miao N",
+      "surname": "Gu",
+      "givenname": "Miao N"
+    },
+    {
+      "sequence": 3,
+      "surname": "Wang",
+      "givenname": "Shi"
+    },
+    {
+      "sequence": 4,
+      "surname": "Chu",
+      "middlename": "C",
+      "givenname": "Hai"
+    }   
+  ],
   "CorporateAuthor": [
     "Hunter, Rick",
     "Crusher, Beverly"
@@ -112,13 +151,6 @@ describe Summon::Document do
     "http://disney.com"
   ],
   "openUrl": "ctx_ver=Z39.88-2004&rfr_id=info:sid\/summon.serialssolutions.com&rft_val_fmt=info:ofi\/fmt:kev:mtx:dc&rft.title=Lisa+Hunter+--+alive&rft.creator=Hunter%2C+Lisa&rft.date=c200-0.&rft.pub=Spirulina+Records&rft.externalDBID=n%2Fa&rft.externalDocID=b16644323",
-  "Author_xml": [
-    {
-      "fullname": "Hunter, Lisa",
-      "surname": "Hunter",
-      "givenname": "Lisa"
-    }
-  ],
   "Library": [
     "Women's Center Library"
   ],

data/spec/summon/schema/search_spec.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Summon::Search do
-  it "maps" do
-    search = Summon::Search.new(@service, JSON.parse(<<-JSON))
+  before do
+    @search = Summon::Search.new(@service, JSON.parse(<<-JSON))
     {
       "pageCount": 0,
       "didYouMeanSuggestions": [
@@ -23,14 +23,17 @@ describe Summon::Search do
       "sessionId": "cfaa4020-1abe-4a9d-ae6e-e433a36c1069",
       "query": {}
     }
-JSON
-    search.page_count.should == 0
-    search.record_count.should == 4589937
-    search.query_time.should == 124
-    search.session_id.should == "cfaa4020-1abe-4a9d-ae6e-e433a36c1069"
-    search.documents.should == []
-    search.version.should == "1.0.0"
-    search.query.should be_kind_of(Summon::Query)
+  JSON
+  end
+  
+  it "maps" do
+    @search.page_count.should == 0
+    @search.record_count.should == 4589937
+    @search.query_time.should == 124
+    @search.session_id.should == "cfaa4020-1abe-4a9d-ae6e-e433a36c1069"
+    @search.documents.should == []
+    @search.version.should == "1.0.0"
+    @search.query.should be_kind_of(Summon::Query)
   end
   
   it "should handle an error case" do
@@ -58,5 +61,11 @@ JSON
     Summon::Search.new(@service, {}).should be_empty
     Summon::Search.new(@service, {"documents" => [{}]}).should_not be_empty
   end
+  
+  context "to_s" do
+    it "renders correctly" do
+      @search.to_s.should == "<Summon::Search>{records: 4589937, pages: 0, query_time: 124ms, request_time: 129ms}"
+    end
+  end
     
 end

data/spec/summon_spec.rb

@@ -21,7 +21,7 @@ describe "Summon Gem Integration Test" do
     d = documents[0]
     d.id.should == 'proquest_dll_1839009301'
     d.content_type.should == 'Newspaper Article'
-    d.authors.map{|a| a.name}.should == ["Hunter, Lisa"]
+    d.authors.map{|a| a.name}.should == ["Liang, Yong X", "Gu, Miao N", "Wang, Shi D", "Chu, Hai C"]
     d.open_url.should == "ctx_ver=Z39.88-2004&rfr_id=info:sid/summon.serialssolutions.com&rft_val_fmt=info:ofi/fmt:kevLmtx:journal&rft.genre=article&rft.atitle=OBITUARIES&rft.jtitle=Arizona+Republic&rft.date=2002-03-16&rft.issn=0892-8711&rft.spage=B.5&rft.externalDBID=AREP&rft.externalDocID=1839009301"
     d.fulltext?.should be(false)
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: summon
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Charles Lowell
@@ -16,14 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 -05:00
+date: 2011-06-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -34,12 +31,12 @@ dependencies:
         - 2
         - 0
         version: 1.2.0
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: *id001
+  name: json
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -50,12 +47,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: *id002
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,7 +61,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
+  prerelease: false
+  type: :development
+  requirement: *id003
+  name: rake
 description: Ruby language bindings for Serials Solutions Summon Unified Discovery Service
 email: 
 - cowboyd@thefrontside.net
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby language bindings for Serials Solutions Summon Unified Discovery Service