hphones-ruby 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25c61ef3e11a0f877c8ec0af76a6f06bf90d2894
-  data.tar.gz: a8e4ef5f8e023996fb7f1466e8ef5f680e01061d
+  metadata.gz: 00556e53ee71c148c31b173d0087ec8818fc09b7
+  data.tar.gz: b8fa6073496428027d4d248d2481de0c65991446
 SHA512:
-  metadata.gz: 4ec366fd27a90871e0f2ebd0163759f0aa1cb3ca4cb98e163acc0d8f75c2eb6a07de9a4752f7a1123f6173201f7b816ce8e38830a87fc2b95433ed17e182e9b7
-  data.tar.gz: b4643d98c4eb0abcb32b2ee48666da54fb38cf5d1a8e4f2055c8e3969dabded10933eb43bcc47a662f3b2b0d4c8a926d65e4492b3f63bd19b59f4fa9e637a3ec
+  metadata.gz: 52e5a06556cab0dcefeab73fc80ac516d41d32c5fbb6c317c6d1708ec6d07f13f16c5161900d0d1eef9bfdd57589e9a43dc35417d3a7e8bfd08726c243de64e2
+  data.tar.gz: eb9ca2256f2ae56806700530b9002f9e05755bb9b801089a1949560d3a00323401cc6db14826673b8929213bcd15db2a6469e1ebec4776dbe45bf16581b4d852

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hphones-ruby (0.0.1)
+    hphones-ruby (0.0.2)
       faraday
       hashie
 
@@ -13,7 +13,7 @@ GEM
     dotenv (2.2.1)
     faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
-    hashie (3.5.6)
+    hashie (3.5.7)
     method_source (0.9.0)
     multipart-post (2.0.0)
     pry (0.11.3)

data/data/endpoints.yml

@@ -1,10 +1,12 @@
 get_index:
   method: get
+  response: json
   params:
     - key: cmd
       value: getIndex
 get_artist:
   method: get
+  response: json
   params:
     - key: cmd
       value: getArtist
@@ -12,6 +14,7 @@ get_artist:
       required: true
 get_album:
   method: get
+  response: json
   params:
     - key: cmd
       value: getAlbum
@@ -19,32 +22,38 @@ get_album:
       required: true
 get_upcoming:
   method: get
+  response: json
   params:
     - key: cmd
       value: getUpcoming
 get_wanted:
   method: get
+  response: json
   params:
     - key: cmd
       value: getWanted
 get_similar:
   method: get
+  response: json
   params:
     - key: cmd
       value: getSimilar
 get_history:
   method: get
+  response: json
   params:
     - key: cmd
       value: getHistory
 # NOT WORKING YET
 # get_logs:
 #   method: get
+#   response: json
 #   params:
 #       - key: cmd
 #         value: getLogs
 find_artist:
   method: get
+  response: json
   params:
     - key: cmd
       value: findArtist
@@ -54,6 +63,7 @@ find_artist:
       required: false
 find_album:
   method: get
+  response: json
   params:
     - key: cmd
       value: findAlbum
@@ -63,6 +73,7 @@ find_album:
       required: false
 add_artist:
   method: get
+  response: status
   params:
     - key: cmd
       value: addArtist
@@ -70,6 +81,7 @@ add_artist:
       required: true
 add_album:
   method: get
+  response: status
   params:
     - key: cmd
       value: addAlbum
@@ -77,6 +89,7 @@ add_album:
       required: true
 del_artist:
   method: get
+  response: status
   params:
     - key: cmd
       value: delArtist
@@ -84,6 +97,7 @@ del_artist:
       required: true
 pause_artist:
   method: get
+  response: status
   params:
     - key: cmd
       value: pauseArtist
@@ -91,6 +105,7 @@ pause_artist:
       required: true
 resume_artist:
   method: get
+  response: status
   params:
     - key: cmd
       value: resumeArtist
@@ -98,6 +113,7 @@ resume_artist:
       required: true
 refresh_artist:
   method: get
+  response: status
   params:
     - key: cmd
       value: refreshArtist
@@ -105,6 +121,7 @@ refresh_artist:
       required: true
 queue_album:
   method: get
+  response: status
   params:
     - key: cmd
       value: queueAlbum
@@ -116,6 +133,7 @@ queue_album:
       required: false
 unqueue_album:
   method: get
+  response: status
   params:
     - key: cmd
       value: unqueueAlbum
@@ -123,11 +141,13 @@ unqueue_album:
       required: true
 force_search:
   method: get
+  response: status
   params:
     - key: cmd
       value: forceSearch
 force_process:
   method: get
+  response: status
   params:
       - key: cmd
         value: forceProcess
@@ -135,6 +155,7 @@ force_process:
         required: false
 force_active_artists_update:
   method: get
+  response: status
   params:
     - key: cmd
       value: forceActiveArtistsUpdate
@@ -145,26 +166,31 @@ get_version:
       value: getVersion
 check_github:
   method: get
+  response: status
   params:
     - key: cmd
       value: checkGithub
 shutdown:
   method: get
+  response: status
   params:
     - key: cmd
       value: shutdown
 restart:
   method: get
+  response: status
   params:
     - key: cmd
       value: restart
 update:
   method: get
+  response: status
   params:
     - key: cmd
       value: update
 get_artist_art:
   method: get
+  response: path
   params:
     - key: cmd
       value: getArtistArt
@@ -172,6 +198,7 @@ get_artist_art:
       required: true
 get_artist_info:
   method: get
+  response: json
   params:
     - key: cmd
       value: getArtistInfo
@@ -179,6 +206,7 @@ get_artist_info:
       required: true
 get_album_info:
   method: get
+  response: json
   params:
     - key: cmd
       value: getAlbumInfo
@@ -186,6 +214,7 @@ get_album_info:
       required: true
 get_artist_thumb:
   method: get
+  response: path
   params:
     - key: cmd
       value: getArtistThumb
@@ -193,6 +222,7 @@ get_artist_thumb:
       required: true
 get_album_thumb:
   method: get
+  response: path
   params:
     - key: cmd
       value: getAlbumThumb
@@ -200,6 +230,7 @@ get_album_thumb:
       required: true
 choose_specific_download:
   method: get
+  response: json
   params:
     - key: cmd
       value: choose_specific_download

data/lib/hphones.rb

@@ -52,7 +52,7 @@ class Hphones
     super
   end
 
-  def respond_to_missing?(mth)
+  def respond_to_missing?(mth, *)
     !!lookup_endpoint(mth) || super
   end
 

data/lib/hphones/endpoint.rb

@@ -11,7 +11,7 @@ class Hphones
     class MissingParameterError < StandardError; end
 
     # The path to the endpoints file.
-    ENDPOINTS_PATH = File.join('data', 'endpoints.yml')
+    ENDPOINTS_PATH = File.join(File.dirname(__FILE__), '..', '..', 'data', 'endpoints.yml')
 
     class << self
       def lookup(key)
@@ -37,10 +37,14 @@ class Hphones
 
     def fetch
       api_params = compile_params
-      req = Hphones::Request.new(api)
+      req = Hphones::Request.new(api, self)
       req.send endpoint_info['method'], api_params
     end
 
+    def response_type
+      endpoint_info['response']
+    end
+
     private
 
     attr_reader :key, :api, :params

data/lib/hphones/request.rb

@@ -5,16 +5,21 @@ class Hphones
   # Represents an API request
   #
   class Request
-    attr_reader :api
+    attr_reader :api, :endpoint
 
-    def initialize(api)
+    def initialize(api, endpoint)
       @api = api
+      @endpoint = endpoint
     end
 
     def get(params = {})
       conn = api.connection
       compiled_params = params.merge('apikey' => api.api_key)
-      Hphones::Response.new(conn.get(api.base_path, compiled_params))
+      Hphones::Response.new(self, conn.get(api.base_path, compiled_params))
+    end
+
+    def response_type
+      endpoint.response_type
     end
   end
 end

data/lib/hphones/response.rb

@@ -8,20 +8,51 @@ class Hphones
   # Represents an API response
   #
   class Response
-    def initialize(http_response)
+    STATUS_OK = 'OK'
+
+    RESPONSE_TYPE_JSON = 'json'
+    RESPONSE_TYPE_STATUS = 'status'
+    RESPONSE_TYPE_PATH = 'path'
+
+    def initialize(request, http_response)
       @http_response = http_response
+      @request = request
     end
 
     def data
-      @data ||= parse_json http_response.body
+      @data ||= parse_data http_response.body
     end
 
     private
 
-    attr_reader :http_response
+    attr_reader :request, :http_response
+
+    def parse_data(body)
+      case request.response_type
+      when RESPONSE_TYPE_JSON
+        parse_json body
+      when RESPONSE_TYPE_STATUS
+        parse_status body
+      when RESPONSE_TYPE_PATH
+        parse_path body
+      end
+    end
+
+    def parse_json(body)
+      JSON.parse body
+    end
+
+    def parse_status(body)
+      case body
+      when STATUS_OK
+        true
+      else
+        false
+      end
+    end
 
-    def parse_json(json_str)
-      JSON.parse json_str
+    def parse_path(body)
+      body
     end
   end
 end

data/lib/hphones/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Hphones
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hphones-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tyler Guillen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday