serrano 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e329983c57815e197e683e64cf0a55300ede36bec3ada9a58612d4abd209f02a
-  data.tar.gz: 25dbce2ee336448219f50ea8e669da1bab787ccdd535f86d59c3aece3798fc71
+  metadata.gz: efab429b63ceee803e97a3ab2dab647bc9ad606fcb03df713f52075696403687
+  data.tar.gz: e0f90a7ae6ccbe78788b4e4d12afac66ea7f73da84503cff6d8cdb3046ec893f
 SHA512:
-  metadata.gz: ffaf70de61b00919b7418125f73e23b34195445de5fcb23d9b32793e30d5d4971ba266e1d8421c76cef6f1e824b6ee87e6235f23a7fb3945f2c5447eea351f8d
-  data.tar.gz: ab93cece3c5e5661bedcf06812ff28276e192fc54a648b0e97902799cabc333ea5d14d51f67a60ef6b83555aabade56a19b5b664152ca1eef0bc2d4667ba217f
+  metadata.gz: f2af2d7a4e358423df3a4452e7091ba1b46c82110a30345ee83db401a14392cff49ab2e253d06562cc0f89011e815a7150ae97d53347d5f96d67dbfd761b9b8b
+  data.tar.gz: ec19825f8e798113ef2923cc0945721675f8dc37ab1b0a3cc7aeb3234ce71d4bf9fa6697670d69cc33f730560927cf1e45169b5b67691eb82992054b600cdaff

data/.gitignore

@@ -36,3 +36,5 @@ build/
 cache/
 
 lib/serrano/response.rb
+
+cursor_testing.rb

data/.rubocop.yml

@@ -0,0 +1,14 @@
+inherit_from: .rubocop_todo.yml
+
+Naming/FileName:
+  Exclude:
+    - 'test/test-helper.rb'
+
+Metrics/ParameterLists:
+  Max: 18
+
+# Offense count: 22
+# Configuration parameters: AllowedVariables.
+Lint/UselessAssignment:
+  Exclude:
+    - 'lib/serrano/filters.rb'

data/.rubocop_todo.yml

@@ -0,0 +1,122 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-12-18 19:46:09 -0800 using RuboCop version 0.61.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'serrano.gemspec'
+
+# Offense count: 32
+Metrics/AbcSize:
+  Max: 91
+
+# Offense count: 1
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Max: 28
+
+# Offense count: 1
+# Configuration parameters: CountBlocks.
+Metrics/BlockNesting:
+  Max: 4
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 367
+
+# Offense count: 5
+Metrics/CyclomaticComplexity:
+  Max: 11
+
+# Offense count: 20
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/MethodLength:
+  Max: 54
+
+# Offense count: 8
+Metrics/PerceivedComplexity:
+  Max: 15
+
+# Offense count: 7
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: io, id, to, by, on, in, at, ip, db
+Naming/UncommunicativeMethodParamName:
+  Exclude:
+    - 'lib/serrano/filterhandler.rb'
+    - 'lib/serrano/request_cursor.rb'
+    - 'lib/serrano/utils.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
+# SupportedStyles: assign_to_condition, assign_inside_condition
+Style/ConditionalAssignment:
+  Exclude:
+    - 'bin/serrano'
+
+# Offense count: 6
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'bin/serrano'
+    - 'lib/serrano.rb'
+    - 'lib/serrano/cn.rb'
+    - 'lib/serrano/filters.rb'
+    - 'lib/serrano/utils.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: format, sprintf, percent
+Style/FormatString:
+  Exclude:
+    - 'lib/serrano/utils.rb'
+
+# Offense count: 1
+# Configuration parameters: .
+# SupportedStyles: annotated, template, unannotated
+Style/FormatStringToken:
+  EnforcedStyle: unannotated
+
+# Offense count: 1
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/serrano/response.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'lib/serrano/cnrequest.rb'
+    - 'lib/serrano/utils.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/SelfAssignment:
+  Exclude:
+    - 'lib/serrano/utils.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Exclude:
+    - 'lib/serrano/utils.rb'
+
+# Offense count: 198
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 525

data/.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.1.8
-  - 2.2.4
   - 2.5.0
+  - 2.6.0
+before_install:
+  - gem update --system
+  - gem install bundler
+  - gem --version
 script:
-  bundle exec rake test TESTOPTS="-v"
+  - bundle exec rake test TESTOPTS="-v"
+  - bundle exec rubocop

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.5.2 (2019-08-07)
+
+* fix url encoding (#51)
+* started using Rubocop; many styling changes (#52)
+
 ## 0.5.0 (2018-04-08)
 
 * Updated dependency versions

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/Gemfile.lock

@@ -1,64 +1,80 @@
 PATH
   remote: .
   specs:
-    serrano (0.5.0)
-      faraday (~> 0.14.0)
-      faraday_middleware (~> 0.12.2)
+    serrano (0.5.2)
+      faraday (~> 0.15.0)
+      faraday_middleware (>= 0.12.2, < 0.14.0)
       multi_json (~> 1.13, >= 1.13.1)
       thor (~> 0.20.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    codecov (0.1.10)
+    ast (2.4.0)
+    codecov (0.1.14)
       json
       simplecov
       url
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    docile (1.3.0)
-    faraday (0.14.0)
+    docile (1.3.2)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.12.2)
+    faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
-    hashdiff (0.3.7)
-    json (2.1.0)
+    hashdiff (1.0.0)
+    jaro_winkler (1.5.3)
+    json (2.2.0)
     multi_json (1.13.1)
-    multipart-post (2.0.0)
-    power_assert (1.1.1)
-    public_suffix (3.0.2)
-    rake (12.3.1)
-    safe_yaml (1.0.4)
-    simplecov (0.16.1)
+    multipart-post (2.1.1)
+    parallel (1.17.0)
+    parser (2.6.3.0)
+      ast (~> 2.4.0)
+    power_assert (1.1.4)
+    public_suffix (3.1.1)
+    rainbow (3.0.0)
+    rake (12.3.3)
+    rubocop (0.74.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.6)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
+    safe_yaml (1.0.5)
+    simplecov (0.17.0)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    test-unit (3.2.7)
+    test-unit (3.3.3)
       power_assert
-    thor (0.20.0)
+    thor (0.20.3)
+    unicode-display_width (1.6.0)
     url (0.3.2)
-    vcr (4.0.0)
-    webmock (3.3.0)
+    vcr (5.0.0)
+    webmock (3.6.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16, >= 1.16.1)
+  bundler (~> 2.0, >= 2.0.2)
   codecov (~> 0.1.10)
   json (~> 2.1)
   rake (~> 12.3, >= 12.3.1)
+  rubocop (~> 0.74.0)
   serrano!
-  simplecov (~> 0.16.1)
+  simplecov (~> 0.17.0)
   test-unit (~> 3.2, >= 3.2.7)
-  vcr (~> 4.0)
-  webmock (~> 3.3)
+  vcr (~> 5.0)
+  webmock (~> 3.4, >= 3.4.1)
 
 BUNDLED WITH
-   1.16.1
+   2.0.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2018 Scott Chamberlain
+Copyright (C) 2019 Scott Chamberlain
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.md

@@ -60,6 +60,11 @@ To get in the polite pool it's a good idea now to include a `mailto` email
 address. See docs for more information. TLDR: set your email in an env var `CROSSREF_EMAIL`.
 
 
+URL Encoding:
+
+We do URL encoding of DOIs for you for all methods except `Serrano.citation_count` which doesn't work if you encode DOIs beforehand. We use `ERB::Util.url_encode` to encode.
+
+
 ## Install
 
 ### Release version

data/Rakefile

@@ -1,42 +1,49 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
 require 'rake/testtask'
+require 'rubocop/rake_task'
 
 Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/test-*.rb']
+  t.libs << 'test'
+  t.test_files = FileList['test/test_*.rb']
   t.verbose = true
   t.warning = false
 end
 
-desc "Run tests"
-task :default => :test
+desc 'Run tests'
+task default: :test
+
+RuboCop::RakeTask.new(:rubocop) do |t|
+  t.options = ['--display-cop-names']
+end
 
-desc "Build serrano docs"
+desc 'Build serrano docs'
 task :docs do
-	system "yardoc"
+  system 'yardoc'
 end
 
-desc "bundle install"
+desc 'bundle install'
 task :bundle do
-  system "bundle install"
+  system 'bundle install'
 end
 
-desc "clean out builds"
+desc 'clean out builds'
 task :clean do
-  system "ls | grep [0-9].gem | xargs rm"
+  system 'ls | grep [0-9].gem | xargs rm'
 end
 
-desc "Build serrano"
+desc 'Build serrano'
 task :build do
-	system "gem build serrano.gemspec"
+  system 'gem build serrano.gemspec'
 end
 
-desc "Install serrano"
-task :install => [:bundle, :build] do
-	system "gem install serrano-#{Serrano::VERSION}.gem"
+desc 'Install serrano'
+task install: %i[bundle build] do
+  system "gem install serrano-#{Serrano::VERSION}.gem"
 end
 
-desc "Release to Rubygems"
-task :release => :build do
+desc 'Release to Rubygems'
+task release: :build do
   system "gem push serrano-#{Serrano::VERSION}.gem"
 end

data/bin/serrano

@@ -1,14 +1,15 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "thor"
-require "serrano"
-require "multi_json"
+require 'thor'
+require 'serrano'
+require 'multi_json'
 
 class Sr < Thor
   include Thor::Actions
   # class_option :json, :type => :boolean, :default => false
 
-  desc "works [DOIs]", "Get works by DOIs"
+  desc 'works [DOIs]', 'Get works by DOIs'
   long_desc <<-LONGDESC
     `serrano works` accepts one or more DOIs to search for works
 
@@ -47,17 +48,17 @@ class Sr < Thor
     \x5"http://orcid.org/0000-0003-4087-8021"
     \x5"http://orcid.org/0000-0002-2076-5452"
   LONGDESC
-  option :json, :type => :boolean, :default => false
-  option :filter, :type => :hash, :default => nil
-  option :limit, :type => :numeric, :default => nil
-  def works(ids=nil)
-    if ids.nil?
-      out = Serrano.works(filter: options[:filter], limit: options[:limit])
-    else
-      out = Serrano.works(ids: ids.split(","), filter: options[:filter])
-    end
+  option :json, type: :boolean, default: false
+  option :filter, type: :hash, default: nil
+  option :limit, type: :numeric, default: nil
+  def works(ids = nil)
+    out = if ids.nil?
+            Serrano.works(filter: options[:filter], limit: options[:limit])
+          else
+            Serrano.works(ids: ids.split(','), filter: options[:filter])
+          end
     if !options[:json]
-      out = out.collect { |x| x['message'].select { |k,v| k[/DOI|type|title/] } }
+      out = out.collect { |x| x['message'].select { |k, _v| k[/DOI|type|title/] } }
       out.each do |x|
         puts 'DOI: ' + x['DOI'].to_s
         puts 'type: ' + x['type']
@@ -69,7 +70,7 @@ class Sr < Thor
     end
   end
 
-  desc "members [member IDs]", "Get members by id"
+  desc 'members [member IDs]', 'Get members by id'
   long_desc <<-LONGDESC
     `serrano members` accepts one or more Crossref member IDs
 
@@ -96,26 +97,26 @@ class Sr < Thor
 
     24 7 45 31 22 67 72 17 53 75 0 68 12 16 50 79 40 18 40 195
   LONGDESC
-  option :json, :type => :boolean, :default => false
-  option :query, :type => :string, :default => nil
-  option :limit, :type => :numeric, :default => nil
-  option :works, :type => :boolean, :default => false
-  def members(ids=nil)
+  option :json, type: :boolean, default: false
+  option :query, type: :string, default: nil
+  option :limit, type: :numeric, default: nil
+  option :works, type: :boolean, default: false
+  def members(ids = nil)
     if ids.nil?
       out = Serrano.members(query: options[:query], limit: options[:limit],
-        works: options[:works])
+                            works: options[:works])
     else
-      out = Serrano.members(ids: ids.split(","), query: options[:query], limit: options[:limit],
-        works: options[:works])
+      out = Serrano.members(ids: ids.split(','), query: options[:query], limit: options[:limit],
+                            works: options[:works])
     end
 
     if !options[:json]
       if !options[:works]
-        if out.class == Hash
-          out = out['message']['items']
-        else
-          out = out.collect { |x| x['message'] }
-        end
+        out = if out.class == Hash
+                out['message']['items']
+              else
+                out.collect { |x| x['message'] }
+              end
 
         # out = out.collect { |x| x['message'].select { |k,v| k[/id|primary-name/] } }
         out.each do |x|
@@ -131,8 +132,7 @@ class Sr < Thor
     end
   end
 
-
-  desc "prefixes [DOI prefixes]", "Search for prefixes by DOI prefix"
+  desc 'prefixes [DOI prefixes]', 'Search for prefixes by DOI prefix'
   long_desc <<-LONGDESC
     `serrano prefixes` accepts one or more Crossref member IDs
 
@@ -162,24 +162,24 @@ class Sr < Thor
     \x5"Co-Action Publishing"
     \x5"Oxford University Press (OUP)"
   LONGDESC
-  option :json, :type => :boolean, :default => false
-  option :limit, :type => :numeric, :default => nil
-  option :works, :type => :boolean, :default => false
-  def prefixes(ids=nil)
-    if ids.nil?
-      out = Serrano.prefixes(limit: options[:limit], works: options[:works])
-    else
-      out = Serrano.prefixes(ids: ids.split(","), limit: options[:limit],
-        works: options[:works])
-    end
+  option :json, type: :boolean, default: false
+  option :limit, type: :numeric, default: nil
+  option :works, type: :boolean, default: false
+  def prefixes(ids = nil)
+    out = if ids.nil?
+            Serrano.prefixes(limit: options[:limit], works: options[:works])
+          else
+            Serrano.prefixes(ids: ids.split(','), limit: options[:limit],
+                             works: options[:works])
+          end
 
     if !options[:json]
       if !options[:works]
-        if out.class == Hash
-          out = out['message']['items']
-        else
-          out = out.collect { |x| x['message'] }
-        end
+        out = if out.class == Hash
+                out['message']['items']
+              else
+                out.collect { |x| x['message'] }
+              end
 
         out.each do |x|
           puts 'member: ' + x['member']
@@ -195,7 +195,7 @@ class Sr < Thor
     end
   end
 
-  desc "funders [funder IDs]", "Search for funders by DOI prefix"
+  desc 'funders [funder IDs]', 'Search for funders by DOI prefix'
   long_desc <<-LONGDESC
     `serrano funders` accepts one or more Crossref funder IDs
 
@@ -226,26 +226,26 @@ class Sr < Thor
 
     $ serrano funders 10.13039/100000001 --works=true --limit=2
   LONGDESC
-  option :json, :type => :boolean, :default => false
-  option :query, :type => :string, :default => nil
-  option :limit, :type => :numeric, :default => nil
-  option :works, :type => :boolean, :default => false
-  def funders(ids=nil)
+  option :json, type: :boolean, default: false
+  option :query, type: :string, default: nil
+  option :limit, type: :numeric, default: nil
+  option :works, type: :boolean, default: false
+  def funders(ids = nil)
     if ids.nil?
       out = Serrano.funders(query: options[:query], limit: options[:limit],
-        works: options[:works])
+                            works: options[:works])
     else
-      out = Serrano.funders(ids: ids.split(","), query: options[:query], limit: options[:limit],
-        works: options[:works])
+      out = Serrano.funders(ids: ids.split(','), query: options[:query], limit: options[:limit],
+                            works: options[:works])
     end
 
     if !options[:json]
       if !options[:works]
-        if out.class == Hash
-          out = out['message']['items']
-        else
-          out = out.collect { |x| x['message'] }
-        end
+        out = if out.class == Hash
+                out['message']['items']
+              else
+                out.collect { |x| x['message'] }
+              end
 
         out.each do |x|
           puts 'id: ' + x['id']
@@ -261,8 +261,7 @@ class Sr < Thor
     end
   end
 
-
-  desc "journals [journal ISSNs]", "Search for journals by ISSNs"
+  desc 'journals [journal ISSNs]', 'Search for journals by ISSNs'
   long_desc <<-LONGDESC
     `serrano journals` accepts one or more journal ISSNs
 
@@ -293,26 +292,26 @@ class Sr < Thor
 
     $ serrano journals 2167-8359 --query=ecology --works=true --limit=2
   LONGDESC
-  option :json, :type => :boolean, :default => false
-  option :query, :type => :string, :default => nil
-  option :limit, :type => :numeric, :default => nil
-  option :works, :type => :boolean, :default => false
-  def journals(ids=nil)
+  option :json, type: :boolean, default: false
+  option :query, type: :string, default: nil
+  option :limit, type: :numeric, default: nil
+  option :works, type: :boolean, default: false
+  def journals(ids = nil)
     if ids.nil?
       out = Serrano.journals(query: options[:query], limit: options[:limit],
-        works: options[:works])
+                             works: options[:works])
     else
-      out = Serrano.journals(ids: ids.split(","), query: options[:query], limit: options[:limit],
-        works: options[:works])
+      out = Serrano.journals(ids: ids.split(','), query: options[:query], limit: options[:limit],
+                             works: options[:works])
     end
 
     if !options[:json]
       if !options[:works]
-        if out.class == Hash
-          out = out['message']['items']
-        else
-          out = out.collect { |x| x['message'] }
-        end
+        out = if out.class == Hash
+                out['message']['items']
+              else
+                out.collect { |x| x['message'] }
+              end
 
         out.each do |x|
           puts 'ISSN: ' + x['ISSN'][0]
@@ -328,7 +327,7 @@ class Sr < Thor
     end
   end
 
-  desc "types [type name]", "Search for types by name"
+  desc 'types [type name]', 'Search for types by name'
   long_desc <<-LONGDESC
     `serrano types` accepts one or more type names
 
@@ -359,20 +358,20 @@ class Sr < Thor
 
     $ serrano types dissertation --works --limit=2
   LONGDESC
-  option :json, :type => :boolean, :default => false
-  option :works, :type => :boolean, :default => false
-  option :limit, :type => :numeric, :default => nil
+  option :json, type: :boolean, default: false
+  option :works, type: :boolean, default: false
+  option :limit, type: :numeric, default: nil
   def types(*ids)
     out = Serrano.types(ids: ids, limit: options[:limit],
-      works: options[:works])
+                        works: options[:works])
 
     if !options[:json]
       if !options[:works]
-        if out.class == Hash
-          out = out['message']['items']
-        else
-          out = out.collect { |x| x['message'] }
-        end
+        out = if out.class == Hash
+                out['message']['items']
+              else
+                out.collect { |x| x['message'] }
+              end
 
         out.each do |x|
           puts 'id: ' + x['id']
@@ -387,7 +386,7 @@ class Sr < Thor
     end
   end
 
-  desc "licenses", "Search for licenses by name"
+  desc 'licenses', 'Search for licenses by name'
   long_desc <<-LONGDESC
     `serrano licenses` accepts one or more type names
 
@@ -416,8 +415,8 @@ class Sr < Thor
     "National Science Foundation"
     \x5"U.S. Department of Energy"
   LONGDESC
-  option :json, :type => :boolean, :default => false
-  option :query, :type => :string, :default => nil
+  option :json, type: :boolean, default: false
+  option :query, type: :string, default: nil
   def licenses
     out = Serrano.licenses(query: options[:query])
     if !options[:json]
@@ -432,7 +431,7 @@ class Sr < Thor
     end
   end
 
-  desc "contneg", "Content negotiation"
+  desc 'contneg', 'Content negotiation'
   long_desc <<-LONGDESC
     `serrano contneg` accepts a DOI
 
@@ -444,15 +443,15 @@ class Sr < Thor
 
     Murtaugh PA (2014).  In defense of P values . Ecology 95: 611–617.
   LONGDESC
-  option :format, :type => :string, :default => "text"
-  option :style, :type => :string, :default => "apa"
-  option :locale, :type => :string, :default => "en-US"
+  option :format, type: :string, default: 'text'
+  option :style, type: :string, default: 'apa'
+  option :locale, type: :string, default: 'en-US'
   def contneg(ids)
     puts Serrano.content_negotiation(ids: ids, format: options[:format], style:
       options[:style], locale: options[:locale])
   end
 
-  desc "version", "Get serrano version"
+  desc 'version', 'Get serrano version'
   def version
     puts Serrano::VERSION
   end
@@ -460,11 +459,11 @@ class Sr < Thor
   private
 
   def print_works(data)
-    if data.is_a? Array
-      data = data[0]['message']['items']
-    else
-      data = data.collect { |x| x['message'].select { |k,v| k[/DOI|type|title/] } }
-    end
+    data = if data.is_a? Array
+             data[0]['message']['items']
+           else
+             data.collect { |x| x['message'].select { |k, _v| k[/DOI|type|title/] } }
+           end
     data.each do |x|
       puts 'DOI: ' + x['DOI']
       puts 'type: ' + x['type']
@@ -472,7 +471,6 @@ class Sr < Thor
       puts
     end
   end
-
 end
 
 Sr.start(ARGV)