cuukie 0.3.0 → 0.3.1

data/README.markdown

@@ -12,9 +12,7 @@ Go to a folder where you would normally run _cucumber_, and run _cuukie_ instead
 
     cuukie --showpage
 
-That's basically it.
-
-# Command-line Arguments
+# Command Line Arguments
 
 Cuukie passes arguments that it doesn't recognize to Cucumber, so feel free to mix Cuukie arguments and Cucumber arguments:
 
@@ -28,7 +26,7 @@ For more options:
 
 ## Advanced Cuuking
 
-Cuukie is actually two things: a server that displays running features on a web page, and a Cucumber formatter that sends data to the server. You can run these two components independently. For example, you might want to keep the server running all the time:
+Cuukie is actually two things: a server that displays running features on a web page, and a Cucumber formatter that sends data to the server. You can run these two components separately. For example, you might want to keep the server running all the time:
 
     cuukie --server
 
@@ -44,7 +42,7 @@ When you run Cucumber, ask it to use the _cuukie_ formatter to send data to the
 
 ## Even More Advanced Cuuking
 
-You can pick a port when you start the cuukie server...
+Maybe you want to run the Cuukie server on your build machine. You can pick a port when you start the cuukie server...
 
     cuukie --server --cuukieport 4570
 
@@ -52,8 +50,6 @@ You can pick a port when you start the cuukie server...
 
     cucumber --format cuukie CUUKIE_SERVER=http://my.server:4570
 
-This stuff is useful if you want to put the Cuukie server on your build machine.
-
 Enjoy!
 
 ## License

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/cuukie.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cuukie"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paolo \"Nusco\" Perrotta"]

data/doc/pomodoro.txt

@@ -1,6 +1,12 @@
 I use this file to track my own work on the project. Each line is a pomodoro (a 25' slot).
 Latest pomodoro comes first:
 
+- debug (the % bug)
+- debug (the % bug)
+- explore cucumber's new HTML formatter
+- explore cucumber's new HTML formatter
+- debug (the % bug)
+- test on a large project
 - autorequire formatter
 - refactoring
 - debugging

data/lib/cuukie/formatter.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + '/code_snippets'
 require 'rest-client'
-require 'json'
 
 module Cuukie
   class Formatter
@@ -76,7 +75,7 @@ module Cuukie
     private
 
     def post(url, params = {})
-      RestClient.post "#{@server}/#{url}", params.to_json
+      RestClient.post "#{@server}/#{url}", params
     end
   end
 end

data/lib/cuukie/server/server.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'sinatra/base'
-require 'json'
 require 'syntax/convertors/html'
 
 module Cuukie
@@ -113,11 +112,11 @@ module Cuukie
       def code_snippet_for(exception)
         return '' unless exception[:raw_lines]
         result = '<pre class="ruby"><code>'
-        linenum = exception[:first_line]
+        linenum = exception[:first_line].to_i
         html_lines = htmlize(exception[:raw_lines]).split "\n"
         html_lines.each do |html_line|
           line = "<span class=\"linenum\">#{linenum}</span>#{html_line}"
-          line = "<span class=\"offending\">#{line}</span>" if linenum == exception[:marked_line]
+          line = "<span class=\"offending\">#{line}</span>" if linenum.to_s == exception[:marked_line]
           result << "#{line}<br/>"
           linenum += 1
         end
@@ -190,17 +189,10 @@ module Cuukie
       convertor.convert(ruby, false)
     end
     
-    include Rack::Utils
-    
     def read_from_request
-      data = JSON.parse request.body.read
       result = {}
-      data.each do |k, v|
-        if v.class == String && k !~ /^raw_/
-          result[k.to_sym] = escape_html(v)
-        else
-          result[k.to_sym] = v
-        end
+      request.params.each do |k, v|
+        result[k.to_sym] = (k =~ /^raw_/) ? v : Rack::Utils.escape_html(v)
       end
       result
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cuukie
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70137970663940 !ruby/object:Gem::Requirement
+  requirement: &70353331008760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70137970663940
+  version_requirements: *70353331008760
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70137976108560 !ruby/object:Gem::Requirement
+  requirement: &70353330924000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70137976108560
+  version_requirements: *70353330924000
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70137976108080 !ruby/object:Gem::Requirement
+  requirement: &70353330922360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70137976108080
+  version_requirements: *70353330922360
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70137976107600 !ruby/object:Gem::Requirement
+  requirement: &70353330919480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137976107600
+  version_requirements: *70353330919480
 - !ruby/object:Gem::Dependency
   name: syntax
-  requirement: &70137976107120 !ruby/object:Gem::Requirement
+  requirement: &70353330917160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137976107120
+  version_requirements: *70353330917160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70137976106640 !ruby/object:Gem::Requirement
+  requirement: &70353330915080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70137976106640
+  version_requirements: *70353330915080
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70137976106160 !ruby/object:Gem::Requirement
+  requirement: &70353330913840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70137976106160
+  version_requirements: *70353330913840
 description: A drop-in replacement for the "cucumber" command. It shows running features
   on a web page.
 email: paolo.nusco.perrotta@gmail.com
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 787056299110256408
+      hash: -3498473730206577411
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: