daddy 0.3.26 → 0.3.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d05f32a7716826aee0c54ebb8b8d537415e6314
-  data.tar.gz: d8907de3a6079ac95b4a860499a505ac6e9b714e
+  metadata.gz: ddcc1a299d62f5d6236c3737303b57f47fe69101
+  data.tar.gz: 813bf1c9f10fc4b2cf8fc221205e385c56c4df88
 SHA512:
-  metadata.gz: 09d8a1f63d6240b47f65eedbdfed88e9f1c88833fc0cbeca8fd43d20c86f644ca91cc75f12ebf3a1595d174bc67da61ab702b1686ee3733ab1ad0186d970bced
-  data.tar.gz: e33b3bbe129f6c169cdbe20922ca72453328d77754786bea48d036c36e8f03508157e98b0196d7201e26245e2110aa85b0bdc71321f6dc6505128eaccee227b1
+  metadata.gz: 1edaf332c854b8ad4af1b491c2998a65e9e46392bcd0ebed7904ff6516a88e5b2b073027900052b004bb63fbe10ab970968dbd2eaf545586d8edb8e2e79689b4
+  data.tar.gz: 7d9cae5f76a36b40751b5062a536b8b5d40d72da35dabe649d535144c96065af19a0964734bedf95635f05ed9563b67daca8ac484d83c8e2f547fdfa65607035

data/lib/daddy/cucumber/helpers/capture.rb

@@ -1,7 +1,7 @@
 module Daddy
   module Cucumber
     module Capture
-      feature_dir = 'feature'
+      feature_dir = 'features'
       ARGV.each_with_index do |arg, i|
         if arg == '-r'
           feature_dir = ARGV[i + 1]
@@ -16,6 +16,9 @@ module Daddy
       @@_images = []
     
       def capture(options = {})
+        options ||= {}
+        options = {:title => options} if options.is_a?(String)
+
         pause
         return if ENV['FORMAT'] == 'junit'
 
@@ -26,10 +29,12 @@ module Daddy
         image = "#{IMAGE_DIR}/#{@@_screen_count}.png"
         page.driver.save_screenshot("#{REPORT_DIR}/#{image}", :full => true)
 
+        image_tag = "<img class=\"screenshot\" src=\"#{image}\" title=\"#{options[:title]}\" alt=\"#{url}\"/>"
+
         if options[:flash]
-          puts "<img class=\"screenshot\" src=\"#{image}\" alt=\"#{url}\"/>"
+          puts image_tag
         else
-          @@_images << "<img class=\"screenshot\" src=\"#{image}\" alt=\"#{url}\"/>"
+          @@_images << image_tag
         end
       end
 

data/lib/daddy/formatter/screenshot.js

@@ -1,18 +1,38 @@
-$(document).ready(function() {
-  var viewer = $('<div id="screenshot_viewer" style="display: none;"></div>');
-  viewer.css({position: 'absolute'});
-  viewer.appendTo(document.body);
+if (typeof daddy === "undefined") {
+  var daddy = {};
+}
+daddy.screenshot = {};
 
-  $('.screenshot').click(function() {
-    var clone= $(this).clone().removeClass('screenshot');
-    clone.click(function() {
-      viewer.hide();
-    });
-    
-    viewer.empty().append(clone);
+daddy.screenshot.get_or_create_viewer = function() {
+  if (!this.viewer) {
+    this.viewer = $('<div id="screenshot_viewer" style="display: none;"></div>');
+    this.viewer.css({position: 'absolute'}).appendTo('body');
+    this.viewer.show_image = function(image) {
+      var clone= $(image).clone().removeClass('screenshot');
     
-    viewer.css('left', $(window).scrollLeft());
-    viewer.css('top', $(window).scrollTop());
-    viewer.show();
+      this.empty().append(clone);
+      this.css('left', $(window).scrollLeft());
+      this.css('top', $(window).scrollTop());
+      this.show();
+    };
+    this.viewer.close = function() {
+      this.hide();
+    };
+  }
+  
+  return this.viewer;
+};
+
+var viewer = null;
+
+$(document).ready(function() {
+  viewer = daddy.screenshot.get_or_create_viewer();
+
+  $('body').click(function(e) {
+    viewer.close();
+    if ($(e.target).hasClass('screenshot')) {
+      viewer.show_image(e.target);
+    }
   });
+
 });

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.3.26'.freeze
+  VERSION = '0.3.27'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.3.26
+  version: 0.3.27
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara