capybara-screenshot 1.0.9 → 1.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmMwYzE2YmM3NGE1NGJjNjM5Y2ZiYjNhNGIwMjE3Y2VjM2JmNjVhMw==
+    NDM5NDRiYWIwNmRkY2JkMWFiMjRkNWUzYjE1YTUwZWY3NmE5MmY4NQ==
   data.tar.gz: !binary |-
-    YWIzMjk0MjA5OGZmOTA3MjExYjI5MjhjMDhiZTAxZTUxZmQ5ZjRlNg==
+    OTMwNTdiZWE1ZGU5NjMyZDVjZjM0ZTQyZGJmMjJjNDY3Y2VjZTQ5ZA==
 SHA512:
   metadata.gz: !binary |-
-    ZWJkZGEyMTY5YmY5NTgzMDg2OGNlOWQ2Yjc3YmZlMjZhNTBkZDUzMmE0YjYw
-    MjMwODZlMTUxNjYwOWIxNTRlOWZiYTZjYTk4ZjllYTM2MjIzN2E5Y2ZhMTkw
-    NDc0ZDc0OGQ3MDc2ZTQ4NDlmOTNkOTc0MjFhNDQ3OWQ0ODc0ZTM=
+    ZDhmNDQ2YTA3MTkwZWNlM2JhZmI5MDdhZjA1ZTNlNWI2OTA1MDYxODVmNjVi
+    ZDJjZmI3YTZmZmEzMmZmYjRiODdlODljZDQ1NjM3YzQ2ZTIxMmU1YTJkNDhj
+    ODk1OGUxYWVlYjQwZDcyYWVmZmFmOWQxMTQ5MWYzYzZmY2ZmYjU=
   data.tar.gz: !binary |-
-    OGQxNzQ2Nzk4N2Q5ZGIzMjVkMGRjOGM3OTM0ODc1YzFlOTcwMDA5YjBlMDM5
-    NjE0MTljNGU1ZGUyMTdmMjEwMDViZmZiOGFhNmNkMDdjYWEzZjNkMzBkYmVl
-    OTJjMWMzMzBjMjkxZWQ0Yjk5YTg4MjRkMjNhOTYyNzIxNWQ0MGI=
+    NTQ5ZjZjMjkxZTg3MmU1YzJiYzViN2M5OWNlMjU4NGM1ODhmODlkNGE2NTJi
+    OWFhN2VhNzYyMDJiY2FiYTgxYjhjZjE1NmYyNTU5NzA4NmViZTQwYzUwMmRh
+    ZGE3ZDNhYWU0OThlMDMxM2FjZmNiZGZhZjdkNzgyZTM4ZWFiOTc=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+29 June 2015 - 1.0.9 -> 1.0.10
+
+* [Small fix to memoization](https://github.com/mattheworiordan/capybara-screenshot/pull/134) plus [mini refactor](https://github.com/mattheworiordan/capybara-screenshot/commit/1db950bc53c729b26b8881d058a8781d6e7611b8)
+
+Thanks to [Systho](https://github.com/Systho)
+
 6 April 2015 - 1.0.8 -> 1.0.9
 -----------
 

data/lib/capybara-screenshot.rb

@@ -52,11 +52,7 @@ module Capybara
     end
 
     def self.capybara_root
-      return @capybara_root if defined?(@capybara_root)
-      #If the path isn't set, default to the current directory
-      capybara_tmp_path = Capybara.save_and_open_page_path || '.'
-
-      @capybara = if defined?(::Rails)
+      @capybara_root ||= if defined?(::Rails)
         ::Rails.root.join capybara_tmp_path
       elsif defined?(Padrino)
         Padrino.root capybara_tmp_path
@@ -91,6 +87,13 @@ module Capybara
     def self.reset_prune_history
       @pruned_previous_screenshots = nil
     end
+
+    private
+
+    # If the path isn't set, default to the current directory
+    def self.capybara_tmp_path
+      Capybara.save_and_open_page_path || '.'
+    end
   end
 end
 

data/lib/capybara-screenshot/pruner.rb

@@ -8,13 +8,13 @@ module Capybara
 
         @strategy_proc = case strategy
         when :keep_all
-          -> { }
+          lambda { }
         when :keep_last_run
-          -> { prune_with_last_run_strategy }
+          lambda { prune_with_last_run_strategy }
         when Hash
           raise ArgumentError, ":keep key is required" unless strategy[:keep]
           raise ArgumentError, ":keep value must be number greater than zero" unless strategy[:keep].to_i > 0
-          -> { prune_with_numeric_strategy(strategy[:keep].to_i) }
+          lambda { prune_with_numeric_strategy(strategy[:keep].to_i) }
         else
           fail "Invalid prune strategy #{strategy}. `:keep_all`or `{ keep: 10 }` are valid examples."
         end

data/lib/capybara-screenshot/saver.rb

@@ -72,6 +72,7 @@ module Capybara
         old_path = Capybara.save_and_open_page_path
         Capybara.save_and_open_page_path = nil
         yield
+      ensure
         Capybara.save_and_open_page_path = old_path
       end
 

data/lib/capybara-screenshot/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Screenshot
-    VERSION = '1.0.9'
+    VERSION = '1.0.10'
   end
 end

data/spec/unit/saver_spec.rb

@@ -119,6 +119,20 @@ describe Capybara::Screenshot::Saver do
     expect(saver).to_not be_html_saved
   end
 
+  context 'when saving a screenshot fails' do
+    it 'still restores the original value of Capybara.save_and_open_page_path' do
+      Capybara.save_and_open_page_path = 'tmp/bananas'
+
+      expect(capybara_mock).to receive(:save_page).and_raise
+
+      expect {
+        saver.save
+      }.to raise_error
+
+      expect(Capybara.save_and_open_page_path).to eq('tmp/bananas')
+    end
+  end
+
   describe '#output_screenshot_path' do
     let(:saver) { Capybara::Screenshot::Saver.new(capybara_mock, page_mock) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Matthew O'Riordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara