pebblebed 0.0.36 → 0.0.37

data/lib/pebblebed/config.rb

@@ -11,10 +11,11 @@ module Pebblebed
     def service(name, options = {})
       Pebblebed.require_service(name, options)
     end
-  end
 
-  def self.config(&block)
-    Builder.new.send(:instance_eval, &block)
+    def base_uri(value)
+      Pebblebed.base_uri = value
+    end
+    alias base_url base_uri
   end
 
   def self.require_service(name, options = {})
@@ -26,33 +27,58 @@ module Pebblebed
     END
   end
 
-  def self.host
-    @host
-  end
+  class << self
+    def config(&block)
+      Builder.new.send(:instance_eval, &block)
+    end
 
-  def self.host=(value)
-    @host = value
-  end
+    def host
+      @host
+    end
 
-  def self.memcached
-    raise RuntimeError, "Please set Pebblebed.memcached = <your memcached client>" unless @memcached
-    @memcached
-  end
+    def host=(value)
+      @host = value
+    end
 
-  def self.memcached=(value)
-    @memcached = value
-  end
+    def memcached
+      raise RuntimeError, "Please set Pebblebed.memcached = <your memcached client>" unless @memcached
+      @memcached
+    end
 
-  def self.services
-    @services.keys
-  end
+    def memcached=(value)
+      @memcached = value
+    end
 
-  def self.version_of(service)
-    return 1 unless @services && @services[service.to_sym]
-    @services[service.to_sym][:version] || 1
-  end
+    def services
+      @services.keys
+    end
+
+    def base_uri
+      @base_uri
+    end
+    alias base_url base_uri
+
+    def base_uri=(value)
+      @base_uri = value
+    end
+    alias base_url= base_uri=
 
-  def self.root_url_for(service, url_opts={})
-    URI("http://#{url_opts[:host] || self.host}/api/#{service}/v#{version_of(service)}/")
+    def version_of(service)
+      return 1 unless @services && @services[service.to_sym]
+      @services[service.to_sym][:version] || 1
+    end
+
+    def root_url_for(service, url_opts={})
+      URI.join(base_url_for(url_opts), "/api/#{service}/v#{version_of(service)}/")
+    end
+
+    def base_url_for(url_opts)
+      raise RuntimeError, "Please specify only one of host & base_uri" if url_opts[:host] && (url_opts[:base_uri] || url_opts[:base_url])
+      [:base_uri, :base_url].each do |key|
+        return url_opts[key] if url_opts[key]
+      end
+      return "http://#{url_opts[:host]}" if url_opts[:host]
+      base_uri || "http://#{host}"
+    end
   end
 end

data/lib/pebblebed/http.rb

@@ -10,11 +10,12 @@ require 'active_support'
 
 module Pebblebed
   class HttpError < StandardError
-    attr_reader :status, :message
+    attr_reader :status, :message, :response
 
-    def initialize(message, status = nil)
+    def initialize(message, status = nil, response = nil)
       @message = message
       @status = status
+      @response = response
     end
 
     def not_found?
@@ -104,7 +105,7 @@ module Pebblebed
       elsif result.status >= 400
         errmsg = "Service request to '#{result.url}' failed (#{result.status}):"
         errmsg << extract_error_summary(result.body)
-        raise HttpError.new(ActiveSupport::SafeBuffer.new(errmsg), result.status)
+        raise HttpError.new(ActiveSupport::SafeBuffer.new(errmsg), result.status, result)
       end
       result
     end

data/lib/pebblebed/version.rb

@@ -1,3 +1,3 @@
 module Pebblebed
-  VERSION = "0.0.36"
+  VERSION = "0.0.37"
 end

data/spec/config_spec.rb

@@ -31,4 +31,42 @@ describe Pebblebed do
     Pebblebed.root_url_for(:foobar).to_s.should eq "http://example.org/api/foobar/v2/"
   end
 
+  it "works with pebbles that are exposed via https" do
+    Pebblebed.config do
+      service :checkpoint
+      service :foobar, :version => 2
+    end
+    Pebblebed.base_url = "https://example.org"
+    Pebblebed.root_url_for(:checkpoint).to_s.should eq "https://example.org/api/checkpoint/v1/"
+    Pebblebed.root_url_for(:checkpoint, :base_uri => 'https://checkpoint.dev').to_s.should eq "https://checkpoint.dev/api/checkpoint/v1/"
+    Pebblebed.root_url_for(:foobar).to_s.should eq "https://example.org/api/foobar/v2/"
+  end
+
+  it "allows passed in parameters to take precedence" do
+    Pebblebed.config do
+      service :checkpoint
+      service :foobar, :version => 2
+    end
+    Pebblebed.base_url = "https://example.org"
+    Pebblebed.root_url_for(:checkpoint, :host => 'checkpoint.dev').to_s.should eq "http://checkpoint.dev/api/checkpoint/v1/"
+  end
+
+  it "raises an error if :host and :base_uri are both specified as parameters" do
+    Pebblebed.config do
+      service :checkpoint
+    end
+    -> {Pebblebed.root_url_for(:checkpoint, :base_uri => 'https://checkpoint.dev', :host => 'checkpoint.dev')}.should raise_error RuntimeError
+    -> {Pebblebed.root_url_for(:checkpoint, :base_url => 'https://checkpoint.dev', :host => 'checkpoint.dev')}.should raise_error RuntimeError
+  end
+
+  it "request_uri takes precedence over host" do
+    Pebblebed.config do
+      host "example.net"
+      service :checkpoint
+      service :foobar, :version => 2
+    end
+    Pebblebed.base_url = "https://example.org"
+    Pebblebed.root_url_for(:checkpoint).to_s.should eq "https://example.org/api/checkpoint/v1/"
+    Pebblebed.root_url_for(:checkpoint, :base_uri => 'https://checkpoint.dev').to_s.should eq "https://checkpoint.dev/api/checkpoint/v1/"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -326,18 +326,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 808709011224488874
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 808709011224488874
 requirements: []
 rubyforge_project: pebblebed
 rubygems_version: 1.8.24
@@ -359,3 +353,4 @@ test_files:
 - spec/sinatra_spec.rb
 - spec/spec_helper.rb
 - spec/uid_spec.rb
+has_rdoc: