summon 1.1.9 → 1.1.12

data/lib/summon/transport/http.rb

@@ -15,6 +15,7 @@ module Summon::Transport
       @session_id = @options[:session_id] || "SUMMON-SESSION-#{Socket.gethostname}-#{$$}-#{sidalloc}"
       @url        = @options[:url]
       @log        = Summon::Log.new(options[:log])
+      @benchmark  = @options[:benchmark] || Summon::Service::Pass.new
     end
 
     def get(path, params = {})
@@ -24,40 +25,50 @@ module Summon::Transport
     end    
 
     def urlget(url, params = nil, session_id = nil)
-      uri = URI.parse url
-      params ||= from_query_string(uri.query)      
-      session_id ||= @session_id
-      headers = Headers.new(
-        :url => url,
-        :params => params,
-        :access_id => @access_id,
-        :secret_key => @secret_key,
-        :client_key => @client_key,
-        :session_id => session_id,
-        :log => @log
-      )
-      
-      @log.info("ruby-summon:transport") {
-        "GET: #{url}"
-      }
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.start do
-        get = Net::HTTP::Get.new("#{uri.path}#{'?' + uri.query if uri.query && uri.query != ''}")
-        get.merge! headers
-        http.request(get) do |response|          
-          case response
-            when Net::HTTPSuccess
-              return parse(response)
-            when Net::HTTPUnauthorized
-              raise AuthorizationError, status(response)
-            when Net::HTTPClientError
-              raise RequestError, error(response)
-            when Net::HTTPServerError
-              raise ServiceError, error(response)
-            else
-              raise UnknownResponseError, "Unknown response: #{response}"
-          end
+      @benchmark.report("total:") do
+        uri = URI.parse url
+        params ||= from_query_string(uri.query)      
+        session_id ||= @session_id
+        headers = @benchmark.report("calculate headers") do
+          Headers.new(
+            :url => url,
+            :params => params,
+            :access_id => @access_id,
+            :secret_key => @secret_key,
+            :client_key => @client_key,
+            :session_id => session_id,
+            :log => @log
+          )
         end
+        @log.info("ruby-summon:transport") {
+          "GET: #{url}"
+        }
+        result = nil
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.start do
+            get = Net::HTTP::Get.new("#{uri.path}#{'?' + uri.query if uri.query && uri.query != ''}")
+            get.merge! headers
+            response = @benchmark.report("http request") do
+              http.request(get)
+            end
+            case response
+              when Net::HTTPSuccess
+                @benchmark.report("parse response") do
+                  result = parse(response)
+                end
+              when Net::HTTPUnauthorized
+                raise AuthorizationError, status(response)
+              when Net::HTTPClientError
+                raise RequestError, error(response)
+              when Net::HTTPServerError
+                raise ServiceError, error(response)
+              else
+                raise UnknownResponseError, "Unknown response: #{response}"
+            end
+          end
+    
+        ###
+        result
       end
     end
 

data/spec/summon/schema/document_spec.rb

@@ -227,6 +227,8 @@ content_type: Audio Recording
 corporate_authors: 
 - Hunter, Rick
 - Crusher, Beverly
+dbid: 
+- GXQ
 dissertation_advisor: Claudio Friedmann
 dissertation_category: Education
 dissertation_degree: M.S.J.
@@ -236,6 +238,7 @@ dissertation_degree_date_decade: "2000"
 dissertation_degree_date_year: "2001"
 dissertation_school: West Virginia University
 doi: 10.1109\/CBMS.2008.1
+edition: 
 end_page: i
 fulltext: false
 genres: 
@@ -256,6 +259,8 @@ issns:
 issue: "7"
 languages: 
 - English
+lib_guide_tab: []
+
 library: Women's Center Library
 open_url: 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
 page_count: xxviii, 140 p.

data/spec/summon/schema/facet_spec.rb

@@ -17,7 +17,8 @@ describe Summon::Facet do
     it "should return the default value" do
       mock(:service, :locale => 'en').tap do |service|
         @facet = Summon::Facet.new(service, JSON.parse(EXAMPLE_FACET_JSON))
-        @facet.local_name.should == @facet.display_name
+        @facet.display_name.should == "ContentType"
+        @facet.local_name.should == "Content Type"
       end
     end
     

data/spec/summon/schema_spec.rb

@@ -33,7 +33,7 @@ describe Summon::Schema do
         Class.new(Summon::Schema).new(service).tap do |o|
           o.translate("ContentType").should == 'Type de la Contente'
           service.stub!(:locale).and_return('en')
-          o.translate("ContentType").should == 'ContentType'
+          o.translate("ContentType").should == 'Content Type'
         end
       end
     end
@@ -48,7 +48,7 @@ describe Summon::Schema do
     it "should default to english if it does not recognize the locale" do
       mock(:service, :locale => 'xx').tap do |service|
         Class.new(Summon::Schema).new(service).tap do |o|
-          o.translate("ContentType").should == 'ContentType'
+          o.translate("ContentType").should == 'Content Type'
         end
       end
     end
@@ -110,6 +110,33 @@ describe Summon::Schema do
       o.steaming.should_not be_nil
       o.steaming.type.should == "swirled"
     end
+
+    it "should accept a class as transformer" do
+      class Summon::DogHouse < Summon::Schema
+        attr :type
+      end
+      class_eval do
+        attr :place, :transform => Summon::DogHouse
+      end
+
+      o = init('place' => {:type => 'fancy'})
+      o.place.should_not be_nil
+      o.place.type.should == 'fancy'
+    end
+
+    it "should accept an array of symbols as transformer" do
+      module Summon::Pets; end
+      class Summon::Pets::PitBull < Summon::Schema
+        attr :name
+      end
+      class_eval do
+        attr :dog, :transform => [:pets, :pit_bull]
+      end
+
+      o = init('dog' => {:name => 'Fido'})
+      o.dog.should_not be_nil
+      o.dog.name.should == "Fido"
+    end
   
     it "will apply a transform across an array if the field is an array" do
       class Summon::DogPatch < Summon::Schema

data/summon.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{summon}
-  s.version = "1.1.7"
+  s.version = "1.1.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Charles Lowell"]
-  s.date = %q{2010-03-08}
+  s.date = %q{2010-10-19}
   s.description = %q{Ruby language bindings for Serials Solutions Summon Unified Discovery Service}
   s.email = ["cowboyd@thefrontside.net"]
   s.executables = ["summon", "summonh"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt"]
-  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "bin/summon", "bin/summonh", "ispec/integration_spec.rb", "lib/summon.rb", "lib/summon/cli.rb", "lib/summon/locales/en.rb", "lib/summon/locales/fr.rb", "lib/summon/locales/jp.rb", "lib/summon/locales/xx.rb", "lib/summon/log.rb", "lib/summon/schema.rb", "lib/summon/schema/availability.rb", "lib/summon/schema/citation.rb", "lib/summon/schema/date.rb", "lib/summon/schema/document.rb", "lib/summon/schema/error.rb", "lib/summon/schema/facet.rb", "lib/summon/schema/query.rb", "lib/summon/schema/range.rb", "lib/summon/schema/recommendation_list.rb", "lib/summon/schema/search.rb", "lib/summon/schema/suggestion.rb", "lib/summon/service.rb", "lib/summon/transport.rb", "lib/summon/transport/canned.json", "lib/summon/transport/canned.rb", "lib/summon/transport/errors.rb", "lib/summon/transport/headers.rb", "lib/summon/transport/http.rb", "lib/summon/transport/qstring.rb", "script/console", "script/destroy", "script/generate", "spec/spec.opts", "spec/spec_helper.rb", "spec/summon/log_spec.rb", "spec/summon/schema/availability_spec.rb", "spec/summon/schema/citation_spec.rb", "spec/summon/schema/date_spec.rb", "spec/summon/schema/document_spec.rb", "spec/summon/schema/facet_spec.rb", "spec/summon/schema/query_spec.rb", "spec/summon/schema/range_spec.rb", "spec/summon/schema/recommendation_list_spec.rb", "spec/summon/schema/search_spec.rb", "spec/summon/schema_spec.rb", "spec/summon/service_spec.rb", "spec/summon/transport/headers_spec.rb", "spec/summon/transport/http_spec.rb", "spec/summon/transport/qstring_spec.rb", "spec/summon_spec.rb", "summon.gemspec"]
+  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "bin/summon", "bin/summonh", "ispec/integration_spec.rb", "lib/summon.rb", "lib/summon/benchmark.rb", "lib/summon/cli.rb", "lib/summon/locales/dadk.rb", "lib/summon/locales/dede.rb", "lib/summon/locales/en.rb", "lib/summon/locales/eses.rb", "lib/summon/locales/fifi.rb", "lib/summon/locales/fr.rb", "lib/summon/locales/frfr.rb", "lib/summon/locales/isis.rb", "lib/summon/locales/itit.rb", "lib/summon/locales/jp.rb", "lib/summon/locales/nlnl.rb", "lib/summon/locales/nono.rb", "lib/summon/locales/ptpt.rb", "lib/summon/locales/svse.rb", "lib/summon/locales/zacn.rb", "lib/summon/locales/zhcn.rb", "lib/summon/log.rb", "lib/summon/schema.rb", "lib/summon/schema/availability.rb", "lib/summon/schema/citation.rb", "lib/summon/schema/date.rb", "lib/summon/schema/document.rb", "lib/summon/schema/error.rb", "lib/summon/schema/facet.rb", "lib/summon/schema/query.rb", "lib/summon/schema/range.rb", "lib/summon/schema/recommendation_list.rb", "lib/summon/schema/search.rb", "lib/summon/schema/suggestion.rb", "lib/summon/service.rb", "lib/summon/transport.rb", "lib/summon/transport/canned.json", "lib/summon/transport/canned.rb", "lib/summon/transport/errors.rb", "lib/summon/transport/headers.rb", "lib/summon/transport/http.rb", "lib/summon/transport/qstring.rb", "script/console", "script/destroy", "script/generate", "spec/spec.opts", "spec/spec_helper.rb", "spec/summon/log_spec.rb", "spec/summon/schema/availability_spec.rb", "spec/summon/schema/citation_spec.rb", "spec/summon/schema/date_spec.rb", "spec/summon/schema/document_spec.rb", "spec/summon/schema/facet_spec.rb", "spec/summon/schema/query_spec.rb", "spec/summon/schema/range_spec.rb", "spec/summon/schema/recommendation_list_spec.rb", "spec/summon/schema/search_spec.rb", "spec/summon/schema_spec.rb", "spec/summon/service_spec.rb", "spec/summon/transport/headers_spec.rb", "spec/summon/transport/http_spec.rb", "spec/summon/transport/qstring_spec.rb", "spec/summon_spec.rb", "summon.gemspec"]
   s.homepage = %q{http://summon.rubyforge.org}
   s.post_install_message = %q{
 For comprehensive documentation on Summon API options and usage visit:
@@ -22,14 +22,14 @@ http://api.summon.serialssolutions.com
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{summon}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby language bindings for Serials Solutions Summon Unified Discovery Service}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 1.2.0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<hoe>, [">= 2.5.0"])

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: summon
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 1
   - 1
-  - 9
-  version: 1.1.9
+  - 12
+  version: 1.1.12
 platform: ruby
 authors: 
 - Charles Lowell
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-04 00:00:00 -05:00
+date: 2010-10-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 2
@@ -35,9 +38,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -49,14 +54,16 @@ dependencies:
   name: hoe
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 6
-        - 0
-        version: 2.6.0
+        - 2
+        version: 2.6.2
   type: :development
   version_requirements: *id003
 description: Ruby language bindings for Serials Solutions Summon Unified Discovery Service
@@ -81,11 +88,24 @@ files:
 - bin/summonh
 - ispec/integration_spec.rb
 - lib/summon.rb
+- lib/summon/benchmark.rb
 - lib/summon/cli.rb
+- lib/summon/locales/dadk.rb
+- lib/summon/locales/dede.rb
 - lib/summon/locales/en.rb
+- lib/summon/locales/eses.rb
+- lib/summon/locales/fifi.rb
 - lib/summon/locales/fr.rb
+- lib/summon/locales/frfr.rb
+- lib/summon/locales/isis.rb
+- lib/summon/locales/itit.rb
 - lib/summon/locales/jp.rb
-- lib/summon/locales/xx.rb
+- lib/summon/locales/nlnl.rb
+- lib/summon/locales/nono.rb
+- lib/summon/locales/ptpt.rb
+- lib/summon/locales/svse.rb
+- lib/summon/locales/zacn.rb
+- lib/summon/locales/zhcn.rb
 - lib/summon/log.rb
 - lib/summon/schema.rb
 - lib/summon/schema/availability.rb
@@ -145,23 +165,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: summon
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby language bindings for Serials Solutions Summon Unified Discovery Service

data/lib/summon/locales/xx.rb

@@ -1,180 +0,0 @@
-module Summon
-  module Locale
-    module XX
-      TRANSLATIONS = {
-        "ContentType"               => "ContentType",
-        "IsScholarly"               => "IsScholarly",
-        "Language"                  => "Language",
-        "Library"                   => "Library",
-        "PublicationDate"           => "PublicationDate",
-        "SubjectTerms"              => "SubjectTerms",
-        
-        "Album"                     => "Album",
-        "Architectural Drawing"     => "Architectural Drawing",
-        "Archival Material"         => "Archival Material",
-        "Art"                       => "Art",
-        "Artifact"                  => "Artifact",
-        "Audio Recording"           => "Audio Recording",
-        "Blueprint"                 => "Blueprint",
-        "Blueprints"                => "Blueprints",
-        "Book"                      => "Book",
-        "Book Chapter"              => "Book Chapter",
-        "Book Review"               => "Book Review",
-        "Catalog"                   => "Catalog",
-        "Ceremonial Object"         => "Ceremonial Object",
-        "Clothing"                  => "Clothing",
-        "Computer File"             => "Computer File",
-        "Conference Proceeding"     => "Conference Proceeding",
-        "Dissertation"              => "Dissertation",
-        "Drawing"                   => "Drawing",
-        "eBook"                     => "eBook",
-        "Equipment"                 => "Equipment",
-        "Furnishing"                => "Furnishing",
-        "Government Document"       => "Government Document",
-        "Graphic Arts"              => "Graphic Arts",
-        "Houseware"                 => "Houseware",
-        "Image"                     => "Image",
-        "Implements"                => "Implements",
-        "Journal"                   => "Journal",
-        "Journal Article"           => "Journal Article",
-        "Kit"                       => "Kit",
-        "Manuscript"                => "Manuscript",
-        "Map"                       => "Map",
-        "Microfilm"                 => "Microfilm",
-        "Microform"                 => "Microform",
-        "Model"                     => "Model",
-        "Music Recording"           => "Music Recording",
-        "Music Score"               => "Music Score",
-        "Musical Instrument"        => "Musical Instrument",
-        "Newsletter"                => "Newsletter",
-        "Newspaper"                 => "Newspaper",
-        "Newspaper Article"         => "Newspaper Article",
-        "Painting"                  => "Painting",
-        "Pamphlet"                  => "Pamphlet",
-        "Paper"                     => "Paper",
-        "Patent"                    => "Patent",
-        "Personal Article"          => "Personal Article",
-        "Photograph"                => "Photograph",
-        "Play"                      => "Play",
-        "Poem"                      => "Poem",
-        "Postcard"                  => "Postcard",
-        "Poster"                    => "Poster",
-        "Presentation"              => "Presentation",
-        "Publication"               => "Publication",
-        "Publication Article"       => "Publication Article",
-        "Realia"                    => "Realia",
-        "Report"                    => "Report",
-        "Special Collection"        => "Special Collection",
-        "Spoken Word Recording"     => "Spoken Word Recording",
-        "Standard"                  => "Standard",
-        "Tool"                      => "Tool",
-        "Trade Publication Article" => "Trade Publication Article",
-        "Transcript"                => "Transcript",
-        "Video Recording"           => "Video Recording",
-        "Web Resource"              => "Web Resource",
-
-        "Language"                  => "Language",
-        "Afrikaans"                 => "Afrikaans",
-        "Albanian"                  => "Albanian",
-        "Amharic"                   => "Amharic",
-        "Arabic"                    => "Arabic",
-        "Aragonese"                 => "Aragonese",
-        "Armenian"                  => "Armenian",
-        "Aymara"                    => "Aymara",
-        "Azerbaijani"               => "Azerbaijani",
-        "Bambara"                   => "Bambara",
-        "Basque"                    => "Basque",
-        "Belarusian"                => "Belarusian",
-        "Bengali"                   => "Bengali",
-        "Bosnian"                   => "Bosnian",
-        "Breton"                    => "Breton",
-        "Bulgarian"                 => "Bulgarian",
-        "Burmese"                   => "Burmese",
-        "Catalan"                   => "Catalan",
-        "Chechen"                   => "Chechen",
-        "Chinese"                   => "Chinese",
-        "Church Slavic"             => "Church Slavic",
-        "Cree"                      => "Cree",
-        "Croatian"                  => "Croatian",
-        "Czech"                     => "Czech",
-        "Danish"                    => "Danish",
-        "Dutch"                     => "Dutch",
-        "English"                   => "English",
-        "Esperanto"                 => "Esperanto",
-        "Estonian"                  => "Estonian",
-        "Fijian"                    => "Fijian",
-        "Finnish"                   => "Finnish",
-        "French"                    => "French",
-        "Fulah"                     => "Fulah",
-        "Galician"                  => "Galician",
-        "Ganda"                     => "Ganda",
-        "Georgian"                  => "Georgian",
-        "German"                    => "German",
-        "Greek"                     => "Greek",
-        "Haitian"                   => "Haitian",
-        "Hebrew"                    => "Hebrew",
-        "Hindi"                     => "Hindi",
-        "Hungarian"                 => "Hungarian",
-        "Icelandic"                 => "Icelandic",
-        "Indonesian"                => "Indonesian",
-        "Inuktitut"                 => "Inuktitut",
-        "inupiaq"                   => "inupiaq",
-        "Irish"                     => "Irish",
-        "Italian"                   => "Italian",
-        "Japanese"                  => "Japanese",
-        "Javanese"                  => "Javanese",
-        "Korean"                    => "Korean",
-        "Kurdish"                   => "Kurdish",
-        "Lao"                       => "Lao",
-        "Latin"                     => "Latin",
-        "Latvian"                   => "Latvian",
-        "Lithuanian"                => "Lithuanian",
-        "Macedonian"                => "Macedonian",
-        "Malay"                     => "Malay",
-        "Maltese"                   => "Maltese",
-        "Maori"                     => "Maori",
-        "Marathi"                   => "Marathi",
-        "Mongolian"                 => "Mongolian",
-        "Navajo"                    => "Navajo",
-        "Ndonga"                    => "Ndonga",
-        "Nepali"                    => "Nepali",
-        "Norwegian"                 => "Norwegian",
-        "Norwegian Bokmål"          => "Norwegian Bokmål",
-        "Ojibwa"                    => "Ojibwa",
-        "Pali"                      => "Pali",
-        "Panjabi"                   => "Panjabi",
-        "Persian"                   => "Persian",
-        "Polish"                    => "Polish",
-        "Portuguese"                => "Portuguese",
-        "Pushto"                    => "Pushto",
-        "Quechua"                   => "Quechua",
-        "Romanian"                  => "Romanian",
-        "Russian"                   => "Russian",
-        "Sanskrit"                  => "Sanskrit",
-        "Serbian"                   => "Serbian",
-        "Slovak"                    => "Slovak",
-        "Slovenian"                 => "Slovenian",
-        "Spanish"                   => "Spanish",
-        "Sundanese"                 => "Sundanese",
-        "Swahili"                   => "Swahili",
-        "Swedish"                   => "Swedish",
-        "Tagalog"                   => "Tagalog",
-        "Tamil"                     => "Tamil",
-        "Telugu"                    => "Telugu",
-        "Thai"                      => "Thai",
-        "Tibetan"                   => "Tibetan",
-        "Tswana"                    => "Tswana",
-        "Turkish"                   => "Turkish",
-        "Ukrainian"                 => "Ukrainian",
-        "Urdu"                      => "Urdu",
-        "Vietnamese"                => "Vietnamese",
-        "Welsh"                     => "Welsh",
-        "Western Frisian"           => "Western Frisian",
-        "Wolof"                     => "Wolof",
-        "Yiddish"                   => "Yiddish",
-        "Yoruba"                    => "Yoruba",
-        "Zulu"                      => "Zulu"
-      }
-    end
-  end
-end