Make response object

Author: Robovirtuoso

Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

kraken-io.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency('json')
   s.add_dependency('httparty')
   s.add_dependency('multipart-post')
+  s.add_dependency('activesupport')
   s.add_development_dependency('rspec')
   s.add_development_dependency('webmock', '~> 1.17')
 end

lib/kraken-io.rb

@@ -1,50 +1,59 @@
 require 'json'
 require 'httparty'
-require 'net/http/post/multipart'
+require 'active_support/hash_with_indifferent_access'
+require 'active_support/core_ext/hash'
+
+require 'kraken-io/http_multi_part'
+require 'kraken-io/response'
 
 module Kraken
   class API
     include HTTParty
+    extend  HTTPMultiPart
+
+    base_uri 'https://api.kraken.io/v1'
 
     attr_accessor :api_key, :api_secret
 
-    def initialize(api_key = '', api_secret = '')
-      @api_key = api_key
-      @api_secret = api_secret
+    def initialize(options = {})
+      @api_key    = options.fetch(:api_key)
+      @api_secret = options.fetch(:api_secret)
     end
 
-    def url(params = {})
-      params.merge!({
-        'auth' => {
-          'api_key' => @api_key,
-          'api_secret' => @api_secret
-        }
-      })
-
-      self.class.post('https://api.kraken.io/v1/url', {:body => JSON.generate(params)})
+    def url(url, params = {})
+      params = normalized_params(params).merge!(auth_hash)
+      params[:url] = url
+      res = self.class.post('/url', body: params.to_json)
+      res = Kraken::Response.new(res)
+      yield res if block_given? or return res
     end
 
-    def upload(params = {})
-      params.merge!({
-        'auth' => {
-          'api_key' => @api_key,
-          'api_secret' => @api_secret
-        }
-      })
+    def upload(file_name, params = {})
+      params = normalized_params(params).merge!(auth_hash)
+      res = self.class.multipart_post('/upload', file: file_name, body: params.to_json)
+      res = Kraken::Response.new(res)
+      yield res if block_given? or return res
+    end
 
-      url = URI.parse("https://api.kraken.io/v1/upload")
+    private
 
-      File.open(params['file']) do |file|
-        params.delete('file')
+    def normalized_params(params)
+      params = params.with_indifferent_access
 
-        req = Net::HTTP::Post::Multipart.new url.path, "body" => JSON.generate(params), "file" => UploadIO.new(file, 'logotyp.png')
+      unless params.keys.include?(:callback)
+        params[:wait] = true
+      end
 
-        https = Net::HTTP.new(url.host, url.port)
-        https.use_ssl = true
+      params
+    end
 
-        res = https.start() {|conn| conn.request(req)}
-        response = JSON.parse(res.body)
-      end
+    def auth_hash
+      {
+        auth: {
+          api_key: api_key,
+          api_secret: api_secret
+        }
+      }
     end
   end
 end

lib/kraken-io/http_multi_part.rb

@@ -0,0 +1,19 @@
+require 'net/http/post/multipart'
+
+module HTTPMultiPart
+  def multipart_post(url, params = {})
+    unless params.has_key?(:file)
+      post(url, params)
+    end
+
+    url = URI.parse(base_uri + url)
+
+    req = Net::HTTP::Post::Multipart.new(url.path, { 
+      file: UploadIO.new(File.open(params[:file]), 'file'), 
+      body: params[:body] })
+
+    https = Net::HTTP.new(url.host, url.port)
+    https.use_ssl = true
+    https.request(req)
+  end
+end

lib/kraken-io/response.rb

@@ -0,0 +1,20 @@
+require 'active_support/ordered_options'
+require 'forwardable'
+require 'delegate'
+require 'json'
+
+module Kraken
+  class Response < SimpleDelegator
+    extend Forwardable
+
+    def_delegators :@parsed, :success, :file_name, :original_size,
+      :kraked_size, :saved_bytes, :kraked_url
+
+    def initialize(response)
+      super(response)
+      @parsed = ActiveSupport::InheritableOptions.new(JSON.parse(response.body).with_indifferent_access)
+    end
+
+    alias_method :original_response, :__getobj__
+  end
+end

spec/kraken-io/response_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Kraken::Response do
+  subject do
+    Kraken::Response.new(WebMock::Response.new(body: result.to_json))
+  end
+
+  let(:result) do
+    {
+      "success" =>  true,
+      "file_name" => "header.jpg",
+      "original_size" =>  324520,
+      "kraked_size" =>  165358,
+      "saved_bytes" =>  159162,
+      "kraked_url" => "http://dl.kraken.io/ecdfa5c55d5668b1b5fe9e420554c4ee/header.jpg"
+    }
+  end
+
+  describe "delegates to the response object" do
+    its(:success)       { should == result['success'] }
+    its(:file_name)     { should == result['file_name'] }
+    its(:original_size) { should == result['original_size'] }
+    its(:kraked_size)   { should == result['kraked_size'] }
+    its(:saved_bytes)   { should == result['saved_bytes'] }
+    its(:kraked_url)    { should == result['kraked_url'] }
+  end
+
+  describe "still responds to HTTP response methods" do
+    its(:status) { should eq [200, ''] }
+  end
+end

spec/kraken-io_spec.rb

@@ -9,27 +9,33 @@
       "kraked_size" =>  165358,
       "saved_bytes" =>  159162,
       "kraked_url" => "http://dl.kraken.io/ecdfa5c55d5668b1b5fe9e420554c4ee/header.jpg"
-    }.to_json
+    }
+  end
+
+  subject { Kraken::API.new(api_key: 1, api_secret: 2) }
+
+  describe 'initialize' do
+    it 'is an error to leave out the key or secret' do
+      expect { Kraken::API.new(api_secret: 2) }.to raise_error KeyError
+      expect { Kraken::API.new(api_key: 2) }.to raise_error KeyError
+    end
   end
 
-  subject { Kraken::API.new(1,2) }
   describe '#url' do
     let(:expected_params) do
       {
-          'url' => 'http://farts.gallery',
           'wait' => true,
-          'auth' => { 'api_key' => 1, 'api_secret' => 2}
+          'auth' => { 'api_key' => 1, 'api_secret' => 2},
+          'url' => 'http://farts.gallery'
       }
     end
 
     it 'provides a url to the kraken api' do
       stub_request(:post, "https://api.kraken.io/v1/url")
-        .with(:body => expected_params.to_json).to_return(body: result)
+        .with(:body => expected_params.to_json).to_return(body: result.to_json)
 
-        subject.url(
-          'url' => 'http://farts.gallery',
-          'wait' => true
-        )
+      res = subject.url('http://farts.gallery')
+      expect(res.code).to eq 200
     end
   end
 
@@ -46,12 +52,10 @@
         expect(req.body).to include(expected_params.to_json)
         expect(req.body).to include('filename="test.gif"')
         expect(req.headers['Content-Type']).to include('multipart/form-data')
-      end.to_return(body: result)
+      end.to_return(body: result.to_json)
 
-      subject.upload(
-        'wait' => true,
-        'file' => File.expand_path('test.gif', File.dirname(__FILE__))
-      )
+      res = subject.upload(File.expand_path('test.gif', File.dirname(__FILE__)))
+      expect(res).to be_kind_of Kraken::Response
     end
   end
 end