restful_resource 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91803ab9a7afb00f09ddc7272c06e3330f3418fd
-  data.tar.gz: 8ed0b0c0a0b914b940cdb35cc3c486107909e0b2
+  metadata.gz: 36cc91bc3981c424860da9b4d0796b4a6ecd39fa
+  data.tar.gz: 36335e18b3355ef43378f4bf40063e13cef20d49
 SHA512:
-  metadata.gz: aada22cf8f429ea81558f25f73b8e9bc4420929e1156e21f57a4d01fa1af45c47a528e25a76eb774c96a708e31da85459c738067ca3ef5e7d5af3b41570f2a8f
-  data.tar.gz: 797b5200c5f2a7d9ece83ddb0aadccffe8b13414b5eebeaf5d5401f564467cc0bf0fd681be34e6623443f22ef8600aa5c174f9e9fe6d8498764331f869af3cff
+  metadata.gz: 3f4140e5cdec22eacdbea78d34d92547929c4b261f41ee2c34de587f235cbf55a4957b1d4d93c9437bda5289f25b9f856d4fdff5d362bcea3bf0dace9de2f901
+  data.tar.gz: 79c6dd84751fb90dabecfa78218e12b879e6a1a7b99dfc207f674cc2663626c2a75c8a3219e8163886d3fb7c4b8abfc5364cf7a008fbe0194b45b2867d082b2e

data/lib/restful_resource/base.rb

@@ -2,20 +2,16 @@ module RestfulResource
   class Base < OpenObject
     extend RestfulResource::Associations
 
-    def self.http=(http)
-      @http = http
-    end
+    def self.configure(base_url: nil, username: nil, password: nil)
+      @base_url = URI.parse(base_url)
 
-    def self.http
-      @http ||= RestfulResource::HttpClient.new(authorization: superclass.base_authorization)
-    end
+      auth = nil
 
-    def self.http_authorization(user, password)
-      @base_authorization = RestfulResource::Authorization.http_authorization(user, password)
-    end
+      if (username.present? && password.present?)
+        auth = RestfulResource::Authorization.http_authorization(username, password)
+      end
 
-    def self.base_url=(url)
-      @base_url = URI.parse(url)
+      @http = RestfulResource::HttpClient.new(authorization: auth)
     end
 
     def self.resource_path(url)
@@ -23,24 +19,24 @@ module RestfulResource
     end
 
     def self.find(id, params={})
-      response = superclass.http.get(member_url(id, params))
+      response = http.get(member_url(id, params))
       self.new(parse_json(response.body))
     end
 
     def self.where(params={})
-      response = superclass.http.get(collection_url(params))
+      response = http.get(collection_url(params))
       self.paginate_response(response)
     end
 
     def self.get(params={})
-      response = superclass.http.get(collection_url(params))
+      response = 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 = superclass.http.put(url, data: data)
+      response = http.put(url, data: data)
       self.new(parse_json(response.body))
     end
 
@@ -63,14 +59,17 @@ module RestfulResource
     end
 
     protected
-    def self.base_url
-      raise BaseUrlMissing.new if @base_url.nil? 
-
-      @base_url
+    def self.http
+      @http || superclass.http
     end
 
-    def self.base_authorization
-      @base_authorization
+    def self.base_url
+      result = @base_url
+      if result.nil? && superclass.respond_to?(:base_url)
+        result = superclass.base_url
+      end
+      raise "Base url missing" if result.nil?
+      result
     end
 
     private
@@ -79,12 +78,12 @@ module RestfulResource
     end
 
     def self.member_url(id, params)
-      url = merge_url_paths(superclass.base_url, @resource_path, id, @action_prefix)
+      url = merge_url_paths(base_url, @resource_path, id, @action_prefix)
       replace_parameters(url, params)
     end
 
     def self.collection_url(params)
-      url = merge_url_paths(superclass.base_url, @resource_path, @action_prefix)
+      url = merge_url_paths(base_url, @resource_path, @action_prefix)
       replace_parameters(url, params)
     end
 

data/lib/restful_resource/version.rb

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

data/spec/restful_resource/base_authorization_spec.rb

@@ -1,6 +1,6 @@
 require_relative '../spec_helper'
 
-describe "http client" do
+describe RestfulResource::Base, 'authorization' do
   before :each do
     class FirstClient < RestfulResource::Base
     end
@@ -8,6 +8,8 @@ describe "http client" do
     class SecondClient < RestfulResource::Base
     end
 
+    class NotConfiguredClient < RestfulResource::Base; end
+
     class FirstTest < FirstClient
       resource_path 'test'
     end
@@ -16,31 +18,39 @@ describe "http client" do
       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')
+    FirstClient.configure(base_url: 'http://api.carwow.co.uk/api/first')
+    SecondClient.configure(base_url: 'http://api.carwow.co.uk/api/second',
+                           username: 'test_user',
+                           password: 'test_pass')
   end
 
   it "should use two different http instances" do
-    expect(FirstTest.http).not_to equal(SecondTest.http)
+    expect(FirstTest.send(:http)).not_to equal(SecondTest.send(:http))
   end
 
   it 'should have http auth on SecondClient when initialised first' do
-    SecondTest.http
-    FirstTest.http
+    SecondTest.send(:http)
+    FirstTest.send(:http)
 
-    authorization = SecondTest.http.instance_variable_get :@authorization
+    authorization = SecondTest.send(: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
+    FirstTest.send(:http)
+    SecondTest.send(:http)
 
-    authorization = SecondTest.http.instance_variable_get :@authorization
+    authorization = SecondTest.send(:http).instance_variable_get :@authorization
     expect(authorization).to be_truthy
   end
+
+  it 'should have same http auth on superclass' do
+    expect(SecondTest.send(:http)).to equal(SecondClient.send(:http))
+  end
+
+  it 'should raise exception if base_url is not set' do
+    expect { NotConfiguredClient.send(:base_url) }.to raise_error 'Base url missing'
+  end
+
 end
 

data/spec/restful_resource/base_spec.rb

@@ -3,8 +3,8 @@ require_relative '../spec_helper'
 describe RestfulResource::Base do
   before :each do
     @mock_http = double("mock_http")
-    RestfulResource::Base.http = @mock_http
-    RestfulResource::Base.base_url = "http://api.carwow.co.uk/"
+    allow(RestfulResource::Base).to receive(:http).and_return(@mock_http)
+    RestfulResource::Base.configure(base_url: 'http://api.carwow.co.uk/')
   end
 
   it "should act as an openobject" do
@@ -77,11 +77,9 @@ 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
+      BaseA.configure(base_url: "http://a.carwow.co.uk")
 
-      BaseB.base_url = "http://b.carwow.co.uk"
-      BaseB.http = @mock_http
+      BaseB.configure(base_url: "http://b.carwow.co.uk")
 
       expect_get('http://a.carwow.co.uk/testa/1', RestfulResource::Response.new())
       expect_get('http://b.carwow.co.uk/testb/2', RestfulResource::Response.new())

data/spec/restful_resource/rails_validations_spec.rb

@@ -3,8 +3,8 @@ require_relative '../spec_helper'
 describe RestfulResource::RailsValidations do
   before :each do
     @mock_http = double("mock_http")
-    RestfulResource::Base.http = @mock_http
-    RestfulResource::Base.base_url = "http://api.carwow.co.uk/"
+    RestfulResource::Base.configure(base_url: "http://api.carwow.co.uk/")
+    allow(RestfulResource::Base).to receive(:http).and_return(@mock_http)
   end
 
   context "#put without errors" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restful_resource
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - David Santoro