fakettp 0.3.2 → 0.3.3

data/.gitignore

@@ -4,3 +4,4 @@ install
 testinstall
 coverage
 tmtags
+fakettp.gemspec

data/Rakefile

@@ -20,8 +20,9 @@ begin
     gem.add_dependency 'activerecord'
     gem.add_development_dependency 'jeweler'
     gem.add_development_dependency 'rcov'
-    gem.add_development_dependency "rspec"
-    gem.add_development_dependency "cucumber"
+    gem.add_development_dependency 'rspec'
+    gem.add_development_dependency 'rack-test'
+    gem.add_development_dependency 'cucumber'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -92,7 +93,7 @@ task :clean do
 end
 
 task :local_install do
-  system 'sudo gem in -l pkg/*'
+  system "sudo gem in -l pkg/fakettp-#{File.read('VERSION').chomp}.gem"
 end
 
 desc 'Install FakeTTP into local install directory'

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/fakettp/config.ru

@@ -1,5 +1,17 @@
 require 'rubygems'
-
+#require 'sinatra/lib/sinatra.rb'
+require 'sinatra'
+ 
+Sinatra::Application.default_options.merge!(
+  :run => false,
+  :env => :production,
+  :raise_errors => true
+)
+ 
+log = File.new("fakettp.log", "a")
+STDOUT.reopen(log)
+STDERR.reopen(log)
+ 
 FAKETTP_BASE = File.expand_path(File.dirname(__FILE__))
 require 'fakettp'
 

data/spec/fakettp/controller_spec.rb

@@ -2,7 +2,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'hpricot'
 
 describe 'Controller' do
-  include Sinatra::Test
+  include Rack::Test::Methods
+
+  def app
+    Sinatra::Application
+  end
+  
   before :all do
     @host = YAML.load(File.read(FAKETTP_BASE + '/fakettp.yml'))['hostname']
   end
@@ -22,7 +27,7 @@ describe 'Controller' do
 
     describe 'on the fakettp host' do
       def do_post
-        post '/reset', nil, :host => @host
+        post '/reset', nil, 'HTTP_HOST' => @host
       end
 
       it 'resets the simulator' do
@@ -32,24 +37,24 @@ describe 'Controller' do
 
       it 'is successful' do
         do_post
-        @response.should be_ok
+        last_response.should be_ok
       end
 
       it 'returns a plain text response' do
         do_post
-        @response.content_type.should == 'text/plain'
+        last_response.content_type.should == 'text/plain'
       end
 
       it 'returns an acknowledgement message' do
         do_post
-        @response.body.should == "Reset OK\n"
+        last_response.body.should == "Reset OK\n"
       end
     end
     
     describe 'on another host' do
       it 'acts like any other simulated request' do
-        post '/reset', nil, :host => 'foo.fake.local'
-        response.body.should == "Simulator received mismatched request\n"
+        post '/reset', nil, 'HTTP_HOST' => 'foo.fake.local'
+        last_response.body.should == "Simulator received mismatched request\n"
       end
     end
   end
@@ -62,7 +67,7 @@ describe 'Controller' do
 
     describe 'on the fakettp host' do
       def do_post
-        post '/expect', @body, :host => @host
+        post '/expect', @body, 'HTTP_HOST' => @host
       end
 
       it 'sets a simulator expectation using the request body' do
@@ -72,24 +77,24 @@ describe 'Controller' do
 
       it 'is successful' do
         do_post
-        @response.should be_ok
+        last_response.should be_ok
       end
 
       it 'returns a plain text response' do
         do_post
-        @response.content_type.should == 'text/plain'
+        last_response.content_type.should == 'text/plain'
       end
 
       it 'returns an acknowledgement message' do
         do_post
-        @response.body.should == "Expect OK\n"
+        last_response.body.should == "Expect OK\n"
       end
     end
     
     describe 'on another host' do
       it 'acts like any other simulated request' do
-        post '/expect', @body, :host => 'foo.fake.local'
-        response.body.should == "Simulator received mismatched request\n"
+        post '/expect', @body, 'HTTP_HOST' => 'foo.fake.local'
+        last_response.body.should == "Simulator received mismatched request\n"
       end
     end
   end
@@ -118,18 +123,18 @@ describe 'Controller' do
 
         it 'returns a 500 status' do
           do_request
-          @response.status.should == 500
+          last_response.status.should == 500
         end
 
         it 'returns a plain text response' do
           do_request
-          @response.content_type.should == 'text/plain'
+          last_response.content_type.should == 'text/plain'
         end
 
         unless verb == 'HEAD' # No body for that one
           it 'returns an error message' do
             do_request
-            @response.body.should == "Simulator received mismatched request\n"
+            last_response.body.should == "Simulator received mismatched request\n"
           end
         end
       end
@@ -145,7 +150,7 @@ describe 'Controller' do
 
     describe 'on the fakettp host' do
       def do_get
-        get '/verify', nil, :host => @host
+        get '/verify', nil, 'HTTP_HOST' => @host
       end
 
       it 'verifies the simulator' do
@@ -155,7 +160,7 @@ describe 'Controller' do
 
       it 'returns a plain text response' do
         do_get
-        @response.content_type.should == 'text/plain'
+        last_response.content_type.should == 'text/plain'
       end
 
       describe 'when verification succeeds' do
@@ -165,12 +170,12 @@ describe 'Controller' do
 
         it 'is successful' do
           do_get
-          @response.should be_ok
+          last_response.should be_ok
         end
 
         it 'returns an acknowledgement message' do
           do_get
-          @response.body.should == "Verify OK\n"
+          last_response.body.should == "Verify OK\n"
         end
       end
 
@@ -181,20 +186,20 @@ describe 'Controller' do
 
         it 'returns 500 Internal Error' do
           do_get
-          @response.status.should == 500
+          last_response.status.should == 500
         end
 
         it 'lists the errors' do
           do_get
-          @response.body.should == @errors
+          last_response.body.should == @errors
         end
       end
     end
     
     describe 'on another host' do
       it 'acts like any other simulated request' do
-        get '/verify', nil, :host => 'foo.fake.local'
-        response.body.should == "Simulator received mismatched request\n"
+        get '/verify', nil, 'HTTP_HOST' => 'foo.fake.local'
+        last_response.body.should == "Simulator received mismatched request\n"
       end
     end
   end
@@ -208,13 +213,13 @@ describe 'Controller' do
       end
       
       def do_get
-        get '/', nil, :host => @host
-        @response_doc = Hpricot(@response.body)
+        get '/', nil, 'HTTP_HOST' => @host
+        @response_doc = Hpricot(last_response.body)
       end
 
       it 'returns an html response' do
         do_get
-        response.content_type.should == 'text/html'
+        last_response.content_type.should == 'text/html'
       end
       
       it 'sets the title' do
@@ -242,8 +247,8 @@ describe 'Controller' do
     
     describe 'on another host' do
       it 'acts like any other simulated request' do
-        get '/', nil, :host => 'foo.fake.local'
-        response.body.should == "Simulator received mismatched request\n"
+        get '/', nil, 'HTTP_HOST' => 'foo.fake.local'
+        last_response.body.should == "Simulator received mismatched request\n"
       end
     end
   end

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'spec'
 require 'sinatra'
 require 'spec/interop/test'
-require 'sinatra/test'
+require 'rack/test'
 require 'active_record'
 require 'shoulda/active_record'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fakettp
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Kerry Buckley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-19 00:00:00 +01:00
+date: 2009-10-29 00:00:00 +00:00
 default_executable: fakettp
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
   type: :development
@@ -96,7 +106,6 @@ files:
 - Rakefile
 - VERSION
 - bin/fakettp
-- fakettp.gemspec
 - features/control.feature
 - features/dashboard.feature
 - features/expectations.feature

data/fakettp.gemspec

@@ -1,111 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{fakettp}
-  s.version = "0.3.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Kerry Buckley"]
-  s.date = %q{2009-10-19}
-  s.default_executable = %q{fakettp}
-  s.description = %q{HTTP server mocking tool}
-  s.email = %q{kerryjbuckley@gmail.com}
-  s.executables = ["fakettp"]
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/fakettp",
-     "fakettp.gemspec",
-     "features/control.feature",
-     "features/dashboard.feature",
-     "features/expectations.feature",
-     "features/expectations/expect_get",
-     "features/expectations/get_foo",
-     "features/expectations/get_root",
-     "features/expectations/pass_and_fail",
-     "features/expectations/set_response",
-     "features/step_definitions/expectations.rb",
-     "features/step_definitions/http.rb",
-     "features/step_definitions/simulator.rb",
-     "features/step_definitions/webrat_steps.rb",
-     "features/support/env.rb",
-     "features/support/fakettp.rb",
-     "features/support/paths.rb",
-     "features/support/xpath.rb",
-     "features/verification.feature",
-     "lib/fakettp.rb",
-     "lib/fakettp/commands/fakettp_command.rb",
-     "lib/fakettp/config.ru",
-     "lib/fakettp/controller.rb",
-     "lib/fakettp/db.rb",
-     "lib/fakettp/error.rb",
-     "lib/fakettp/expectation.rb",
-     "lib/fakettp/expectation_helper.rb",
-     "lib/fakettp/fakettp.yml",
-     "lib/fakettp/public/fakettp.css",
-     "lib/fakettp/schema.rb",
-     "lib/fakettp/simulator.rb",
-     "lib/fakettp/views/index.erb",
-     "spec/fakettp/commands/fakettp_command_spec.rb",
-     "spec/fakettp/controller_spec.rb",
-     "spec/fakettp/error_spec.rb",
-     "spec/fakettp/expectation_helper_spec.rb",
-     "spec/fakettp/expectation_spec.rb",
-     "spec/fakettp/simulator_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/kerryb/fakettp}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{HTTP server mocking tool}
-  s.test_files = [
-    "spec/fakettp/commands/fakettp_command_spec.rb",
-     "spec/fakettp/controller_spec.rb",
-     "spec/fakettp/error_spec.rb",
-     "spec/fakettp/expectation_helper_spec.rb",
-     "spec/fakettp/expectation_spec.rb",
-     "spec/fakettp/simulator_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sinatra-sinatra>, [">= 0.10.1"])
-      s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
-    else
-      s.add_dependency(%q<sinatra-sinatra>, [">= 0.10.1"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_dependency(%q<activerecord>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<sinatra-sinatra>, [">= 0.10.1"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-    s.add_dependency(%q<activerecord>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
-  end
-end