puffing-billy 0.2.0 → 0.2.1

data/.gitignore

@@ -1,2 +1,3 @@
 node_modules/
 log/test.log
+.ruby-version

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    puffing-billy (0.1.3)
+    puffing-billy (0.2.1)
       capybara
       em-http-request
       eventmachine
       eventmachine_httpserver
       http_parser.rb
-      rspec
-      yajl-ruby
+      multi_json
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.3)
+    builder (3.2.0)
     capybara (2.0.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -28,6 +28,11 @@ GEM
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.0.9)
     cookiejar (0.3.0)
+    cucumber (1.2.5)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.7)
+      multi_json (~> 1.3)
     daemons (1.1.9)
     diff-lcs (1.2.1)
     em-http-request (1.0.3)
@@ -45,6 +50,8 @@ GEM
     faye-websocket (0.4.7)
       eventmachine (>= 0.12.0)
     ffi (1.4.0)
+    gherkin (2.11.8)
+      multi_json (~> 1.3)
     guard (1.6.2)
       listen (>= 0.6.0)
       lumberjack (>= 1.0.2)
@@ -97,13 +104,13 @@ GEM
     websocket (1.0.7)
     xpath (1.0.0)
       nokogiri (~> 1.3)
-    yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   capybara-webkit
+  cucumber
   faraday
   guard
   poltergeist

data/README.md

@@ -34,7 +34,7 @@ You can also record HTTP interactions and replay them later. See
 
 Add this line to your application's Gemfile:
 
-    gem 'puffing-billy', :require => 'billy'
+    gem 'puffing-billy'
 
 And then execute:
 
@@ -44,7 +44,7 @@ Or install it yourself as:
 
     $ gem install puffing-billy
 
-## Usage
+## RSpec Usage
 
 In your `spec_helper.rb`:
 
@@ -64,6 +64,10 @@ In your tests:
 proxy.stub('http://example.com/text/').and_return(:text => 'Foobar')
 proxy.stub('http://example.com/json/').and_return(:json => { :foo => 'bar' })
 proxy.stub('http://example.com/jsonp/').and_return(:jsonp => { :foo => 'bar' })
+proxy.stub('http://example.com/headers/').and_return({
+  :headers => { 'Access-Control-Allow-Origin' => '*' },
+  :json    => { :foo => 'bar' }
+})
 proxy.stub('http://example.com/wtf/').and_return(:body => 'WTF!?', :content_type => 'text/wtf')
 
 # Stub redirections and other return codes
@@ -88,6 +92,48 @@ proxy.stub('https://example.com/proc/').and_return(Proc.new { |params, headers,
 Stubs are reset between tests.  Any requests that are not stubbed will be
 proxied to the remote server.
 
+## Cucumber Usage
+
+In your `features/support/env.rb`:
+
+```ruby
+require 'billy/cucumber'
+
+After do
+  Capybara.use_default_driver
+end
+```
+
+An example feature:
+
+```
+Feature: Stubbing via billy
+
+  @javascript @billy
+  Scenario: Test billy
+    And a stub for google
+```
+
+And in steps:
+
+```
+Before('@billy') do
+  Capybara.current_driver = :poltergeist_billy
+  Capybara.javascript_driver = :poltergeist_billy
+end
+
+And /^a stub for google$/ do
+  proxy.stub('http://www.google.com/').and_return(:text => "I'm not Google!")
+  visit 'http://www.google.com/'
+  page.should have_content("I'm not Google!")
+end
+```
+
+It's good practice to reset the driver after each scenario, so having an 
+`@billy` tag switches the drivers on for a given scenario. Also note that 
+stubs are reset after each step, so any usage of a stub should be in the 
+same step that it was created in.
+
 ## Caching
 
 Requests routed through the external proxy are cached.

data/lib/billy.rb

@@ -4,3 +4,53 @@ require "billy/proxy_request_stub"
 require "billy/cache"
 require "billy/proxy"
 require "billy/proxy_connection"
+
+$billy_proxy = Billy::Proxy.new
+$billy_proxy.start
+
+module Billy
+  def self.proxy
+    $billy_proxy
+  end
+
+  def self.register_drivers
+    ['capybara/poltergeist', 'capybara/webkit', 'selenium/webdriver'].each do |d|
+      begin
+        require d
+      rescue LoadError
+      end
+    end
+
+    if defined?(Capybara::Poltergeist)
+      Capybara.register_driver :poltergeist_billy do |app|
+        options = {
+          phantomjs_options: [
+            '--ignore-ssl-errors=yes',
+            "--proxy=#{Billy.proxy.host}:#{Billy.proxy.port}"
+          ]
+        }
+        Capybara::Poltergeist::Driver.new(app, options)
+      end
+    end
+
+    if defined?(Capybara::Webkit::Driver)
+      Capybara.register_driver :webkit_billy do |app|
+        driver = Capybara::Webkit::Driver.new(app)
+        driver.browser.set_proxy(:host => Billy.proxy.host,
+                                 :port => Billy.proxy.port)
+        driver.browser.ignore_ssl_errors
+        driver
+      end
+    end
+
+    if defined?(Selenium::WebDriver)
+      Capybara.register_driver :selenium_billy do |app|
+        profile = Selenium::WebDriver::Firefox::Profile.new
+        profile.proxy = Selenium::WebDriver::Proxy.new(
+          :http => "#{Billy.proxy.host}:#{Billy.proxy.port}",
+          :ssl => "#{Billy.proxy.host}:#{Billy.proxy.port}")
+        Capybara::Selenium::Driver.new(app, :profile => profile)
+      end
+    end
+  end
+end

data/lib/billy/cucumber.rb

@@ -0,0 +1,19 @@
+require 'cucumber'
+require 'capybara/cucumber'
+require 'billy'
+
+Billy.register_drivers
+
+module Billy
+  module CucumberHelper
+    def proxy
+      Billy.proxy
+    end
+  end
+end
+
+World(Billy::CucumberHelper)
+
+After('@billy') do
+  proxy.reset
+end

data/lib/billy/proxy_request_stub.rb

@@ -1,4 +1,4 @@
-require 'yajl'
+require 'multi_json'
 
 module Billy
   class ProxyRequestStub
@@ -28,7 +28,7 @@ module Billy
 
       if res[:json]
         headers = {'Content-Type' => 'application/json'}.merge(headers)
-        body = Yajl::Encoder.encode(res[:json])
+        body = MultiJson.dump(res[:json])
       elsif res[:jsonp]
         headers = {'Content-Type' => 'application/javascript'}.merge(headers)
         if res[:callback]
@@ -38,7 +38,7 @@ module Billy
         else
           callback = params['callback'][0]
         end
-        body = "#{callback}(#{Yajl::Encoder::encode(res[:jsonp])})"
+        body = "#{callback}(#{MultiJson.dump(res[:jsonp])})"
       elsif res[:text]
         headers = {'Content-Type' => 'text/plain'}.merge(headers)
         body = res[:text]

data/lib/billy/rspec.rb

@@ -2,14 +2,9 @@ require 'rspec'
 require 'capybara/rspec'
 require 'billy'
 
-$billy_proxy = Billy::Proxy.new
-$billy_proxy.start
+Billy.register_drivers
 
 module Billy
-  def self.proxy
-    $billy_proxy
-  end
-
   module RspecHelper
     def proxy
       Billy.proxy
@@ -24,42 +19,3 @@ RSpec.configure do |config|
     proxy.reset
   end
 end
-
-['capybara/poltergeist', 'capybara/webkit', 'selenium/webdriver'].each do |d|
-  begin
-    require d
-  rescue LoadError
-  end
-end
-
-if defined?(Capybara::Poltergeist)
-  Capybara.register_driver :poltergeist_billy do |app|
-    options = {
-      phantomjs_options: [
-        '--ignore-ssl-errors=yes',
-        "--proxy=#{Billy.proxy.host}:#{Billy.proxy.port}"
-      ]
-    }
-    Capybara::Poltergeist::Driver.new(app, options)
-  end
-end
-
-if defined?(Capybara::Webkit::Driver)
-  Capybara.register_driver :webkit_billy do |app|
-    driver = Capybara::Webkit::Driver.new(app)
-    driver.browser.set_proxy(:host => Billy.proxy.host,
-                             :port => Billy.proxy.port)
-    driver.browser.ignore_ssl_errors
-    driver
-  end
-end
-
-if defined?(Selenium::WebDriver)
-  Capybara.register_driver :selenium_billy do |app|
-    profile = Selenium::WebDriver::Firefox::Profile.new
-    profile.proxy = Selenium::WebDriver::Proxy.new(
-      :http => "#{Billy.proxy.host}:#{Billy.proxy.port}",
-      :ssl => "#{Billy.proxy.host}:#{Billy.proxy.port}")
-    Capybara::Selenium::Driver.new(app, :profile => profile)
-  end
-end

data/lib/billy/version.rb

@@ -1,3 +1,3 @@
 module Billy
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/puffing-billy.gemspec

@@ -24,11 +24,12 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rack"
   gem.add_development_dependency "guard"
   gem.add_development_dependency "rb-inotify"
+  gem.add_development_dependency "rspec"
+  gem.add_development_dependency "cucumber"
   gem.add_runtime_dependency "eventmachine"
   gem.add_runtime_dependency "em-http-request"
   gem.add_runtime_dependency "eventmachine_httpserver"
   gem.add_runtime_dependency "http_parser.rb"
-  gem.add_runtime_dependency "yajl-ruby"
-  gem.add_runtime_dependency "rspec"
+  gem.add_runtime_dependency "multi_json"
   gem.add_runtime_dependency "capybara"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puffing-billy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -156,14 +156,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -172,7 +172,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: em-http-request
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -188,7 +204,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: eventmachine_httpserver
+  name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -204,7 +220,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: http_parser.rb
+  name: eventmachine_httpserver
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -220,7 +236,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -236,7 +252,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -291,6 +307,7 @@ files:
 - lib/billy.rb
 - lib/billy/cache.rb
 - lib/billy/config.rb
+- lib/billy/cucumber.rb
 - lib/billy/mitm.crt
 - lib/billy/mitm.key
 - lib/billy/proxy.rb