gnawrnip 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6af6f42bf91fd705297fbffe6ae646ab12b61f34
-  data.tar.gz: b63314cda20223f47b9085b9ce6812f77b131b56
+  metadata.gz: 28f121a332c225aa6a9be33c505ff2e8052450fb
+  data.tar.gz: 016797eb3184c9d0159b82e935e8f4b29ee9aff2
 SHA512:
-  metadata.gz: 79aec3026d063787269ba122e935eb42c22aa5ac174c65e1328700f82d29bc62d35a62620a3f76024a803ca55734271724e48bf9a2555fa9a43870ada44fe2ab
-  data.tar.gz: 544a546b864326be38eff60454eea7b83aaba559ac5656de9535ce1c7817922aedd315afffc84db0c39bf18f0e6cd74d0d6ecfb5f241947c85b2704e0c31aa2b
+  metadata.gz: 4fcee738f720198d3ad6716c58c1a8b2ed0af60cf09c2451385963e3b1ef376b067a28df54d1ee54e80a5144fda4f86996059c47cdd7b4ee05fb27d1a15d2d98
+  data.tar.gz: 842e30f5b810c1d862316027240f438b623c894743513beaac784db84568b906dda80b1d1a43bbb76c86e9948cf434deca396a6b91cb6e9350f762aa54d29aad

data/Gemfile

@@ -7,4 +7,5 @@ group :example do
   gem 'poltergeist'
   gem 'selenium-webdriver'
   gem 'sinatra'
+  gem 'tilt', '~> 1.4.1'
 end

data/example/.rspec

@@ -1,4 +1,4 @@
 --colour
--r turnip
+-r turnip/rspec
 -r turnip/capybara
 

data/gnawrnip.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'capybara', "~> 2.2"
-  spec.add_dependency 'turnip_formatter', '~> 0.3.0'
+  spec.add_dependency 'turnip_formatter', '~> 0.3.2'
   spec.add_dependency 'oily_png'
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/gnawrnip/developer.rb

@@ -46,4 +46,3 @@ module Gnawrnip
     end
   end
 end
-

data/lib/gnawrnip/ext/capybara/session.rb

@@ -2,15 +2,30 @@ require 'capybara/session'
 
 module Capybara
   class Session
-    SAVE_SCREENSHOT_METHODS = NODE_METHODS + [
-      :visit, :has_title?, :has_no_title?, :go_back, :go_forward
+    SAVE_SCREENSHOT_METHODS = [
+      :click_button,
+      :click_link,
+      :click_link_or_button,
+      :click_on,
+      :fill_in,
+      :choose,
+      :check,
+      :uncheck,
+      :select,
+      :unselect,
+      :attach_file,
+      :execute_script,
+      :go_back,
+      :go_forward,
+      :switch_to_window,
+      :visit
     ]
 
     SAVE_SCREENSHOT_METHODS.each do |method|
       alias_method "after_hook_#{method}".to_sym, method
 
       define_method method do |*args, &block|
-        Gnawrnip.photographer.take_shot
+        Gnawrnip.photographer.take_shot if current_url != 'about:blank'
         send("after_hook_#{method}", *args, &block)
       end
     end

data/lib/gnawrnip/gnawrnip.css

@@ -0,0 +1,39 @@
+div#steps-statistics section.scenario div.steps div.screenshot img {
+    max-width: 90%;
+    border: 2px solid black;
+}
+
+div#steps-statistics section.scenario div.steps div.screenshot.animation > div.nav {
+    text-align: center;
+}
+
+div#steps-statistics section.scenario div.steps div.screenshot.animation > div.nav .pager {
+    margin-left: auto;
+    margin-right: auto;
+}
+
+div#steps-statistics section.scenario div.steps div.screenshot.animation > div.nav .pager span {
+    font-size: 50px;
+    display: inline;
+    color: #999999;
+    cursor: pointer;
+}
+
+div#steps-statistics section.scenario div.steps div.screenshot.animation > div.nav .pager span.cycle-pager-active {
+    color: red;
+}
+
+div#steps-statistics section.scenario div.steps div.screenshot.animation > div.nav .manipulate {
+    margin-bottom: 1em;
+}
+
+div#steps-statistics section.scenario div.steps div.screenshot.animation > div.nav .manipulate i {
+    color: black;
+    cursor: pointer;
+    margin-left: 0.3em;
+    margin-right: 0.3em;
+}
+
+div#steps-statistics section.scenario div.steps div.screenshot.animation > div.nav .manipulate i:hover {
+    color: #aa0000;
+}

data/lib/gnawrnip/image.rb

@@ -8,13 +8,12 @@ module Gnawrnip
     #
     def initialize(filepath)
       @filepath = filepath
-      analysis
     end
 
-    def to_html(format = :png)
-      width  = width
-      height = height
-      src    = "data:image/#{format};base64,#{to_base64}"
+    def to_html
+      width  = canvas.width
+      height = canvas.height
+      src    = canvas.to_data_url
 
       %Q(<img width="#{width}" height="#{height}" src="#{src}"/>)
     end
@@ -23,36 +22,24 @@ module Gnawrnip
     # @return [Fixnum] Width of image
     #
     def width
-      @dimension.width
+      canvas.width
     end
 
     #
     # @return [Fixnum] Height of image
     #
     def height
-      @dimension.height
-    end
-
-    def to_base64
-      Base64.strict_encode64(File.read(@filepath))
+      canvas.height
     end
 
     def resize(width, height)
-      canvas.resample_bilinear(width, height).save(@filepath)
-      analysis
+      canvas.resample_bilinear!(width, height)
     end
 
     private
 
-      #
-      # Update dimension (OilyPNG::Dimension) of Image
-      #
-      def analysis
-        @dimension = canvas.dimension
-      end
-
-      def canvas
-        OilyPNG::Canvas.from_file(@filepath)
-      end
+    def canvas
+      @canvas ||= OilyPNG::Canvas.from_file(@filepath)
+    end
   end
 end

data/lib/gnawrnip/rspec.rb

@@ -5,10 +5,6 @@ RSpec.configure do |config|
     Gnawrnip.ready!
   end
 
-  config.after(:all) do
-    Gnawrnip.finish!
-  end
-
   # https://github.com/jnicklas/capybara/blob/master/lib/capybara/rspec.rb
   fetch_current_example = RSpec.respond_to?(:current_example) ?
     proc { RSpec.current_example } : proc { |context| context.example }
@@ -26,6 +22,10 @@ RSpec.configure do |config|
       Gnawrnip.photographer.take_shot
       screenshots = Gnawrnip.photographer.frames.compact
       example.metadata[:gnawrnip][:screenshot] = screenshots
+    else
+      Gnawrnip.photographer.frames.compact.each do |fp|
+        fp.close!
+      end
     end
   end
 end

data/lib/gnawrnip/screenshot.rb

@@ -1,7 +1,6 @@
 require 'time'
 require 'capybara'
-require 'securerandom'
-require 'fileutils'
+require 'tempfile'
 
 module Gnawrnip
   class Screenshot
@@ -19,9 +18,8 @@ module Gnawrnip
       # @example
       #   image = Gnawrnip::Screenshot.take
       #
-      #
       # @param   [Fixnum]  wait_second  Second to repeat the retry
-      # @return  [String]  Image filename of screenshot
+      # @return  [Tempfile]  Image file of screenshot
       #
       def take(wait_second = Capybara.default_wait_time)
         start_time = Time.now
@@ -48,19 +46,13 @@ module Gnawrnip
       end
 
       #
-      # @return [Gnawrnip::Image]
+      # @return [Tempfile]
       #
       def shot
-        path = filepath
-
-        FileUtils.touch(path)
-        session.save_screenshot(path)
-
-        path
-      end
-
-      def filepath
-        SCREENSHOT_OUTPUT_DIR + '/gnawrnip-' + SecureRandom.uuid + '.png'
+        Tempfile.open(['gnawrnip', '.png']) do |fp|
+          session.save_screenshot(fp.path)
+          fp
+        end
       end
     end
   end

data/lib/gnawrnip/step_screenshot.rb

@@ -1,4 +1,3 @@
-require 'base64'
 require 'turnip_formatter/step_template/exception'
 require 'gnawrnip/developer'
 
@@ -6,8 +5,8 @@ module Gnawrnip
   class StepScreenshot < TurnipFormatter::StepTemplate::Exception
     on_failed :build
 
-    def self.scss
-      File.read(File.dirname(__FILE__) + '/gnawrnip.scss')
+    def self.css
+      File.read(File.dirname(__FILE__) + '/gnawrnip.css')
     end
 
     def build(example)
@@ -46,15 +45,15 @@ module Gnawrnip
         EOS
     end
 
-    def single_image(path)
+    def single_image(file)
       text = '<div class="screenshot">'
-      text += develop([path])
+      text += develop([file])
       text + '</div>'
     end
 
-    def develop(paths)
-      paths.map do |path|
-        image = developer.develop(path)
+    def develop(files)
+      files.map do |file|
+        image = developer.develop(file.path)
         image.to_html
       end.join
     end

data/lib/gnawrnip/version.rb

@@ -1,3 +1,3 @@
 module Gnawrnip
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/gnawrnip.rb

@@ -4,8 +4,6 @@ require 'gnawrnip/rspec'
 require 'gnawrnip/photographer'
 
 module Gnawrnip
-  SCREENSHOT_OUTPUT_DIR = File.expand_path('./gnawrnip_tmp')
-
   class << self
     #
     # [Boolean] Whether to make animation GIF
@@ -35,12 +33,6 @@ module Gnawrnip
     def ready!
       require 'gnawrnip/ext/capybara/session' if animation?
       require 'gnawrnip/step_screenshot'
-
-      FileUtils.mkdir_p(SCREENSHOT_OUTPUT_DIR)
-    end
-
-    def finish!
-      FileUtils.rm_rf(SCREENSHOT_OUTPUT_DIR)
     end
 
     def animation?
@@ -58,6 +50,6 @@ module Gnawrnip
 end
 
 Gnawrnip.configure do |c|
-  c.make_animation    = true
-  c.max_frame_size    = nil
+  c.make_animation = true
+  c.max_frame_size = nil
 end

data/spec/gnawrnip/image_spec.rb

@@ -13,11 +13,7 @@ module Gnawrnip
 
     context 'image size is 640x480' do
       let(:canvas) do
-        double(dimension: dimension, save: nil)
-      end
-
-      let(:dimension) do
-        double(width: 640, height: 480)
+        double(width: 640, height: 480, save: nil)
       end
 
       describe '.width' do
@@ -33,14 +29,10 @@ module Gnawrnip
       describe '.resize' do
         let(:canvas) do
           canvas = super()
-          expect(canvas).to receive(:resample_bilinear).with(320, 240).and_return(canvas)
+          expect(canvas).to receive(:resample_bilinear!).with(320, 240).once
           canvas
         end
 
-        before do
-          expect_any_instance_of(Image).to receive(:analysis).twice
-        end
-
         it { image.resize(320, 240) }
       end
     end

data/spec/gnawrnip/step_screenshot_spec.rb

@@ -18,7 +18,13 @@ module Gnawrnip
       subject { template.build(example) }
 
       context 'has multiple data' do
-        let(:paths) { ['/path/to/A.png', '/path/to/B.png', '/path/to/C.png'] }
+        let(:paths) do
+          [
+            double(path: '/path/to/A.png'),
+            double(path: '/path/to/B.png'),
+            double(path: '/path/to/C.png')
+          ]
+        end
 
         it 'should get image tag and source that base64 encoded' do
           should include '<div class="screenshot animation">'
@@ -27,7 +33,7 @@ module Gnawrnip
       end
 
       context 'has single data' do
-        let(:paths) { ['/path/to/A.png'] }
+        let(:paths) { [double(path: '/path/to/A.png')] }
         it do
           should include '<div class="screenshot">'
           should_not include '<div class="nav">'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gnawrnip
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Wataru MIYAGUNI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: oily_png
   requirement: !ruby/object:Gem::Requirement
@@ -132,8 +132,8 @@ files:
 - lib/gnawrnip.rb
 - lib/gnawrnip/developer.rb
 - lib/gnawrnip/ext/capybara/session.rb
+- lib/gnawrnip/gnawrnip.css
 - lib/gnawrnip/gnawrnip.js
-- lib/gnawrnip/gnawrnip.scss
 - lib/gnawrnip/image.rb
 - lib/gnawrnip/no_screenshot.png
 - lib/gnawrnip/photographer.rb

data/lib/gnawrnip/gnawrnip.scss

@@ -1,47 +0,0 @@
-div#steps-statistics section.scenario {
-    div.steps {
-        div.screenshot {
-           img {
-             max-width: 90%;
-             border: 2px solid black;
-           }
-        }
-
-        div.screenshot.animation {
-            > div.nav {
-                text-align: center;
-
-                .pager {
-                    margin-left: auto;
-                    margin-right: auto;
-
-                    span {
-                        font-size: 50px;
-                        display: inline;
-                        color: #999999;
-                        cursor: pointer;
-
-                        &.cycle-pager-active {
-                            color: red;
-                        }
-                    }
-                }
-
-                .manipulate {
-                    margin-bottom: 1em;
-
-                    i {
-                        color: black;
-                        cursor: pointer;
-                        margin-left: 0.3em;
-                        margin-right: 0.3em;
-
-                        &:hover {
-                            color: #aa0000;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}