vcr 1.5.0 → 1.5.1

data/CHANGELOG.md

@@ -2,7 +2,15 @@
 
 ## In git
 
-[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.5.0...master)
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.5.1...master)
+
+## 1.5.1 (January 12, 2011)
+
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.5.0...v1.5.1)
+
+* Fix response and request serialization so that the headers are raw
+  strings.  This fixes intermittent YAML seg faults for paperclip
+  uploads to S3.  But reported by [Rob Slifka](https://github.com/rslifka).
 
 ## 1.5.0 (January 12, 2011)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vcr (1.5.0)
+    vcr (1.5.1)
 
 GEM
   remote: http://rubygems.org/

data/Rakefile

@@ -5,7 +5,10 @@ Bundler::GemHelper.install_tasks
 require 'rake'
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.verbose = false
+  t.rspec_opts = %w[--format progress] if ENV['FULL_BUILD']
+end
 
 desc "Run all examples using rcov"
 RSpec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|

data/lib/vcr/structs.rb

@@ -61,7 +61,14 @@ module VCR
         important_vals = important_header_values(k, val_array)
         next unless important_vals.size > 0
 
-        new_headers[k] = important_vals
+        # Ensure the values are raw strings.
+        # Apparently for Paperclip uploads to S3, headers
+        # get serialized with some extra stuff which leads
+        # to a seg fault. See this issue for more info:
+        # https://github.com/myronmarston/vcr/issues#issue/39
+        string_vals = important_vals.map { |v| String.new(v) }
+
+        new_headers[k] = string_vals
       end if headers
 
       self.headers = new_headers.empty? ? nil : new_headers

data/lib/vcr/version.rb

@@ -3,7 +3,7 @@ module VCR
 
   def version
     @version ||= begin
-      string = '1.5.0'
+      string = '1.5.1'
 
       def string.parts; VCR.version.split('.').map { |p| p.to_i }; end
       def string.major; parts[0]; end

data/script/FullBuildRakeFile

@@ -1,19 +1,46 @@
 # this is in a separate rakefile because our main one depends on the bundled gems
 # already being installed.  This must be able to run w/o bundled gems installed.
 
+def rake(command = "")
+  sh "rake #{command} FULL_BUILD=true"
+end
+
 desc "Run a full build: install necessary gems with bundler, runs specs, run cukes"
-task :build => :ensure_bundler_installed do
-  sh "bundle install"
-  sh "rake"
+task :build => :bundle_install do
+  rake
+end
+
+desc "Install necessary gems with bundler and runs specs"
+task :spec => :bundle_install do
+  rake "spec"
+end
+
+desc "Install necessary gems with bundler and runs cukes"
+task :cucumber => :bundle_install do
+  rake "cucumber"
+end
+
+desc "Prints description of current ruby interpreter"
+task :print_ruby_description do
+  description = if defined?(RUBY_DESCRIPTION)
+    RUBY_DESCRIPTION
+  else
+    # RUBY_DESCRIPTION is undefined on 1.8.6
+    "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE} patchlevel #{RUBY_PATCHLEVEL}) [#{RUBY_PLATFORM}]"
+  end
+
+  puts
+  puts "=" * 80
+  puts "Using #{description}"
+  puts "=" * 80
+  puts
 end
 
-desc "Install necessary gems with bundler, runs specs, run cukes"
-task :spec => :ensure_bundler_installed do
+task :bundle_install => :ensure_bundler_installed do
   sh "bundle install"
-  sh "rake spec"
 end
 
-task :ensure_bundler_installed do
+task :ensure_bundler_installed => :print_ruby_description do
   installed = begin
     require 'rubygems'
     require 'bundler'
@@ -26,3 +53,4 @@ task :ensure_bundler_installed do
     sh "gem install bundler"
   end
 end
+

data/spec/vcr/structs_spec.rb

@@ -23,6 +23,20 @@ shared_examples_for "a header normalizer" do
   it 'sets empty hash header to nil' do
     with_headers({}).headers.should be_nil
   end
+
+  it 'ensures header keys are serialized to yaml as raw strings' do
+    key = 'my-key'
+    key.instance_variable_set(:@foo, 7)
+    instance = with_headers(key => ['value1'])
+    instance.headers.to_yaml.should == { 'my-key' => ['value1'] }.to_yaml
+  end
+
+  it 'ensures header values are serialized to yaml as raw strings' do
+    value = 'my-value'
+    value.instance_variable_set(:@foo, 7)
+    instance = with_headers('my-key' => [value])
+    instance.headers.to_yaml.should == { 'my-key' => ['my-value'] }.to_yaml
+  end
 end
 
 shared_examples_for "a body normalizer" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vcr
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Myron Marston
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 -08:00
+date: 2011-01-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency