sinatra_fake_webservice 0.2.0 → 0.9.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.9.0

data/lib/sinatra_webservice.rb

@@ -1,13 +1,22 @@
-
+require 'net/http'
+require 'uri'
 
 class SinatraWebService
   
   attr_accessor :host, :port
+  attr_accessor :current_thread
   
   class SinatraStem < Sinatra::Base      
+    
+    enable :methodoverride
+    
     get '/' do
       "Hello! i am lindesy lohan!"
     end
+    
+    post '/gimmie' do
+      "here ya go"
+    end
   end
   
   
@@ -17,13 +26,17 @@ class SinatraWebService
   end
   
   def running?
-    false
+    self.current_thread.alive? rescue false
   end
 
   def run!
+    if Thread.list.size > 1
+      Thread.list.first.kill
+    end
+    
     @port = find_free_port
     
-    app = Thread.new("running_app") do
+    self.current_thread = Thread.new do
         SinatraStem.run! :post => @host, :port => @port.to_i
       sleep 1
     end
@@ -46,8 +59,32 @@ class SinatraWebService
     end
   end
   
+  def get_response(action)
+    res = Net::HTTP.start(self.host, self.port) do |http|
+      http.get(action)
+    end
+  end
+  
+  def delete_response(action, data = "", headers = nil, dest = nil)
+    data = data.empty? ? "_method=delete" : data += "&_method=delete"
+    post_response(action, data, headers, dest)
+  end
+  
+  def put_response(action, data = "", headers = nil, dest = nil)
+    data = data.empty? ? "_method=put" : data += "&_method=put"
+    post_response(action, data, headers, dest)
+  end
+  
+  def post_response(action, data, headers = nil, dest = nil)
+    res = Net::HTTP.start(self.host, self.port) do |http|
+      http.post(action, data, headers, dest)
+    end
+  end
+  
   def method_missing(method, *args, &block)
-    SinatraStem.send(method, *args, &block) unless method.to_s == "proxy"
+    SinatraStem.instance_eval do |base|
+      route method.to_s.upcase, *args, &block
+    end 
   end
 
 end

data/sinatra_fake_webservice.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_fake_webservice}
-  s.version = "0.2.0"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Elad Meidar"]
-  s.date = %q{2010-02-18}
+  s.date = %q{2010-03-03}
   s.description = %q{FakeWeb allows you to fake a response from a specific url, this gem intends to give developers the option to allow several responses from the same url based on parameters (ex: WSDL)}
   s.email = %q{elad@nautilus6.com}
   s.extra_rdoc_files = [
@@ -23,9 +23,7 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
-     "lib/sinatra_ext.rb",
      "lib/sinatra_webservice.rb",
-     "lib/web_service.rb",
      "metal/sinatra_stem.rb",
      "sinatra.log",
      "sinatra_fake_webservice.gemspec",

data/test/helper.rb

@@ -1,16 +1,15 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
-require 'net/http'
-require 'uri'
+
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'metal'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'sinatra/base'
-#require 'sinatra_ext'
+
 require 'sinatra_webservice'
-#require 'web_service'
+
 
 class Test::Unit::TestCase
 end

data/test/test_sinatra_fake_webservice.rb

@@ -6,6 +6,23 @@ class TestSinatraFakeWebservice < Test::Unit::TestCase
     
     setup do
       @sinatra_app = SinatraWebService.new
+      @sinatra_app.run!
+      
+      @sinatra_app.get '/payme' do
+        "OMG I GOT PAID"
+      end
+      
+      @sinatra_app.post '/returnme' do
+        "#{params[:return_value]}"
+      end
+       
+      @sinatra_app.delete '/killme' do
+        "argh! i is dead."
+      end 
+      
+      @sinatra_app.put '/gimmieitnow' do
+        "yay, i haz it."
+      end
     end
     
     should "have default host and port" do
@@ -15,21 +32,38 @@ class TestSinatraFakeWebservice < Test::Unit::TestCase
     
     context "with a registered GET service" do
       
-      setup do
-        @sinatra_app.get '/payme' do
-          "OMG I GOT PAID"
-        end
+      should "respond to GET '/payme' with 'OMG I GOT PAID" do
+        res = @sinatra_app.get_response('/payme') 
+        assert_equal "OMG I GOT PAID",res.body
+      end
+    end
+    
+    context "with a registered POST service" do
+      
+      should "respond to POST '/returnme' with param :return_value with param value" do
+        res = @sinatra_app.post_response('/returnme',"return_value=2")
         
-        @sinatra_app.run!
+        assert_equal "2", res.body
       end
+    end
+    
+    context "with a registered DELETE service" do
       
-      should "respond to '/payme' with 'OMG I GOT PAID" do
-        res = Net::HTTP.start(@sinatra_app.host, @sinatra_app.port) do |http|
-          http.get('/payme')
-        end
-
-        assert_equal "OMG I GOT PAID",res.body
+      should "respond to DELETE '/killme'" do
+        res = @sinatra_app.delete_response('/killme')
+        
+        assert_equal "argh! i is dead.", res.body
       end
     end
+    
+    context "with a registered PUT service" do
+      
+      should "respond to put '/gimmieitnow'" do
+        res = @sinatra_app.put_response('/gimmieitnow')
+        
+        assert_equal "yay, i haz it.", res.body
+      end
+    end
+    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_fake_webservice
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Elad Meidar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 -05:00
+date: 2010-03-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,9 +48,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- lib/sinatra_ext.rb
 - lib/sinatra_webservice.rb
-- lib/web_service.rb
 - metal/sinatra_stem.rb
 - sinatra.log
 - sinatra_fake_webservice.gemspec

data/lib/sinatra_ext.rb

@@ -1,16 +0,0 @@
-# Disabling the capture of the Errno::EADDRINUSE exception in #run! so we can make WebService catch it.
-# class Sinatra::Base
-#   def self.run!(options={})
-#     attempts = 0
-#     set options
-#     handler = detect_rack_handler
-#     handler_name = handler.name.gsub(/.*::/, '')
-#     handler.run self, :Host => bind, :Port => port do |server|
-#       trap(:INT) do
-#         ## Use thins' hard #stop! if available, otherwise just #stop
-#         server.respond_to?(:stop!) ? server.stop! : server.stop
-#       end
-#       set :running, true
-#     end
-#   end
-# end

data/lib/web_service.rb

@@ -1,60 +0,0 @@
-require 'net/http'
-class WebService
-  
-  class SinatraStem < Sinatra::Base      
-    get '/' do
-      "Hello! i am lindesy lohan!"
-    end
-  end
-  
-  attr_accessor :port, :host, :name, :sinatra_app
-  
-  
-  # Initialize a new face service
-  def initialize(options = {})
-    @name = options[:name] ||= "App"
-    @port = options[:port] ||= "4567"
-    @host = options[:host] ||= "localhost"
-    @sinatra_app = Sinatra::Base.new 
-  end
-  
-  def proxy
-    @sinatra_app
-  end
-  
-  def run
-    
-    @port = find_free_port
-    
-    app = Thread.new("running_#{self.name}") do
-      puts "\n == Starting webservice '#{@name}' on port #{@port}"
-        proxy.run! :post => @host, :port => @port.to_i
-      sleep 1
-    end
-  end
-  
-  def find_free_port
-    found = false
-    attempts = 0
-    while !found and attempts < 10
-      puts "\n== Trying port #{@port}"
-      begin
-        res = Net::HTTP.start(host,port) do |http|
-          http.get('/')
-        end
-        attempts += 1
-        @port = @port.succ
-      rescue Errno::ECONNREFUSED
-        return @port
-      end
-    end
-  end
-  
-  def proxy
-    @sinatra_app
-  end
-  
-  def method_missing(method, *args, &block)
-    proxy.send(method, *args, &block) unless method.to_s == "proxy"
-  end
-end