ww 0.3.0 → 0.3.1

data/lib/ww/double/spy.rb

@@ -13,6 +13,10 @@ module Ww
         end
       end
 
+      def spy_them_all!
+        before { spy! }
+      end
+
       def requests
         @requests ||= Store.new
       end
@@ -23,7 +27,7 @@ module Ww
 
       module InstanceMethods
         def spy!
-          self.class.store(@request)
+          self.class.store(@request) if @spyed ^ (@spyed = true)
         end
         alias stump! spy!
       end

data/lib/ww/double.rb

@@ -18,16 +18,14 @@ module Ww
     end
 
     def unbound_action(klass, mname, block)
-      ret = nil
       klass.module_eval do
         begin
           define_method(mname, &block)
-          ret = instance_method(mname)
+          instance_method(mname)
         ensure
           remove_method(mname) if instance_methods.include?(mname)
         end
       end
-      return ret
     end
     module_function :unbound_action
   end

data/lib/ww/server.rb

@@ -24,7 +24,7 @@ module Ww
     end
 
     def_delegators :current_app, *double_methods = %w[
-      spy requests mock verify stub
+      spy spy_them_all! requests mock verify stub
     ]
 
     attr_reader :app, :port
@@ -37,6 +37,7 @@ module Ww
 
     def start_once
       @app.reset!
+      current_app.testing_thread = Thread.current
       start! unless running?
     end
 
@@ -60,10 +61,27 @@ module Ww
     private
     def run_with_picking_server_instance!
       q = Queue.new
-      @thread = Thread.new { @handler.run(@app, :Port => @port) {|server| q << server } }
+      opt = handler_options(@handler)
+      @thread = Thread.new { @handler.run(@app, opt ) {|server| q << silence!(server) } }
       @server = q.pop
     end
 
+    def handler_options(handler)
+      opt = {:Port => @port}
+      if handler.name == "Rack::Handler::WEBrick"
+        l = WEBrick::Log.new("/dev/null")
+        opt.update(:Logger => l, :AccessLog => [l, WEBrick::AccessLog::COMMON_LOG_FORMAT])
+      end
+      return opt
+    end
+
+    def silence!(server)
+      case server.class.name
+      when "Thin::Server" then server.silent = true
+      end
+      return server
+    end
+
     def shutdown_http_server
       case @server.class.name
       when "WEBrick::HTTPServer" then @server.shutdown

data/lib/ww/spy_eye.html.haml

@@ -6,6 +6,14 @@
   %head
     %title&= title
     %script{:src=>"http://ajax.googleapis.com/ajax/libs/jquery/1.3.1/jquery.min.js"}
+    :javascript
+      $(function(){
+        $(".request .headers h3").click(function(){ $(this).next("table").toggle() });
+        $(".request .body h3").click(function(){ $(this).next("pre").toggle() });
+        $(".request .headers table").hide();
+        $(".request .body pre").hide();
+      });
+
     %style{:type=>"text/css"}
       :sass
         body
@@ -15,7 +23,7 @@
         h1
           font-size: 10px
 
-        div.stump
+        .request
           font-size: 10px
           border: 1px solid silver
           padding: 0 1em
@@ -50,18 +58,18 @@
               font-weight: normal
               font-family: 'Courier', monospace
 
-          .headers table, div.body pre
+          .headers table, .body pre
             border: 1px dashed green
             margin: 1em
             padding: 1em
 
-          div.body pre
+          .body pre
             overflow: auto
             font-size: 12px
   %body
     %h1&= title
     - requests.each do |wreq|
-      %div.stump{:id => wreq.object_id}
+      .request{:id => wreq.object_id}
         %h2
           %span.method&= wreq.request_method
           %span.path&= wreq.fullpath
@@ -69,27 +77,19 @@
           %span.time&= wreq.time.iso8601
           from
           %span.source&= wreq.ip
-        %div
-          .headers
-            %h3 Headers
-            %table
-              - wreq.env.each do |k,v|
-                - next if k =~ /\A[a-z]/
-                %tr
-                  %th&= k
-                  %td&= v
+        .headers
+          %h3 Headers
+          %table
+            - wreq.env.each do |k,v|
+              - next if k =~ /\A[a-z]/
+              %tr
+                %th&= k
+                %td&= v
 
-          - unless wreq.get?
-            .body
-              %h3
-                Body
-                %span.media_type= wreq.media_type
-              %pre&= wreq.parsed_body.pretty_inspect
+        - unless wreq.get?
+          .body
+            %h3
+              Body
+              %span.media_type= wreq.media_type
+            %pre&= wreq.parsed_body.pretty_inspect
 
-:javascript
-  jQuery(function(){
-    $("div.stump .headers h3").click(function(){ $(this).next("table").toggle() });
-    $("div.stump .body h3").click(function(){ $(this).next("pre").toggle() });
-    $("div.stump .headers table").hide();
-    $("div.stump .body pre").hide();
-  });

data/lib/ww.rb

@@ -1,5 +1,5 @@
 module Ww
-  Version = '0.3.0'
+  Version = '0.3.1'
 
   def to_app(*args, &block)
     $stderr.puts <<-WORNING

data/spec/spec_helper.rb

@@ -2,3 +2,21 @@ require 'rubygems'
 require 'sinatra'
 $: << File.expand_path("../lib", File.dirname(__FILE__))
 
+module WwSpec
+  module ExampleMethods
+    def servlet_defining_get_root
+      Ww::Servlet.base do
+        get("/") do
+          response.status = 200
+          response["Content-Type"] = "text/plain"
+          response.body = "Hello World"
+        end
+      end
+    end
+  end
+end
+
+Spec::Runner.configure do |config|
+  config.include WwSpec::ExampleMethods
+end
+ 

data/spec/ww/double/mock_spec.rb

@@ -0,0 +1,60 @@
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
+require 'ww/servlet'
+
+describe Ww::Double::Mock, "with Servlet" do
+  before do
+    @server = servlet_defining_get_root
+  end
+
+  describe "mock(:get, '/', :verify => lambda" do
+    before do
+      v = Proc.new {|req, par| par["entity_id"].to_i == 1 && par["entity_value"] == "var" }
+
+      @server.mock( :get, '/', :verify => v) do
+        response.status = 200
+        response["Content-Type"] = "text/plain"
+        response.body = "Hi World"
+      end
+      @server.testing_thread = Thread.new{ sleep }
+    end
+
+    it do
+      @server.new.call( Rack::MockRequest.env_for("/", :method => "GET"))
+      @server.testing_thread.should_not be_alive
+    end
+
+    it do
+      @server.new.call( Rack::MockRequest.env_for("/?entity_id=1&entity_value=var", :method => "GET"))
+      @server.testing_thread.should be_alive
+    end
+  end
+
+  describe "mock(:get, '/')" do
+    before do
+      @server.mock(:get, '/') do
+        response.status = 200
+        response["Content-Type"] = "text/plain"
+        response.body = "Hi World"
+      end
+    end
+
+    describe "call" do
+      before do
+        app = @server.new
+        @response = app.call( Rack::MockRequest.env_for("/", :method => "GET"))
+      end
+
+      subject{ @response }
+
+      it { should == [200, {"Content-Type"=>"text/plain", "Content-Length"=>"8"}, ["Hi World"]] }
+      it {
+        expect{ @server.verify }.should_not raise_error Ww::Double::MockError
+      }
+    end
+
+    describe "don't call" do
+      it { expect{ @server.verify }.should raise_error Ww::Double::MockError }
+    end
+  end
+end
+

data/spec/ww/double/spy_spec.rb

@@ -0,0 +1,80 @@
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
+require 'ww/servlet'
+
+describe Ww::Double, "with Servlet" do
+  before do
+    @server = servlet_defining_get_root
+  end
+
+  describe "spy(:get, '/')" do
+    before do
+      @server.spy(:get, '/') do
+        response.status = 200
+        response["Content-Type"] = "text/plain"
+        response.body = "Hi World"
+      end
+    end
+
+    describe "GET / リクエストの" do
+      before do
+        app = @server.new
+        @response = app.call( Rack::MockRequest.env_for("/", :method => "GET"))
+      end
+
+      subject{ @server.requests.first }
+
+      it { should be_a Rack::Request }
+      its(:request_method) { should == 'GET' }
+      its(:fullpath) { should == "/" }
+
+      it "bodyは空のIOであること" do
+        subject.body.rewind
+        subject.body.read.should == ""
+      end
+
+      it "レスポンスは想定どおりのものであること" do
+        @response.should ==
+          [200, {"Content-Type"=>"text/plain", "Content-Length"=>"8"}, ["Hi World"]]
+      end
+    end
+  end
+
+  describe "spy(:get, '/') backword compat, old version spy! or spy(:get..) called stump!" do
+    before do
+      @server.get('/backword') do
+        stump!
+
+        response.status = 200
+        response["Content-Type"] = "text/plain"
+        response.body = "Hi World"
+      end
+
+      app = @server.new
+      @response = app.call( Rack::MockRequest.env_for("/backword", :method => "GET"))
+    end
+
+    subject{ @server.requests }
+    it { should_not be_empty }
+    it { @server.requests.first.should be_a Ww::Double::Spy::Request }
+  end
+
+  describe "spy_them_all! - extend spy feature to all actions" do
+    before do
+      @server.spy_them_all!
+      @app = @server.new
+      3.times{ @app.call( Rack::MockRequest.env_for("/", :method => "GET")) }
+    end
+    subject{ @server }
+
+    it { should have(3).requests }
+
+    describe "do-not collect if already collected" do
+      before do
+        @server.spy(:get, '/spyed'){ "Hello" }
+        @app.call( Rack::MockRequest.env_for("/spyed", :method => "GET"))
+      end
+      it { should have(3 + 1).requests }
+    end
+  end
+end
+

data/spec/ww/double/stub_spec.rb

@@ -0,0 +1,59 @@
+require File.expand_path("../../spec_helper", File.dirname(__FILE__))
+require 'ww/servlet'
+
+describe Ww::Double::Stub, "included to Servlet" do
+  before do
+    @server = servlet_defining_get_root
+  end
+
+  describe "stub(:get, '/dynamic_add')" do
+    before do
+      @server.stub(:get, '/dynamic_add') do
+        response.status = 200
+        response["Content-Type"] = "text/plain"
+        response.body = "Hi World"
+      end
+    end
+
+    subject{
+      @server.new.call( Rack::MockRequest.env_for("/dynamic_add", :method => "GET"))
+    }
+
+    it { should == [200, {"Content-Type"=>"text/plain", "Content-Length"=>"8"}, ["Hi World"]] }
+  end
+
+  describe "stub(:get, '/') # override" do
+    before do
+      @server.stub(:get, '/') do
+        response.status = 200
+        response["Content-Type"] = "text/plain"
+        response.body = "Hi World"
+      end
+    end
+
+    subject{
+      @server.new.call( Rack::MockRequest.env_for("/", :method => "GET"))
+    }
+
+    it { should == [200, {"Content-Type"=>"text/plain", "Content-Length"=>"8"}, ["Hi World"]] }
+  end
+
+  describe "stub(:get, '/') # re-define after app initialized" do
+    before do
+      @app = @server.new
+
+      @server.stub(:get, '/') do
+        response.status = 200
+        response["Content-Type"] = "text/plain"
+        response.body = "Hi! World"
+      end
+    end
+
+    subject{
+      @app.call( Rack::MockRequest.env_for("/", :method => "GET"))
+    }
+
+    it { should == [200, {"Content-Type"=>"text/plain", "Content-Length"=>"9"}, ["Hi! World"]] }
+  end
+end
+

data/spec/ww/server_integration_spec.rb

@@ -5,7 +5,7 @@ require 'json'
 
 describe Ww::Server do
   before do
-    Ww::Server.handler = :mongrel # Mongrel is most silent.
+    Ww::Server.handler = :webrick
     Ww::Server[:spec] ||= Ww::Server.build_double(3080) do
       get("/goodnight") { "Good night" }
       spy(:get, "/hello") { "Hello world" }
@@ -69,5 +69,26 @@ describe Ww::Server do
       expect{ Ww::Server[:spec].verify }.should raise_error Ww::Double::MockError
     end
   end
+
+  describe "mocking with verifying expectation" do
+    before do
+      v = lambda {|req,par| par["key"] == "value" }
+      Ww::Server[:spec].mock(:get, "/goodnight", :verify => v) do
+        "OYASUMI-NASAI"
+      end
+    end
+
+    it "fail unless access there" do
+      expect{
+        URI("http://localhost:3080/goodnight").read
+      }.should raise_error Ww::Double::MockError
+    end
+
+    it "pass if access there" do
+      expect{
+        URI("http://localhost:3080/goodnight?key=value").read
+      }.should_not raise_error
+    end
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ww
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - moro
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-17 00:00:00 +09:00
+date: 2010-01-20 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,10 +61,15 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- README.rdoc
+- ChangeLog
+- MIT-LICENSE
 - Rakefile
 - spec/spec_helper.rb
 - spec/ww/application_spec.rb
-- spec/ww/double_spec.rb
+- spec/ww/double/mock_spec.rb
+- spec/ww/double/spy_spec.rb
+- spec/ww/double/stub_spec.rb
 - spec/ww/double_spy_request_spec.rb
 - spec/ww/server_integration_spec.rb
 - spec/ww/server_spec.rb

data/spec/ww/double_spec.rb

@@ -1,144 +0,0 @@
-require File.expand_path("../spec_helper", File.dirname(__FILE__))
-require 'ww/servlet'
-
-describe Ww::Double, "with Servlet" do
-  before do
-    @server = Ww::Servlet.base do
-      get("/") do
-        response.status = 200
-        response["Content-Type"] = "text/plain"
-        response.body = "Hello World"
-      end
-    end
-  end
-
-  describe "stub(:get, '/dynamic_add')" do
-    before do
-      @server.stub(:get, '/dynamic_add') do
-        response.status = 200
-        response["Content-Type"] = "text/plain"
-        response.body = "Hi World"
-      end
-    end
-
-    subject{
-      @server.new.call( Rack::MockRequest.env_for("/dynamic_add", :method => "GET"))
-    }
-
-    it { should == [200, {"Content-Type"=>"text/plain", "Content-Length"=>"8"}, ["Hi World"]] }
-  end
-
-  describe "stub(:get, '/') # override" do
-    before do
-      @server.stub(:get, '/') do
-        response.status = 200
-        response["Content-Type"] = "text/plain"
-        response.body = "Hi World"
-      end
-    end
-
-    subject{
-      @server.new.call( Rack::MockRequest.env_for("/", :method => "GET"))
-    }
-
-    it { should == [200, {"Content-Type"=>"text/plain", "Content-Length"=>"8"}, ["Hi World"]] }
-  end
-
-  describe "stub(:get, '/') # re-define after app initialized" do
-    before do
-      @app = @server.new
-
-      @server.stub(:get, '/') do
-        response.status = 200
-        response["Content-Type"] = "text/plain"
-        response.body = "Hi! World"
-      end
-    end
-
-    subject{
-      @app.call( Rack::MockRequest.env_for("/", :method => "GET"))
-    }
-
-    it { should == [200, {"Content-Type"=>"text/plain", "Content-Length"=>"9"}, ["Hi! World"]] }
-  end
-
-  describe "mock(:get, '/')" do
-    before do
-      @server.mock(:get, '/') do
-        response.status = 200
-        response["Content-Type"] = "text/plain"
-        response.body = "Hi World"
-      end
-    end
-
-    describe "call" do
-      before do
-        app = @server.new
-        @response = app.call( Rack::MockRequest.env_for("/", :method => "GET"))
-      end
-
-      subject{ @response }
-
-      it { should == [200, {"Content-Type"=>"text/plain", "Content-Length"=>"8"}, ["Hi World"]] }
-      it {
-        expect{ @server.verify }.should_not raise_error Ww::Double::MockError
-      }
-    end
-
-    describe "don't call" do
-      it { expect{ @server.verify }.should raise_error Ww::Double::MockError }
-    end
-  end
-
-  describe "spy(:get, '/')" do
-    before do
-      @server.spy(:get, '/') do
-        response.status = 200
-        response["Content-Type"] = "text/plain"
-        response.body = "Hi World"
-      end
-    end
-
-    describe "GET / リクエストの" do
-      before do
-        app = @server.new
-        @response = app.call( Rack::MockRequest.env_for("/", :method => "GET"))
-      end
-
-      subject{ @server.requests.first }
-
-      it { should be_a Rack::Request }
-      its(:request_method) { should == 'GET' }
-      its(:fullpath) { should == "/" }
-
-      it "bodyは空のIOであること" do
-        subject.body.rewind
-        subject.body.read.should == ""
-      end
-
-      it "レスポンスは想定どおりのものであること" do
-        @response.should ==
-          [200, {"Content-Type"=>"text/plain", "Content-Length"=>"8"}, ["Hi World"]]
-      end
-    end
-  end
-
-  describe "spy(:get, '/') backword compat" do
-    before do
-      @server.get('/backword') do
-        stump!
-        response.status = 200
-        response["Content-Type"] = "text/plain"
-        response.body = "Hi World"
-      end
-
-      app = @server.new
-      @response = app.call( Rack::MockRequest.env_for("/backword", :method => "GET"))
-    end
-
-    subject{ @server.requests }
-    it { should_not be_empty }
-    it { @server.requests.first.should be_a Ww::Double::Spy::Request }
-  end
-end
-