kraken-io 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 927703fd46ec662ea64578cecb8589dfde21d68f
-  data.tar.gz: 7d7bf33a13ce67a99a013dd5b2c35a199abfeacc
+  metadata.gz: dcf2758e91edc0914df8ac3b0612094a0acd7afa
+  data.tar.gz: 2d86b7c78d74482902a62682c6c7964c18c32a1d
 SHA512:
-  metadata.gz: 7bbb72eac59df48bde082e7d4474ea0940ef2d785f311a256849ac8f35af81ae917901a68e8f6e186cdc3dfe63ce83e5392047b6fe7bee01b8e536722d7bbccd
-  data.tar.gz: 07107083986dd2beb3244d90b03a0457a103055258effbd81f84e6917298c040aea04362c6384693b737a4daf8a918eccf668f1a8d4e0a409ff8472b9708147a
+  metadata.gz: 1c58c080015aca348f142087ec49b33aa138fc912be1820e64993c22887f8e26c5db84d2485609accb458bf643a8cad62fc9c1ad9af8f70958f108456afde0fe
+  data.tar.gz: f55daf3c1f69dece0381e434089160141fe3c60f25c6c71b933ad28bb511fd3b818b5103c50dd035eb9cdcb409526561e1f8d3283808c7895293ffb026430527

data/lib/kraken-io.rb

@@ -1,51 +1,96 @@
 require 'json'
 require 'httparty'
-require 'rest-client'
-require 'net/http/post/multipart'
+require 'active_support/hash_with_indifferent_access'
+require 'active_support/core_ext/hash'
+require 'thread'
+
+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
-        }
-      })
+    def async
+      @async = true
+      self
+    end
 
-      self.class.post('https://api.kraken.io/v1/url', {:body => JSON.generate(params)})
+    def sync
+      @async = false
+      self
     end
 
-    def upload(params = {})
-      params.merge!({
-        'auth' => {
-          'api_key' => @api_key,
-          'api_secret' => @api_secret
-        }
-      })
+    def url(url, params = {})
+      params = normalized_params(params).merge!(auth_hash)
+      params[:url] = url
+      call_kraken do
+        res = self.class.post('/url', body: params.to_json)
+        res = Kraken::Response.new(res)
+        yield res if block_given? or return res
+      end
+    end
 
-      url = URI.parse("https://api.kraken.io/v1/upload")
+    def callback_url(url)
+      @callback_url = url
+      self
+    end
 
-      File.open(params['file']) do |file|
-        params.delete('file')
+    def upload(file_name, params = {})
+      params = normalized_params(params).merge!(auth_hash)
+      call_kraken do
+        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
+    end
 
-        req = Net::HTTP::Post::Multipart.new url.path, "body" => JSON.generate(params), "file" => UploadIO.new(file, 'logotyp.png')
+    private
+    def call_kraken(&block)
+      if @async
+        call_async(&block)
+      else
+        yield
+      end
+    end
+
+    def call_async(&block)
+      Thread.abort_on_exception = false
+      Thread.new do |t|
+        block.call
+      end
+      nil
+    end
 
-        https = Net::HTTP.new(url.host, url.port)
-        https.use_ssl = true
+    def normalized_params(params)
+      params = params.with_indifferent_access
 
-        res = https.start() {|conn| conn.request(req)}
-        response = JSON.parse(res.body)
+      if params.keys.include?(:callback_url) || @callback_url
+        params[:callback_url] = @callback_url
+      else
+        params[:wait] = true
       end
+
+      params
+    end
+
+    def auth_hash
+      {
+        auth: {
+          api_key: api_key,
+          api_secret: api_secret
+        }
+      }
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kraken-io
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Przemek Matylla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httmultiparty
+  name: multipart-post
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: multipart-post
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -67,13 +67,55 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.17'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.17'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -81,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: With this gem you can plug into the power and speed of Kraken.io Image
-  Optimizer. http://kraken.io/
+  Optimizer. https://kraken.io/
 email:
 - przemek@matylla.pl
 executables: []
@@ -109,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Ruby gem for interacting with Kraken.io API