sham_rack 1.3.5 → 1.3.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGUzNjMxMzE4N2M3NDA3ZWY2ZDQ5NWIzZDg2Mjg2ZjJhMmNiYWQxMA==
+    ZmU4NWE2MGVhYjA0ZDE5ODM1NjJiYTlhMzE1MTg5MjMyMTQ4YmExNg==
   data.tar.gz: !binary |-
-    M2I4NDc5Njg5YTE0MzAwYjczYzZkYjA0ZWQ5OTExYjYxNTE5YzM5MQ==
+    ZmEwZDliNjk4MzIxNjdkYWNlZTQzY2ZhOWU2ZDdjMzg1NmZiODk4Yw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGJmZTUwOGIwMDhkY2Q4MTY3NmFkMWNkYjk2MmNiMWRjMGZmZDk2MWQ3YWFj
-    YzZlNzEwYzFhYmQ0M2NlM2MxYjViMzIwYTAwZWI4N2FlZjc3NjM3MjcwYzRi
-    MjJiYTEyMWRhOTNiY2IyYzVlOGIyOTg1ZmJjMDg0NmZmY2RmNWU=
+    NDI2MTVkYzU3OWI2YTgwYzFkMWEzYzg0NWJlOTM3YzU4NjhmYzk0Mzc1NTUy
+    ZGNhMTY2OGQ1ODA2ODExY2U3OTE3M2VjZjI3MjE0ZjllZDQ5YTE4OGQyNDY3
+    YTEwZTM1OWRjZGZiZjMyM2U2NmVkYjFmN2I2NTA4NzNlNTUxOTc=
   data.tar.gz: !binary |-
-    ZGQxNGYxNmFjNjViZTQzZThmOWQ5MWI4YTExZTg5N2YzMGJlMTcwZjViNTEy
-    ZDVhNGQ2Y2QyODcyZTk4YThmMmEwNzAxNzM2ZmU4NzIxM2U3Yzg5ZDIzMTY4
-    MTA2NmI1NDkyNTAyZmJjYzgzMjg5MGJkNmQyMGQwYTg0YWZlYzE=
+    ZmEyODY4YTVlNGRkNTNmMjE4ODNhZjlhNDUwODU0MjI3ZDFmZGYyYTcwNGJk
+    M2I2NTk0OGU1MDA2NTJiYWUyODczZGZjYTQ2ZjY2YjRmOGYwZDMzZmM4OTU1
+    MDljNjA2OTQ5NWFmNzQxMzAzZWYzZWEzZGZhZDMwZDA1NGI2ZGY=

data/README.markdown

@@ -53,9 +53,9 @@ Using it
       run MyApp.new
     end
 
-### Any old app
+### Any old Rack app
 
-    ShamRack.mount(my_google_stub, "google.com")
+    ShamRack.at("google.com").mount(my_google_stub) 
 
 ### General-purpose stubbing
 

data/Rakefile

@@ -6,7 +6,7 @@ task "default" => "spec"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = ["--colour", "--format", "nested"]
+  t.rspec_opts = ["--format", "nested"]
 end
 
 require 'bundler'

data/lib/sham_rack.rb

@@ -1,5 +1,5 @@
 require "sham_rack/net_http"
-require "sham_rack/registry"
+require "sham_rack/registration"
 require "sham_rack/version"
 
 # ShamRack allows access to Rack applications using Net::Http, but without network traffic.
@@ -7,5 +7,5 @@ require "sham_rack/version"
 # For more detail, see http://github.com/mdub/sham_rack
 #
 module ShamRack
-  extend ShamRack::Registry
+  extend ShamRack::Registration
 end

data/lib/sham_rack/net_http.rb

@@ -1,6 +1,5 @@
 require "net/http"
 require "rack"
-require "sham_rack/registry"
 
 class << Net::HTTP
 

data/lib/sham_rack/patron.rb

@@ -1,5 +1,5 @@
 require "patron"
-require "sham_rack/registry"
+require "sham_rack"
 require "uri"
 
 module Patron

data/lib/sham_rack/registration.rb

@@ -0,0 +1,82 @@
+module ShamRack
+
+  module Registration
+
+    ADDRESS_PATTERN = /^[a-z0-9-]+(\.[a-z0-9-]+)*$/i
+
+    def unmount_all
+      registry.clear
+    end
+
+    def at(address, port = nil, &app_block)
+      mount_point = mount_point_for(address, port)
+      if app_block
+        mount_point.mount(app_block)
+      else
+        mount_point
+      end
+    end
+
+    def application_for(address, port = nil)
+      mount_point_for(address, port).app
+    end
+
+    def mount(app, address, port = nil)
+      at(address, port).mount(app)
+    end
+
+    private
+
+    def mount_point_for(address, port)
+      registry[mount_key(address, port)]
+    end
+
+    def registry
+      @registry ||= Hash.new do |hash, key|
+        hash[key] = MountPoint.new
+      end
+    end
+
+    def mount_key(address, port)
+      unless address =~ ADDRESS_PATTERN
+        raise ArgumentError, "invalid address"
+      end
+      port ||= Net::HTTP.default_port
+      port = Integer(port)
+      [address, port]
+    end
+
+  end
+
+  class MountPoint
+
+    attr_reader :app
+
+    def mount(app)
+      @app = app
+    end
+
+    def unmount
+      @app = nil
+    end
+
+    def rackup(&block)
+      require "rack"
+      mount(Rack::Builder.new(&block).to_app)
+    end
+
+    def sinatra(&block)
+      require "sinatra/base"
+      sinatra_app = Class.new(Sinatra::Base)
+      sinatra_app.class_eval(&block)
+      mount(sinatra_app.new)
+    end
+
+    def stub
+      require "sham_rack/stub_web_service"
+      mount(StubWebService.new)
+    end
+
+  end
+
+end

data/lib/sham_rack/version.rb

@@ -1,3 +1,3 @@
 module ShamRack
-  VERSION = "1.3.5"
+  VERSION = "1.3.6"
 end

data/spec/sham_rack_spec.rb

@@ -9,6 +9,16 @@ require "rack"
 
 describe ShamRack do
 
+  class NetHttpProhibited < StandardError; end
+
+  before do
+    any_instance_of(Net::HTTP) do |http|
+      stub(http).start do
+        raise NetHttpProhibited, "real network calls are not allowed"
+      end
+    end
+  end
+
   after(:each) do
     ShamRack.unmount_all
   end
@@ -56,31 +66,54 @@ describe ShamRack do
 
   end
 
-  describe ".mount" do
+  describe ".at" do
+
+    context "with a block" do
+
+      it "mounts associated block as an app" do
+
+        ShamRack.at("simple.xyz") do |env|
+          ["200 OK", { "Content-type" => "text/plain" }, ["Easy, huh?"]]
+        end
+
+        open("http://simple.xyz").read.should == "Easy, huh?"
+
+      end
+
+    end
 
     context "with a URL" do
 
       it "raises an ArgumentError" do
         lambda do
-          ShamRack.mount(GreetingApp.new, "http://www.greetings.com")
+          ShamRack.at("http://www.greetings.com")
         end.should raise_error(ArgumentError, "invalid address")
       end
 
     end
 
-  end
+    describe "#mount" do
 
-  describe ".at" do
+      it "mounts an app" do
 
-    describe "with a block" do
+        ShamRack.at("hello.xyz").mount(GreetingApp.new)
 
-      it "mounts associated block as an app" do
+        open("http://hello.xyz").read.should == "Hello, world"
 
-        ShamRack.at("simple.xyz") do |env|
-          ["200 OK", { "Content-type" => "text/plain" }, ["Easy, huh?"]]
-        end
+      end
 
-        open("http://simple.xyz").read.should == "Easy, huh?"
+    end
+
+    describe "#unmount" do
+
+      it "deregisters a mounted app" do
+
+        ShamRack.at("gone.xyz").mount(GreetingApp.new)
+        ShamRack.at("gone.xyz").unmount
+
+        lambda do
+          open("http://gone.xyz").read
+        end.should raise_error(NetHttpProhibited)
 
       end
 
@@ -143,6 +176,18 @@ describe ShamRack do
 
   end
 
+  describe ".mount" do
+
+    it "is deprecated, but still works" do
+
+      ShamRack.mount(GreetingApp.new, "hello.xyz")
+
+      open("http://hello.xyz").read.should == "Hello, world"
+
+    end
+
+  end
+
   describe "response" do
 
     before(:each) do

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require "rspec"
 require "rr"
 
 RSpec.configure do |config|
-  config.mock_with :rr
+  config.mock_with RR::Adapters::RSpec2
 end
 
 require "test_apps"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sham_rack
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -33,7 +33,7 @@ extra_rdoc_files: []
 files:
 - lib/sham_rack/net_http.rb
 - lib/sham_rack/patron.rb
-- lib/sham_rack/registry.rb
+- lib/sham_rack/registration.rb
 - lib/sham_rack/stub_web_service.rb
 - lib/sham_rack/version.rb
 - lib/sham_rack.rb

data/lib/sham_rack/registry.rb

@@ -1,71 +0,0 @@
-module ShamRack
-
-  module Registry
-
-    ADDRESS_PATTERN = /^[a-z0-9-]+(\.[a-z0-9-]+)*$/i
-
-    def mount(rack_app, address, port = nil)
-      unless address =~ ADDRESS_PATTERN
-        raise ArgumentError, "invalid address"
-      end
-      if port.nil?
-        port = Net::HTTP.default_port
-      else
-        port = Integer(port)
-      end
-      registry[[address, port]] = rack_app
-    end
-
-    def unmount_all
-      registry.clear
-    end
-
-    def at(address, port = nil, &block)
-      if block
-        mount(block, address, port)
-      else
-        Registrar.new(address, port)
-      end
-    end
-
-    def application_for(address, port = nil)
-      port ||= Net::HTTP.default_port
-      registry[[address, port]]
-    end
-
-    private
-
-    def registry
-      @registry ||= {}
-    end
-
-  end
-
-  class Registrar
-
-    def initialize(address, port = nil)
-      @address = address
-      @port = port
-    end
-
-    def rackup(&block)
-      require "rack"
-      app = Rack::Builder.new(&block).to_app
-      ShamRack.mount(app, @address, @port)
-    end
-
-    def sinatra(&block)
-      require "sinatra/base"
-      sinatra_app = Class.new(Sinatra::Base)
-      sinatra_app.class_eval(&block)
-      ShamRack.mount(sinatra_app.new, @address, @port)
-    end
-
-    def stub
-      require "sham_rack/stub_web_service"
-      ShamRack.mount(StubWebService.new, @address, @port)
-    end
-
-  end
-
-end