serrano 0.5.0 → 1.0.0

data/lib/serrano/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Serrano
   # Custom error class for rescuing from all Serrano errors
   class Error < StandardError; end

data/lib/serrano/faraday.rb

@@ -1,5 +1,7 @@
-require 'faraday'
-require 'multi_json'
+# frozen_string_literal: true
+
+require "faraday"
+require "multi_json"
 
 # @private
 module FaradayMiddleware
@@ -32,19 +34,19 @@ module FaradayMiddleware
     private
 
     def error_message_400(response)
-      "\n   #{response[:method].to_s.upcase} #{response[:url].to_s}\n   Status #{response[:status]}#{error_body(response[:body])}"
+      "\n   #{response[:method].to_s.upcase} #{response[:url]}\n   Status #{response[:status]}#{error_body(response[:body])}"
     end
 
     def error_body(body)
-      if not body.nil? and not body.empty? and body.kind_of?(String)
-        if is_json?(body)
+      if !body.nil? && !body.empty? && body.is_a?(String)
+        if json?(body)
           body = ::MultiJson.load(body)
-          if body['message'].nil?
+          if body["message"].nil?
             body = nil
-          elseif body['message'].length == 1
-            body = body['message']
+            elseif body["message"].length == 1
+            body = body["message"]
           else
-            body = body['message'].collect { |x| x['message'] }.join('; ')
+            body = body["message"].collect { |x| x["message"] }.join("; ")
           end
         end
       end
@@ -56,16 +58,15 @@ module FaradayMiddleware
       end
     end
 
-    def error_message_500(response, body=nil)
-      "#{response[:method].to_s.upcase} #{response[:url].to_s}: #{[response[:status].to_s + ':', body].compact.join(' ')}"
+    def error_message_500(response, body = nil)
+      "#{response[:method].to_s.upcase} #{response[:url]}: #{[response[:status].to_s + ":", body].compact.join(" ")}"
     end
 
-    def is_json?(string)
+    def json?(string)
       MultiJson.load(string)
-      return true
+      true
     rescue MultiJson::ParseError
-      return false
+      false
     end
-
   end
 end

data/lib/serrano/filterhandler.rb

@@ -1,33 +1,33 @@
+# frozen_string_literal: true
+
 # helper functions
 module Helpers
-
-  $others = ['license_url','license_version','license_delay','full_text_version','full_text_type',
-             'award_number','award_funder']
-
   def filter_handler(x = nil)
+    others = %w[license_url license_version license_delay full_text_version full_text_type
+      award_number award_funder]
     if x.nil?
       nil
     else
       x = stringify(x)
-      nn = x.keys.collect{ |z| z.to_s }
-      if nn.collect{ |w| $others.include? w }.any?
-        nn = nn.collect{ |b|
-          if $others.include? b
+      nn = x.keys.collect(&:to_s)
+      if nn.collect { |w| others.include? w }.any?
+        nn = nn.collect { |b|
+          if others.include? b
             case b
-            when 'license_url'
-              'license.url'
-            when 'license_version'
-              'license.version'
-            when 'license_delay'
-              'license.delay'
-            when 'full_text_version'
-              'full-text.version'
-            when 'full_text_type'
-              'full-text.type'
-            when 'award_number'
-              'award.number'
-            when 'award_funder'
-              'award.funder'
+            when "license_url"
+              "license.url"
+            when "license_version"
+              "license.version"
+            when "license_delay"
+              "license.delay"
+            when "full_text_version"
+              "full-text.version"
+            when "full_text_type"
+              "full-text.type"
+            when "award_number"
+              "award.number"
+            when "award_funder"
+              "award.funder"
             end
           else
             b
@@ -35,21 +35,20 @@ module Helpers
         }
       end
 
-      newnn = nn.collect{ |m| m.gsub("_", "-") }
+      newnn = nn.collect { |m| m.tr("_", "-") }
       x = rename_keys(x, newnn)
-      x = x.collect{ |k,v| [k, v].join(":") }.join(',')
-      return x
+      x.collect { |k, v| [k, v].join(":") }.join(",")
+
     end
   end
 
   def stringify(x)
-    (x.keys.map{ |k,v| k.to_s }.zip x.values).to_h
+    (x.keys.map { |k, _v| k.to_s }.zip x.values).to_h
   end
 
   def rename_keys(x, y)
     (y.zip x.values).to_h
   end
-
 end
 
 module Serrano
@@ -61,4 +60,3 @@ module Serrano
     include Helpers
   end
 end
-

data/lib/serrano/filters.rb

@@ -1,94 +1,100 @@
-##
-# Serrano::Filters
-#
-# Information on Crossref API filters
-#
-# @example
-#    require 'serrano'
-#    # List filter names
-#    Serrano::Filters.names
-#    # List filter values and description
-#    Serrano::Filters.filters
-#    Serrano::Filters.filters['has_funder']
-#    Serrano::Filters.filters['has_funder']['description']
+# frozen_string_literal: true
+
 module Serrano
+  def self.filters
+    Filters
+  end
+
+  ##
+  # Serrano::Filters
+  #
+  # Information on Crossref API filters
+  #
+  # @example
+  #    require 'serrano'
+  #    # List filter names
+  #    Serrano::Filters.names
+  #    # List filter values and description
+  #    Serrano::Filters.filters
+  #    Serrano::Filters.filters['has_funder']
+  #    Serrano::Filters.filters['has_funder']['description']
   module Filters
     def self.names
-      $filter_details.keys
+      FILTER_DETAILS.keys
     end
 
     def self.filters
-      $filter_details
+      FILTER_DETAILS
     end
+
+    FILTER_DETAILS = {
+      "has_funder" => {"possible_values" => nil, "description" => "metadata which includes one or more funder entry"},
+      "funder" => {"possible_values" => "{funder_id}", "description" => "metadata which include the {funder_id} in FundRef data"},
+      "location" => {"possible_values" => "{country_name}", "description" => "funder records where location = {country name}. Only works on /funders route"},
+      "prefix" => {"possible_values" => "{owner_prefix}", "description" => "metadata belonging to a DOI owner prefix {owner_prefix} (e.g. '10.1016' )"},
+      "member" => {"possible_values" => "{member_id}", "description" => "metadata belonging to a CrossRef member"},
+      "from_index_date" => {"possible_values" => "{date}", "description" => "metadata indexed since (inclusive) {date}"},
+      "until_index_date" => {"possible_values" => "{date}", "description" => "metadata indexed before (inclusive) {date}"},
+      "from_deposit_date" => {"possible_values" => "{date}", "description" => "metadata last (re)deposited since (inclusive) {date}"},
+      "until_deposit_date" => {"possible_values" => "{date}", "description" => "metadata last (re)deposited before (inclusive) {date}"},
+      "from_update_date" => {"possible_values" => "{date}", "description" => "Metadata updated since (inclusive) {date} Currently the same as 'from_deposit_date'"},
+      "until_update_date" => {"possible_values" => "{date}", "description" => "Metadata updated before (inclusive) {date} Currently the same as 'until_deposit_date'"},
+      "from_created_date" => {"possible_values" => "{date}", "description" => "metadata first deposited since (inclusive) {date}"},
+      "until_created_date" => {"possible_values" => "{date}", "description" => "metadata first deposited before (inclusive) {date}"},
+      "from_pub_date" => {"possible_values" => "{date}", "description" => "metadata where published date is since (inclusive) {date}"},
+      "until_pub_date" => {"possible_values" => "{date}", "description" => "metadata where published date is before (inclusive)  {date}"},
+      "from_online_pub_date" => {"possible_values" => "{date}", "description" => "metadata where online published date is since (inclusive) {date}"},
+      "until_online_pub_date" => {"possible_values" => "{date}", "description" => "metadata where online published date is before (inclusive) {date}"},
+      "from_print_pub_date" => {"possible_values" => "{date}", "description" => "metadata where print published date is since (inclusive) {date}"},
+      "until_print_pub_date" => {"possible_values" => "{date}", "description" => "metadata where print published date is before (inclusive) {date}"},
+      "from_posted_date" => {"possible_values" => "{date}", "description" => "metadata where posted date is since (inclusive) {date}"},
+      "until_posted_date" => {"possible_values" => "{date}", "description" => "metadata where posted date is before (inclusive) {date}"},
+      "from_accepted_date" => {"possible_values" => "{date}", "description" => "metadata where accepted date is since (inclusive) {date}"},
+      "until_accepted_date" => {"possible_values" => "{date}", "description" => "metadata where accepted date is before (inclusive) {date}"},
+      "has_license" => {"possible_values" => nil, "description" => "metadata that includes any '<license_ref>' elements"},
+      "license_url" => {"possible_values" => "{url}", "description" => "metadata where '<license_ref>' value equals {url}"},
+      "license_version" => {"possible_values" => "{string}", "description" => "metadata where the '<license_ref>''s 'applies_to' attribute  is '{string}'"},
+      "license_delay" => {"possible_values" => "{integer}", "description" => "metadata where difference between publication date and the '<license_ref>''s 'start_date' attribute is <= '{integer}' (in days"},
+      "has_full_text" => {"possible_values" => nil, "description" => "metadata that includes any full text '<resource>' elements_"},
+      "full_text_version" => {"possible_values" => "{string}", "description" => "metadata where '<resource>' element's 'content_version' attribute is '{string}'"},
+      "full_text_type" => {"possible_values" => "{mime_type}", "description" => "metadata where '<resource>' element's 'content_type' attribute is '{mime_type}' (e.g. 'application/pdf')"},
+      "full_text_application" => {"possible_values" => "{string}", "description" => "metadata where <resource> link has one of the following intended applications: text-mining, similarity-checking or unspecified"},
+      "has_references" => {"possible_values" => nil, "description" => "metadata for works that have a list of references"},
+      "has_archive" => {"possible_values" => nil, "description" => "metadata which include name of archive partner"},
+      "archive" => {"possible_values" => "{string}", "description" => "metadata which where value of archive partner is '{string}'"},
+      "has_orcid" => {"possible_values" => nil, "description" => "metadata which includes one or more ORCIDs"},
+      "has_authenticated_orcid" => {"possible_values" => nil, "description" => "metadata which includes one or more ORCIDs where the depositing publisher claims to have witness the ORCID owner authenticate with ORCID"},
+      "orcid" => {"possible_values" => "{orcid}", "description" => "metadata where '<orcid>' element's value = '{orcid}'"},
+      "issn" => {"possible_values" => "{issn}", "description" => "metadata where record has an ISSN = '{issn}' Format is 'xxxx_xxxx'."},
+      "directory" => {"possible_values" => "{directory}", "description" => "metadata records whose article or serial are mentioned in the given '{directory}'. Currently the only supported value is 'doaj'"},
+      "doi" => {"possible_values" => "{doi}", "description" => "metadata describing the DOI '{doi}'"},
+      "updates" => {"possible_values" => "{doi}", "description" => "metadata for records that represent editorial updates to the DOI '{doi}'"},
+      "is_update" => {"possible_values" => nil, "description" => "metadata for records that represent editorial updates"},
+      "has_update_policy" => {"possible_values" => nil, "description" => "metadata for records that include a link to an editorial update policy"},
+      "container_title" => {"possible_values" => nil, "description" => "metadata for records with a publication title exactly with an exact match"},
+      "category_name" => {"possible_values" => nil, "description" => "metadata for records with an exact matching category label"},
+      "type" => {"possible_values" => "{type}", "description" => "metadata records whose type = '{type}' Type must be an ID value from the list of types returned by the '/types' resource"},
+      "type_name" => {"possible_values" => nil, "description" => "metadata for records with an exacty matching type label"},
+      "award_number" => {"possible_values" => "{award_number}", "description" => "metadata for records with a matching award nunber_ Optionally combine with 'award_funder'"},
+      "award_funder" => {"possible_values" => "{funder doi or id}", "description" => "metadata for records with an award with matching funder. Optionally combine with 'award_number'"},
+      "has_assertion" => {"possible_values" => nil, "description" => "metadata for records with any assertions"},
+      "assertion_group" => {"possible_values" => nil, "description" => "metadata for records with an assertion in a particular group"},
+      "assertion" => {"possible_values" => nil, "description" => "metadata for records with a particular named assertion"},
+      "has_affiliation" => {"possible_values" => nil, "description" => "metadata for records that have any affiliation information"},
+      "alternative_id" => {"possible_values" => nil, "description" => "metadata for records with the given alternative ID, which may be a publisher_specific ID, or any other identifier a publisher may have provided"},
+      "article_number" => {"possible_values" => nil, "description" => "metadata for records with a given article number"},
+      "has_abstract" => {"possible_values" => nil, "description" => "metadata for records which include an abstract"},
+      "has_clinical_trial_number" => {"possible_values" => nil, "description" => "metadata for records which include a clinical trial number"},
+      "content_domain" => {"possible_values" => nil, "description" => "metadata where the publisher records a particular domain name as the location Crossmark content will appear"},
+      "has_content_domain" => {"possible_values" => nil, "description" => "metadata where the publisher records a domain name location for Crossmark content"},
+      "has_crossmark_restriction" => {"possible_values" => nil, "description" => "metadata where the publisher restricts Crossmark usage to content domains"},
+      "has_relation" => {"possible_values" => nil, "description" => "metadata for records that either assert or are the object of a relation"},
+      "relation_type" => {"possible_values" => nil, "description" => "One of the relation types from the Crossref relations schema (e.g. is-referenced-by, is-parent-of, is-preprint-of)"},
+      "relation_object" => {"possible_values" => nil, "description" => "Relations where the object identifier matches the identifier provided"},
+      "relation_object_type" => {"possible_values" => nil, "description" => "One of the identifier types from the Crossref relations schema (e.g. doi, issn)"},
+      "public_references" => {"possible_values" => nil, "description" => "metadata where publishers allow references to be distributed publically"},
+      "publisher_name" => {"possible_values" => nil, "description" => "metadata for records with an exact matching publisher name"},
+      "affiliation" => {"possible_values" => nil, "description" => "metadata for records with at least one contributor with the given affiliation"}
+    }.freeze
   end
 end
-
-$filter_details = {
-  "has_funder" => { "possible_values" => nil, "description" => "metadata which includes one or more funder entry" },
-  "funder" => { "possible_values" => "{funder_id}", "description" => "metadata which include the {funder_id} in FundRef data" },
-  "location" =>  { "possible_values" => "{country_name}", "description" => "funder records where location = {country name}. Only works on /funders route" },
-  "prefix" => { "possible_values" => "{owner_prefix}", "description" => "metadata belonging to a DOI owner prefix {owner_prefix} (e.g. '10.1016' )" },
-  "member" => { "possible_values" => "{member_id}", "description" => "metadata belonging to a CrossRef member" },
-  "from_index_date" => { "possible_values" => '{date}', "description" => "metadata indexed since (inclusive) {date}" },
-  "until_index_date" => { "possible_values" => '{date}', "description" => "metadata indexed before (inclusive) {date}" },
-  "from_deposit_date" => { "possible_values" => '{date}', "description" => "metadata last (re)deposited since (inclusive) {date}" },
-  "until_deposit_date" => { "possible_values" => '{date}', "description" => "metadata last (re)deposited before (inclusive) {date}" },
-  "from_update_date" => { "possible_values" => '{date}', "description" => "Metadata updated since (inclusive) {date} Currently the same as 'from_deposit_date'" },
-  "until_update_date" => { "possible_values" => '{date}', "description" => "Metadata updated before (inclusive) {date} Currently the same as 'until_deposit_date'" },
-  "from_created_date" => { "possible_values" => '{date}', "description" => "metadata first deposited since (inclusive) {date}" },
-  "until_created_date" => { "possible_values" => '{date}', "description" => "metadata first deposited before (inclusive) {date}" },
-  "from_pub_date" => { "possible_values" => '{date}', "description" => "metadata where published date is since (inclusive) {date}" },
-  "until_pub_date" => { "possible_values" => '{date}', "description" => "metadata where published date is before (inclusive)  {date}" },
-  "from_online_pub_date" => { "possible_values" => '{date}', "description" => "metadata where online published date is since (inclusive) {date}" },
-  "until_online_pub_date" => { "possible_values" =>  '{date}', "description" => "metadata where online published date is before (inclusive) {date}" },
-  "from_print_pub_date" => { "possible_values" => '{date}', "description" => "metadata where print published date is since (inclusive) {date}" },
-  "until_print_pub_date" => { "possible_values" => '{date}', "description" => "metadata where print published date is before (inclusive) {date}" },
-  "from_posted_date" => { "possible_values" => '{date}', "description" => "metadata where posted date is since (inclusive) {date}" },
-  "until_posted_date" => { "possible_values" => '{date}', "description" => "metadata where posted date is before (inclusive) {date}" },
-  "from_accepted_date" => { "possible_values" => '{date}', "description" => "metadata where accepted date is since (inclusive) {date}" },
-  "until_accepted_date" => { "possible_values" => '{date}', "description" => "metadata where accepted date is before (inclusive) {date}" },
-  "has_license" => { "possible_values" => nil, "description" => "metadata that includes any '<license_ref>' elements" },
-  "license_url" => { "possible_values" => '{url}', "description" => "metadata where '<license_ref>' value equals {url}" },
-  "license_version" => { "possible_values" => '{string}', "description" => "metadata where the '<license_ref>''s 'applies_to' attribute  is '{string}'"},
-  "license_delay" => { "possible_values" => "{integer}", "description" => "metadata where difference between publication date and the '<license_ref>''s 'start_date' attribute is <= '{integer}' (in days"},
-  "has_full_text" => { "possible_values" => nil, "description" => "metadata that includes any full text '<resource>' elements_" },
-  "full_text_version" => { "possible_values" => '{string}' , "description" => "metadata where '<resource>' element's 'content_version' attribute is '{string}'" },
-  "full_text_type" => { "possible_values" => '{mime_type}' , "description" => "metadata where '<resource>' element's 'content_type' attribute is '{mime_type}' (e.g. 'application/pdf')" },
-  "full_text_application" => { "possible_values" => '{string}' , "description" => "metadata where <resource> link has one of the following intended applications: text-mining, similarity-checking or unspecified" },
-  "has_references" => { "possible_values" => nil , "description" => "metadata for works that have a list of references" },
-  "has_archive" => { "possible_values" => nil , "description" => "metadata which include name of archive partner" },
-  "archive" => { "possible_values" => '{string}', "description" => "metadata which where value of archive partner is '{string}'" },
-  "has_orcid" => { "possible_values" => nil, "description" => "metadata which includes one or more ORCIDs" },
-  "has_authenticated_orcid" => { "possible_values" => nil , "description" => "metadata which includes one or more ORCIDs where the depositing publisher claims to have witness the ORCID owner authenticate with ORCID"},
-  "orcid" => { "possible_values" => '{orcid}', "description" => "metadata where '<orcid>' element's value = '{orcid}'" },
-  "issn" => { "possible_values" => '{issn}', "description" => "metadata where record has an ISSN = '{issn}' Format is 'xxxx_xxxx'." },
-  "directory" => { "possible_values" => "{directory}", "description" => "metadata records whose article or serial are mentioned in the given '{directory}'. Currently the only supported value is 'doaj'" },
-  "doi" => { "possible_values" => '{doi}', "description" => "metadata describing the DOI '{doi}'" },
-  "updates" => { "possible_values" => '{doi}', "description" => "metadata for records that represent editorial updates to the DOI '{doi}'" },
-  "is_update" => { "possible_values" => nil, "description" => "metadata for records that represent editorial updates" },
-  "has_update_policy" => { "possible_values" => nil, "description" => "metadata for records that include a link to an editorial update policy" },
-  "container_title" => { "possible_values" => nil, "description" => "metadata for records with a publication title exactly with an exact match" },
-  "category_name" => { "possible_values" => nil, "description" => "metadata for records with an exact matching category label" },
-  "type" => { "possible_values" => '{type}', "description" => "metadata records whose type = '{type}' Type must be an ID value from the list of types returned by the '/types' resource" },
-  "type_name" => { "possible_values" => nil, "description" => "metadata for records with an exacty matching type label" },
-  "award_number" => { "possible_values" => "{award_number}", "description" => "metadata for records with a matching award nunber_ Optionally combine with 'award_funder'" },
-  "award_funder" => { "possible_values" => '{funder doi or id}', "description" => "metadata for records with an award with matching funder. Optionally combine with 'award_number'" },
-  "has_assertion" => { "possible_values" => nil, "description" => "metadata for records with any assertions" },
-  "assertion_group" => { "possible_values" => nil, "description" => "metadata for records with an assertion in a particular group" },
-  "assertion" => { "possible_values" => nil, "description" => "metadata for records with a particular named assertion" },
-  "has_affiliation" => { "possible_values" => nil, "description" => "metadata for records that have any affiliation information" },
-  "alternative_id" => { "possible_values" => nil, "description" => "metadata for records with the given alternative ID, which may be a publisher_specific ID, or any other identifier a publisher may have provided" },
-  "article_number" => { "possible_values" => nil, "description" => "metadata for records with a given article number" },
-  "has_abstract" => { "possible_values" => nil, "description" => "metadata for records which include an abstract" },
-  "has_clinical_trial_number" => { "possible_values" => nil, "description" => "metadata for records which include a clinical trial number" },
-  "content_domain" => { "possible_values" => nil, "description" => "metadata where the publisher records a particular domain name as the location Crossmark content will appear" },
-  "has_content_domain" => { "possible_values" => nil, "description" => "metadata where the publisher records a domain name location for Crossmark content" },
-  "has_crossmark_restriction" => { "possible_values" => nil, "description" => "metadata where the publisher restricts Crossmark usage to content domains" },
-  "has_relation" => { "possible_values" => nil, "description" => "metadata for records that either assert or are the object of a relation" },
-  "relation_type" => { "possible_values" => nil, "description" => "One of the relation types from the Crossref relations schema (e.g. is-referenced-by, is-parent-of, is-preprint-of)" },
-  "relation_object" => { "possible_values" => nil, "description" => "Relations where the object identifier matches the identifier provided" },
-  "relation_object_type" => { "possible_values" => nil, "description" => "One of the identifier types from the Crossref relations schema (e.g. doi, issn)" },
-  "public_references" => { "possible_values" => nil, "description" => "metadata where publishers allow references to be distributed publically" },
-  "publisher_name" => { "possible_values" => nil, "description" => "metadata for records with an exact matching publisher name" },
-  "affiliation" => { "possible_values" => nil, "description" => "metadata for records with at least one contributor with the given affiliation" }
-}

data/lib/serrano/helpers/configuration.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 # taken from: https://viget.com/extend/easy-gem-configuration-variables-with-defaults
 module Configuration
-
   def configuration
     yield self
   end
@@ -22,5 +23,4 @@ module Configuration
       define_method name, &block
     end
   end
-
 end

data/lib/serrano/request.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
+require "erb"
 require "faraday"
 require "multi_json"
 require "serrano/error"
-require "serrano/constants"
-require 'serrano/utils'
-require 'serrano/helpers/configuration'
+require "serrano/utils"
+require "serrano/helpers/configuration"
 
 ##
 # Serrano::Request
@@ -11,7 +13,6 @@ require 'serrano/helpers/configuration'
 # Class to perform HTTP requests to the Crossref API
 module Serrano
   class Request #:nodoc:
-
     attr_accessor :endpt
     attr_accessor :id
     attr_accessor :query
@@ -29,7 +30,7 @@ module Serrano
     attr_accessor :verbose
 
     def initialize(endpt, id, query, filter, offset,
-      limit, sample, sort, order, facet, select, 
+      limit, sample, sort, order, facet, select,
       works, agency, options, verbose)
 
       self.endpt = endpt
@@ -50,52 +51,53 @@ module Serrano
     end
 
     def perform
-      filt = filter_handler(self.filter)
+      filt = filter_handler(filter)
 
-      self.select = self.select.join(",") if self.select && self.select.class == Array
+      self.select = select.join(",") if select && select.class == Array
 
-      args = { query: self.query, filter: filt, offset: self.offset,
-              rows: self.limit, sample: self.sample, sort: self.sort,
-              order: self.order, facet: self.facet, 
-              select: self.select }
-      opts = args.delete_if { |k, v| v.nil? }
+      args = {query: query, filter: filt, offset: offset,
+              rows: limit, sample: sample, sort: sort,
+              order: order, facet: facet,
+              select: select}
+      opts = args.delete_if { |_k, v| v.nil? }
 
-      if verbose
-        conn = Faraday.new(:url => Serrano.base_url, :request => options || []) do |f|
+      conn = if verbose
+        Faraday.new(url: Serrano.base_url, request: options || []) do |f|
           f.response :logger
           f.use FaradayMiddleware::RaiseHttpException
-          f.adapter  Faraday.default_adapter
+          f.adapter Faraday.default_adapter
         end
       else
-        conn = Faraday.new(:url => Serrano.base_url, :request => options || []) do |f|
+        Faraday.new(url: Serrano.base_url, request: options || []) do |f|
           f.use FaradayMiddleware::RaiseHttpException
-          f.adapter  Faraday.default_adapter
+          f.adapter Faraday.default_adapter
         end
       end
 
       conn.headers[:user_agent] = make_ua
       conn.headers["X-USER-AGENT"] = make_ua
 
-      if self.id.nil?
-        res = conn.get self.endpt, opts
-        return MultiJson.load(res.body)
+      if id.nil?
+        res = conn.get endpt, opts
+        MultiJson.load(res.body)
       else
+        self.id = Array(id)
+        # url encoding
+        self.id = id.map { |x| ERB::Util.url_encode(x) }
         coll = []
-        Array(self.id).each do |x|
-          if self.works
-            endpt = self.endpt + '/' + x.to_s + "/works"
+        id.each do |x|
+          endpt = if works
+            self.endpt + "/" + x.to_s + "/works"
+          elsif agency
+            self.endpt + "/" + x.to_s + "/agency"
           else
-            if self.agency
-              endpt = self.endpt + '/' + x.to_s + "/agency"
-            else
-              endpt = self.endpt + '/' + x.to_s
-            end
+            self.endpt + "/" + x.to_s
           end
 
           res = conn.get endpt, opts
           coll << MultiJson.load(res.body)
         end
-        return coll
+        coll
       end
     end
   end