passety 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aae122cdfdcc920d76baa7b5f6abd977b8603c8d
-  data.tar.gz: 1339a7700efc6d23d6bc18d8d990333578d97a2c
+  metadata.gz: 133b4abe3e0bff51650678790c3df2c545dc4983
+  data.tar.gz: 5b03dce74c6ed7ca46092edb900b169a1a058eec
 SHA512:
-  metadata.gz: 032fe5217e94bdb7b4c10cc987a662bef1a20cca6234fcf4a5b1baac4bce89f45c296c85d8a932d82bdac049f209b44c4bcd044b6fc83974203ab5100f8b05cb
-  data.tar.gz: b40eed51a451ffd12a31b42ee2035299bb8dec6c01942ee77c471494f08784f170f3c6ff4dad9a3c36ac15d58a3728671f7432cecdf7382d0694ad7617cae202
+  metadata.gz: 26e9498d470b726519e5102578888ee53e06fafd15b61a90f0d1b41ea4d8c48d8f2ea27e5e53564482614b7e6d6850a6db446840eb86b57c0968d55aaaa1a954
+  data.tar.gz: 2b6529739271c288b94b579c20573dbb887bcce37b3edc2f9c69790265247bd5f73a916cba5984069e33d28029d01b84b1d0ff65552f9b490dfcd10ca2ac618e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    passety (0.0.7)
+    passety (0.0.8)
       faraday
       json
 

data/lib/passety/exceptions/not_authorized_error.rb

@@ -0,0 +1,4 @@
+module Passety
+  class NotAuthorizedError < StandardError
+  end
+end

data/lib/passety/exceptions/not_found_error.rb

@@ -0,0 +1,4 @@
+module Passety
+  class NotFoundError < StandardError
+  end
+end

data/lib/passety/exceptions/read_only_error.rb

@@ -0,0 +1,4 @@
+module Passety
+  class ReadOnlyError < StandardError
+  end
+end

data/lib/passety/item.rb

@@ -14,11 +14,11 @@ module Passety
     end
 
     def update(id, params)
-      @wrapper.perform_request { |c| c.put(url(id), JSON.generate(params)) }
+      @wrapper.perform_request { |c| c.put(url(id), encode_params(params)) }
     end
 
     def create(params)
-      @wrapper.perform_request { |c| c.post(@uri, JSON.generate(params)) }
+      @wrapper.perform_request { |c| c.post(@uri, encode_params(params)) }
     end
 
     def destroy(id)
@@ -29,5 +29,18 @@ module Passety
     def url(id)
       '/' + [ @uri, id ].join('/')
     end
+
+    def encode_params(params)
+      has_multipart?(params) ? params : JSON.generate(params)
+    end
+
+    def has_multipart?(obj)
+      if obj.respond_to?(:each) && !obj.is_a?(String)
+        (obj.respond_to?(:values) ? obj.values : obj).each do |val|
+          return true if (val.respond_to?(:content_type) || has_multipart?(val))
+        end
+      end
+      false
+    end
   end
 end

data/lib/passety/nested_item.rb

@@ -1,5 +1,5 @@
 module Passety
-  class NestedItem
+  class NestedItem < Item
     def initialize(wrapper, parent, uri)
       @wrapper = wrapper
       @parent = parent
@@ -15,11 +15,11 @@ module Passety
     end
 
     def update(pid, id, params)
-      @wrapper.perform_request { |c| c.put(url(pid, id), JSON.generate(params)) }
+      @wrapper.perform_request { |c| c.put(url(pid, id), encode_params(params)) }
     end
 
     def create(pid, params)
-      @wrapper.perform_request { |c| c.post(url(pid), JSON.generate(params)) }
+      @wrapper.perform_request { |c| c.post(url(pid), encode_params(params)) }
     end
 
     def destroy(pid, id)

data/lib/passety/photo.rb

@@ -0,0 +1,11 @@
+module Passety
+  class Photo < NestedItem
+    def initialize(wrapper, parent)
+      super(wrapper, parent, 'photos')
+    end
+
+    def create(pid, params = {})
+      Item.new(@wrapper, 'uploads').create(params.merge(tid: pid))
+    end
+  end
+end

data/lib/passety/response.rb

@@ -0,0 +1,37 @@
+module Passety
+  class Response
+    attr_reader :response
+
+    def initialize(response)
+      @response = response
+    end
+
+    def content_type
+      ((response.headers.values_at('content-type', 'Content-Type').compact.first || '').split(';').first || '').strip
+    end
+
+    def parsed
+      parse_body(response)
+    end
+
+    def headers
+      response.headers
+    end
+
+    def status
+      response.status
+    end
+
+    def body
+      response.body || ''
+    end
+
+    private
+    def parse_body(response)
+      body = response.env[:body].strip
+      JSON[body]
+    rescue
+      nil
+    end
+  end
+end

data/lib/passety/thing.rb

@@ -7,5 +7,9 @@ module Passety
     def properties
       @properties ||= Property.new(@wrapper, 'things')
     end
+
+    def photos
+      @photos ||= Photo.new(@wrapper, 'things')
+    end
   end
 end

data/lib/passety/version.rb

@@ -1,3 +1,3 @@
 module Passety
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/passety/wrapper.rb

@@ -1,7 +1,8 @@
 module Passety
   class Wrapper
-    def initialize(app_id, secret)
-      @token = authenticate(app_id, secret)
+    def initialize(token, options = {})
+      @token = token
+      @raise_errors = options.fetch(:raise_errors, true)
     end
 
     def authorized?
@@ -24,28 +25,24 @@ module Passety
       perform_request { |c| c.get('/') }
     end
 
-    def perform_request(need_auth = true)
-      raise 'Not Authorized' if need_auth and not authorized?
-      response = yield(connection)
-      parse_body(response)
-    end
+    def perform_request
+      response = Response.new(yield(connection))
 
-    private
-    def parse_body(response)
-      body = response.env[:body].strip
-      JSON[body]
-    rescue
-      nil
-    end
+      if @raise_errors
+        raise NotAuthorizedError.new if response.status == 401
+        raise ReadOnlyError.new      if response.status == 403
+        raise NotFoundError.new      if response.status == 404
+      end
 
-    def connection
-      @connection ||= Faraday.new(url: API_URL, headers: { 'Accept' => 'application/json; version=1', 'Authorization' => "Bearer #{@token}" })
+      response
     end
 
-    def authenticate(app_id, secret)
-      response = Faraday.new(url: OAUTH_URL).post('/oauth/token', application_id: app_id, secret: secret)
-      auth = parse_body(response)
-      auth['token'] unless auth.nil?
+    private
+    def connection
+      @connection ||= Faraday.new(url: API_URL, headers: { 'Accept' => 'application/json; version=1', 'Authorization' => "Bearer #{@token}" }) do |f|
+        f.request :multipart
+        f.adapter Faraday.default_adapter
+      end
     end
   end
 end

data/lib/passety.rb

@@ -3,6 +3,7 @@ require 'json'
 
 require 'passety/version'
 require 'passety/wrapper'
+require 'passety/response'
 
 require 'passety/item'
 require 'passety/nested_item'
@@ -11,8 +12,12 @@ require 'passety/collections/thing'
 require 'passety/collection'
 require 'passety/property'
 require 'passety/thing'
+require 'passety/photo'
+
+require 'passety/exceptions/not_found_error'
+require 'passety/exceptions/read_only_error'
+require 'passety/exceptions/not_authorized_error'
 
 module Passety
-  OAUTH_URL = ENV['PASSETY_OAUTH_URL'] || 'https://passety.com'
   API_URL = ENV['PASSETY_API_URL'] || 'https://api.passety.com/'
 end

data/spec/wrapper_spec.rb

@@ -4,14 +4,11 @@ describe Passety::Wrapper do
   let(:app_id) { 'app_id' }
   let(:secret) { 'secret' }
   let(:token) { 'w32vd234231rr' }
-  let(:response) { "{\"token\": \"#{token}\"}" }
 
-  let(:wrapper) { Passety::Wrapper.new(app_id, secret) }
+  let(:wrapper) { Passety::Wrapper.new(token) }
   let(:tid) { 'AABAJ' }
 
   before do
-    stub_request(:post, "#{Passety::OAUTH_URL}/oauth/token").
-      to_return(:status => 200, :body => response, :headers => {})
     stub_request(:post, "#{Passety::API_URL}/things/")
     stub_request(:post, "#{Passety::API_URL}/things/#{tid}")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passety
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Passety Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,9 +154,14 @@ files:
 - lib/passety.rb
 - lib/passety/collection.rb
 - lib/passety/collections/thing.rb
+- lib/passety/exceptions/not_authorized_error.rb
+- lib/passety/exceptions/not_found_error.rb
+- lib/passety/exceptions/read_only_error.rb
 - lib/passety/item.rb
 - lib/passety/nested_item.rb
+- lib/passety/photo.rb
 - lib/passety/property.rb
+- lib/passety/response.rb
 - lib/passety/thing.rb
 - lib/passety/version.rb
 - lib/passety/wrapper.rb