shutl_resource 0.10.4 → 0.10.5

data/lib/shutl/resource/configuration.rb

@@ -20,14 +20,16 @@ module Shutl::Resource
 
   module Configuration
     class << self
-      def logger
-        @logger ||= Logger.new($stdout)
-      end
+      attr_accessor :base_uri
 
       def configure
         yield self
       end
 
+      def logger
+        @logger ||= Logger.new($stdout)
+      end
+
       def logger=(logger)
         @logger = logger
       end

data/lib/shutl/resource/rest_class_methods.rb

@@ -271,6 +271,8 @@ module Shutl::Resource
     def generate_url!(url_pattern, args, params = {})
       url = url_pattern.dup
 
+      url = "#{Shutl::Resource.base_uri}#{url}" unless self.base_uri
+
       args, url = replace_args_from_pattern! args, url
 
       url = URI.escape url

data/lib/shutl/resource/version.rb

@@ -1,5 +1,5 @@
 module Shutl
   module Resource
-    VERSION = '0.10.4'
+    VERSION = '0.10.5'
   end
 end

data/lib/shutl_resource.rb

@@ -10,7 +10,7 @@ require 'shutl/resource/errors'
 module Shutl::Resource
   extend self
 
-  delegate :logger, :logger=, to: Configuration
+  delegate :logger, :logger=, :base_uri, :base_uri=, to: Configuration
 
   def configure(*args, &block)
     Configuration.configure(*args, &block)

data/spec/configuration_spec.rb

@@ -13,5 +13,18 @@ describe Shutl::Resource do
 
       Shutl::Resource.logger.should == logger
     end
+
+    it "allows for configuration of the base uri" do
+      Shutl::Resource.configure do |config|
+        config.base_uri = 'base uri'
+      end
+
+      Shutl::Resource.base_uri.should == 'base uri'
+
+      #set it back to not corrupt other tests
+      Shutl::Resource.configure do |config|
+        config.base_uri = nil
+      end
+    end
   end
 end

data/spec/configured_base_uri_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe TestConfiguredBaseUriResource do
+  let(:headers) do
+    {'Accept' => 'application/json',
+     'Content-Type' => 'application/json',
+     'Authorization' => 'Bearer some auth'}
+  end
+
+  before do
+    Shutl::Resource.configure do |config|
+      config.base_uri = "http://configured"
+    end
+  end
+
+  after do
+    Shutl::Resource.configure do |config|
+      config.base_uri = nil
+    end
+  end
+
+  context "uses the configured base uri if present" do
+    before do
+      @request = stub_request(:get, 'http://configured/test_configured_base_uri_resources/a').
+        to_return(:status  => 200,
+                  :body    => '{"test_configured_base_uri_resource": { "a": "a", "b": 2 }}',
+                  :headers => headers)
+    end
+
+    it 'should query the endpoint' do
+      TestConfiguredBaseUriResource.find('a', auth: "some auth")
+
+      @request.should have_been_requested
+    end
+  end
+
+  context "doesnt override a resources declared base uri" do
+    before do
+      @request = stub_request(:get, 'http://host/test_rests/a').
+        to_return(:status  => 200,
+                  :body    => '{"test_rest": { "a": "a", "b": 2 }}',
+                  :headers => headers)
+    end
+
+    it 'should query the endpoint' do
+      TestRest.find('a', auth: "some auth")
+
+      @request.should have_been_requested
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -2,5 +2,7 @@ require 'shutl_resource'
 require 'webmock/rspec'
 
 require 'support/test_resource'
+require 'support/test_resource'
+require 'support/configured_base_uri_resource'
 require 'support/test_singular_resource'
 require 'support/double_logger'

data/spec/support/configured_base_uri_resource.rb

@@ -0,0 +1,5 @@
+class TestConfiguredBaseUriResource
+  include Shutl::Resource::Rest
+  resource_id :a
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shutl_resource
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70115703855460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,31 +23,21 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.10.0
+  version_requirements: *70115703855460
 - !ruby/object:Gem::Dependency
   name: shutl_auth
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70115703853480 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
+  version_requirements: *70115703853480
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70115703852820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,15 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70115703852820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70115703850460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -71,15 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70115703850460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70115703870120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,15 +67,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.11.0
+  version_requirements: *70115703870120
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70115703885320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -103,15 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70115703885320
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70115703884340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -119,12 +89,7 @@ dependencies:
         version: 1.8.7
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.7
+  version_requirements: *70115703884340
 description: Shutl Rest resource
 email:
 - davidr@shutl.co.uk
@@ -152,10 +117,12 @@ files:
 - script/ci
 - shutl_resource.gemspec
 - spec/configuration_spec.rb
+- spec/configured_base_uri_spec.rb
 - spec/dynamic_resource_spec.rb
 - spec/remote_url_spec.rb
 - spec/rest_resource_spec.rb
 - spec/spec_helper.rb
+- spec/support/configured_base_uri_resource.rb
 - spec/support/double_logger.rb
 - spec/support/test_resource.rb
 - spec/support/test_singular_resource.rb
@@ -173,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2937045685155006965
+      hash: -1303369992111380096
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -182,19 +149,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2937045685155006965
+      hash: -1303369992111380096
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Manage Shutl Rest resource. Parse/Serialize JSON
 test_files:
 - spec/configuration_spec.rb
+- spec/configured_base_uri_spec.rb
 - spec/dynamic_resource_spec.rb
 - spec/remote_url_spec.rb
 - spec/rest_resource_spec.rb
 - spec/spec_helper.rb
+- spec/support/configured_base_uri_resource.rb
 - spec/support/double_logger.rb
 - spec/support/test_resource.rb
 - spec/support/test_singular_resource.rb