crowdtilt 1.0.0 → 1.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGI4NTg1OTFjZGNkMGI1NzRiMjRkYWUyYWUxMGE4NTFjMWIwMWJiNw==
+    MzQ0Yjk3OGY3ODk2ZDI4Y2EzMGU4MmE2NjIxYzFmZTIyZjQ0ZjI1Yg==
   data.tar.gz: !binary |-
-    MzQ0OWE0NzZlNjczMWM1ZmEzMWQwMGNiY2M2NzA2ZTZkYWI1Y2VjNA==
-!binary "U0hBNTEy":
+    ZTA2OGI3ZWRkYzY1NjVhYmIxMzc2MzQ4ZDJmNjUxNTA1YWQyYjQ5Nw==
+SHA512:
   metadata.gz: !binary |-
-    NDg0MGE1YmU2YTk1MjRmOWIxMmU2NDhlNmY1MTkyN2E4OTRmZDg1ZDViM2I2
-    MzkyMmE1NGNhNmFlMGM3NjZiMTEzYmVlYTBjNDliMzljNDBiNTZjMTI5Mzdj
-    MjI3NjkxYTAyZjJlZjcyYWZmNTMwY2ZhNTZmNWIzYzVmZDE5NGE=
+    ZjUxZWI0YWVlNDEyNjJkYzZlODkzZjIyMDg3ZGE0YTM3Zjg2MjMyZGU4MTQ0
+    YTc0MzM0OTkwMTY3YzQ0NWE1ZDQzZjEwYzY1ODU3MzUxNDQ0OWJhNzI5MDRh
+    Y2JhMDM0ZjExZDc3NTI2NWEyNWY5NzdlNWE3NjkwNjNiOTBmYzA=
   data.tar.gz: !binary |-
-    ZGFiMDdlZDEwMDgzYmU0ZTIyYjhiMjk0YmMyNDIzMWNmNDkyNjZlYTA5OTBh
-    NzBkOWEwY2UwMjk0NzVlYjk5MGI1OTEyM2QxYTQ5Yzg0MmQ0OTNmYTFhMTFh
-    NzhjNzBkOTA2ZWNjMzc4ZjAwMDExZWYzOTk5ZDkwN2QyZTVhMDQ=
+    NjZhZmJjN2ZhYTJjOGRiNDZmYjU2ZTE1ODAxY2ViZjUxZjQwZDRhZDBjMTRj
+    OTVmY2UyYjc4YjNiM2U0MGVkODQ0MmMyYmM2NWEwMWQ5NzllZDk2OTE4NjE4
+    MGUzZWViMTQ0YjhhMzViMjlhOGFmNzM0ZGEwZTQ1NmFmMWNkNjE=

data/lib/crowdtilt.rb

@@ -1,108 +1,2 @@
-require 'active_support'
-require 'faraday'
-require 'faraday_middleware'
-require 'json'
-
-module Crowdtilt
-  
-  class << self
-    
-    attr_accessor :api_key, :api_secret, :mode, :base_url, :version
-    
-    def configure(params)
-      raise ArgumentError, "You must include both the api_key and api_secret" unless (params.include?(:api_key) && params.include?(:api_secret))
-      @api_key = params[:api_key]
-      @api_secret = params[:api_secret]
-      
-      @version = 'v1'
-      
-      if params[:mode] == 'production'
-        @mode = 'production'
-        @base_url = 'https://api.crowdtilt.com'
-      else
-        @mode = 'sandbox'
-        @base_url = 'https://api-sandbox.crowdtilt.com'
-      end
-      
-      @base_url = params[:base_url] if params[:base_url]
-      @version = params[:version] if params[:version]
-      
-      true      
-    end 
-  
-    def get(string)
-      request :get, uri(string)
-    end
-  
-    def post(string, params={})
-      request :post, uri(string), params
-    end
-  
-    def put(string, params={})
-      request :put, uri(string), params
-    end
-  
-    def delete(string)
-      request :delete, uri(string)
-    end
-  
-    def get_users()
-      get("/users")['users']
-    end
-
-    def get_user(id)
-      get("/users/#{id}")['user']
-    end
-
-    def create_user(user)
-      post("/users", { :user => user })['user']
-    end
-
-    def update_user(id, user)
-      put("/users/#{id}", { :user => user })['user']
-    end
-
-    private
-  
-    def request(method,*args)
-      conn = Faraday.new(:url => @base_url) do |faraday|
-        # faraday.response :logger
-        faraday.request :json
-        faraday.response :json, :content_type => /\bjson$/
-        faraday.use :instrumentation
-        faraday.adapter Faraday.default_adapter
-      end
-      conn.basic_auth(@api_key, @api_secret)
-      conn.headers.update({'Content-Type' => 'application/json'})
-      
-      res = conn.send method.to_sym, *args
-        
-      case res.status
-        when 401
-          raise "Invalid credentials"
-        when 400...599
-          if res.body.include? 'error'
-            raise res.body['error']
-          else
-            raise 'Unknown error'
-          end
-        else
-          res.body
-      end
-    end
-    
-    def uri(string)   
-      if string =~ /^\/v/
-        string
-      elsif string =~ /^v/
-        '/' + string
-      elsif string =~ /^\//
-        "/#{@version}" + string
-      else
-        "/#{@version}/" + string
-      end
-    end
-  
-  end
-
-end
+require 'crowdtilt/api_error'
+require 'crowdtilt/crowdtilt'

data/lib/crowdtilt/api_error.rb

@@ -0,0 +1,11 @@
+module Crowdtilt
+
+  class ApiError < StandardError
+    attr_accessor :response
+
+    def initialize(message, response)
+      @response = response
+      super(message)
+    end
+  end
+end

data/lib/crowdtilt/crowdtilt.rb

@@ -0,0 +1,130 @@
+require 'active_support'
+require 'faraday'
+require 'faraday_middleware'
+require 'json'
+
+module Crowdtilt
+
+  class << self
+
+    attr_accessor :api_key, :api_secret, :mode, :base_url, :version
+
+    def configure(params)
+      raise ArgumentError, "You must include both the api_key and api_secret" unless (params.include?(:api_key) && params.include?(:api_secret))
+      @api_key = params[:api_key]
+      @api_secret = params[:api_secret]
+
+      @version = 'v1'
+
+      if params[:mode] == 'production'
+        @mode = 'production'
+        @base_url = 'https://api.tilt.com'
+      else
+        @mode = 'sandbox'
+        @base_url = 'https://api-sandbox.tilt.com'
+      end
+
+      @base_url = params[:base_url] if params[:base_url]
+      @version = params[:version] if params[:version]
+
+      true
+    end
+
+    def get(string)
+      if block_given?
+        request :get, uri(string), &Proc.new
+      else
+        request :get, uri(string)
+      end
+    end
+
+    def post(string, params={})
+      if block_given?
+        request :post, uri(string), params, &Proc.new
+      else
+        request :post, uri(string), params
+      end
+    end
+
+    def put(string, params={})
+      if block_given?
+        request :put, uri(string), params, &Proc.new
+      else
+        request :put, uri(string), params
+      end
+    end
+
+    def delete(string)
+      if block_given?
+        request :delete, uri(string), &Proc.new
+      else
+        request :delete, uri(string)
+      end
+    end
+
+    def get_users()
+      get("/users")['users']
+    end
+
+    def get_user(id)
+      get("/users/#{id}")['user']
+    end
+
+    def create_user(user)
+      post("/users", { :user => user })['user']
+    end
+
+    def update_user(id, user)
+      put("/users/#{id}", { :user => user })['user']
+    end
+
+    private
+
+    def request(method, *args)
+      conn = Faraday.new(:url => @base_url) do |faraday|
+        # faraday.response :logger
+        faraday.request :json
+        faraday.response :json, :content_type => /\bjson$/
+        faraday.use :instrumentation
+        faraday.adapter Faraday.default_adapter
+      end
+      conn.basic_auth(@api_key, @api_secret)
+      conn.headers.update({'Content-Type' => 'application/json'})
+
+      yield conn if block_given?
+
+      res = conn.send method.to_sym, *args
+      handle_response(res)
+    end
+
+    def handle_response(res)
+      response_obj = res.respond_to?(:to_hash) ? res.to_hash : res
+      case response_obj[:status]
+        when 401
+          raise ApiError.new('Invalid credentials', response_obj)
+        when 400...599
+          if response_obj[:body].include? 'error'
+            raise ApiError.new(response_obj[:body]['error'], response_obj)
+          else
+            raise ApiError.new('Unknown error', response_obj)
+          end
+        else
+          response_obj[:body]
+      end
+    end
+
+    def uri(string)
+      if string =~ /^\/v/
+        string
+      elsif string =~ /^v/
+        '/' + string
+      elsif string =~ /^\//
+        "/#{@version}" + string
+      else
+        "/#{@version}/" + string
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: crowdtilt
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.3
 platform: ruby
 authors:
 - Marc St Raymond
+- Sam Wyman
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -30,20 +31,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -87,12 +82,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: A lightweight ruby wrapper for the Crowdtilt API
-email: marc@crowditlt.com
+email: team@crowdhoster.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/crowdtilt.rb
+- lib/crowdtilt/api_error.rb
+- lib/crowdtilt/crowdtilt.rb
 homepage: https://www.crowdtilt.com/learn/developers
 licenses:
 - MIT
@@ -113,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Crowdtilt Ruby Client