pebblebed 0.3.24 → 0.3.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61e873eb207deb6e334781ef5a2849148340823e
-  data.tar.gz: b5c830a42e8502a1060257c3c780f3ca34d5cf10
+  metadata.gz: 54866fbc0a14546c0debe6bf4543d6a0adea572b
+  data.tar.gz: ba9444ba7b2d6855afdde6b2e6c9d4780910cabb
 SHA512:
-  metadata.gz: 9fb71a2ed4d8c26ed5bc840ea3c2f621b6237f10dd09969dfcf1b2db01cc46372884deb3b91c77ee800b2726dc237972724425fe4262c2b7b8fcd99d50823223
-  data.tar.gz: 01b4481e4dfe611c1b198c5eb175c143757c69431d5695c9985b1397dad50169b64f3f924bd8e69638bed1acd550c1ff89d7cb3a57d6eb5d958526e7db80baff
+  metadata.gz: 16a35634df1b2d1a1f5b5c6c2e735310d5f688636d7cd595ee13e9a391b248a8700b807301042d4c902c753c1d8f7075b9742f9374b523c1f55112a9411ccb15
+  data.tar.gz: 565c4b3095752c9154dc3416e2ac8d3de9a336587afe24b640f0e9d8d824146d41b13b6d3909d0160c6b6b62383db52d3e4b73e109a1ea2cc8e023bebbbba84b

data/lib/pebblebed/config.rb

@@ -4,6 +4,10 @@ module Pebblebed
       Pebblebed.host = value
     end
 
+    def scheme(value)
+      Pebblebed.scheme = value
+    end
+
     def default_host(value)
       Pebblebed.default_host = value
     end
@@ -40,7 +44,7 @@ module Pebblebed
       Builder.new.send(:instance_eval, &block)
     end
 
-    attr_accessor :host, :default_host
+    attr_accessor :host, :default_host, :scheme
 
     def memcached
       raise RuntimeError, "Please set Pebblebed.memcached = <your memcached client>" unless @memcached
@@ -92,7 +96,7 @@ module Pebblebed
       [:base_uri, :base_url].each do |key|
         return url_opts[key] if url_opts[key]
       end
-      scheme = url_opts[:scheme] || 'http'
+      scheme = url_opts[:scheme] || ::Pebblebed.scheme || 'http'
       return "#{scheme}://#{url_opts[:host]}" if url_opts[:host]
       base_uri || "#{scheme}://#{host}"
     end

data/lib/pebblebed/sinatra.rb

@@ -37,7 +37,7 @@ module Sinatra
         return @pebbles if @pebbles
         connector_options = {
           :host => ::Pebblebed.host || request.host || ::Pebblebed.default_host,
-          :scheme => request.scheme
+          :scheme => ::Pebblebed.scheme || request.scheme
         }
         @pebbles = ::Pebblebed::Connector.new(checkpoint_session, connector_options)
       end

data/lib/pebblebed/version.rb

@@ -1,3 +1,3 @@
 module Pebblebed
-  VERSION = "0.3.24"
+  VERSION = "0.3.25"
 end

data/spec/config_spec.rb

@@ -6,12 +6,14 @@ describe Pebblebed do
   it "has a nice dsl that configures stuff" do
     Pebblebed.config do
       host "example.org"
+      scheme "https"
       memcached "MemcachedClient"
       session_cookie "my.session"
       service :checkpoint
     end
 
     expect(Pebblebed.host).to eq "example.org"
+    expect(Pebblebed.scheme).to eq "https"
     expect(Pebblebed.memcached).to eq "MemcachedClient"
     expect(Pebblebed.session_cookie).to eq "my.session"
     expect(Pebblebed::Connector.instance_methods).to include :checkpoint
@@ -29,6 +31,7 @@ describe Pebblebed do
 
   it "can calculate the root uri of any pebble" do
     Pebblebed.config do
+      scheme 'http'
       service :checkpoint
       service :foobar, :version => 2
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.3.24
+  version: 0.3.25
 platform: ruby
 authors:
 - Katrina Owen