picturelife 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70cb3e82a2e7a9da6aef56b46beedb101c8dd3a3
-  data.tar.gz: 814c20f34212c76c3ef2ab463482c045eebc4fb4
+  metadata.gz: c6bc0bb122024f1c4ca5652c7c6df24240c519e5
+  data.tar.gz: d0c7ec4df6e50f5a4c8e29eb8ba122760f026fda
 SHA512:
-  metadata.gz: 7a293f8d2025a200ce2c9eddb7b81b4a8a273771817f9bed148f6a072b12552bec02b883bb562b130b9b84f2f1e3153efcbad3fa779b56418b904fce2198c15c
-  data.tar.gz: 4f630b5d9a3bf5ff323b32d1a604153c8dab6090be1dea547d6e41ddd9b927104c519c86d9765836ed1c779647ad2ac236c6108fb84853a390a3a3e9dbe50eba
+  metadata.gz: 6e2a6f81e86bb75c04d0a7fae1d15951f89efc9c34e3bd1f7f2abd67aad8df000bf9f641ba39d6fe8dcf8c7e8a14e1e3fe363be343689f8dbc0bf261b445bf31
+  data.tar.gz: c5754a07bb304733f63746d34f1573af4371190e7e6a318508552623123b06f065bc2fde485aebff179c9eaab259a8485f2ebbde725d9ad0a31a22b7f2862048

data/lib/picturelife.rb

@@ -1,8 +1,7 @@
 require 'cgi'
 require 'json'
-require 'oauth'
 require 'excon'
-require 'net/http'
+require 'net/https'
 require 'digest/sha2'
 require 'picturelife/error'
 require 'picturelife/util'
@@ -12,11 +11,9 @@ require 'picturelife/oauth'
 require 'picturelife/api'
 require 'picturelife/ruler'
 
-Excon.defaults[:ssl_verify_peer] = false
-
 include Picturelife::Util
 include Picturelife::Ruler
 
 module Picturelife
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/picturelife/api.rb

@@ -28,10 +28,20 @@ module Picturelife
       def api_get(uri)
         uri      = URI(URI.encode(uri))
         response = Net::HTTP.get(uri)
-        response = JSON.parse(response)
+        response = parse_response(response)
         raise ApiError.new(response["status"], response["error"], response) if (response["status"] != 20000 && response["status"] != 200)
         response
       end
+
+      def parse_response(string)
+        error_response = {
+          'status' => -1,
+          'error'  => string.to_s
+        }
+
+        JSON.parse(response) rescue error_response
+      end
+
     end
   end
 end

data/lib/picturelife/base.rb

@@ -5,6 +5,8 @@ module Picturelife
     attr_accessor :access_token
     attr_accessor :refresh_token
     attr_reader   :redirect_uri
+    attr_reader   :token_expires
+    attr_reader   :user_id
 
     def redirect_uri=(uri)
       @redirect_uri = escape_uri(uri)
@@ -30,6 +32,8 @@ module Picturelife
     def reset_authentication!
       @access_token  = nil
       @refresh_token = nil
+      @token_expires = nil
+      @user_id       = nil
     end
   end
 end

data/lib/picturelife/oauth.rb

@@ -41,7 +41,7 @@ module Picturelife
     end
 
     private
-
+    
     def api_oauth_get(uri)
       uri      = URI(URI.encode(uri))
       response = Net::HTTP.get(uri)
@@ -49,57 +49,6 @@ module Picturelife
       raise OAuthError.new(response["error"]) if response["status"] != 200
       response
     end
-  end
-
-
-  class OAuth
-
-    attr_accessor :verb, :uri, :body
-
-    def initialize(verb, uri, body)
-      @verb   = verb
-      @uri    = uri
-      @body = body
-    end
-
-    def authorization_header
-      header = "OAuth "
-      oauth_params.each do |k, v|
-        header += "#{k}=\"#{v}\", "
-      end
-      header.slice(0..-3) # chop off last ", "
-    end
-
-    private
-
-    def oauth_params
-      {
-        'oauth_timestamp'        => Time.now.getutc.to_i.to_s,
-        'oauth_token'            => escape_uri(Picturelife.access_token),
-        'oauth_consumer_key'     => Picturelife.client_id,
-        'oauth_signature_method' => 'HMAC-SHA1',
-        'oauth_signature'        => signature,
-        'oauth_nonce'            => nonce,
-        'oauth_version'          => '1.0'
-      }
-    end
-
-    def signature
-      body = @body.dup
-      body['access_token'] = Picturelife.access_token
-      body = body.map      { |k, v| [k.to_s, v.to_s] }
-      body = body.sort.map { |k, v| escape_uri("#{k}=#{v}") }.join('%26')
-
-      base   = [verb, escape_uri(uri), body].join('&')
-      key    = [Picturelife.client_secret, Picturelife.access_token].join('&')
-      escape_uri(sign(key, base))
-    end
-
-    def sign(key, base)
-      digest = OpenSSL::Digest::Digest.new('sha1')
-      hmac   = OpenSSL::HMAC.digest(digest, key, base)
-      Base64.encode64(hmac).chomp.gsub(/\n/, '')
-    end
 
   end
 end

data/lib/picturelife/ruler.rb

@@ -1,6 +1,6 @@
 module Picturelife
 
-  RULER_ENDPOINT  = "https://services.picturelife.com/ruler/"
+  RULER_ENDPOINT = "https://services.picturelife.com/ruler/"
 
   module Ruler
 

data/lib/picturelife/util.rb

@@ -23,10 +23,6 @@ module Picturelife
       @client_uuid ||= rand(10**10).to_s
     end
 
-    def nonce
-      rand(10**10).to_s
-    end
-    
     def get_signature(file_path)
       Digest::SHA256.hexdigest File.read(file_path)
     end

data/picturelife.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'json'
   spec.add_dependency 'excon'
-  spec.add_dependency 'oauth'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picturelife
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Albert Zak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -38,20 +38,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: oauth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement