pebble_timeline 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9f963dfdcfe444374718db5508c0642afb794d0
-  data.tar.gz: 7f4201115b6e339698823d7c880edc55c2ac6154
+  metadata.gz: 39ea03fd9c14fd853cda3e9c23da0633546052c1
+  data.tar.gz: 3eadd2e606c098795a77764392bce11122c88a6c
 SHA512:
-  metadata.gz: 8466a192ee66f3b3cb3dc90b101fd97742bc15d0ddaeb61a902fa7fe12ccbef495a047958803aadafaac2843c44c51df71dc2e9789d02f3757a48e1e61665eeb
-  data.tar.gz: eda34eb53e0dd988fddd88dc6a1df9b7b6082c06bd581a8247e0e2e1779310f2da10459a1d0150928d034302a8ec218157ec5486da38f7efa3ed03244fa4f0cf
+  metadata.gz: 16dbc4acd357bd4563909c0e51a9a9c4f8f45aa3573c318d2129ddd9ed3568c198b907adfd5df7d9601cf6c1ff353f622ec4365264094cfde84c4f61445da07b
+  data.tar.gz: e6f2a2a840b30e3ffe1ad9acbbd445206cbc30c6b1e687466b89199c53b48aaa2cea726ed5b44b93c5a5ca8ef4c4c089012e69cbc9a34a2a35110d75df208417

data/README.md

@@ -23,22 +23,23 @@ Or install it yourself as:
 ```
 require 'pebble_timeline'
 
-api = PebbleTimeline::API.new(API_KEY)
+PebbleTimeline.configure do |config|
+  config.api_key = API_KEY
+end
 
 # Shared pins
-pins = PebbleTimeline::Pins.new(api)
+pins = PebbleTimeline::Pins.new
 pins.create(id: "test-1", topics: 'test', time: "2015-06-19T20:00:00Z", layout: { type: 'genericPin', title: 'test 1' })
 pins.update("test-1", topics: 'test', time: "2015-06-19T20:00:00Z", layout: { type: 'genericPin', title: 'test 1' })
 pins.delete("test-1")
 
 # User pins
-user_pins = PebbleTimeline::Pins.new(api, 'user', USER_TOKEN)
+user_pins = PebbleTimeline::Pins.new('user', USER_TOKEN)
 user_pins.create(id: "test-1", time: "2015-06-12T16:42:00Z", layout: { type: 'genericPin', title: 'test 1' })
 user_pins.delete("test-1")
 
 # Subscriptions
-subscriptions = PebbleTimeline::Subscriptions.new(api)
-subscriptions.get(USER_TOKEN)
+PebbleTimeline::Subscriptions.get(USER_TOKEN)
 ```
 
 ## Contributing

data/lib/pebble_timeline/api.rb

@@ -1,28 +1,29 @@
 module PebbleTimeline
   class API
-    def initialize(api_key = nil)
-      raise ConfigMissingAPIKeyError, 'You must provide an API Key' unless PebbleTimeline.config.api_key || api_key
+    def initialize
+      raise ConfigMissingAPIKeyError, 'You must provide an API Key' unless PebbleTimeline.config.api_key
 
-      @api_key = PebbleTimeline.config.api_key || api_key
+      @api_key = PebbleTimeline.config.api_key
       @base_url = PebbleTimeline.config.base_url
     end
 
-    def call(url, http_method, params={})
-      response = send(http_method, url, params)
+    def self.call(url, http_method, params={})
+      @api ||= self.new
+      response = @api.send(http_method, url, params)
       response.body
     end
 
-    def connection
-      @connection ||= Faraday.new(url: @api_url) do |faraday|
-        faraday.headers['Content-Type'] = 'application/json'
-        faraday.headers['X-API-Key'] = @api_key
-        faraday.adapter Faraday.default_adapter
-        faraday.use PebbleTimeline::Middleware::ErrorDetector
-      end
-    end
-
     private
 
+      def connection
+        @connection ||= Faraday.new(url: @api_url) do |faraday|
+          faraday.headers['Content-Type'] = 'application/json'
+          faraday.headers['X-API-Key'] = @api_key
+          faraday.adapter Faraday.default_adapter
+          faraday.use PebbleTimeline::Middleware::ErrorDetector
+        end
+      end
+
       def post(path, params)
         connection.post do |req|
           req.url resource_url(path)

data/lib/pebble_timeline/errors.rb

@@ -1,6 +1,7 @@
 module PebbleTimeline
 
   class APIError < StandardError
+    attr_accessor :code
   end
 
   class ConfigError < StandardError

data/lib/pebble_timeline/middleware/error_detector.rb

@@ -5,7 +5,15 @@ module PebbleTimeline
       def call(env)
         @app.call(env).on_complete do |env|
           unless (200..299).include? env[:status]
-            raise APIError, env[:body]
+            error = APIError.new env[:body]
+
+            begin
+              response = JSON.load env[:body]
+              error = APIError.new response['errorMessage']
+              error.code = response['errorCode']
+            ensure
+              raise error
+            end
           end
         end
       end

data/lib/pebble_timeline/pins.rb

@@ -1,24 +1,23 @@
 module PebbleTimeline
   class Pins
-    def initialize(master, scope = 'shared', user_token = nil)
-      @master = master
+    def initialize(scope = 'shared', user_token = nil)
       @scope = scope
       @user_token = user_token if @scope == 'user'
     end
 
     def create(params = {})
       params.merge!(user_token: @user_token) if @user_token
-      @master.call("#{@scope}/pins/#{params[:id]}", :put, params)
+      API.call("#{@scope}/pins/#{params[:id]}", :put, params)
     end
 
     def update(id, params = {})
       params.merge!(user_token: @user_token) if @user_token
-      @master.call("#{@scope}/pins/#{id}.json", :put, params)
+      API.call("#{@scope}/pins/#{id}.json", :put, params)
     end
 
     def delete(id, params = {})
       params.merge!(user_token: @user_token) if @user_token
-      @master.call("#{@scope}/pins/#{id}", :delete, params)
+      API.call("#{@scope}/pins/#{id}", :delete, params)
     end
   end
 end

data/lib/pebble_timeline/subscriptions.rb

@@ -1,11 +1,7 @@
 module PebbleTimeline
   class Subscriptions
-    def initialize(master)
-      @master = master
-    end
-
-    def get(user_token)
-      JSON.load @master.call("user/subscriptions", :get, { user_token: user_token })
+    def self.get(user_token)
+      JSON.load API.call("user/subscriptions", :get, { user_token: user_token })
     end
   end
 end

data/lib/pebble_timeline/version.rb

@@ -1,3 +1,3 @@
 module PebbleTimeline
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pebble_timeline
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Salim Hbeiliny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport