metal_archives 2.1.1 → 3.1.0

data/lib/metal_archives/{error.rb → errors.rb}

@@ -32,7 +32,15 @@ module MetalArchives
     ##
     # Error in backend response
     #
-    class APIError < Error; end
+    class APIError < Error
+      attr_reader :code
+
+      def initialize(response)
+        super("#{response.reason}: #{response.body}")
+
+        @code = response.code
+      end
+    end
 
     ##
     # Error in method argument

data/lib/metal_archives/http_client.rb

@@ -1,61 +1,62 @@
 # frozen_string_literal: true
 
-require 'faraday'
-require 'faraday_throttler'
+require "http"
 
 module MetalArchives
   ##
-  # HTTP request client
+  # Generic HTTP client
   #
-  class HTTPClient # :nodoc:
-    class << self
-      ##
-      # Retrieve a HTTP resource
-      #
-      # [Raises]
-      # - rdoc-ref:MetalArchives::Errors::InvalidIDError when receiving a status code == 404n
-      # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
-      #
-      def get(*params)
-        response = client.get(*params)
-
-        raise Errors::InvalidIDError, response.status if response.status == 404
-        raise Errors::APIError, response.status if response.status >= 400
-
-        response
-      rescue Faraday::Error::ClientError => e
-        MetalArchives.config.logger.error e.response
-        raise Errors::APIError, e
+  class HTTPClient
+    attr_reader :endpoint, :metrics
+
+    def initialize(endpoint = MetalArchives.config.endpoint)
+      @endpoint = endpoint
+      @metrics = { hit: 0, miss: 0 }
+    end
+
+    def get(path, params = {})
+      response = http
+        .get(url_for(path), params: params)
+
+      # Log cache status
+      status = response.headers["x-cache-status"]&.downcase&.to_sym
+      MetalArchives.config.logger.info "Cache #{status} for #{path}" if status
+
+      case status
+      when :hit
+        metrics[:hit] += 1
+      when :miss, :bypass, :expired, :stale, :updating, :revalidated
+        metrics[:miss] += 1
       end
+      raise Errors::InvalidIDError, response if response.code == 404
+      raise Errors::APIError, response unless response.status.success?
 
-      private
+      response
+    end
 
-      ##
-      # Retrieve a HTTP client
-      #
-      #
-      def client
-        raise Errors::InvalidConfigurationError, 'Not configured yet' unless MetalArchives.config
+    private
 
-        @faraday ||= Faraday.new do |f|
-          f.request   :url_encoded # form-encode POST params
-          f.response  :logger, MetalArchives.config.logger
+    def http
+      @http ||= HTTP
+        .headers(headers)
+        .use(logging: { logger: MetalArchives.config.logger })
+        .encoding("utf-8")
 
-          f.use       MetalArchives::Middleware::Headers
-          f.use       MetalArchives::Middleware::CacheCheck
-          f.use       MetalArchives::Middleware::RewriteEndpoint
-          f.use       MetalArchives::Middleware::Encoding
+      return @http unless MetalArchives.config.endpoint_user && MetalArchives.config.endpoint_password
 
-          MetalArchives.config.middleware.each { |m| f.use m } if MetalArchives.config.middleware
+      @http
+        .basic_auth(user: MetalArchives.config.endpoint_user, pass: MetalArchives.config.endpoint_password)
+    end
 
-          f.use       :throttler,
-                      :rate => MetalArchives.config.request_rate,
-                      :wait => MetalArchives.config.request_timeout,
-                      :logger => MetalArchives.config.logger
+    def headers
+      {
+        user_agent: "#{MetalArchives.config.app_name}/#{MetalArchives.config.app_version} (#{MetalArchives.config.app_contact})",
+        accept: "application/json",
+      }
+    end
 
-          f.adapter   Faraday.default_adapter
-        end
-      end
+    def url_for(path)
+      "#{endpoint}#{path}"
     end
   end
 end

data/lib/metal_archives/models/artist.rb

@@ -1,19 +1,20 @@
 # frozen_string_literal: true
 
-require 'date'
-require 'countries'
+require "date"
+require "countries"
+require "nokogiri"
 
 module MetalArchives
   ##
   # Represents a single performer (but not a solo artist)
   #
-  class Artist < MetalArchives::BaseModel
+  class Artist < Base
     ##
     # :attr_reader: id
     #
     # Returns +Integer+
     #
-    property :id, :type => Integer
+    property :id, type: Integer
 
     ##
     # :attr_reader: name
@@ -35,7 +36,7 @@ module MetalArchives
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
     # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
     #
-    property :aliases, :multiple => true
+    property :aliases, multiple: true
 
     ##
     # :attr_reader: country
@@ -46,7 +47,7 @@ module MetalArchives
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
     # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
     #
-    property :country, :type => ISO3166::Country
+    property :country, type: ISO3166::Country
 
     ##
     # :attr_reader: location
@@ -62,24 +63,24 @@ module MetalArchives
     ##
     # :attr_reader: date_of_birth
     #
-    # Returns rdoc-ref:NilDate
+    # Returns rdoc-ref:Date
     #
     # [Raises]
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
     # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
     #
-    property :date_of_birth, :type => NilDate
+    property :date_of_birth, type: Date
 
     ##
     # :attr_reader: date_of_death
     #
-    # Returns rdoc-ref:NilDate
+    # Returns rdoc-ref:Date
     #
     # [Raises]
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
     # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
     #
-    property :date_of_death, :type => NilDate
+    property :date_of_death, type: Date
 
     ##
     # :attr_reader: cause_of_death
@@ -101,7 +102,7 @@ module MetalArchives
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
     # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
     #
-    enum :gender, :values => %i[male female]
+    enum :gender, values: [:male, :female]
 
     ##
     # :attr_reader: biography
@@ -145,17 +146,67 @@ module MetalArchives
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
     # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
     #
-    # [+similar+]
+    # [+links+]
     #     - +:url+: +String+
     #     - +:type+: +Symbol+, either +:official+, +:unofficial+ or +:unlisted_bands+
     #     - +:title+: +String+
     #
-    property :links, :multiple => true
+    property :links, multiple: true
 
-    # TODO: active bands/albums
-    # TODO: past bands/albums
-    # TODO: guest bands/albums
-    # TODO: misc bands/albums
+    ##
+    # :attr_reader: bands
+    #
+    # Returns +Array+ of +Hash+ containing the following keys
+    #
+    # [Raises]
+    # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
+    # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
+    #
+    # [+bands+]
+    #     - +:band+: rdoc-ref:Band
+    #     - +:active+: Boolean
+    #     - +:years_active+: +Array+ of rdoc-ref:Range containing +Integer+
+    #     - +:role+: +String+
+    #
+    property :bands, type: Hash, multiple: true
+
+    # TODO: guest/session bands
+    # TODO: misc bands
+
+    ##
+    # Serialize to hash
+    #
+    def to_h
+      {
+        type: "artist",
+        id: id,
+        name: name,
+        aliases: aliases || [],
+        country: country&.alpha3,
+        location: location,
+        date_of_birth: date_of_birth&.iso8601,
+        date_of_death: date_of_death&.iso8601,
+        cause_of_death: cause_of_death,
+        gender: gender,
+        biography: biography,
+        trivia: trivia,
+        photo: photo,
+        links: links || [],
+        bands: bands || [],
+      }
+    end
+
+    ##
+    # Deserialize from hash
+    #
+    def self.from_h(hash)
+      return unless hash.fetch(:type) == "artist"
+
+      new(hash.slice(:id, :name, :aliases, :location, :cause_of_death, :gender, :biography, :trivial, :photo, :links, :bands))
+        .tap { |m| m.country = ISO3166::Country[hash[:country]] }
+        .tap { |m| m.date_of_birth = Date.parse(hash[:date_of_birth]) if hash[:date_of_birth] }
+        .tap { |m| m.date_of_death = Date.parse(hash[:date_of_death]) if hash[:date_of_death] }
+    end
 
     protected
 
@@ -168,28 +219,24 @@ module MetalArchives
     #
     def assemble # :nodoc:
       ## Base attributes
-      url = "#{MetalArchives.config.default_endpoint}artist/view/id/#{id}"
-      response = HTTPClient.get url
+      response = MetalArchives.http.get "/artist/view/id/#{id}"
 
-      properties = Parsers::Artist.parse_html response.body
+      properties = Parsers::Artist.parse_html response.to_s
 
       ## Biography
-      url = "#{MetalArchives.config.default_endpoint}artist/read-more/id/#{id}/field/biography"
-      response = HTTPClient.get url
+      response = MetalArchives.http.get "/artist/read-more/id/#{id}/field/biography"
 
-      properties[:biography] = response.body
+      properties[:biography] = response.to_s
 
       ## Trivia
-      url = "#{MetalArchives.config.default_endpoint}artist/read-more/id/#{id}/field/trivia"
-      response = HTTPClient.get url
+      response = MetalArchives.http.get "/artist/read-more/id/#{id}/field/trivia"
 
-      properties[:trivia] = response.body
+      properties[:trivia] = response.to_s
 
       ## Related links
-      url = "#{MetalArchives.config.default_endpoint}link/ajax-list/type/person/id/#{id}"
-      response = HTTPClient.get url
+      response = MetalArchives.http.get "/link/ajax-list/type/person/id/#{id}"
 
-      properties[:links] = Parsers::Artist.parse_links_html response.body
+      properties[:links] = Parsers::Artist.parse_links_html response.to_s
 
       properties
     end
@@ -204,9 +251,9 @@ module MetalArchives
       #     +Integer+
       #
       def find(id)
-        return cache[id] if cache.include? id
+        return MetalArchives.cache[id] if MetalArchives.cache.include? id
 
-        Artist.new :id => id
+        Artist.new id: id
       end
 
       ##
@@ -246,16 +293,15 @@ module MetalArchives
       def find_by(query)
         raise MetalArchives::Errors::ArgumentError unless query.include? :name
 
-        url = "#{MetalArchives.config.default_endpoint}search/ajax-artist-search/"
         params = Parsers::Artist.map_params query
 
-        response = HTTPClient.get url, params
-        json = JSON.parse response.body
+        response = MetalArchives.http.get "/search/ajax-artist-search/", params
+        json = JSON.parse response.to_s
 
-        return nil if json['aaData'].empty?
+        return nil if json["aaData"].empty?
 
-        data = json['aaData'].first
-        id = Nokogiri::HTML(data.first).xpath('//a/@href').first.value.delete('\\').split('/').last.gsub(/\D/, '').to_i
+        data = json["aaData"].first
+        id = Nokogiri::HTML(data.first).xpath("//a/@href").first.value.delete('\\').split("/").last.gsub(/\D/, "").to_i
 
         find id
       end
@@ -298,8 +344,7 @@ module MetalArchives
       def search(name)
         raise MetalArchives::Errors::ArgumentError unless name.is_a? String
 
-        url = "#{MetalArchives.config.default_endpoint}search/ajax-artist-search/"
-        query = { :name => name }
+        query = { name: name }
 
         params = Parsers::Artist.map_params query
 
@@ -309,16 +354,16 @@ module MetalArchives
           if @max_items && @start >= @max_items
             []
           else
-            response = HTTPClient.get url, params.merge(:iDisplayStart => @start)
-            json = JSON.parse response.body
+            response = MetalArchives.http.get "/search/ajax-artist-search/", params.merge(iDisplayStart: @start)
+            json = JSON.parse response.to_s
 
-            @max_items = json['iTotalRecords']
+            @max_items = json["iTotalRecords"]
 
             objects = []
 
-            json['aaData'].each do |data|
+            json["aaData"].each do |data|
               # Create Artist object for every ID in the results list
-              id = Nokogiri::HTML(data.first).xpath('//a/@href').first.value.delete('\\').split('/').last.gsub(/\D/, '').to_i
+              id = Nokogiri::HTML(data.first).xpath("//a/@href").first.value.delete('\\').split("/").last.gsub(/\D/, "").to_i
               objects << Artist.find(id)
             end
 
@@ -341,7 +386,7 @@ module MetalArchives
       # - rdoc-ref:MetalArchives::Errors::ParserError when parsing failed. Please report this error.
       #
       def all
-        search ''
+        search ""
       end
     end
   end

data/lib/metal_archives/models/band.rb

@@ -1,19 +1,20 @@
 # frozen_string_literal: true
 
-require 'date'
-require 'countries'
+require "date"
+require "countries"
+require "nokogiri"
 
 module MetalArchives
   ##
   # Represents an band (person or group)
   #
-  class Band < MetalArchives::BaseModel
+  class Band < Base
     ##
     # :attr_reader: id
     #
     # Returns +Integer+
     #
-    property :id, :type => Integer
+    property :id, type: Integer
 
     ##
     # :attr_reader: name
@@ -35,7 +36,7 @@ module MetalArchives
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
     # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
     #
-    property :aliases, :multiple => true
+    property :aliases, multiple: true
 
     ##
     # :attr_reader: country
@@ -46,7 +47,7 @@ module MetalArchives
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
     # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
     #
-    property :country, :type => ISO3166::Country
+    property :country, type: ISO3166::Country
 
     ##
     # :attr_reader: location
@@ -62,24 +63,24 @@ module MetalArchives
     ##
     # :attr_reader: date_formed
     #
-    # Returns rdoc-ref:NilDate
+    # Returns rdoc-ref:Date
     #
     # [Raises]
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
     # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
     #
-    property :date_formed, :type => Date
+    property :date_formed, type: Date
 
     ##
-    # :attr_reader: date_active
+    # :attr_reader: years_active
     #
-    # Returns +Array+ of rdoc-ref:Range
+    # Returns +Array+ of rdoc-ref:Range containing +Integer+
     #
     # [Raises]
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
     # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
     #
-    property :date_active, :type => MetalArchives::Range, :multiple => true
+    property :years_active, type: Range, multiple: true
 
     ##
     # :attr_reader: genres
@@ -90,7 +91,7 @@ module MetalArchives
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
     # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
     #
-    property :genres, :multiple => true
+    property :genres, multiple: true
 
     ##
     # :attr_reader: lyrical_themes
@@ -101,7 +102,7 @@ module MetalArchives
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
     # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
     #
-    property :lyrical_themes, :multiple => true
+    property :lyrical_themes, multiple: true
 
     ##
     # :attr_reader: label
@@ -112,7 +113,7 @@ module MetalArchives
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
     # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
     #
-    property :label, :type => MetalArchives::Label
+    property :label, type: Label
 
     ##
     # :attr_reader: independent
@@ -123,7 +124,7 @@ module MetalArchives
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
     # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
     #
-    enum :independent, :values => [true, false]
+    enum :independent, values: [true, false]
 
     ##
     # :attr_reader: comment
@@ -145,10 +146,35 @@ module MetalArchives
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
     # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
     #
-    enum :status, :values => %i[active split_up on_hold unknown changed_name disputed]
+    enum :status, values: [:active, :split_up, :on_hold, :unknown, :changed_name, :disputed]
 
-    # TODO: releases
-    # TODO: members
+    ##
+    # :attr_reader: releases
+    #
+    # Returns +Array+ of rdoc-ref:Release
+    #
+    # [Raises]
+    # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
+    # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
+    #
+    property :releases, type: Release, multiple: true
+
+    ##
+    # :attr_reader: members
+    #
+    # Returns +Array+ of +Hash+ containing the following keys
+    #
+    # [Raises]
+    # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
+    # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
+    #
+    # [+members+]
+    #     - +:artist+: rdoc-ref:Artist
+    #     - +:current+: Boolean
+    #     - +:years_active+: +Array+ of rdoc-ref:Range containing +Integer+
+    #     - +:role+: +String+
+    #
+    property :members, type: Artist, multiple: true
 
     ##
     # :attr_reader: similar
@@ -163,7 +189,7 @@ module MetalArchives
     #     - +:band+: rdoc-ref:Band
     #     - +:score+: +Integer+
     #
-    property :similar, :type => Hash, :multiple => true
+    property :similar, type: Hash, multiple: true
 
     ##
     # :attr_reader: logo
@@ -196,12 +222,12 @@ module MetalArchives
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
     # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
     #
-    # [+similar+]
+    # [+links+]
     #     - +:url+: +String+
     #     - +:type+: +Symbol+, either +:official+ or +:merchandise+
     #     - +:title+: +String+
     #
-    property :links, :multiple => true
+    property :links, multiple: true
 
     protected
 
@@ -214,28 +240,29 @@ module MetalArchives
     #
     def assemble # :nodoc:
       ## Base attributes
-      url = "#{MetalArchives.config.default_endpoint}band/view/id/#{id}"
-      response = HTTPClient.get url
+      response = MetalArchives.http.get "/band/view/id/#{id}"
 
-      properties = Parsers::Band.parse_html response.body
+      properties = Parsers::Band.parse_html response.to_s
 
       ## Comment
-      url = "#{MetalArchives.config.default_endpoint}band/read-more/id/#{id}"
-      response = HTTPClient.get url
+      response = MetalArchives.http.get "/band/read-more/id/#{id}"
 
-      properties[:comment] = response.body
+      properties[:comment] = response.to_s
 
       ## Similar artists
-      url = "#{MetalArchives.config.default_endpoint}band/ajax-recommendations/id/#{id}"
-      response = HTTPClient.get url
+      response = MetalArchives.http.get "/band/ajax-recommendations/id/#{id}"
 
-      properties[:similar] = Parsers::Band.parse_similar_bands_html response.body
+      properties[:similar] = Parsers::Band.parse_similar_bands_html response.to_s
 
       ## Related links
-      url = "#{MetalArchives.config.default_endpoint}link/ajax-list/type/band/id/#{id}"
-      response = HTTPClient.get url
+      response = MetalArchives.http.get "/link/ajax-list/type/band/id/#{id}"
+
+      properties[:links] = Parsers::Band.parse_related_links_html response.to_s
+
+      ## Releases
+      response = MetalArchives.http.get "/band/discography/id/#{id}/tab/all"
 
-      properties[:links] = Parsers::Band.parse_related_links_html response.body
+      properties[:releases] = Parsers::Band.parse_releases_html response.to_s
 
       properties
     end
@@ -250,9 +277,9 @@ module MetalArchives
       #     +Integer+
       #
       def find(id)
-        return cache[id] if cache.include? id
+        return MetalArchives.cache[id] if MetalArchives.cache.include? id
 
-        Band.new :id => id
+        Band.new id: id
       end
 
       ##
@@ -291,8 +318,8 @@ module MetalArchives
       #     - +:name+: +String+
       #     - +:exact+: +Boolean+
       #     - +:genre+: +String+
-      #     - +:country+: +ISO366::Country+
-      #     - +:year_formation+: rdoc-ref:Range of rdoc-ref:NilDate
+      #     - +:country+: +ISO3166::Country+
+      #     - +:year_formation+: rdoc-ref:Range containing rdoc-ref:Date
       #     - +:comment+: +String+
       #     - +:status+: see rdoc-ref:Band.status
       #     - +:lyrical_themes+: +String+
@@ -301,16 +328,15 @@ module MetalArchives
       #     - +:independent+: boolean
       #
       def find_by(query)
-        url = "#{MetalArchives.config.default_endpoint}search/ajax-advanced/searching/bands"
         params = Parsers::Band.map_params query
 
-        response = HTTPClient.get url, params
-        json = JSON.parse response.body
+        response = MetalArchives.http.get "/search/ajax-advanced/searching/bands", params
+        json = JSON.parse response.to_s
 
-        return nil if json['aaData'].empty?
+        return nil if json["aaData"].empty?
 
-        data = json['aaData'].first
-        id = Nokogiri::HTML(data.first).xpath('//a/@href').first.value.delete('\\').split('/').last.gsub(/\D/, '').to_i
+        data = json["aaData"].first
+        id = Nokogiri::HTML(data.first).xpath("//a/@href").first.value.delete('\\').split("/").last.gsub(/\D/, "").to_i
 
         find id
       end
@@ -331,8 +357,8 @@ module MetalArchives
       #     - +:name+: +String+
       #     - +:exact+: +Boolean+
       #     - +:genre+: +String+
-      #     - +:country+: +ISO366::Country+
-      #     - +:year_formation+: rdoc-ref:Range of +Date+
+      #     - +:country+: +ISO3166::Country+
+      #     - +:year_formation+: rdoc-ref:Range containing rdoc-ref:Date
       #     - +:comment+: +String+
       #     - +:status+: see rdoc-ref:Band.status
       #     - +:lyrical_themes+: +String+
@@ -363,8 +389,8 @@ module MetalArchives
       #     - +:name+: +String+
       #     - +:exact+: +Boolean+
       #     - +:genre+: +String+
-      #     - +:country+: +ISO366::Country+
-      #     - +:year_formation+: rdoc-ref:Range of +Date+
+      #     - +:country+: +ISO3166::Country+
+      #     - +:year_formation+: rdoc-ref:Range containing rdoc-ref:Date
       #     - +:comment+: +String+
       #     - +:status+: see rdoc-ref:Band.status
       #     - +:lyrical_themes+: +String+
@@ -373,8 +399,6 @@ module MetalArchives
       #     - +:independent+: boolean
       #
       def search_by(query)
-        url = "#{MetalArchives.config.default_endpoint}search/ajax-advanced/searching/bands"
-
         params = Parsers::Band.map_params query
 
         l = lambda do
@@ -383,16 +407,16 @@ module MetalArchives
           if @max_items && @start >= @max_items
             []
           else
-            response = HTTPClient.get url, params.merge(:iDisplayStart => @start)
-            json = JSON.parse response.body
+            response = MetalArchives.http.get "/search/ajax-advanced/searching/bands", params.merge(iDisplayStart: @start)
+            json = JSON.parse response.to_s
 
-            @max_items = json['iTotalRecords']
+            @max_items = json["iTotalRecords"]
 
             objects = []
 
-            json['aaData'].each do |data|
+            json["aaData"].each do |data|
               # Create Band object for every ID in the results list
-              id = Nokogiri::HTML(data.first).xpath('//a/@href').first.value.delete('\\').split('/').last.gsub(/\D/, '').to_i
+              id = Nokogiri::HTML(data.first).xpath("//a/@href").first.value.delete('\\').split("/").last.gsub(/\D/, "").to_i
               objects << Band.find(id)
             end
 
@@ -421,7 +445,8 @@ module MetalArchives
       #
       def search(name)
         raise MetalArchives::Errors::ArgumentError unless name.is_a? String
-        search_by :name => name
+
+        search_by name: name
       end
 
       ##