puffing-billy 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c210f975286ead0f70c852cbeaa2a5bd5f22dc88
-  data.tar.gz: 7f408efe6f4ce17a9e53fc5b0a3f963b15425e2d
+  metadata.gz: 11f63ec36c7471c6290b07e64f35879c9b4efd7e
+  data.tar.gz: d309c50f0918f9893ddb9da69beb034bf3b26133
 SHA512:
-  metadata.gz: 9dfaca86a69fac9cb4938eb68c4298c482d7ae02155b93ef23a9d0b51e4891d9944a38f2002a833843a9f778c3f62d526278955d9b69b3bd26e70f56ce20d083
-  data.tar.gz: b17c5ea015846c53fa4434dbd0735417e111f52ea1fd0c02921cf899a595d68bbe208a60ad10f20aa7c96c483484742e3a10694d28c496421c79d66274521b29
+  metadata.gz: 24b195fd2c7711efa8f9846b7cf97b2e55ddfab4ae181483645bcecaf78bd5c112e5d886d4ed51ba2de2e6fdfd1876a21eb52360efe323fe953515ce89643612
+  data.tar.gz: c88c7270b7921f76bc72eba910f2e8a6062cf0db17c8506d5389127ac18bb9677878fc6a3a2225bc195bdd5ea60d58f1b0db159e44320a5f6520373561d62e4b

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+v0.9.2, 2017-01-18
+------------------
+  * Ensure that files are closed after being opened [#175](https://github.com/oesmith/puffing-billy/pull/175)
+  * Fix floating scopes [#177](https://github.com/oesmith/puffing-billy/pull/177)
+
 v0.9.1, 2016-07-28
 ------------------
   * Rescue LoadErrors during driver registration [#170](https://github.com/oesmith/puffing-billy/pull/170)

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    puffing-billy (0.9.1)
-      addressable
+    puffing-billy (0.9.2)
+      addressable (~> 2.4.0)
       em-http-request (~> 1.1.0)
       em-synchrony
       eventmachine (~> 1.0.4)
@@ -28,7 +28,7 @@ GEM
       ffi (~> 1.0, >= 1.0.11)
     cliver (0.3.2)
     coderay (1.1.0)
-    cookiejar (0.3.0)
+    cookiejar (0.3.3)
     cucumber (2.0.2)
       builder (>= 2.1.2)
       cucumber-core (~> 1.2.0)
@@ -40,15 +40,15 @@ GEM
       gherkin (~> 2.12.0)
     daemons (1.2.3)
     diff-lcs (1.2.5)
-    em-http-request (1.1.3)
+    em-http-request (1.1.5)
       addressable (>= 2.3.4)
-      cookiejar (<= 0.3.0)
+      cookiejar (!= 0.3.1)
       em-socksify (>= 0.3)
       eventmachine (>= 1.0.3)
       http_parser.rb (>= 0.6.0)
     em-socksify (0.3.1)
       eventmachine (>= 1.0.0.beta.4)
-    em-synchrony (1.0.5)
+    em-synchrony (1.0.6)
       eventmachine (>= 1.0.0.beta.1)
     eventmachine (1.0.8)
     eventmachine_httpserver (0.2.1)

data/README.md

@@ -408,6 +408,21 @@ RSpec.configure do |config|
 end
 ```
 
+## Separate Cache Directory for Each Test (in Cucumber)
+
+If you want the cache for each test to be independent, i.e. have it's own directory where the cache files are stored, you can use a Before tag like so:
+
+```rb
+Before('@javascript') do |scenario, block|
+  Billy.configure do |c|
+    feature_name = scenario.feature.name.underscore
+    scenario_name = scenario.name.underscore
+    c.cache_path = "features/support/fixtures/req_cache/#{feature_name}/#{scenario_name}/"
+    Dir.mkdir_p(Billy.config.cache_path) unless File.exist?(Billy.config.cache_path)
+  end
+end
+```
+
 ## Stub requests recording
 
 If you want to record requests to stubbed URIs, set the following configuration option:
@@ -478,7 +493,6 @@ end
 
 Note that this approach may cause unexpected behavior if your backend sends the Referer HTTP header (which is unlikely).
 
-
 ## Resources
 
 * [Bring Ruby VCR to Javascript testing with Capybara and puffing-billy](http://architects.dzone.com/articles/bring-ruby-vcr-javascript)

data/lib/billy/cache.rb

@@ -30,15 +30,15 @@ module Billy
     end
 
     def fetch_from_persistence(key)
-      @cache[key] = YAML.load(File.open(cache_file(key))) if persisted?(key)
+      @cache[key] = YAML.load_file(cache_file(key)) if persisted?(key)
     rescue ArgumentError => e
       Billy.log :error, "Could not parse YAML: #{e.message}"
       nil
     end
 
-    def store(method, url, request_headers, body, response_headers, status, content)
+    def store(key, _scope, method, url, request_headers, body, response_headers, status, content)
       cached = {
-        scope: scope,
+        scope: _scope,
         url: format_url(url),
         body: body,
         status: status,
@@ -49,7 +49,6 @@ module Billy
 
       cached.merge!(request_headers: request_headers) if Billy.config.cache_request_headers
 
-      key = key(method, url, body)
       @cache[key] = cached
 
       if Billy.config.persist_cache

data/lib/billy/handlers/proxy_handler.rb

@@ -21,6 +21,9 @@ module Billy
                                  port: Billy.config.proxied_request_port }} )
         end
 
+        cache_scope = Billy::Cache.instance.scope
+        cache_key = Billy::Cache.instance.key(method.downcase, url, body)
+
         req = EventMachine::HttpRequest.new(url, opts)
         req = req.send(method.downcase, build_request_options(url, headers, body))
 
@@ -40,7 +43,17 @@ module Billy
           end
 
           if cacheable?(url, response[:headers], response[:status])
-            Billy::Cache.instance.store(method.downcase, url, headers, body, response[:headers], response[:status], response[:content])
+            Billy::Cache.instance.store(
+              cache_key,
+              cache_scope,
+              method.downcase,
+              url,
+              headers,
+              body,
+              response[:headers],
+              response[:status],
+              response[:content]
+            )
           end
 
           Billy.log(:info, "puffing-billy: PROXY #{method} succeeded for '#{url}'")

data/lib/billy/version.rb

@@ -1,3 +1,3 @@
 module Billy
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

data/lib/tasks/billy.rake

@@ -67,7 +67,7 @@ namespace :cache do
   end
 
   def load_cache_file(filename)
-    YAML.load(File.open(filename))
+    YAML.load_file(filename)
   rescue ArgumentError => e
     puts "Could not parse YAML: #{e.message}"
   end

data/puffing-billy.gemspec

@@ -28,7 +28,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'cucumber'
   gem.add_development_dependency 'watir-webdriver'
-  gem.add_runtime_dependency 'addressable'
+  # addressable 2.5.0 drops support for ruby 1.9.3
+  gem.add_runtime_dependency 'addressable', '~> 2.4.0'
   gem.add_runtime_dependency 'eventmachine', '~> 1.0.4'
   gem.add_runtime_dependency 'em-synchrony'
   gem.add_runtime_dependency 'em-http-request', '~> 1.1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puffing-billy
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Olly Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -196,16 +196,16 @@ dependencies:
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -386,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Easy request stubs for browser tests.
@@ -411,3 +411,4 @@ test_files:
 - spec/lib/proxy_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_server.rb
+has_rdoc: