cobot_client 0.5.0 → 0.6.0

data/cobot_client.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = CobotClient::VERSION
 
-  gem.add_dependency 'activesupport'
   gem.add_dependency 'virtus'
   gem.add_dependency 'oauth2'
   gem.add_dependency 'rest-client'

data/lib/cobot_client/api_client.rb

@@ -25,8 +25,6 @@ module CobotClient
       delete subdomain, "/bookings/#{id}"
     end
 
-    private
-
     def put(subdomain, path, params)
       JSON.parse RestClient.put(cobot_url(subdomain, "/api#{path}"), params, auth_headers).body,
         symbolize_names: true
@@ -41,9 +39,9 @@ module CobotClient
         symbolize_names: true
     end
 
-    def get(subdomain, path)
+    def get(subdomain, path, params = {})
       JSON.parse(
-        RestClient.get(cobot_url(subdomain, "/api#{path}"), auth_headers).body,
+        RestClient.get(cobot_url(subdomain, "/api#{path}", params: params), auth_headers).body,
         symbolize_names: true
       )
     end

data/lib/cobot_client/url_helper.rb

@@ -1,9 +1,16 @@
-require 'active_support/core_ext/module/attribute_accessors'
 require 'uri'
 
 module CobotClient::UrlHelper
   # set this to override the site for accessing the cobot api
-  mattr_accessor :site
+
+  @@site = 'https://www.cobot.me'
+  def self.site
+    @@site
+  end
+
+  def self.site=(site)
+    @@site = site
+  end
 
   # generates a url to access the cobot api
   # see the spec for usage examples
@@ -11,10 +18,10 @@ module CobotClient::UrlHelper
     path = path_options.first.is_a?(String) ? path_options.first : '/'
     options = path_options.find{|p| p.is_a?(Hash)} || {}
 
-    url = URI.parse(site || 'https://www.cobot.me')
+    url = URI.parse(CobotClient::UrlHelper.site)
     url.host = url.host.split('.').tap{|parts| parts[0] = subdomain}.join('.')
     url.path = path
-    url.query = URI.encode_www_form(options[:params]) if options[:params]
+    url.query = URI.encode_www_form(options[:params]) if options[:params] && options[:params].any?
 
     url.to_s
   end

data/lib/cobot_client/version.rb

@@ -1,3 +1,3 @@
 module CobotClient
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/cobot_client/api_client_spec.rb

@@ -65,4 +65,19 @@ describe CobotClient::ApiClient do
       api_client.delete_booking 'co-up', 'booking-1'
     end
   end
+
+  context '#get' do
+    it 'calls rest client' do
+      RestClient.should_receive(:get).with('https://co-up.cobot.me/api/invoices?from=2013-10-6&to=2013-10-12',
+        'Authorization' => 'Bearer token-123') { default_response }
+
+      api_client.get 'co-up', '/invoices', {from: '2013-10-6', to: '2013-10-12'}
+    end
+
+    it 'returns the response json' do
+      RestClient.stub(:get) { stub(:response, body: [{number: 1}].to_json) }
+
+      expect(api_client.get('co-up', '/invoices')).to eql([{number: 1}])
+    end
+  end
 end

data/spec/cobot_client/url_helper_spec.rb

@@ -7,6 +7,16 @@ describe CobotClient::UrlHelper, 'cobot_url' do
     end
   end
 
+  after(:each) do
+    CobotClient::UrlHelper.site = 'https://www.cobot.me'
+  end
+
+  it 'lets me change the site' do
+    CobotClient::UrlHelper.site = 'https://www.cobot.com'
+
+    expect(helper.cobot_url).to eql('https://www.cobot.com/')
+  end
+
   it 'returns the default url' do
     expect(helper.cobot_url).to eql('https://www.cobot.me/')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cobot_client
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement