gnawrnip 0.2.2 → 0.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6fe6dcc279e3f16ba816e4348d651588d0012594
+  data.tar.gz: 58614d16197b2f281539529b6c010f6cd609097d
+SHA512:
+  metadata.gz: 9ad73dc09318b71443e7cf7003d1022edf4fe8095fa28cfdeefbbb22da327841f326d82ab77a0194a2d59b99e1368ccb6014d73b697729df19560460b1d77d8e
+  data.tar.gz: 1833ffb0f79761ca3e4eed6889e1d9c6570ddf750155bc9692f0445e216d311bdd310e012ef05e61f41f8c8ea335c7a4d477f4c1e57736caccf1a29b5e3289ba

data/example/spec/spec_helper.rb

@@ -21,7 +21,7 @@ Capybara.default_driver = :poltergeist
 Capybara.javascript_driver = :selenium
 
 Gnawrnip.configure do |c|
-  c.frame_interval_ms = 1000
+  c.frame_interval_ms = 200
   c.make_animation    = true
   c.max_frame_size    = 1024 # pixel
 end

data/gnawrnip.gemspec

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

data/lib/gnawrnip/developer.rb

@@ -0,0 +1,49 @@
+require 'gnawrnip/image'
+
+module Gnawrnip
+  class Developer
+    def develop(file)
+      image = Image.new(file)
+      resize(image) if need_resize?
+      image
+    end
+
+    private
+
+    def resize(image)
+      new_width, new_height = calculate_new_size(image.width, image.height)
+
+      return if [new_width, new_height] === [image.width, image.height]
+
+      image.resize(new_width, new_height)
+    end
+
+    def need_resize?
+      !Gnawrnip.max_frame_size.nil?
+    end
+
+    #
+    # Return new frame size (width and height).
+    # This size is keeping original aspect ratio.
+    #
+    # @return  [Array]  New width and height size. [width, height]
+    #
+    def calculate_new_size(width, height)
+      ratio  = width.to_f / height.to_f
+      target = Gnawrnip.max_frame_size
+
+      return [width, height] if target > [width, height].max
+
+      if ratio < 1
+        new_width  = target * ratio
+        new_height = target
+      else
+        new_width  = target
+        new_height = target / ratio
+      end
+
+      return [new_width, new_height]
+    end
+  end
+end
+

data/lib/gnawrnip/image.rb

@@ -0,0 +1,53 @@
+require 'oily_png'
+
+module Gnawrnip
+  class Image
+    #
+    # @parma [File] Screenshot image file (png)
+    #
+    def initialize(file)
+      @file = file
+      analysis
+    end
+
+    #
+    # @return [Fixnum] Width of image
+    #
+    def width
+      @dimension.width
+    end
+
+    #
+    # @return [Fixnum] Height of image
+    #
+    def height
+      @dimension.height
+    end
+
+    def to_base64
+      Base64.strict_encode64(File.read(@file.path))
+    end
+
+    def resize(width, height)
+      canvas.resample_bilinear(width, height).save(@file.path)
+      analysis
+    end
+
+    def close!
+      @file.close!
+    end
+
+    private
+
+      #
+      # Update dimension (OilyPNG::Dimension) of Image
+      #
+      def analysis
+        @dimension = canvas.dimension
+      end
+
+      def canvas
+        OilyPNG::Canvas.from_file(@file)
+      end
+  end
+end

data/lib/gnawrnip/publisher.rb

@@ -4,27 +4,26 @@ module Gnawrnip
   class Publisher
 
     #
-    # @params [Array]  paths  Array of screenshot image filename
+    # @params [Array]  images  Array of Gnawrnip::Image
     #
-    def animation(paths)
-      paths.map { |path| image_tag(path) }.join
+    def animation(images)
+      images.map { |image| image_tag(image) }.join
     end
 
     #
-    # @params [string]  path  Screenshot image filename
+    # @params [Gnawrnip::Image]  image
     #
-    def single(path)
-      image_tag(path)
+    def single(image)
+      image_tag(image)
     end
 
     private
 
-      def image_tag(path, format = :png)
-        %Q|<img src="data:image/#{format.to_s};base64,#{image_base64(path)}"/>|
-      end
-
-      def image_base64(path)
-        Base64.strict_encode64(File.read(path))
+      def image_tag(image, format = :png)
+        width  = image.width
+        height = image.height
+        data   = image.to_base64
+        %Q|<img width="#{width}" height="#{height}" src="data:image/#{format.to_s};base64,#{data}"/>|
       end
   end
 end

data/lib/gnawrnip/screenshot.rb

@@ -1,7 +1,7 @@
 require 'tempfile'
 require 'time'
 require 'capybara'
-require 'oily_png'
+require 'gnawrnip/developer'
 
 module Gnawrnip
   class Screenshot
@@ -28,10 +28,7 @@ module Gnawrnip
         start_time = Time.now
 
         begin
-          tempfile = Tempfile.new(['gnawrnip', '.png'])
-          session.save_screenshot(tempfile.path)
-          resize(tempfile.path) if need_resize?
-          tempfile
+          shot
         rescue Capybara::NotSupportedByDriverError => e
           raise e
         rescue => e
@@ -47,39 +44,13 @@ module Gnawrnip
           Capybara.current_session
         end
 
-        def need_resize?
-          !Gnawrnip.max_frame_size.nil?
-        end
-
-        def resize(path)
-          image = OilyPNG::Canvas.from_file(path)
-          new_width, new_height = calculate_new_size(image.width, image.height)
-
-          image.resample_bilinear!(new_width, new_height)
-          image.save(path)
-        end
-
         #
-        # Return new frame size (width and height).
-        # This size is keeping original aspect ratio.
+        # @return [Gnawrnip::Image]
         #
-        # @return  [Array]  New width and height size. [width, height]
-        #
-        def calculate_new_size(width, height)
-          ratio  = width.to_f / height.to_f
-          target = Gnawrnip.max_frame_size
-
-          return [width, height] if target > [width, height].max
-
-          if ratio < 1
-            new_width  = target * ratio
-            new_height = target
-          else
-            new_width  = target
-            new_height = target / ratio
-          end
-
-          return [new_width, new_height]
+        def shot
+          tempfile = Tempfile.new(['gnawrnip', '.png'])
+          session.save_screenshot(tempfile.path)
+          Developer.new.develop(tempfile)
         end
     end
   end

data/lib/gnawrnip/step_screenshot.rb

@@ -6,16 +6,16 @@ module Gnawrnip
   module StepScreenshot
     class << self
       #
-      # @param  [Array] png_base64_list  array of base64 encoded image
+      # @param  [Array] images  array of Gnawrnip::Image
       #
-      def build(png_base64_list)
-        case png_base64_list.length
+      def build(images)
+        case images.length
         when 0
           ''
         when 1
-          single_image(png_base64_list.first)
+          single_image(images.first)
         else
-          animation_image(png_base64_list)
+          animation_image(images)
         end
       end
 
@@ -25,8 +25,10 @@ module Gnawrnip
               <div class="nav">
                   <div class="pager"></div>
                   <div class="manipulate">
-                      <span class="play selected">&#9654;</span>
-                      <span class="stop">&#9632;</span>
+                      <i class="fa fa-2x fa-step-backward prev"></i>
+                      <i class="fa fa-2x fa-play play"></i>
+                      <i class="fa fa-2x fa-pause pause"></i>
+                      <i class="fa fa-2x fa-step-forward next"></i>
                   </div>
               </div>
               <div class="slides">
@@ -49,43 +51,54 @@ end
 
 module TurnipFormatter
   Template.add_js_file('http://cdnjs.cloudflare.com/ajax/libs/jquery.cycle2/20130801/jquery.cycle2.min.js')
+  Template.add_css_file('http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css')
 
   Template.add_js(<<-EOS)
     $(function() {
         $('.screenshot.animation').each(function() {
             var slide = $(this).find('.slides').cycle({
-                timeout: 1000,
-                autoHeight: "container",
+                timeout: #{Gnawrnip.frame_interval_ms},
+                autoHeight: "calc",
                 pager: $(this).find('div.nav .pager')
             });
 
             var nav = $(this).find('div.nav');
-            var playButton = nav.find('.play');
-            var stopButton = nav.find('.stop');
-
-            var coloringOfStopped = function() {
-                playButton.removeClass("selected");
-                stopButton.addClass("selected");
+            var playButton  = nav.find('.play');
+            var pauseButton = nav.find('.pause');
+            var prevButton  = nav.find('.prev');
+            var nextButton  = nav.find('.next');
+
+            var setPauseManipulate = function() {
+                playButton.show();
+                pauseButton.hide();
+                prevButton.show();
+                nextButton.show();
             };
 
-            var coloringOfPlaying = function() {
-                playButton.addClass("selected");
-                stopButton.removeClass("selected");
+            var setPlayManipulate = function() {
+                playButton.hide();
+                pauseButton.show();
+                prevButton.hide();
+                nextButton.hide();
             };
 
             playButton.click(function() { slide.cycle('resume'); });
-            stopButton.click(function() { slide.cycle('pause'); });
+            pauseButton.click(function() { slide.cycle('pause'); });
+            prevButton.click(function() { slide.cycle('prev'); });
+            nextButton.click(function() { slide.cycle('next'); });
+
+            setPlayManipulate();
 
             slide.on('cycle-pager-activated', function(event, opts) {
                 slide.cycle('pause');
             });
 
             slide.on('cycle-paused', function(event, opts) {
-                coloringOfStopped();
+                setPauseManipulate();
             });
 
             slide.on('cycle-resumed', function(event, opts) {
-                coloringOfPlaying();
+                setPlayManipulate();
             });
         });
     });
@@ -122,13 +135,16 @@ module TurnipFormatter
                     }
 
                     .manipulate {
-                        span {
+                        margin-bottom: 1em;
+
+                        i {
                             color: black;
-                            font-size: 30px;
                             cursor: pointer;
+                            margin-left: 0.3em;
+                            margin-right: 0.3em;
 
-                            &.selected {
-                                color: red;
+                            &:hover {
+                                color: #aa0000;
                             }
                         }
                     }

data/lib/gnawrnip/version.rb

@@ -1,3 +1,3 @@
 module Gnawrnip
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/gnawrnip/developer_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+require 'gnawrnip/developer'
+
+module Gnawrnip
+  describe Developer do
+    let(:developer) do
+      Developer.new
+    end
+
+    before do
+      Image.any_instance.stub(:analysis)
+    end
+
+    context 'No given Gnawrnip.max_frame_size' do
+      describe '.develop' do
+        before do
+          Gnawrnip.max_frame_size = nil
+          Developer.should_not_receive(:resize)
+        end
+
+        it { developer.develop(nil) }
+      end
+    end
+
+    context 'Given Gnawrnip.max_frame_size' do
+      context 'width larger than height.' do
+        describe '.develop' do
+          before do
+            Gnawrnip.max_frame_size = 300
+            Image.any_instance.stub(:width).and_return(640)
+            Image.any_instance.stub(:height).and_return(480)
+            Image.any_instance.should_receive(:resize).with(300, 225)
+          end
+
+          it { developer.develop(nil) }
+        end
+      end
+
+      context 'height larger than width.' do
+        describe '.develop' do
+          before do
+            Gnawrnip.max_frame_size = 400
+            Image.any_instance.stub(:width).and_return(480)
+            Image.any_instance.stub(:height).and_return(640)
+            Image.any_instance.should_receive(:resize).with(300, 400)
+          end
+
+          it { developer.develop(nil) }
+        end
+      end
+
+      context 'Given max_frame_size larger than original.' do
+        describe '.develop' do
+          before do
+            Gnawrnip.max_frame_size = 1024
+            Image.any_instance.stub(:width).and_return(640)
+            Image.any_instance.stub(:height).and_return(480)
+            Image.any_instance.should_not_receive(:resize)
+          end
+
+          it { developer.develop(nil) }
+        end
+      end
+    end
+  end
+end

data/spec/gnawrnip/image_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+require 'gnawrnip/image'
+
+module Gnawrnip
+  describe Image do
+    before do
+      Image.any_instance.stub(:canvas).and_return(canvas)
+    end
+
+    let(:image) do
+      Image.new(GnawrnipTest.image('gnawrnip/image'))
+     end
+
+    context 'image size is 640x480' do
+      let(:canvas) do
+        double(dimension: dimension, save: nil)
+      end
+
+      let(:dimension) do
+        double(width: 640, height: 480)
+      end
+
+      describe '.width' do
+        subject { image.width }
+        it { should eql 640 }
+      end
+
+      describe '.height' do
+        subject { image.height }
+        it { should eql 480 }
+      end
+
+      describe '.resize' do
+        let(:canvas) do
+          canvas = super()
+          canvas.should_receive(:resample_bilinear).with(320, 240).and_return(canvas)
+          canvas
+        end
+
+        before do
+          Image.any_instance.should_receive(:analysis).twice
+        end
+
+        it { image.resize(320, 240) }
+      end
+    end
+  end
+end

data/spec/gnawrnip/photographer_spec.rb

@@ -8,6 +8,7 @@ module Gnawrnip
     end
 
     before do
+      Screenshot.stub(:take).and_return('foo')
       photographer.reset!
       photographer.take_shot
       photographer.take_shot

data/spec/gnawrnip/rspec_spec.rb

@@ -16,6 +16,7 @@ module Gnawrnip
     end
 
     before do
+      Gnawrnip.photographer.stub(:take_shot)
       Gnawrnip.photographer.stub(:frames) { ['aiueo', nil, 'lllll'] }
     end
 

data/spec/gnawrnip/screenshot_spec.rb

@@ -11,8 +11,9 @@ module Gnawrnip
           end
         end
 
-        subject { lambda { Screenshot.take } }
-        it { should raise_error Capybara::NotSupportedByDriverError }
+        it 'should raise Capybara::NotSupportByDriverError' do
+          expect { Screenshot.take }.to raise_error Capybara::NotSupportedByDriverError
+        end
       end
     end
 
@@ -30,81 +31,24 @@ module Gnawrnip
             Time.stub(:now).and_return(now, now + 3)
           end
 
-          subject do
-            lambda {
+          it 'should raise Timeout Error' do
+            expect {
               Capybara.using_wait_time 2 do
                 Screenshot.take
               end
-            }
+            }.to raise_error Timeout::Error
           end
-
-          it { should raise_error Timeout::Error }
         end
       end
     end
 
-    context 'No given Gnawrnip.max_frame_size' do
+    context 'success screenshot' do
       describe '.take' do
-        subject { Screenshot.take.read }
-
-        context 'No given max frame size' do
-          before do
-            Gnawrnip.max_frame_size = nil
-            Screenshot.should_not_receive(:resize)
-          end
-
-          it { should == "screenshot" }
-        end
-      end
-    end
-
-    context 'Given Gnawrnip.max_frame_size' do
-      before do
-        OilyPNG::Canvas.stub(:from_file) { oily_png }
-      end
-
-      subject { Screenshot.take.read }
-
-      context 'width larger than height.' do
-        let(:oily_png) do
-          oily_png = double('oily_png', width: 640, height: 480, save: nil)
-          oily_png.should_receive(:resample_bilinear!).with(300, 225)
-          oily_png
-        end
-
-        before do
-          Gnawrnip.max_frame_size = 300
-        end
-
-        it { should == "screenshot" }
-      end
-
-      context 'height larger than width.' do
-        let(:oily_png) do
-          oily_png = double('oily_png', width: 480, height: 640, save: nil)
-          oily_png.should_receive(:resample_bilinear!).with(300, 400)
-          oily_png
-        end
-
-        before do
-          Gnawrnip.max_frame_size = 400
-        end
-
-        it { should == "screenshot" }
-      end
-
-      context 'Given max_frame_size larger than original.' do
-        let(:oily_png) do
-          oily_png = double('oily_png', width: 640, height: 480, save: nil)
-          oily_png.should_receive(:resample_bilinear!).with(640, 480)
-          oily_png
-        end
-
         before do
-          Gnawrnip.max_frame_size = 1024
+          Screenshot.should_receive(:shot).once
         end
 
-        it { should == "screenshot" }
+        it { Screenshot.take }
       end
     end
   end

data/spec/gnawrnip/step_screenshot_spec.rb

@@ -15,30 +15,26 @@ module Gnawrnip
       context 'has multiple data' do
         let(:data_list) do
           [
-            GnawrnipTest.image('aiueo'),
-            GnawrnipTest.image('12345'),
-            GnawrnipTest.image('abcde')
+            double(to_base64: 'aiueo', width: 640, height: 480),
+            double(to_base64: '12345', width: 512, height: 200),
+            double(to_base64: 'abcde', width: 640, height: 320)
           ]
         end
 
         it 'should get image tag and source that base64 encoded' do
-          data1 = Base64.strict_encode64('aiueo')
-          data2 = Base64.strict_encode64('12345')
-          data3 = Base64.strict_encode64('abcde')
           should include '<div class="screenshot animation">'
-          should include '<img src="data:image/png;base64,' + data1 + '"/>'
-          should include '<img src="data:image/png;base64,' + data2 + '"/>'
-          should include '<img src="data:image/png;base64,' + data3 + '"/>'
+          should include '<img width="640" height="480" src="data:image/png;base64,aiueo"/>'
+          should include '<img width="512" height="200" src="data:image/png;base64,12345"/>'
+          should include '<img width="640" height="320" src="data:image/png;base64,abcde"/>'
           should include '<div class="nav">'
         end
       end
 
       context 'has single data' do
-        let(:data_list) { [GnawrnipTest.image('aiueo')] }
+        let(:data_list) { [ double(to_base64: 'abcde', width: 640, height: 480) ] }
         it {
-          data = Base64.strict_encode64('aiueo')
           should include '<div class="screenshot">'
-          should include '<img src="data:image/png;base64,' + data + '"/></div>'
+          should include '<img width="640" height="480" src="data:image/png;base64,abcde"/></div>'
           should_not include '<div class="nav">'
         }
       end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: gnawrnip
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.2.3
 platform: ruby
 authors:
 - Wataru MIYAGUNI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-16 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,39 +27,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: turnip_formatter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 0.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 0.2.9
 - !ruby/object:Gem::Dependency
   name: oily_png
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,49 +69,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Gnawrnip is a TurnipFormatter Add-on that provides put a screen shot
@@ -145,7 +130,9 @@ files:
 - example/web.rb
 - gnawrnip.gemspec
 - lib/gnawrnip.rb
+- lib/gnawrnip/developer.rb
 - lib/gnawrnip/ext/capybara/session.rb
+- lib/gnawrnip/image.rb
 - lib/gnawrnip/no_screenshot.png
 - lib/gnawrnip/photographer.rb
 - lib/gnawrnip/publisher.rb
@@ -153,6 +140,8 @@ files:
 - lib/gnawrnip/screenshot.rb
 - lib/gnawrnip/step_screenshot.rb
 - lib/gnawrnip/version.rb
+- spec/gnawrnip/developer_spec.rb
+- spec/gnawrnip/image_spec.rb
 - spec/gnawrnip/photographer_spec.rb
 - spec/gnawrnip/rspec_spec.rb
 - spec/gnawrnip/screenshot_spec.rb
@@ -161,35 +150,30 @@ files:
 homepage: https://github.com/gongo/gnawrnip
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 95231575692747815
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 95231575692747815
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Add-on for TurnipFormatter with Capybara
 test_files:
+- spec/gnawrnip/developer_spec.rb
+- spec/gnawrnip/image_spec.rb
 - spec/gnawrnip/photographer_spec.rb
 - spec/gnawrnip/rspec_spec.rb
 - spec/gnawrnip/screenshot_spec.rb