vidsy-data-api 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93f40e4e9c553a989d40f3c585dbd3e1cb57f72c
-  data.tar.gz: b379b58644a2bfdc978dc1d8da777e306d004ec1
+  metadata.gz: b630829b895f90fdfac65adee62b293654f69d50
+  data.tar.gz: 417e2cfb904fd6a102789aa854b40b82a557196b
 SHA512:
-  metadata.gz: 170bc521276ffb37cf0ea1cf64ad478546ab29a520e4dae31768e78cdfefd679956fd4c7332e213a4e3b1023265e5ce457c5ce6e8929c7e020454fe44a958e7b
-  data.tar.gz: ec0362660160e90858633f58db0e130c7d03648857bfae9b6c679a3bc4be18afc09ba33b9a7f998e3495601cc614cf108db940f22c34c77fdb411b737fb91093
+  metadata.gz: 81d0cf0afde69d3778fe5558683dabba24b18c8e9d1614875efa644f3dfb4c7ba1b54eeba42181af73bba3c190325a63fc9d8902c2bb9000b85e9421fdad434d
+  data.tar.gz: 8e308eeece5fe54c1af6663d3f53305edaeba907535d16597675cf7b8790c45b1590070e319ed88beea6def83d2e9b2134c09f366097aa18f26a2c2574c7a33f

data/lib/vidsy/data/api.rb

@@ -1,4 +1,4 @@
-require "vidsy/data/api/client"
+require "vidsy/data/api/configuration"
 require "vidsy/data/api/version"
 
 module Vidsy

data/lib/vidsy/data/api/brand.rb

@@ -1,34 +1,41 @@
 require "vidsy/data/api/client"
+require "vidsy/data/api/configuration"
 
 module Vidsy
   module Data
     module API
-      class Brand < Client
+      class Brand
         def initialize(id = nil)
           @id = id
         end
 
-        def challenges
-          raise(ArgumentError, "ID not set for Brand") if id.nil?
-          challenges = get "#{routes.brand}/#{id}/#{routes.challenges}"
-          challenges.size == 0 ? nil : challenges
+        def self.all
+          new.all
         end
 
-        def self.all
-          brands = get "#{routes.brands}"
-          brands.size == 0 ? nil : brands
+        def all
+          client.get "#{routes.brands}"
+        end
+
+        def challenges
+          raise(ArgumentError, "ID not set for Brand") if id.nil?
+          client.get "#{routes.brand}/#{id}/#{routes.challenges}"
         end
 
         private
 
         attr_reader :id
 
-        def get(path)
-          self.class.superclass.method(:get).call path
+        def client
+          Vidsy::Data::API::Client.new
+        end
+
+        def configuration
+          Vidsy::Data::API::Configuration
         end
 
         def routes
-          self.class.superclass.method(:routes).call
+          configuration.routes
         end
       end
     end

data/lib/vidsy/data/api/client.rb

@@ -1,78 +1,28 @@
-require "faraday"
-require "json"
-require "ostruct"
+require "vidsy/data/api/request"
+require "vidsy/data/api/response"
 
 module Vidsy
   module Data
     module API
       class Client
-        @@config = OpenStruct.new
-
-        def self.set_api_key(s)
-          raise(ArgumentError, "API key must be String") unless s.is_a? String
-          @@config.tap { |c| c.api_key = s }
-        end
-
-        def self.set_endpoint(s)
-          raise(ArgumentError, "Endpoint must be String") unless s.is_a? String
-          @@config.tap { |c| c.endpoint = s }
-        end
-
-        def self.set_routes(h)
-          raise(ArgumentError, "Routes must be Hash") unless h.is_a? Hash
-          @@config.tap { |c| c.routes = OpenStruct.new h }
-        end
-
-        def self.set_version(s)
-          raise(ArgumentError, "Version must be String") unless s.is_a? String
-          @@config.tap { |c| c.version = s }
-        end
-
-        protected
-
-        def self.api_key
-          @@config.api_key
-        end
-
-        def self.endpoint
-          @@config.endpoint
-        end
-
-        def self.get(path)
-          parse connection.get("/#{version}#{path}")
-        end
-
-        def self.post(path, params)
-          response = connection.post do |req|
-            req.url "/#{version}#{path}"
-            req.headers["Content-Type"] = "application/json"
-            req.body = params.to_json
-          end
-
-          parse response
-        end
-
-        def self.routes
-          @@config.routes
+        def get(path)
+          api_response = request.get path
+          response api_response
         end
 
-        def self.version
-          @@config.version || "v1"
+        def post(path, options)
+          api_response = request.post(path, options)
+          response api_response
         end
 
         private
 
-        def self.connection
-          @connection ||= Faraday.new(:url => endpoint) do |f|
-            f.response :logger
-            f.adapter  Faraday.default_adapter
-          end
+        def request
+          Vidsy::Data::API::Request
         end
 
-        def self.parse(response)
-          JSON.parse(response.body)["data"].map do |result|
-            OpenStruct.new result
-          end
+        def response(api_response)
+          Vidsy::Data::API::Response.build api_response
         end
       end
     end

data/lib/vidsy/data/api/configuration.rb

@@ -0,0 +1,29 @@
+require "ostruct"
+
+module Vidsy
+  module Data
+    module API
+      class Configuration
+        DEFAULT_VERSION = "v1"
+
+        class << self
+          attr_accessor :endpoint
+          attr_writer   :routes, :version
+
+          def configure(&block)
+            yield self
+            self
+          end
+
+          def routes
+            OpenStruct.new @routes
+          end
+
+          def version
+            @version ||= DEFAULT_VERSION
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vidsy/data/api/error/response.rb

@@ -0,0 +1,9 @@
+module Vidsy
+  module Data
+    module API
+      module Error
+        class Response < StandardError ; end
+      end
+    end
+  end
+end

data/lib/vidsy/data/api/error/unexpected.rb

@@ -0,0 +1,9 @@
+module Vidsy
+  module Data
+    module API
+      module Error
+        class Unexpected < StandardError ; end
+      end
+    end
+  end
+end

data/lib/vidsy/data/api/request.rb

@@ -0,0 +1,58 @@
+require "faraday"
+require "faraday_middleware"
+require "json"
+require "vidsy/data/api/configuration"
+
+module Vidsy
+  module Data
+    module API
+      class Request
+        def self.get(path)
+          new.get path
+        end
+
+        def self.post(path, options = {})
+          new.post(path, options)
+        end
+
+        def get(path)
+          connection.get complete_path(path)
+        end
+
+        def post(path, options)
+          connection.post do |r|
+            r.body = options.to_json
+            r.headers["Content-Type"] = "application/json"
+            r.url complete_path(path)
+          end
+        end
+
+        private
+
+        def complete_path(path)
+          "/#{version}#{path}"
+        end
+
+        def configuration
+          Vidsy::Data::API::Configuration
+        end
+
+        def connection
+          Faraday.new(:url => endpoint) do |c|
+            c.adapter Faraday.default_adapter
+            c.use Faraday::Response::RaiseError
+            c.response :json, :content_type => /\bjson$/
+          end
+        end
+
+        def endpoint
+          configuration.endpoint
+        end
+
+        def version
+          configuration.version
+        end
+      end
+    end
+  end
+end

data/lib/vidsy/data/api/response.rb

@@ -0,0 +1,46 @@
+require "ostruct"
+require "vidsy/data/api/error/unexpected"
+
+module Vidsy
+  module Data
+    module API
+      class Response
+        def self.build(response)
+          new(response).data
+        end
+
+        def initialize(response)
+          @response = response
+        end
+
+        def data
+          raise unexpected_error unless response.body
+          data = response.body["data"] || raise(response_error)
+          data.map { |e| OpenStruct.new e }
+        end
+
+        private
+
+        attr_reader :response
+
+        def error_details
+          response.body.fetch "details"
+        end
+
+        def error_status
+          response.body.fetch "status"
+        end
+
+        def response_error
+          Vidsy::Data::API::Error::Response.new(
+            "#{error_status} - #{error_details}"
+          )
+        end
+
+        def unexpected_error
+          Vidsy::Data::API::Error::Unexpected
+        end
+      end
+    end
+  end
+end

data/lib/vidsy/data/api/user.rb

@@ -1,17 +1,38 @@
 require "vidsy/data/api/client"
+require "vidsy/data/api/configuration"
 
 module Vidsy
   module Data
     module API
-      class User < Client
+      class User
+        def self.create(options)
+          new.create options
+        end
+
         def self.find(id)
-          users = get "#{routes.user}/#{id}"
-          users.size == 0 ? nil : users.first
+          new.find id
+        end
+
+        def create(options)
+          client.post(routes.user, options).first
+        end
+
+        def find(id)
+          client.get "#{routes.user}/#{id}"
+        end
+
+        private
+
+        def client
+          Vidsy::Data::API::Client.new
+        end
+
+        def configuration
+          Vidsy::Data::API::Configuration
         end
 
-        def self.create(params)
-          users = post(routes.user, params)
-          users.first.id
+        def routes
+          configuration.routes
         end
       end
     end

data/lib/vidsy/data/api/version.rb

@@ -1,7 +1,7 @@
 module Vidsy
   module Data
     module API
-      VERSION = "0.3.0"
+      VERSION = "0.4.0"
     end
   end
 end

data/lib/vidsy/data/api/video.rb

@@ -1,20 +1,30 @@
 require "vidsy/data/api/client"
+require "vidsy/data/api/configuration"
 
 module Vidsy
   module Data
     module API
-      class Video < Client
-        def self.create(params, user_id)
-          videos = post(routes.video, post_params(user_id))
-          videos.first.id
+      class Video
+        def self.create(options)
+          new.create params
+        end
+
+        def create(options)
+          client.post(routes.video, options).first
         end
 
         private
 
-        def self.post_params(user_id)
-          {
-            :user_id => user_id.to_i
-          }
+        def client
+          Vidsy::Data::API::Client.new
+        end
+
+        def configuration
+          Vidsy::Data::API::Configuration
+        end
+
+        def routes
+          configuration.routes
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vidsy-data-api
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Charlie Revett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,6 +105,11 @@ files:
 - lib/vidsy/data/api.rb
 - lib/vidsy/data/api/brand.rb
 - lib/vidsy/data/api/client.rb
+- lib/vidsy/data/api/configuration.rb
+- lib/vidsy/data/api/error/response.rb
+- lib/vidsy/data/api/error/unexpected.rb
+- lib/vidsy/data/api/request.rb
+- lib/vidsy/data/api/response.rb
 - lib/vidsy/data/api/user.rb
 - lib/vidsy/data/api/version.rb
 - lib/vidsy/data/api/video.rb