restful_resource 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc4d1bbfdde924c3b2091f258b2ae0291fa95137
-  data.tar.gz: 2fed2298a294dabe54584bf05aa49f9c4ed51e3e
+  metadata.gz: 91803ab9a7afb00f09ddc7272c06e3330f3418fd
+  data.tar.gz: 8ed0b0c0a0b914b940cdb35cc3c486107909e0b2
 SHA512:
-  metadata.gz: 834ce402bc491c69f8def4d3cba41adfa5e837a3e83265ac1b2520f3f0133624753521f3f4f2008551ea783c62d731c341d81a8799e88f40b9df11c1b5c68031
-  data.tar.gz: f322f3af95316c4b5e470ffa0115015f7bc4495aba2c71fe83716db8a55adfa4d6336104073386ca0d83b98ed1d76fc933338c9347f2f1b2c7eb16826bcbc7be
+  metadata.gz: aada22cf8f429ea81558f25f73b8e9bc4420929e1156e21f57a4d01fa1af45c47a528e25a76eb774c96a708e31da85459c738067ca3ef5e7d5af3b41570f2a8f
+  data.tar.gz: 797b5200c5f2a7d9ece83ddb0aadccffe8b13414b5eebeaf5d5401f564467cc0bf0fd681be34e6623443f22ef8600aa5c174f9e9fe6d8498764331f869af3cff

data/lib/restful_resource/base.rb

@@ -3,11 +3,11 @@ module RestfulResource
     extend RestfulResource::Associations
 
     def self.http=(http)
-      @@http = http
+      @http = http
     end
 
     def self.http
-      @@http ||= RestfulResource::HttpClient.new(authorization: superclass.base_authorization)
+      @http ||= RestfulResource::HttpClient.new(authorization: superclass.base_authorization)
     end
 
     def self.http_authorization(user, password)
@@ -23,24 +23,24 @@ module RestfulResource
     end
 
     def self.find(id, params={})
-      response = http.get(member_url(id, params))
+      response = superclass.http.get(member_url(id, params))
       self.new(parse_json(response.body))
     end
 
     def self.where(params={})
-      response = http.get(collection_url(params))
+      response = superclass.http.get(collection_url(params))
       self.paginate_response(response)
     end
 
     def self.get(params={})
-      response = http.get(collection_url(params))
+      response = superclass.http.get(collection_url(params))
       RestfulResource::OpenObject.new(parse_json(response.body))
     end
 
     def self.put(id, data: {}, **params)
       url = member_url(id, params)
 
-      response = http.put(url, data: data)
+      response = superclass.http.put(url, data: data)
       self.new(parse_json(response.body))
     end
 
@@ -64,6 +64,8 @@ module RestfulResource
 
     protected
     def self.base_url
+      raise BaseUrlMissing.new if @base_url.nil? 
+
       @base_url
     end
 

data/lib/restful_resource/version.rb

@@ -1,3 +1,3 @@
 module RestfulResource
-  VERSION = "0.8.8"
+  VERSION = "0.8.9"
 end

data/spec/restful_resource/base_authorization_spec.rb

@@ -0,0 +1,46 @@
+require_relative '../spec_helper'
+
+describe "http client" do
+  before :each do
+    class FirstClient < RestfulResource::Base
+    end
+
+    class SecondClient < RestfulResource::Base
+    end
+
+    class FirstTest < FirstClient
+      resource_path 'test'
+    end
+
+    class SecondTest < SecondClient
+      resource_path 'test'
+    end
+
+    FirstClient.http = nil
+    FirstClient.base_url = 'http://api.carwow.co.uk/api/first'
+    SecondClient.http = nil
+    SecondClient.base_url = 'http://api.carwow.co.uk/api/second'
+    SecondClient.http_authorization('test_user', 'test_pass')
+  end
+
+  it "should use two different http instances" do
+    expect(FirstTest.http).not_to equal(SecondTest.http)
+  end
+
+  it 'should have http auth on SecondClient when initialised first' do
+    SecondTest.http
+    FirstTest.http
+
+    authorization = SecondTest.http.instance_variable_get :@authorization
+    expect(authorization).to be_truthy
+  end
+
+  it 'should have http auth on SecondTest when initialised second' do
+    FirstTest.http
+    SecondTest.http
+
+    authorization = SecondTest.http.instance_variable_get :@authorization
+    expect(authorization).to be_truthy
+  end
+end
+

data/spec/restful_resource/base_spec.rb

@@ -78,7 +78,10 @@ describe RestfulResource::Base do
   describe "#base_url" do
     it "should be different for each subclass of Base" do
       BaseA.base_url = "http://a.carwow.co.uk"
+      BaseA.http = @mock_http
+
       BaseB.base_url = "http://b.carwow.co.uk"
+      BaseB.http = @mock_http
 
       expect_get('http://a.carwow.co.uk/testa/1', RestfulResource::Response.new())
       expect_get('http://b.carwow.co.uk/testb/2', RestfulResource::Response.new())

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restful_resource
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - David Santoro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,6 +137,7 @@ files:
 - restful_resource.gemspec
 - spec/fixtures.rb
 - spec/restful_resource/associations_spec.rb
+- spec/restful_resource/base_authorization_spec.rb
 - spec/restful_resource/base_spec.rb
 - spec/restful_resource/http_client_spec.rb
 - spec/restful_resource/old_base_spec.rb
@@ -172,6 +173,7 @@ summary: A simple activerecord inspired rest resource base class implemented usi
 test_files:
 - spec/fixtures.rb
 - spec/restful_resource/associations_spec.rb
+- spec/restful_resource/base_authorization_spec.rb
 - spec/restful_resource/base_spec.rb
 - spec/restful_resource/http_client_spec.rb
 - spec/restful_resource/old_base_spec.rb