yarn 0.0.1 → 0.0.2

data/lib/yarn/version.rb

@@ -1,3 +1,3 @@
 module Yarn
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/helpers.rb

@@ -12,22 +12,28 @@ module Helpers
 
   def get(url)
     setup
-    @connection.get "test_objects#{url}"
+    if url == ""
+      @connection.get "/"
+    else
+      @connection.get "test_objects#{url}"
+    end
   end
 
-  def post(url, params={})
+  def post(url, data)
     setup
-    @connection.post url, params
+    @connection.post url, data
   end
 
   def stop_server
     @thread.kill if @thread
+    @server.workers.each { |worker_id| Process.kill("INT", worker_id) } if @server and !@server.workers.empty?
     @server.stop if @server
+    sleep 0.1 # enable socket to close before next test
   end
 
-  def start_server(port=3000,handler=:static)
-    $console = MockIO.new
-    @server = Yarn::Server.new({ port: port, output: $console })
+  def start_server(port=3000,rack="off")
+    $console ||= MockIO.new
+    @server = Yarn::Server.new({ port: port, output: $console, rack: rack, debug: true })
     @thread = Thread.new { @server.start }
     sleep 0.1 until @server.socket # wait for socket to be created
   end
@@ -49,8 +55,10 @@ module Helpers
   private
 
   def setup
-    host = URI.parse("http://#{@server.host}:#{@server.port}")
-    @connection ||= Faraday.new(host)
+    host = "127.0.0.1"
+    port = "3000"
+    uri = URI.parse("http://#{host}:#{port}")
+    @connection = Faraday.new(uri)
   end
 end
 

data/spec/rack/handler/yarn_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+module Rack
+  module Handler
+
+    include Helpers
+
+    # describe Yarn do
+    #   after do
+    #     @thread.kill
+    #   end
+
+    #   it "should start the server" do
+    #     @thread = Thread.new { Yarn.run("test_objects/config.ru") }
+    #     response = get("/").body
+    #     response.gsub(/\n?/,"").should == "Rack works"
+    #   end
+    # end
+  end
+end
+

data/spec/spec_helper.rb

@@ -2,21 +2,18 @@ $LOAD_PATH << File.expand_path('../../../lib', __FILE__)
 
 require 'rubygems'
 require 'bundler/setup'
-require 'fakefs'
 
 # unless /jruby/ =~ `ruby -v`
   require 'simplecov'
   SimpleCov.start do
-    FakeFS.deactivate!
     add_filter "/spec/"
     add_filter "lib/yarn/http*"
   end
 # end
 
-require 'capybara/rspec'
-
 require 'yarn'
 require 'helpers'
+require 'pry'
 
 RSpec.configure do |config|
   config.include Helpers

data/spec/yarn/directory_lister_spec.rb

@@ -5,10 +5,6 @@ module Yarn
 
   describe DirectoryLister do
 
-    before(:each) do
-      FakeFS.deactivate!
-    end
-
     describe "#list" do
       it "returns valid HTML for a directory" do
         response = DirectoryLister.list("lib")
@@ -17,7 +13,6 @@ module Yarn
       end
 
       it "returns valid HTML a long path" do
-        FakeFS.deactivate!
         response = DirectoryLister.list("lib/yarn")
         response.should_not be_nil
         valid_html?(response).should be_true

data/spec/yarn/logging_spec.rb

@@ -10,10 +10,10 @@ module Yarn
 
     describe "#log" do
       it "should make the logging methods available" do
-        @server = Server.new(output: $output)
+        @server = Server.new(output: $output, debug: true)
         @server.should respond_to(:log)
         @server.should respond_to(:debug)
-        @server.socket.close
+        @server.stop
       end
 
       it "should be available in the handler classes" do
@@ -41,6 +41,7 @@ module Yarn
 
     describe "#debug" do
       it "should invoke the log method with a message" do
+        $debug = true
         test_logger = TestLoggging.new
         test_logger.should_receive(:log).with("DEBUG: testing").once
 

data/spec/yarn/parslet_parser_spec.rb

@@ -56,6 +56,13 @@ module Yarn
         puts result
         result[:uri][:query].should == "param1=1&param2=2"
       end
+
+      it "should parse query on rails assets" do
+        result = @parser.run("GET assets/application.js?body=0 HTTP/1.1\n")
+        puts result
+        result[:uri][:query].should == "body=0"
+        result[:uri][:path].should == "assets/application.js"
+      end
     end
 
     describe "#parse headers" do
@@ -95,5 +102,24 @@ module Yarn
       end
     end
 
+    describe "#parse POST body" do
+      it "should parse POST body" do
+        header = "Cookie: $Version=1; Skin=new;"
+        body = "attr=test"
+        request = "POST /form HTTP/1.1\r\n#{header}\r\n\r\n#{body}"
+        result = @parser.run(request)
+        result[:body].should == body
+      end
+
+      it "should parse POST body with added line ending" do
+        header = "Cookie: $Version=1; Skin=new;"
+        body = "attr=test&attr2=some_other_value&attr3=1231682368125361823"
+        request = "POST /form HTTP/1.1\r\n#{header}\r\n\r\n#{body}"
+        result = @parser.run(request)
+        puts result
+        result[:body].should == body
+      end
+    end
+
   end
 end

data/spec/yarn/rack_handler_spec.rb

@@ -3,15 +3,26 @@ require 'spec_helper'
 module Yarn
   describe RackHandler do
 
+    before(:each) do
+      @handler = RackHandler.new(nil)
+      @handler.request = @handler.parser.run "GET http://www.hostname.com:8888/some_controller/some_action?param1=1&param2=2 HTTP/1.1"
+    end
+
     describe "#prepare_response" do
-    
+      it "should call make_env" do
+        @app.stub(:call).and_return([200, {}, []])
+        @handler.prepare_response
+        @handler.env.should_not be_nil
+      end  
+
+      it "should call the rack app" do
+        @app.should_receive(:call)
+        @handler.prepare_response
+      end
     end
 
     describe "#make_env" do
-
       before(:each) do
-        @handler = RackHandler.new(nil,{})
-        @handler.request = @handler.parser.run "GET http://www.hostname.com:8888/some_controller/some_action?param1=1&param2=2 HTTP/1.1"
         @env = @handler.make_env
       end
 

data/spec/yarn/request_handler_spec.rb

@@ -25,6 +25,15 @@ module Yarn
 
           @handler.read_request.should == "line1\nline2\nline3"
         end
+
+        it "should handle POST body" do
+          @req = "POST /app HTTP/1.1\nCookie: $key=value;\nContent-Length: 17;\n\r\nfield1=1&field2=2"
+          @handler.unstub!(:read_request)
+          @handler.session = StringIO.new
+          @handler.session.string = @req
+
+          @handler.read_request.should == @req
+        end
       end
 
       describe "#parse_request" do
@@ -86,22 +95,23 @@ module Yarn
         @handler = RequestHandler.new
         @handler.session = @session
 
-        FakeFS.activate!
         @file_content = "<html><body>success!</body></html>"
         @file = File.open("index.html", 'w') do |file|
           file.write @file_content
         end
+        Dir.mkdir("testdir") unless Dir.exists?("testdir")
       end
 
       after(:each) do
         @handler.close_connection
-        FakeFS.deactivate!
+        File.delete("index.html") if File.exists?("index.html")
+        File.delete("testdir/index.html") if File.exists?("testdir/index.html")
+        Dir.delete("testdir") if Dir.exists?("testdir")
       end
 
       describe "#prepare_response" do
         it "should handle a directory" do
           File.delete("index.html")
-          Dir.mkdir("testdir")
           @handler.stub(:extract_path).and_return("testdir")
           @handler.should_receive(:serve_directory).once
           @handler.prepare_response
@@ -112,6 +122,7 @@ module Yarn
           @handler.stub(:extract_path).and_return("test.html")
           @handler.should_receive(:serve_file).once
           @handler.prepare_response
+          File.delete("test.html")
         end
 
         it "handles missing files" do
@@ -130,10 +141,9 @@ module Yarn
 
       describe "#serve_directory" do
         it "should read index file if it exists" do
-          Dir.mkdir("test")
-          File.new("test/index.html", "w")
+          File.new("testdir/index.html", "w")
           @handler.should_receive(:read_file).once
-          @handler.serve_directory("test")
+          @handler.serve_directory("testdir")
         end
 
         it "should list a directory" do
@@ -144,7 +154,7 @@ module Yarn
       end
 
       describe "#read_file" do
-        it "should return the contents of a file it it exists" do
+        it "should return the contents of a file" do
           @handler.response.body.should be_empty
           @handler.read_file("index.html").should == [@file_content]
         end

data/spec/yarn/server_spec.rb

@@ -5,25 +5,66 @@ module Yarn
 
     after(:each) do
       stop_server
-      @server.stop if @server
+    end
+
+    describe "#new" do
+    end
+
+    describe "#load_rack_app" do
+
+      before(:each) do
+        $console = MockIO.new
+        @server = Server.new( output: $console )
+      end
+
+      it "should print a message and exit if the file does not exist" do
+        Kernel.should_receive(:exit)
+        @server.load_rack_app("non-existing-app.ru")
+        $console.should include("non-existing-app.ru does not exist. Exiting.") 
+      end
+
+      it "should return a rack app if the file exists" do
+        app = @server.load_rack_app("test_objects/config.ru")
+        app.class.should == Rack::Builder
+      end
     end
 
     describe "#start" do
-      it "creates a TCP server" do
-        start_server
-        @server.socket.should_not be_nil
+      it "should creates a TCP server" do
+        @server = Server.new
+        @server.stub(:init_workers)
+        @server.start
+
+        @server.socket.class.should == TCPServer
       end
 
-      it "starts on the supplied port" do
-        @server = Server.new(nil,port: 4000)
+      it "should listen on the supplied port" do
+        @server = Server.new({ port: 4000 })
+        @server.stub(:init_workers)
+        @server.start
 
         @server.socket.addr.should include(4000)
       end
     end
 
+    # describe "#start" do
+    #   it "should start the socket_listener" do
+    #     @thread = Thread.new do
+    #       @server = Server.new({ output: $console })
+    #       @server.start
+    #     end
+    #     sleep 2
+    #     get("/").should be_true
+    #     @thread.kill
+    #   end
+    # end
+
     describe "#stop" do
-      it "notifies the server is stopped" do
-        @server = Server.new(nil,{ output: $console })
+      it "should notify the server is stopped" do
+        $console = MockIO.new
+        @server = Server.new({ output: $console })
+        @server.stub(:init_workers)
+        @server.start
         @server.stop
 
         $console.should include("Server stopped")

data/test_objects/.gitignore

@@ -7,3 +7,4 @@ pkg/*
 doc/*
 rails_app
 rails_app/*
+*.rb

data/test_objects/app.rb

@@ -1,5 +1,3 @@
-#!/bin/ruby
-
 puts "<h1>Dynamic script: #{__FILE__}</h1>"
 puts "2^8 = #{2**8}"
 puts "<br>"

data/test_objects/config.ru

@@ -1,54 +1,6 @@
 require 'rubygems'
 require 'rack'
 
-# The root of our app
-@root = File.expand_path(File.dirname(__FILE__))
-
 run Proc.new { |env|
-  # Extract the requested path from the request
-  path = Rack::Utils.unescape(env['PATH_INFO'])
-  index_file = @root + "#{path}/index.html"
-
-  if File.exists?(index_file)
-    # Return the index
-    [200, {'Content-Type' => get_mime_type(index_file)}, read_file(index_file)]
-  elsif File.exists?(path) && !File.directory?(path)
-    # Return the file
-    [200, {'Content-Type' => get_mime_type(path)}, read_file(path)]
-  else
-    # Return a directory listing
-    Rack::Directory.new(@root).call(env)
-  end
+  [200, {'Content-Type' => "text/plain"}, ["Rack works"]]
 }
-
-def read_file(path)
-  file_contents = []
-  File.open(path, "r") do |file|
-    while (line = file.gets) do
-      file_contents << line
-    end
-  end
-  file_contents
-end
-
-
-def get_mime_type(path)
-  return false unless path.include? '.'
-  filetype = path.split('.').last
-
-  return case
-    when ["html", "htm"].include?(filetype)
-      "text/html"
-    when "txt" == filetype 
-      "text/plain"
-    when "css" == filetype
-      "text/css"
-    when "js" == filetype
-      "text/javascript"
-    when ["png", "jpg", "jpeg", "gif", "tiff"].include?(filetype)
-      "image/#{filetype}"
-    when ["zip","pdf","postscript","x-tar","x-dvi"].include?(filetype)
-      "application/#{filetype}"
-    else false
-  end
-end

data/test_objects/rails_test/.gitignore

@@ -0,0 +1,5 @@
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/
+.sass-cache/

data/test_objects/rails_test/Gemfile

@@ -0,0 +1,34 @@
+source 'http://rubygems.org'
+
+gem 'rails', '3.1.0'
+
+# Bundle edge Rails instead:
+# gem 'rails',     :git => 'git://github.com/rails/rails.git'
+
+gem 'sqlite3'
+gem 'yarn'
+gem 'pry'
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails', "  ~> 3.1.0"
+  gem 'coffee-rails', "~> 3.1.0"
+  gem 'uglifier'
+end
+
+gem 'jquery-rails'
+
+# Use unicorn as the web server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'ruby-debug19', :require => 'ruby-debug'
+
+group :test do
+  # Pretty printed test output
+  gem 'turn', :require => false
+end