bibsync 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 656b20418877066a48f7e30f3f702b47e71c7a5d
+  data.tar.gz: af9f5d4f088255dccc86bd12655a009830050ac3
+SHA512:
+  metadata.gz: 55e6153fa4ffa968cbf1f08dba256c2a0c3b427f6a84babc16d99e62bb519e2450335191dd6ce0c4bc8eac1a830d1ba27999215a517b35feb24f4eda2ed92cd5
+  data.tar.gz: 4f9a2308012649be07f5bf3c8549c1a9ae9a1c0410e8c1f33de47e7991dcd1f067e83ea3e96a5c67e518a7b67980ad358bfa24f641a9f6f12740bff76da35449

data/bibsync.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   s.require_paths = %w(lib)
 
   s.add_runtime_dependency('nokogiri')
+  s.add_runtime_dependency('faraday')
+  s.add_runtime_dependency('faraday_middleware')
   s.add_development_dependency('rake')
   s.add_development_dependency('minitest')
 end

data/lib/bibsync.rb

@@ -1,4 +1,6 @@
 require 'nokogiri'
+require 'faraday'
+require 'faraday_middleware'
 require 'shellwords'
 require 'date'
 require 'pathname'

data/lib/bibsync/actions/check_arxiv_versions.rb

@@ -16,7 +16,7 @@ module BibSync
         notice 'Check for newer version on arXiv'
         @bib.select {|e| e[:arxiv] }.each_slice(SliceSize) do |entry|
           begin
-            xml = fetch_xml("http://export.arxiv.org/api/query?id_list=#{entry.map{|e| arxiv_id(e, version: false, prefix: true) }.join(',')}&max_results=#{SliceSize}")
+            xml = fetch_xml('http://export.arxiv.org/api/query', id_list: entry.map{|e| arxiv_id(e, version: false, prefix: true) }.join(','), max_results: SliceSize)
             xml.xpath('//entry/id').map(&:content).each_with_index do |id, i|
               id.gsub!('http://arxiv.org/abs/', '')
               if id != entry[i][:arxiv]

data/lib/bibsync/actions/determine_arxiv_doi.rb

@@ -48,7 +48,7 @@ module BibSync
         if !entry[:arxiv] && entry[:doi]
           begin
             info('Fetch missing arXiv identifier', key: entry)
-            xml = fetch_xml("http://export.arxiv.org/api/query?search_query=doi:#{entry[:doi]}&max_results=1")
+            xml = fetch_xml('http://export.arxiv.org/api/query', search_query: "doi:#{entry[:doi]}", max_results: 1)
             if xml.xpath('//entry/doi').map(&:content).first == entry[:doi]
               id = xml.xpath('//entry/id').map(&:content).first
               if id =~ %r{\Ahttp://arxiv.org/abs/(.+)\Z}

data/lib/bibsync/actions/fetch_from_arxiv.rb

@@ -37,7 +37,7 @@ module BibSync
           notice 'Downloading from arXiv'
           arxivs.each_slice(SliceSize) do |ids|
             begin
-              xml = fetch_xml("http://export.arxiv.org/api/query?id_list=#{ids.join(',')}&max_results=#{SliceSize}")
+              xml = fetch_xml('http://export.arxiv.org/api/query', id_list: ids.join(','), max_results: SliceSize)
               xml.xpath('//entry/id').map(&:content).each_with_index do |id, i|
                 id.gsub!('http://arxiv.org/abs/', '')
                 info 'arXiv download', key: id

data/lib/bibsync/actions/synchronize_metadata.rb

@@ -12,7 +12,7 @@ module BibSync
       def run
         notice 'Synchronize with arXiv and DOI'
 
-        @bib.each do |entry|
+        @bib.to_a.each do |entry|
           next if entry.comment?
 
           if @force || !(entry[:title] && entry[:author] && entry[:year])
@@ -27,7 +27,7 @@ module BibSync
             update_doi(entry) if entry[:doi]
           end
 
-          if @force || (!entry[:abstract] && entry[:doi] =~ /\A10\.1103\//)
+          if entry[:doi] =~ /\A10\.1103\// && (@force || !entry[:abstract])
             update_aps_abstract(entry)
           end
 
@@ -47,7 +47,7 @@ module BibSync
 
       def update_doi(entry)
         info('Downloading DOI metadata', key: entry)
-        text = fetch("http://dx.doi.org/#{entry[:doi]}", 'Accept' => 'text/bibliography; style=bibtex')
+        text = fetch("http://dx.doi.org/#{entry[:doi]}", nil, 'Accept' => 'text/bibliography; style=bibtex')
         raise text if text == 'Unknown DOI'
         Entry.parse(text).each {|k, v| entry[k] = v }
       rescue => ex
@@ -96,7 +96,7 @@ module BibSync
 
       def update_arxiv(entry)
         info('Downloading arXiv metadata', key: entry)
-        xml = fetch_xml("http://export.arxiv.org/oai2?verb=GetRecord&identifier=oai:arXiv.org:#{arxiv_id(entry, prefix: true, version: false)}&metadataPrefix=arXiv")
+        xml = fetch_xml('http://export.arxiv.org/oai2', verb: 'GetRecord', identifier: "oai:arXiv.org:#{arxiv_id(entry, prefix: true, version: false)}", metadataPrefix: 'arXiv')
         error = xml.xpath('//error').map(&:content).first
         raise error if error
 

data/lib/bibsync/utils.rb

@@ -5,29 +5,35 @@ module BibSync
       $1
     end
 
-    def fetch(url, headers = {})
-      # open(url, headers) {|f| f.read }
-      headers = headers.map {|k,v| '-H ' + Shellwords.escape("#{k}: #{v}") }.join(' ')
-      result = `curl --stderr - -S -s -L #{headers} #{Shellwords.escape url}`
-      raise result.chomp if $? != 0
-      result
+    def fetch(url, params = nil, headers = nil)
+      client = Faraday.new(url) do |c|
+        c.use FaradayMiddleware::FollowRedirects, limit: 3
+        c.use Faraday::Response::RaiseError
+        c.use Faraday::Adapter::NetHttp
+      end
+      response = client.get(url, params, headers)
+      raise "HTTP error #{response.status}" unless response.status == 200
+      body = response.body
+      encoding = body.encoding
+      body.force_encoding(Encoding::UTF_8)
+      body.force_encoding(encoding) unless body.valid_encoding?
+      body
     end
 
     def arxiv_download(dir, id)
-      url = "http://arxiv.org/pdf/#{id}"
-      file = File.join(dir, "#{arxiv_id(id, version: true, prefix: false)}.pdf")
-      result = `curl --stderr - -S -s -L -o #{Shellwords.escape file} #{Shellwords.escape url}`
-      raise result.chomp if $? != 0
+      File.open(File.join(dir, "#{arxiv_id(id, version: true, prefix: false)}.pdf"), 'wb') do |o|
+        o.write(fetch("http://arxiv.org/pdf/#{id}"))
+      end
     end
 
-    def fetch_xml(url, headers = {})
-      xml = Nokogiri::XML(fetch(url, headers))
+    def fetch_xml(url, params = nil, headers = nil)
+      xml = Nokogiri::XML(fetch(url, params, headers))
       xml.remove_namespaces!
       xml
     end
 
-    def fetch_html(url, headers = {})
-      Nokogiri::HTML(fetch(url, headers))
+    def fetch_html(url, params = nil, headers = nil)
+      Nokogiri::HTML(fetch(url, params, headers))
     end
 
     def arxiv_id(arxiv, opts = {})

data/lib/bibsync/version.rb

@@ -1,3 +1,3 @@
 module BibSync
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/test/test_utils.rb

@@ -15,7 +15,7 @@ describe BibSync::Utils do
     end
 
     it 'fetches page with header' do
-      fetch('http://dx.doi.org/10.1098/rspa.1984.0023', 'Accept' => 'text/bibliography; style=bibtex').include?('Berry').must_equal true
+      fetch('http://dx.doi.org/10.1098/rspa.1984.0023', nil, 'Accept' => 'text/bibliography; style=bibtex').include?('Berry').must_equal true
     end
   end
 
@@ -24,7 +24,7 @@ describe BibSync::Utils do
 
   describe '#fetch_xml' do
     it 'fetches xml' do
-      fetch_xml('http://export.arxiv.org/oai2?verb=GetRecord&identifier=oai:arXiv.org:1208.2881&metadataPrefix=arXiv').must_be_instance_of Nokogiri::XML::Document
+      fetch_xml('http://export.arxiv.org/oai2', verb: 'GetRecord', identifier: 'oai:arXiv.org:1208.2881', metadataPrefix: 'arXiv').must_be_instance_of Nokogiri::XML::Document
     end
   end
 

metadata

@@ -1,62 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: bibsync
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Daniel Mendler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: BibSync is a tool to synchronize scientific papers and BibTeX bibliography
@@ -115,27 +136,26 @@ files:
 - test/test_utils.rb
 homepage: https://github.com/minad/bibsync
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: bibsync
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: BibSync is a tool to synchronize scientific papers and BibTeX bibliography
   files
 test_files: []