cucumber-cinema 0.5.0 → 0.6.0

data/README.rdoc

@@ -17,24 +17,14 @@ And bundle bundle install
 Install wkhtmltoimage (https://github.com/csquared/IMGKit)
 
 Add this to features/support/cucumber_screenhot.rb
+  CucumberCinema::ViewSelectStrategy::new_movie
   After do
-    embed_screenshot(scenario, :prefix=>"my-refix") if defined?(CucumberCinema)
+    screenshot_emails
   end
 
 Run your cucumber suite and screenshots will be generated in directory tmp/capybara
 
-If running spork, add this to the env.rb file
-  Spork.each_run do
-    CucumberCinema::new_movie
-  end
-
-
-  Spork.prefork do
-    World(CucumberCinema)
-  end
-  
-If you want to take a screenhot of a scenario regardless of what cinema decides, tag it with @action
-
+Doesn't workwith spork yet
 == Contributing to cucumber-cinema
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/cucumber-cinema.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber-cinema}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Ilya Katz}]
-  s.date = %q{2011-08-04}
+  s.date = %q{2011-08-11}
   s.description = %q{Take a series of screenshots while running your cucumber test suite}
   s.email = %q{ilyakatz@gmail.com}
   s.extra_rdoc_files = [
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
     "cucumber-cinema.gemspec",
     "lib/cucumber-cinema.rb",
     "lib/cucumber_cinema/camera.rb",
-    "lib/cucumber_cinema/path_strategy.rb",
+    "lib/cucumber_cinema/view_strategy.rb",
     "public/galleria/LICENSE",
     "public/galleria/galleria-1.2.5.js",
     "public/galleria/galleria-1.2.5.min.js",

data/lib/cucumber-cinema.rb

@@ -1,45 +1,33 @@
 require 'capybara/util/save_and_open_page'
 require 'cucumber_cinema/camera'
-require 'cucumber_cinema/path_strategy'
+require 'cucumber_cinema/view_strategy'
 module CucumberCinema
 
-  BODY_HASHES=[]
-  SCREENSHOT_DIR_NAME=["#{Time.new.strftime("%Y%m%d%H%M%S")}"]
-  EMAILS={}
-
-  def embed_screenshot(scenario=nil, options={})
-
-    if take_screenshot?(scenario, :url=>current_url)
-      BODY_HASHES<<path
-      CucumberCinema::Camera.new(options).take_screenshot(body)
+  def screenshot_emails(options)
+    current_emails = ActionMailer::Base.deliveries.uniq { |x| x.subject }
+    new_emails = current_emails.select { |k, v| !$cucumber_cinema_emails.key?(k.subject) }
+    new_emails.each { |k, v| $cucumber_cinema_emails[k.subject]=v }
+    new_emails.each_with_index do |e, i|
+      CucumberCinema::Camera.new(options).take_screenshot("<h1>#{e.subject}</h1><pre>#{e}</pre><hr />")
     end
-
-    collect_emails(options)
-    
-  end
-
-  def self.new_movie
-    BODY_HASHES.clear
-    SCREENSHOT_DIR_NAME.clear
-    SCREENSHOT_DIR_NAME<<"#{Time.new.strftime("%Y%m%d%H%M%S")}"
-    EMAILS.clear
   end
 
-  protected
+end
 
+#DOESN' WORK WITH Spork Yet
+module ActionView
+  module Rendering
 
-  #determines whether or not to take a screenshot
-  def take_screenshot?(scenario, options)
-    CucumberCinema::PathStrategy.new.take_screenshot?(scenario, options)
-  end
+    alias_method :render_old, :render
 
-  def collect_emails(options)
-    current_emails = ActionMailer::Base.deliveries.uniq{|x|x.subject}
-    new_emails = current_emails.select { |k, v| !EMAILS.key?(k.subject) }
-    new_emails.each { |k, v| EMAILS[k.subject]=v }
-    new_emails.each_with_index do |e, i|
-      CucumberCinema::Camera.new(options).take_screenshot("<h1>#{e.subject}</h1><pre>#{e}</pre><hr />")
+    def render(options = {}, locals = {}, &block)
+      if CucumberCinema::ViewSelectStrategy.take_screenshot?(request)
+        body = render_old(options, locals, &block)
+        ::CucumberCinema::Camera.new.take_screenshot(body)
+      end
+      render_old(options, locals, &block)
     end
   end
-
 end
+
+World(CucumberCinema)

data/lib/cucumber_cinema/camera.rb

@@ -1,23 +1,11 @@
 module CucumberCinema
   class Camera
 
-    def initialize(options={})
-      if options[:location]
-        @location=options[:location]
-      else
-        @location="#{Rails.root}/tmp/screenshots/"
-      end
-
-      @prefix = options[:prefix].present? ? options[:prefix] : "take-"
-      @pictures=[]
-    end
-
     def take_screenshot(body)
-      screenshot_dir_name = SCREENSHOT_DIR_NAME.first
-      create_directory(screenshot_dir_name)
-      filename="#{screenshot_dir_name}/#{@prefix}-#{rand(10**10)}"
-      Capybara.save_page(body, "#{filename}.html")
-      `wkhtmltoimage #{Capybara.save_and_open_page_path}/#{filename}.html #{@location}/#{filename}.png`
+      create_directory($cucumber_cinema_dir_name)
+      filename="#{$cucumber_cinema_dir_name}/#{$cucumber_cinema_prefix}-#{rand(10**10)}"
+      Capybara.save_page(body.to_str, "#{filename}.html")
+      `wkhtmltoimage #{Capybara.save_and_open_page_path}/#{filename}.html #{$cucumber_cinema_location}/#{filename}.png`
     end
 
     protected
@@ -27,17 +15,11 @@ module CucumberCinema
       if !Dir.exist?("#{Capybara.save_and_open_page_path}/#{screenshot_dir_name}")
         Dir.mkdir("#{Capybara.save_and_open_page_path}/#{screenshot_dir_name}")
       end
-      Dir.mkdir("#{@location}") if !Dir.exist?(@location)
-      Dir.mkdir("#{@location}/#{screenshot_dir_name}") if !Dir.exist?("#{@location}/#{screenshot_dir_name}")
+      Dir.mkdir("#{$cucumber_cinema_location}") if !Dir.exist?($cucumber_cinema_location)
+      if !Dir.exist?("#{$cucumber_cinema_location}/#{screenshot_dir_name}")
+        Dir.mkdir("#{$cucumber_cinema_location}/#{screenshot_dir_name}")
+      end
     end
-#
-#    def create_theater
-#      @files=@pictures
-#      html_path="#{File.dirname(__FILE__)}/../../public/index.html.erb"
-#      html=ERB.new(File.read(html_path)).result
-#      File.open("#{@location}/index.html", 'w') { |f| f.write(doc) }
-#
-#    end
 
   end
 end

data/lib/cucumber_cinema/view_strategy.rb

@@ -0,0 +1,24 @@
+module CucumberCinema
+  module ViewSelectStrategy
+
+    def self.take_screenshot?(request)
+      return false unless request
+      current_shot = "#{request.filtered_parameters["controller"]}-#{request.filtered_parameters["action"]}-#{request.method}"
+      if !$cucumber_cinema_screenshots[current_shot]
+        $cucumber_cinema_screenshots[current_shot] = 1
+        true
+      else
+        false
+      end
+    end
+
+    def self.new_movie(options={})
+      $cucumber_cinema_screenshots = {}
+      $cucumber_cinema_dir_name = "#{Time.new.strftime("%Y%m%d%H%M%S")}"
+      $cucumber_cinema_emails = {}
+      $cucumber_cinema_location=options[:location] || "#{Rails.root}/tmp/screenshots/"
+      $cucumber_cinema_prefix = options[:prefix].present? ? options[:prefix] : "take"
+    end
+
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber-cinema
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Ilya Katz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-04 00:00:00 Z
+date: 2011-08-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -125,7 +125,7 @@ files:
 - cucumber-cinema.gemspec
 - lib/cucumber-cinema.rb
 - lib/cucumber_cinema/camera.rb
-- lib/cucumber_cinema/path_strategy.rb
+- lib/cucumber_cinema/view_strategy.rb
 - public/galleria/LICENSE
 - public/galleria/galleria-1.2.5.js
 - public/galleria/galleria-1.2.5.min.js

data/lib/cucumber_cinema/path_strategy.rb

@@ -1,23 +0,0 @@
-module CucumberCinema
-  class PathStrategy
-
-    #determines whether or not to take a screenshot
-    def take_screenshot?(scenario, options={})
-      current_url=options[:url]
-      #always take screenshots of scenario's with tag @action
-      if scenario and scenario.source_tag_names.include?("@action")
-        return true
-      end
-      if current_url
-        #remove parameters and such
-        path = URI.parse(current_url).path
-        #remove model id's
-        path = current_url.gsub(/\d+/, '')
-        !BODY_HASHES.include?(path)
-      else
-        true
-      end
-    end
-
-  end
-end