enju_ndl 0.1.0.pre33 → 0.1.0.pre34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bc0e7400d06fffdecf259a92484b75fc49607ef
-  data.tar.gz: a223c940f4e943a4486a366d8b44d158729a57ce
+  metadata.gz: 38203a62086f74c310be1ac0b81a4f9bde611ad5
+  data.tar.gz: 4a5050d598a51a9e6bd563cb868812b1781dad4d
 SHA512:
-  metadata.gz: cff7bb45977dc6e341d2f3ea5534f3c5721bae6028ac9d6519832862599e3c67e1aed5803729c6f8fefe5ff73ad14793f19cda30cc6bcce52a513f556c553000
-  data.tar.gz: a7b42bb1dbdfdff8fb650734e1180fcfee9c65c75499c6093940787035934f2b0a927493c0be4d5fbf71478b78d0190cc3fc842468378ca241febfeaddbeb7b8
+  metadata.gz: 742469d8e8b0fecb9b3539238297dc3840f341b4096f9c93b132bf4e70ec6b76ec718c7e2a9b6114fbe8c03e122187cc37cf1208b976c809cbe87f2844f6e465
+  data.tar.gz: 80fa75462e724623647c3ca35a8797a58fe1ab8c2350f642fe1138c6a8a98ecebe576803c1b2e73159b61373756b638c9a69a621b9ccd621155607f2319ba0b0

data/app/controllers/ndl_books_controller.rb

@@ -11,7 +11,7 @@ class NdlBooksController < ApplicationController
     @query = params[:query].to_s.strip
     books = NdlBook.search(params[:query], page)
     @books = Kaminari.paginate_array(
-      books[:items], :total_count => books[:total_entries], :page => page
+      books[:items], total_count: books[:total_entries], page: page
     ).page(page).per(10)
 
     respond_to do |format|
@@ -29,7 +29,7 @@ class NdlBooksController < ApplicationController
         if @manifestation.try(:save)
           format.html { redirect_to @manifestation, notice: t('controller.successfully_created', model: t('activerecord.models.manifestation')) }
         else
-          format.html { redirect_to ndl_books_url , notice: t('enju_ndl.record_not_found') }
+          format.html { redirect_to ndl_books_url, notice: t('enju_ndl.record_not_found') }
         end
       end
     end

data/app/helpers/ndl_books_helper.rb

@@ -4,14 +4,14 @@ module NdlBooksHelper
     if iss_itemno.blank?
       t('enju_ndl.not_available')
     else
-      identifier_type = IdentifierType.where(:name => 'iss_itemno').first
+      identifier_type = IdentifierType.where(name: 'iss_itemno').first
       if identifier_type
-        manifestation = Identifier.where(:body => iss_itemno, :identifier_type_id => identifier_type.id).first.try(:manifestation)
+        manifestation = Identifier.where(body: iss_itemno, identifier_type_id: identifier_type.id).first.try(:manifestation)
       end
-      unless manifestation
-        link_to t('enju_ndl.add'), ndl_books_path(:book => {:iss_itemno => iss_itemno}), :method => :post
-      else
+      if manifestation
         link_to t('enju_ndl.already_exists'), manifestation
+      else
+        button_to t('enju_ndl.add'), ndl_books_path(book: {iss_itemno: iss_itemno}), method: :post, data: {disable_with: t('page.saving')}
       end
     end
   end

data/app/models/ndl_book.rb

@@ -32,11 +32,11 @@ class NdlBook
   end
 
   def creator
-    @node.xpath('./dc:creator').collect(&:content).join(' ')
+    @node.xpath('./dc:creator').map(&:content).join(' ')
   end
 
   def publisher
-    @node.xpath('./dc:publisher').collect(&:content).join(' ')
+    @node.xpath('./dc:publisher').map(&:content).join(' ')
   end
 
   def issued
@@ -56,21 +56,21 @@ class NdlBook
       cnt = self.per_page
       page = 1 if page.to_i < 1
       idx = (page.to_i - 1) * cnt + 1
-      doc = Nokogiri::XML(Manifestation.search_ndl(query, {:cnt => cnt, :page => page, :idx => idx, :raw => true, :mediatype => 1}).to_s)
-      items = doc.xpath('//channel/item').collect{|node| self.new node }
+      doc = Nokogiri::XML(Manifestation.search_ndl(query, {cnt: cnt, page: page, idx: idx, raw: true, mediatype: 1}).to_s)
+      items = doc.xpath('//channel/item').map{|node| self.new node }
       total_entries = doc.at('//channel/openSearch:totalResults').content.to_i
 
-      {:items => items, :total_entries => total_entries}
+      {items: items, total_entries: total_entries}
     else
-      {:items => [], :total_entries => 0}
+      {items: [], total_entries: 0}
     end
   end
 
   def self.import_from_sru_response(itemno)
-    identifier = Identifier.where(body: itemno, :identifier_type_id => IdentifierType.where(name: 'iss_itemno').first_or_create.id).first
+    identifier = Identifier.where(body: itemno, identifier_type_id: IdentifierType.where(name: 'iss_itemno').first_or_create.id).first
     return if identifier
     url = "http://iss.ndl.go.jp/api/sru?operation=searchRetrieve&recordSchema=dcndl&maximumRecords=1&query=%28itemno=#{itemno}%29&onlyBib=true"
-    xml = open(url).read
+    xml = Faraday.get(url).body
     response = Nokogiri::XML(xml).at('//xmlns:recordData')
     return unless response.try(:content)
     Manifestation.import_record(Nokogiri::XML(response.content))

data/lib/enju_ndl/engine.rb

@@ -3,6 +3,7 @@ require 'nokogiri'
 require 'rss'
 require 'lisbn'
 require 'library_stdnums'
+require 'faraday'
 
 module EnjuNdl
   class Engine < ::Rails::Engine

data/lib/enju_ndl/ndl_search.rb

@@ -7,7 +7,7 @@ module EnjuNdl
 
     module ClassMethods
       def import_isbn(isbn)
-        manifestation = Manifestation.import_from_ndl_search(:isbn => isbn)
+        manifestation = Manifestation.import_from_ndl_search(isbn: isbn)
         manifestation
       end
 
@@ -28,7 +28,7 @@ module EnjuNdl
 
       def import_record(doc)
         iss_itemno = URI.parse(doc.at('//dcndl:BibAdminResource[@rdf:about]').values.first).path.split('/').last
-        identifier = Identifier.where(:body => iss_itemno, :identifier_type_id => IdentifierType.where(:name => 'iss_itemno').first_or_create.id).first
+        identifier = Identifier.where(body: iss_itemno, :identifier_type_id => IdentifierType.where(name: 'iss_itemno').first_or_create.id).first
         return identifier.manifestation if identifier
 
         jpno = doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/JPNO"]').try(:content)
@@ -52,7 +52,7 @@ module EnjuNdl
           end
         end
 
-        language = Language.where(:iso_639_2 => get_language(doc)).first
+        language = Language.where(iso_639_2: get_language(doc)).first
         if language
           language_id = language.id
         else
@@ -67,14 +67,14 @@ module EnjuNdl
         doc.xpath('//dcndl:materialType[@rdf:resource]').each do |d|
           case d.attributes['resource'].try(:content)
           when 'http://ndl.go.jp/ndltype/Book'
-            carrier_type = CarrierType.where(:name => 'print').first
-            content_type = ContentType.where(:name => 'text').first
+            carrier_type = CarrierType.where(name: 'print').first
+            content_type = ContentType.where(name: 'text').first
           when 'http://purl.org/dc/dcmitype/Sound'
-            content_type = ContentType.where(:name => 'audio').first
+            content_type = ContentType.where(name: 'audio').first
           when 'http://purl.org/dc/dcmitype/MovingImage'
-            content_type = ContentType.where(:name => 'video').first
+            content_type = ContentType.where(name: 'video').first
           when 'http://ndl.go.jp/ndltype/ElectronicResource'
-            carrier_type = CarrierType.where(:name => 'file').first
+            carrier_type = CarrierType.where(name: 'file').first
           end
         end
 
@@ -98,7 +98,7 @@ module EnjuNdl
             :title_alternative => title[:alternative],
             :title_alternative_transcription => title[:alternative_transcription],
             # TODO: NDLサーチに入っている図書以外の資料を調べる
-            #:carrier_type_id => CarrierType.where(:name => 'print').first.id,
+            #:carrier_type_id => CarrierType.where(name: 'print').first.id,
             :language_id => language_id,
             :pub_date => date,
             :description => description,
@@ -112,24 +112,24 @@ module EnjuNdl
           )
           identifier = {}
           if isbn
-            identifier[:isbn] = Identifier.new(:body => isbn)
-            identifier[:isbn].identifier_type = IdentifierType.where(:name => 'isbn').first_or_create
+            identifier[:isbn] = Identifier.new(body: isbn)
+            identifier[:isbn].identifier_type = IdentifierType.where(name: 'isbn').first_or_create
           end
           if iss_itemno
-            identifier[:iss_itemno] = Identifier.new(:body => iss_itemno)
-            identifier[:iss_itemno].identifier_type = IdentifierType.where(:name => 'iss_itemno').first_or_create
+            identifier[:iss_itemno] = Identifier.new(body: iss_itemno)
+            identifier[:iss_itemno].identifier_type = IdentifierType.where(name: 'iss_itemno').first_or_create
           end
           if jpno
-            identifier[:jpno] = Identifier.new(:body => jpno)
-            identifier[:jpno].identifier_type = IdentifierType.where(:name => 'jpno').first_or_create
+            identifier[:jpno] = Identifier.new(body: jpno)
+            identifier[:jpno].identifier_type = IdentifierType.where(name: 'jpno').first_or_create
           end
           if issn
-            identifier[:issn] = Identifier.new(:body => issn)
-            identifier[:issn].identifier_type = IdentifierType.where(:name => 'issn').first_or_create
+            identifier[:issn] = Identifier.new(body: issn)
+            identifier[:issn].identifier_type = IdentifierType.where(name: 'issn').first_or_create
           end
           if issn_l
-            identifier[:issn_l] = Identifier.new(:body => issn_l)
-            identifier[:issn_l].identifier_type = IdentifierType.where(:name => 'issn_l').first_or_create
+            identifier[:issn_l] = Identifier.new(body: issn_l)
+            identifier[:issn_l].identifier_type = IdentifierType.where(name: 'issn_l').first_or_create
           end
           manifestation.carrier_type = carrier_type if carrier_type
           manifestation.manifestation_content_type = content_type if content_type
@@ -158,18 +158,18 @@ module EnjuNdl
 
         Agent.transaction do
           creator_agents = Agent.import_agents(creators)
-          language_id = Language.where(:iso_639_2 => language).first.id rescue 1
-          content_type_id = ContentType.where(:name => 'text').first.id rescue 1
+          language_id = Language.where(iso_639_2: language).first.id rescue 1
+          content_type_id = ContentType.where(name: 'text').first.id rescue 1
           manifestation.creators << creator_agents
 
           if defined?(EnjuSubject)
-            subject_heading_type = SubjectHeadingType.where(:name => 'ndlsh').first_or_create
+            subject_heading_type = SubjectHeadingType.where(name: 'ndlsh').first_or_create
             subjects.each do |term|
-              subject = Subject.where(:term => term[:term]).first
+              subject = Subject.where(term: term[:term]).first
               unless subject
                 subject = Subject.new(term)
                 subject.subject_heading_type = subject_heading_type
-                subject.subject_type = SubjectType.where(:name => 'concept').first_or_create
+                subject.subject_type = SubjectType.where(name: 'concept').first_or_create
               end
               #if subject.valid?
                 manifestation.subjects << subject
@@ -180,8 +180,8 @@ module EnjuNdl
               ndc9_url = classification_urls.map{|url| URI.parse(URI.escape(url))}.select{|u| u.path.split('/').reverse[1] == 'ndc9'}.first
               if ndc9_url
                 ndc = ndc9_url.path.split('/').last
-                classification_type = ClassificationType.where(:name => 'ndc9').first_or_create
-                classification = Classification.new(:category => ndc)
+                classification_type = ClassificationType.where(name: 'ndc9').first_or_create
+                classification = Classification.new(category: ndc)
                 classification.classification_type = classification_type
                 manifestation.classifications << classification if classification.valid?
               end
@@ -191,7 +191,7 @@ module EnjuNdl
       end
 
       def search_ndl(query, options = {})
-        options = {:dpid => 'iss-ndl-opac', :item => 'any', :idx => 1, :per_page => 10, :raw => false, :mediatype => 1}.merge(options)
+        options = {dpid: 'iss-ndl-opac', item: 'any', :idx => 1, :per_page => 10, :raw => false, :mediatype => 1}.merge(options)
         doc = nil
         results = {}
         startrecord = options[:idx].to_i
@@ -200,7 +200,7 @@ module EnjuNdl
         end
         url = "http://iss.ndl.go.jp/api/opensearch?dpid=#{options[:dpid]}&#{options[:item]}=#{format_query(query)}&cnt=#{options[:per_page]}&idx=#{startrecord}&mediatype=#{options[:mediatype]}"
         if options[:raw] == true
-          open(url).read
+          Faraday.get(url).body
         else
           RSS::Rss::Channel.install_text_element("openSearch:totalResults", "http://a9.com/-/spec/opensearchrss/1.0/", "?", "totalResults", :text, "openSearch:totalResults")
           RSS::BaseListener.install_get_text_element "http://a9.com/-/spec/opensearchrss/1.0/", "totalResults", "totalResults="
@@ -217,13 +217,13 @@ module EnjuNdl
       end
 
       def return_xml(isbn)
-        rss = self.search_ndl(isbn, {:dpid => 'iss-ndl-opac', :item => 'isbn'})
+        rss = self.search_ndl(isbn, {dpid: 'iss-ndl-opac', item: 'isbn'})
         if rss.channel.totalResults.to_i == 0
           isbn = normalize_isbn(isbn)
-          rss = self.search_ndl(isbn, {:dpid => 'iss-ndl-opac', :item => 'isbn'})
+          rss = self.search_ndl(isbn, {dpid: 'iss-ndl-opac', item: 'isbn'})
         end
         if rss.items.first
-          doc = Nokogiri::XML(open("#{rss.items.first.link}.rdf").read)
+          doc = Nokogiri::XML(Faraday.get("#{rss.items.first.link}.rdf").body)
         end
       end
 

data/lib/enju_ndl/version.rb

@@ -1,3 +1,3 @@
 module EnjuNdl
-  VERSION = "0.1.0.pre33"
+  VERSION = "0.1.0.pre34"
 end

data/spec/cassette_library/ImportRequest/should_import_isbn.yml

@@ -2,53 +2,51 @@
 http_interactions:
 - request:
     method: get
-    uri: http://iss.ndl.go.jp/api/opensearch?dpid=iss-ndl-opac&isbn=4797327030&cnt=10&idx=1&mediatype=1
+    uri: http://iss.ndl.go.jp/api/opensearch?cnt=10&dpid=iss-ndl-opac&idx=1&isbn=4797327030&mediatype=1
     body:
       encoding: US-ASCII
       string: ''
     headers:
-      accept-encoding:
+      Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      accept:
+      Accept:
       - "*/*"
-      user-agent:
+      User-Agent:
       - Ruby
   response:
     status:
       code: 200
       message: OK
     headers:
-      date:
-      - Sat, 16 Aug 2014 15:00:52 GMT
-      server:
+      Date:
+      - Wed, 01 Oct 2014 07:53:12 GMT
+      Server:
       - Apache
-      etag:
+      Etag:
       - '"02918cd36785c86b466259d330c412b8"'
-      x-ua-compatible:
+      X-Ua-Compatible:
       - IE=Edge,chrome=1
-      x-runtime:
-      - '0.167314'
-      cache-control:
+      X-Runtime:
+      - '0.151147'
+      Cache-Control:
       - max-age=0, private, must-revalidate
-      status:
+      Status:
       - '200'
-      content-type:
+      Content-Type:
       - application/xml; charset=utf-8
-      set-cookie:
-      - _front_session_id=f475e596e9d2b293bd395e3e7dab4851; domain=.iss.ndl.go.jp;
-        path=/; expires=Sat, 16-Aug-2014 16:00:52 GMT; HttpOnly
-      - serverid=1101; path=/
-      vary:
+      Set-Cookie:
+      - _front_session_id=b45fe55055b9e2198ec7416c2435d578; domain=.iss.ndl.go.jp;
+        path=/; expires=Wed, 01-Oct-2014 08:53:12 GMT; HttpOnly
+      - serverid=1105; path=/
+      Vary:
       - Accept-Encoding,User-Agent
-      content-encoding:
-      - gzip
-      x-content-type-options:
+      X-Content-Type-Options:
       - nosniff
-      x-frame-options:
+      X-Frame-Options:
       - SAMEORIGIN
-      content-length:
+      Content-Length:
       - '1288'
-      connection:
+      Connection:
       - close
     body:
       encoding: ASCII-8BIT
@@ -124,8 +122,8 @@ http_interactions:
         cmVzb3VyY2U9Imh0dHA6Ly93ZWIub21sLmNpdHkub3Nha2EubGcuanAvd2Vi
         b3BhY19pX2phLzAwMTA3ODE2NjciLz4KICAgIDwvaXRlbT4KICA8L2NoYW5u
         ZWw+CjwvcnNzPgo=
-    http_version: '1.0'
-  recorded_at: Sat, 16 Aug 2014 15:00:55 GMT
+    http_version: 
+  recorded_at: Wed, 01 Oct 2014 07:53:13 GMT
 - request:
     method: get
     uri: http://iss.ndl.go.jp/books/R100000002-I000007602726-00.rdf
@@ -133,46 +131,44 @@ http_interactions:
       encoding: US-ASCII
       string: ''
     headers:
-      accept-encoding:
+      User-Agent:
+      - Faraday v0.9.0
+      Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      accept:
+      Accept:
       - "*/*"
-      user-agent:
-      - Ruby
   response:
     status:
       code: 200
       message: OK
     headers:
-      date:
-      - Sat, 16 Aug 2014 15:00:53 GMT
-      server:
+      Date:
+      - Wed, 01 Oct 2014 07:53:12 GMT
+      Server:
       - Apache
-      etag:
-      - '"218e06427931df596c545a94859d542d"'
-      x-ua-compatible:
+      Etag:
+      - '"e1ac6b0fdc6da116e49cbc3e1910e59c"'
+      X-Ua-Compatible:
       - IE=Edge,chrome=1
-      x-runtime:
-      - '0.867414'
-      cache-control:
+      X-Runtime:
+      - '1.022141'
+      Cache-Control:
       - max-age=0, private, must-revalidate
-      status:
+      Status:
       - '200'
-      content-type:
+      Content-Type:
       - application/rdf+xml; charset=utf-8
-      set-cookie:
-      - _front_session_id=cb6566a39420a75c80ad350a06772cd0; domain=.iss.ndl.go.jp;
-        path=/; expires=Sat, 16-Aug-2014 16:00:53 GMT; HttpOnly
-      - serverid=1105; path=/
-      vary:
+      Set-Cookie:
+      - _front_session_id=f278f2506d6f18454728f370b41cb486; domain=.iss.ndl.go.jp;
+        path=/; expires=Wed, 01-Oct-2014 08:53:13 GMT; HttpOnly
+      - serverid=1101; path=/
+      Vary:
       - Accept-Encoding,User-Agent
-      content-encoding:
-      - gzip
-      x-content-type-options:
+      X-Content-Type-Options:
       - nosniff
-      x-frame-options:
+      X-Frame-Options:
       - SAMEORIGIN
-      connection:
+      Connection:
       - close
     body:
       encoding: ASCII-8BIT
@@ -448,106 +444,106 @@ http_interactions:
         dHA6Ly9uZGwuZ28uanAvZGNuZGwvdGVybXMvc29tb2t1QmliSUQiPjEwMDEw
         NDA2NTE3NTA8L2RjdGVybXM6aWRlbnRpZmllcj4KICAgIDxkY3Rlcm1zOmlk
         ZW50aWZpZXIgcmRmOmRhdGF0eXBlPSJodHRwOi8vbmRsLmdvLmpwL2RjbmRs
-        L3Rlcm1zL3NvbW9rdVN1YklEIj4yMzEwMDQxMTQ1NTwvZGN0ZXJtczppZGVu
+        L3Rlcm1zL3NvbW9rdVN1YklEIj4yMzEwMTIwNDU2MDwvZGN0ZXJtczppZGVu
         dGlmaWVyPgogICAgPGRjbmRsOmNhbGxOdW1iZXI+77yQ77yQ77yX77yO77yW
-        77yU77yP77yPPC9kY25kbDpjYWxsTnVtYmVyPgogICAgPGRjbmRsOmF2YWls
-        YWJpbGl0eT7jgIA8L2RjbmRsOmF2YWlsYWJpbGl0eT4KICAgIDxkY3Rlcm1z
-        OmRlc2NyaXB0aW9uPumFjee9ruWgtOaJgCA6IOOCs+ODs+ODlOODpeODvOOC
-        vzwvZGN0ZXJtczpkZXNjcmlwdGlvbj4KICA8L2RjbmRsOkl0ZW0+CiAgPGRj
-        bmRsOkl0ZW0gcmRmOmFib3V0PSJodHRwOi8vaXNzLm5kbC5nby5qcC9ib29r
-        cy9SMTAwMDAwMDAxLUkwNDU0NzgwMzgtMDAjaXRlbSI+CiAgICA8ZGNuZGw6
-        aG9sZGluZ0FnZW50PgogICAgICA8Zm9hZjpBZ2VudD4KICAgICAgICA8Zm9h
-        ZjpuYW1lPuWliOiJr+ecjOeri+Wbs+abuOaDheWgsemkqDwvZm9hZjpuYW1l
-        PgogICAgICAgIDxkY25kbDp0cmFuc2NyaXB0aW9uPuODiuODqeOCseODs+OD
-        quODhOODiOOCt+ODp+OCuOODp+OCpuODm+OCpuOCq+ODszwvZGNuZGw6dHJh
-        bnNjcmlwdGlvbj4KICAgICAgICA8ZGN0ZXJtczppZGVudGlmaWVyIHJkZjpk
-        YXRhdHlwZT0iaHR0cDovL25kbC5nby5qcC9kY25kbC90ZXJtcy9ORExMaWJD
-        b2RlIj4yOTExPC9kY3Rlcm1zOmlkZW50aWZpZXI+CiAgICAgIDwvZm9hZjpB
-        Z2VudD4KICAgIDwvZGNuZGw6aG9sZGluZ0FnZW50PgogICAgPHJkZnM6c2Vl
-        QWxzbyByZGY6cmVzb3VyY2U9Imh0dHA6Ly9vcGFjc3ZyMDEubGlicmFyeS5w
-        cmVmLm5hcmEuanAvbXlsaW1lZGlvL3NlYXJjaC9ib29rLmRvP2JpYmlkPTM0
-        MjgwMSIvPgogICAgPGRjdGVybXM6aWRlbnRpZmllciByZGY6ZGF0YXR5cGU9
-        Imh0dHA6Ly9uZGwuZ28uanAvZGNuZGwvdGVybXMvc29tb2t1QmliSUQiPjEx
-        MTA2OTEzMDwvZGN0ZXJtczppZGVudGlmaWVyPgogICAgPGRjdGVybXM6aWRl
-        bnRpZmllciByZGY6ZGF0YXR5cGU9Imh0dHA6Ly9uZGwuZ28uanAvZGNuZGwv
-        dGVybXMvc29tb2t1U3ViSUQiPjExMTA2OTEzMDwvZGN0ZXJtczppZGVudGlm
-        aWVyPgogICAgPGRjbmRsOmNhbGxOdW1iZXI+MDA3LjY0LeODpuOCpuOCrTwv
-        ZGNuZGw6Y2FsbE51bWJlcj4KICAgIDxkY3Rlcm1zOmRlc2NyaXB0aW9uPumF
-        jee9ruWgtOaJgO+8muaDheWgsemWi+aetjwvZGN0ZXJtczpkZXNjcmlwdGlv
-        bj4KICA8L2RjbmRsOkl0ZW0+CiAgPGRjbmRsOkl0ZW0gcmRmOmFib3V0PSJo
-        dHRwOi8vaXNzLm5kbC5nby5qcC9ib29rcy9SMTAwMDAwMDAxLUkwNDk3NDMx
-        NzYtMDAjaXRlbSI+CiAgICA8ZGNuZGw6aG9sZGluZ0FnZW50PgogICAgICA8
-        Zm9hZjpBZ2VudD4KICAgICAgICA8Zm9hZjpuYW1lPuWliOiJr+ecjOeri+Wb
-        s+abuOaDheWgsemkqDwvZm9hZjpuYW1lPgogICAgICAgIDxkY25kbDp0cmFu
-        c2NyaXB0aW9uPuODiuODqeOCseODs+ODquODhOODiOOCt+ODp+OCuOODp+OC
-        puODm+OCpuOCq+ODszwvZGNuZGw6dHJhbnNjcmlwdGlvbj4KICAgICAgICA8
+        77yU77yP44Om44Km77yPPC9kY25kbDpjYWxsTnVtYmVyPgogICAgPGRjbmRs
+        OmF2YWlsYWJpbGl0eT7jgIA8L2RjbmRsOmF2YWlsYWJpbGl0eT4KICAgIDxk
+        Y3Rlcm1zOmRlc2NyaXB0aW9uPumFjee9ruWgtOaJgCA6IOOCs+ODs+ODlOOD
+        peODvOOCvzwvZGN0ZXJtczpkZXNjcmlwdGlvbj4KICA8L2RjbmRsOkl0ZW0+
+        CiAgPGRjbmRsOkl0ZW0gcmRmOmFib3V0PSJodHRwOi8vaXNzLm5kbC5nby5q
+        cC9ib29rcy9SMTAwMDAwMDAxLUkwNDU0NzgwMzgtMDAjaXRlbSI+CiAgICA8
+        ZGNuZGw6aG9sZGluZ0FnZW50PgogICAgICA8Zm9hZjpBZ2VudD4KICAgICAg
+        ICA8Zm9hZjpuYW1lPuWliOiJr+ecjOeri+Wbs+abuOaDheWgsemkqDwvZm9h
+        ZjpuYW1lPgogICAgICAgIDxkY25kbDp0cmFuc2NyaXB0aW9uPuODiuODqeOC
+        seODs+ODquODhOODiOOCt+ODp+OCuOODp+OCpuODm+OCpuOCq+ODszwvZGNu
+        ZGw6dHJhbnNjcmlwdGlvbj4KICAgICAgICA8ZGN0ZXJtczppZGVudGlmaWVy
+        IHJkZjpkYXRhdHlwZT0iaHR0cDovL25kbC5nby5qcC9kY25kbC90ZXJtcy9O
+        RExMaWJDb2RlIj4yOTExPC9kY3Rlcm1zOmlkZW50aWZpZXI+CiAgICAgIDwv
+        Zm9hZjpBZ2VudD4KICAgIDwvZGNuZGw6aG9sZGluZ0FnZW50PgogICAgPHJk
+        ZnM6c2VlQWxzbyByZGY6cmVzb3VyY2U9Imh0dHA6Ly9vcGFjc3ZyMDEubGli
+        cmFyeS5wcmVmLm5hcmEuanAvbXlsaW1lZGlvL3NlYXJjaC9ib29rLmRvP2Jp
+        YmlkPTM0MjgwMSIvPgogICAgPGRjdGVybXM6aWRlbnRpZmllciByZGY6ZGF0
+        YXR5cGU9Imh0dHA6Ly9uZGwuZ28uanAvZGNuZGwvdGVybXMvc29tb2t1Qmli
+        SUQiPjExMTA2OTEzMDwvZGN0ZXJtczppZGVudGlmaWVyPgogICAgPGRjdGVy
+        bXM6aWRlbnRpZmllciByZGY6ZGF0YXR5cGU9Imh0dHA6Ly9uZGwuZ28uanAv
+        ZGNuZGwvdGVybXMvc29tb2t1U3ViSUQiPjExMTA2OTEzMDwvZGN0ZXJtczpp
+        ZGVudGlmaWVyPgogICAgPGRjbmRsOmNhbGxOdW1iZXI+MDA3LjY0LeODpuOC
+        puOCrTwvZGNuZGw6Y2FsbE51bWJlcj4KICAgIDxkY3Rlcm1zOmRlc2NyaXB0
+        aW9uPumFjee9ruWgtOaJgO+8muaDheWgsemWi+aetjwvZGN0ZXJtczpkZXNj
+        cmlwdGlvbj4KICA8L2RjbmRsOkl0ZW0+CiAgPGRjbmRsOkl0ZW0gcmRmOmFi
+        b3V0PSJodHRwOi8vaXNzLm5kbC5nby5qcC9ib29rcy9SMTAwMDAwMDAxLUkw
+        NDk3NDMxNzYtMDAjaXRlbSI+CiAgICA8ZGNuZGw6aG9sZGluZ0FnZW50Pgog
+        ICAgICA8Zm9hZjpBZ2VudD4KICAgICAgICA8Zm9hZjpuYW1lPuWliOiJr+ec
+        jOeri+Wbs+abuOaDheWgsemkqDwvZm9hZjpuYW1lPgogICAgICAgIDxkY25k
+        bDp0cmFuc2NyaXB0aW9uPuODiuODqeOCseODs+ODquODhOODiOOCt+ODp+OC
+        uOODp+OCpuODm+OCpuOCq+ODszwvZGNuZGw6dHJhbnNjcmlwdGlvbj4KICAg
+        ICAgICA8ZGN0ZXJtczppZGVudGlmaWVyIHJkZjpkYXRhdHlwZT0iaHR0cDov
+        L25kbC5nby5qcC9kY25kbC90ZXJtcy9ORExMaWJDb2RlIj4yOTExPC9kY3Rl
+        cm1zOmlkZW50aWZpZXI+CiAgICAgIDwvZm9hZjpBZ2VudD4KICAgIDwvZGNu
+        ZGw6aG9sZGluZ0FnZW50PgogICAgPHJkZnM6c2VlQWxzbyByZGY6cmVzb3Vy
+        Y2U9Imh0dHA6Ly9vcGFjc3ZyMDEubGlicmFyeS5wcmVmLm5hcmEuanAvbXls
+        aW1lZGlvL3NlYXJjaC9ib29rLmRvP2JpYmlkPTM0MjgwMSIvPgogICAgPGRj
+        dGVybXM6aWRlbnRpZmllciByZGY6ZGF0YXR5cGU9Imh0dHA6Ly9uZGwuZ28u
+        anAvZGNuZGwvdGVybXMvc29tb2t1QmliSUQiPjExMTI1NDg3ODwvZGN0ZXJt
+        czppZGVudGlmaWVyPgogICAgPGRjdGVybXM6aWRlbnRpZmllciByZGY6ZGF0
+        YXR5cGU9Imh0dHA6Ly9uZGwuZ28uanAvZGNuZGwvdGVybXMvc29tb2t1U3Vi
+        SUQiPjExMTI1NDg3ODwvZGN0ZXJtczppZGVudGlmaWVyPgogICAgPGRjbmRs
+        OmNhbGxOdW1iZXI+MDA3LjY0LeODpuOCpuOCrTwvZGNuZGw6Y2FsbE51bWJl
+        cj4KICAgIDxkY3Rlcm1zOmRlc2NyaXB0aW9uPumFjee9ruWgtOaJgO+8muaD
+        heWgsemWi+aetjwvZGN0ZXJtczpkZXNjcmlwdGlvbj4KICA8L2RjbmRsOkl0
+        ZW0+CiAgPGRjbmRsOkl0ZW0gcmRmOmFib3V0PSJodHRwOi8vaXNzLm5kbC5n
+        by5qcC9ib29rcy9SMTAwMDAwMDAxLUkwNTAwMjQ3MDEtMDAjaXRlbSI+CiAg
+        ICA8ZGNuZGw6aG9sZGluZ0FnZW50PgogICAgICA8Zm9hZjpBZ2VudD4KICAg
+        ICAgICA8Zm9hZjpuYW1lPumdmeWyoeecjOeri+S4reWkruWbs+abuOmkqDwv
+        Zm9hZjpuYW1lPgogICAgICAgIDxkY3Rlcm1zOmlkZW50aWZpZXIgcmRmOmRh
+        dGF0eXBlPSJodHRwOi8vbmRsLmdvLmpwL2RjbmRsL3Rlcm1zL05ETExpYkNv
+        ZGUiPjIyMTE8L2RjdGVybXM6aWRlbnRpZmllcj4KICAgICAgPC9mb2FmOkFn
+        ZW50PgogICAgPC9kY25kbDpob2xkaW5nQWdlbnQ+CiAgICA8ZGN0ZXJtczpp
+        ZGVudGlmaWVyIHJkZjpkYXRhdHlwZT0iaHR0cDovL25kbC5nby5qcC9kY25k
+        bC90ZXJtcy9zb21va3VCaWJJRCI+MTAwMDQxMDAzNjgyNjwvZGN0ZXJtczpp
+        ZGVudGlmaWVyPgogICAgPGRjdGVybXM6aWRlbnRpZmllciByZGY6ZGF0YXR5
+        cGU9Imh0dHA6Ly9uZGwuZ28uanAvZGNuZGwvdGVybXMvc29tb2t1U3ViSUQi
+        PjA4MDAwNTk5MzM8L2RjdGVybXM6aWRlbnRpZmllcj4KICAgIDxkY25kbDpj
+        YWxsTnVtYmVyPu+8kO+8kO+8l++8ju+8lu+8lO+8j+ODpuOCpu+8j+ODleOD
+        reOCrzwvZGNuZGw6Y2FsbE51bWJlcj4KICAgIDxkY25kbDphdmFpbGFiaWxp
+        dHk+6LK45Ye65Y+v6IO96LOH5paZPC9kY25kbDphdmFpbGFiaWxpdHk+CiAg
+        PC9kY25kbDpJdGVtPgogIDxkY25kbDpJdGVtIHJkZjphYm91dD0iaHR0cDov
+        L2lzcy5uZGwuZ28uanAvYm9va3MvUjEwMDAwMDAwMS1JMDUwODg0Mzg1LTAw
+        I2l0ZW0iPgogICAgPGRjbmRsOmhvbGRpbmdBZ2VudD4KICAgICAgPGZvYWY6
+        QWdlbnQ+CiAgICAgICAgPGZvYWY6bmFtZT7npo/kupXnnIznq4vlm7Pmm7jp
+        pKg8L2ZvYWY6bmFtZT4KICAgICAgICA8ZGN0ZXJtczppZGVudGlmaWVyIHJk
+        ZjpkYXRhdHlwZT0iaHR0cDovL25kbC5nby5qcC9kY25kbC90ZXJtcy9ORExM
+        aWJDb2RlIj4xODExPC9kY3Rlcm1zOmlkZW50aWZpZXI+CiAgICAgIDwvZm9h
+        ZjpBZ2VudD4KICAgIDwvZGNuZGw6aG9sZGluZ0FnZW50PgogICAgPHJkZnM6
+        c2VlQWxzbyByZGY6cmVzb3VyY2U9Imh0dHA6Ly93d3cubGlicmFyeS5wcmVm
+        LmZ1a3VpLmpwL3dpbmovb3BhYy9zd2l0Y2gtZGV0YWlsLWljY2FwLmRvP2Jp
+        YmlkPTExMDQ0NDE4MTUiLz4KICAgIDxkY3Rlcm1zOmlkZW50aWZpZXIgcmRm
+        OmRhdGF0eXBlPSJodHRwOi8vbmRsLmdvLmpwL2RjbmRsL3Rlcm1zL3NvbW9r
+        dUJpYklEIj4xMTA0NDQxODE1PC9kY3Rlcm1zOmlkZW50aWZpZXI+CiAgICA8
         ZGN0ZXJtczppZGVudGlmaWVyIHJkZjpkYXRhdHlwZT0iaHR0cDovL25kbC5n
-        by5qcC9kY25kbC90ZXJtcy9ORExMaWJDb2RlIj4yOTExPC9kY3Rlcm1zOmlk
-        ZW50aWZpZXI+CiAgICAgIDwvZm9hZjpBZ2VudD4KICAgIDwvZGNuZGw6aG9s
-        ZGluZ0FnZW50PgogICAgPHJkZnM6c2VlQWxzbyByZGY6cmVzb3VyY2U9Imh0
-        dHA6Ly9vcGFjc3ZyMDEubGlicmFyeS5wcmVmLm5hcmEuanAvbXlsaW1lZGlv
-        L3NlYXJjaC9ib29rLmRvP2JpYmlkPTM0MjgwMSIvPgogICAgPGRjdGVybXM6
-        aWRlbnRpZmllciByZGY6ZGF0YXR5cGU9Imh0dHA6Ly9uZGwuZ28uanAvZGNu
-        ZGwvdGVybXMvc29tb2t1QmliSUQiPjExMTI1NDg3ODwvZGN0ZXJtczppZGVu
-        dGlmaWVyPgogICAgPGRjdGVybXM6aWRlbnRpZmllciByZGY6ZGF0YXR5cGU9
-        Imh0dHA6Ly9uZGwuZ28uanAvZGNuZGwvdGVybXMvc29tb2t1U3ViSUQiPjEx
-        MTI1NDg3ODwvZGN0ZXJtczppZGVudGlmaWVyPgogICAgPGRjbmRsOmNhbGxO
-        dW1iZXI+MDA3LjY0LeODpuOCpuOCrTwvZGNuZGw6Y2FsbE51bWJlcj4KICAg
-        IDxkY3Rlcm1zOmRlc2NyaXB0aW9uPumFjee9ruWgtOaJgO+8muaDheWgsemW
-        i+aetjwvZGN0ZXJtczpkZXNjcmlwdGlvbj4KICA8L2RjbmRsOkl0ZW0+CiAg
-        PGRjbmRsOkl0ZW0gcmRmOmFib3V0PSJodHRwOi8vaXNzLm5kbC5nby5qcC9i
-        b29rcy9SMTAwMDAwMDAxLUkwNTAwMjQ3MDEtMDAjaXRlbSI+CiAgICA8ZGNu
-        ZGw6aG9sZGluZ0FnZW50PgogICAgICA8Zm9hZjpBZ2VudD4KICAgICAgICA8
-        Zm9hZjpuYW1lPumdmeWyoeecjOeri+S4reWkruWbs+abuOmkqDwvZm9hZjpu
-        YW1lPgogICAgICAgIDxkY3Rlcm1zOmlkZW50aWZpZXIgcmRmOmRhdGF0eXBl
-        PSJodHRwOi8vbmRsLmdvLmpwL2RjbmRsL3Rlcm1zL05ETExpYkNvZGUiPjIy
-        MTE8L2RjdGVybXM6aWRlbnRpZmllcj4KICAgICAgPC9mb2FmOkFnZW50Pgog
-        ICAgPC9kY25kbDpob2xkaW5nQWdlbnQ+CiAgICA8ZGN0ZXJtczppZGVudGlm
-        aWVyIHJkZjpkYXRhdHlwZT0iaHR0cDovL25kbC5nby5qcC9kY25kbC90ZXJt
-        cy9zb21va3VCaWJJRCI+MTAwMDQxMDAzNjgyNjwvZGN0ZXJtczppZGVudGlm
-        aWVyPgogICAgPGRjdGVybXM6aWRlbnRpZmllciByZGY6ZGF0YXR5cGU9Imh0
-        dHA6Ly9uZGwuZ28uanAvZGNuZGwvdGVybXMvc29tb2t1U3ViSUQiPjA4MDAw
-        NTk5MzM8L2RjdGVybXM6aWRlbnRpZmllcj4KICAgIDxkY25kbDpjYWxsTnVt
-        YmVyPu+8kO+8kO+8l++8ju+8lu+8lO+8j+ODpuOCpu+8j+ODleODreOCrzwv
-        ZGNuZGw6Y2FsbE51bWJlcj4KICAgIDxkY25kbDphdmFpbGFiaWxpdHk+6LK4
-        5Ye65Y+v6IO96LOH5paZPC9kY25kbDphdmFpbGFiaWxpdHk+CiAgPC9kY25k
-        bDpJdGVtPgogIDxkY25kbDpJdGVtIHJkZjphYm91dD0iaHR0cDovL2lzcy5u
-        ZGwuZ28uanAvYm9va3MvUjEwMDAwMDAwMS1JMDUwODg0Mzg1LTAwI2l0ZW0i
-        PgogICAgPGRjbmRsOmhvbGRpbmdBZ2VudD4KICAgICAgPGZvYWY6QWdlbnQ+
-        CiAgICAgICAgPGZvYWY6bmFtZT7npo/kupXnnIznq4vlm7Pmm7jppKg8L2Zv
-        YWY6bmFtZT4KICAgICAgICA8ZGN0ZXJtczppZGVudGlmaWVyIHJkZjpkYXRh
-        dHlwZT0iaHR0cDovL25kbC5nby5qcC9kY25kbC90ZXJtcy9ORExMaWJDb2Rl
-        Ij4xODExPC9kY3Rlcm1zOmlkZW50aWZpZXI+CiAgICAgIDwvZm9hZjpBZ2Vu
-        dD4KICAgIDwvZGNuZGw6aG9sZGluZ0FnZW50PgogICAgPHJkZnM6c2VlQWxz
-        byByZGY6cmVzb3VyY2U9Imh0dHA6Ly93d3cubGlicmFyeS5wcmVmLmZ1a3Vp
-        LmpwL3dpbmovb3BhYy9zd2l0Y2gtZGV0YWlsLWljY2FwLmRvP2JpYmlkPTEx
-        MDQ0NDE4MTUiLz4KICAgIDxkY3Rlcm1zOmlkZW50aWZpZXIgcmRmOmRhdGF0
-        eXBlPSJodHRwOi8vbmRsLmdvLmpwL2RjbmRsL3Rlcm1zL3NvbW9rdUJpYklE
-        Ij4xMTA0NDQxODE1PC9kY3Rlcm1zOmlkZW50aWZpZXI+CiAgICA8ZGN0ZXJt
-        czppZGVudGlmaWVyIHJkZjpkYXRhdHlwZT0iaHR0cDovL25kbC5nby5qcC9k
-        Y25kbC90ZXJtcy9zb21va3VTdWJJRCI+MTAxNDc2NjA5OTwvZGN0ZXJtczpp
-        ZGVudGlmaWVyPgogICAgPGRjbmRsOmNhbGxOdW1iZXI+MDA3LjYt776V772z
-        7723Le++jO++n+++m++9uO++nu++l+++kO++ne+9uO++njwvZGNuZGw6Y2Fs
-        bE51bWJlcj4KICAgIDxkY25kbDphdmFpbGFiaWxpdHk+6LK45Ye655SoPC9k
-        Y25kbDphdmFpbGFiaWxpdHk+CiAgICA8ZGN0ZXJtczpkZXNjcmlwdGlvbj7m
-        iYDolLXloLTmiYAgOiDoh6rnhLYxNuOAnDE4PC9kY3Rlcm1zOmRlc2NyaXB0
-        aW9uPgogIDwvZGNuZGw6SXRlbT4KICA8ZGNuZGw6SXRlbSByZGY6YWJvdXQ9
-        Imh0dHA6Ly9pc3MubmRsLmdvLmpwL2Jvb2tzL1IxMDAwMDAwMDEtSTA1MzA0
-        MjE5My0wMCNpdGVtIj4KICAgIDxkY25kbDpob2xkaW5nQWdlbnQ+CiAgICAg
-        IDxmb2FmOkFnZW50PgogICAgICAgIDxmb2FmOm5hbWU+5aSn6Ziq5biC56uL
-        5Zuz5pu46aSoPC9mb2FmOm5hbWU+CiAgICAgICAgPGRjbmRsOnRyYW5zY3Jp
-        cHRpb24+44Kq44Kq44K144Kr44K344Oq44OE44OI44K344On44Kr44OzPC9k
-        Y25kbDp0cmFuc2NyaXB0aW9uPgogICAgICAgIDxkY3Rlcm1zOmlkZW50aWZp
-        ZXIgcmRmOmRhdGF0eXBlPSJodHRwOi8vbmRsLmdvLmpwL2RjbmRsL3Rlcm1z
-        L05ETExpYkNvZGUiPjI3MjE8L2RjdGVybXM6aWRlbnRpZmllcj4KICAgICAg
-        PC9mb2FmOkFnZW50PgogICAgPC9kY25kbDpob2xkaW5nQWdlbnQ+CiAgICA8
-        cmRmczpzZWVBbHNvIHJkZjpyZXNvdXJjZT0iaHR0cDovL3dlYi5vbWwuY2l0
-        eS5vc2FrYS5sZy5qcC93ZWJvcGFjX2lfamEvMDAxMDc4MTY2NyIvPgogICAg
-        PGRjdGVybXM6aWRlbnRpZmllciByZGY6ZGF0YXR5cGU9Imh0dHA6Ly9uZGwu
-        Z28uanAvZGNuZGwvdGVybXMvc29tb2t1QmliSUQiPjAwMTA3ODE2Njc8L2Rj
-        dGVybXM6aWRlbnRpZmllcj4KICAgIDxkY25kbDpjYWxsTnVtYmVyPjU0OS44
-        N3x844K344OkfHwyMDA0PC9kY25kbDpjYWxsTnVtYmVyPgogIDwvZGNuZGw6
-        SXRlbT4KPC9yZGY6UkRGPg==
-    http_version: '1.0'
-  recorded_at: Sat, 16 Aug 2014 15:00:56 GMT
-recorded_with: VCR 2.9.2
+        by5qcC9kY25kbC90ZXJtcy9zb21va3VTdWJJRCI+MTAxNDc2NjA5OTwvZGN0
+        ZXJtczppZGVudGlmaWVyPgogICAgPGRjbmRsOmNhbGxOdW1iZXI+MDA3LjYt
+        776V772z7723Le++jO++n+++m++9uO++nu++l+++kO++ne+9uO++njwvZGNu
+        ZGw6Y2FsbE51bWJlcj4KICAgIDxkY25kbDphdmFpbGFiaWxpdHk+6LK45Ye6
+        55SoPC9kY25kbDphdmFpbGFiaWxpdHk+CiAgICA8ZGN0ZXJtczpkZXNjcmlw
+        dGlvbj7miYDolLXloLTmiYAgOiDoh6rnhLYxNuOAnDE4PC9kY3Rlcm1zOmRl
+        c2NyaXB0aW9uPgogIDwvZGNuZGw6SXRlbT4KICA8ZGNuZGw6SXRlbSByZGY6
+        YWJvdXQ9Imh0dHA6Ly9pc3MubmRsLmdvLmpwL2Jvb2tzL1IxMDAwMDAwMDEt
+        STA1MzA0MjE5My0wMCNpdGVtIj4KICAgIDxkY25kbDpob2xkaW5nQWdlbnQ+
+        CiAgICAgIDxmb2FmOkFnZW50PgogICAgICAgIDxmb2FmOm5hbWU+5aSn6Ziq
+        5biC56uL5Zuz5pu46aSoPC9mb2FmOm5hbWU+CiAgICAgICAgPGRjbmRsOnRy
+        YW5zY3JpcHRpb24+44Kq44Kq44K144Kr44K344Oq44OE44OI44K344On44Kr
+        44OzPC9kY25kbDp0cmFuc2NyaXB0aW9uPgogICAgICAgIDxkY3Rlcm1zOmlk
+        ZW50aWZpZXIgcmRmOmRhdGF0eXBlPSJodHRwOi8vbmRsLmdvLmpwL2RjbmRs
+        L3Rlcm1zL05ETExpYkNvZGUiPjI3MjE8L2RjdGVybXM6aWRlbnRpZmllcj4K
+        ICAgICAgPC9mb2FmOkFnZW50PgogICAgPC9kY25kbDpob2xkaW5nQWdlbnQ+
+        CiAgICA8cmRmczpzZWVBbHNvIHJkZjpyZXNvdXJjZT0iaHR0cDovL3dlYi5v
+        bWwuY2l0eS5vc2FrYS5sZy5qcC93ZWJvcGFjX2lfamEvMDAxMDc4MTY2NyIv
+        PgogICAgPGRjdGVybXM6aWRlbnRpZmllciByZGY6ZGF0YXR5cGU9Imh0dHA6
+        Ly9uZGwuZ28uanAvZGNuZGwvdGVybXMvc29tb2t1QmliSUQiPjAwMTA3ODE2
+        Njc8L2RjdGVybXM6aWRlbnRpZmllcj4KICAgIDxkY25kbDpjYWxsTnVtYmVy
+        PjU0OS44N3x844K344OkfHwyMDA0PC9kY25kbDpjYWxsTnVtYmVyPgogIDwv
+        ZGNuZGw6SXRlbT4KPC9yZGY6UkRGPg==
+    http_version: 
+  recorded_at: Wed, 01 Oct 2014 07:53:14 GMT
+recorded_with: VCR 2.9.3