daddy 0.1.6 → 0.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWE4YWYwZTQ0ODgzYTlmMjY2YzgzYzkyNzc1OTE4MGUzNWFhN2YyNg==
+    MjljYjA5YjlmM2NiMWY0MmE1YjYxOWQ5MTU1OGE4MmM4ZjVkMzI5NA==
   data.tar.gz: !binary |-
-    NDkyMzI2ZWFmYWU3Mjc2MmViZjc5MDJiODAzNzE0YTYyMTg0OTMxNg==
+    MTlkNmZiNDBjNjNmMDJmYjg5NDFmYTYxMTkzODRhMjhiMGE5MWY3Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWM3MGU0ODc5OTE2MjNmYmM5Nzk2NWQ2MjAyOGViYTg5NjFkZGVmMTczODQ1
-    ZGQxM2NlMjQxNjBkNzU2ZTg3NWM0N2YyNWYzYzVjM2M5ZDViNjIzYmVlYWJi
-    YmYzMzBiYzUyNjA4NjQ3M2FkMTI0MjIzNjMzNTU4MGI2Mzk2MTk=
+    YWE0YzE5OGY3ODYxYzZjMDgyNDE3ZDc1MGE2MGMyMDk5NTYwYTk5NTViYzk2
+    NjY3YTg1NjcwNmE4MmYxMGIxMDQxYThlY2U1MDhjOGRkMTgzZGQ5YmJjMjIy
+    YTdlZGRkMWVkOTBmZGVkMDUwNmVlMzJhMzJjMDQzYjMzYzA3OTI=
   data.tar.gz: !binary |-
-    NDM5NDI5NjhiMTQ2ZWM4NWMzN2IwMTRmZjdkMWMzNjc3NWY1ZWE4OWMyMDVj
-    ZmQ0NjQ4M2Q5ZTczNDE1NmY5YjljODY2NmI4NmU1Y2Y4YzlmZDcyNGU3MDZl
-    ZTY2NjgzZTVhMGE4ZWQ1MDcwNmNlZmJhYjRjMDRlZGE0YmY1NGI=
+    MTFlZDc4ZTJmMzljYjNiOTE5NjU1ZjJhOTQwNGY0YTI2Njc5YjZmOTcwMjBh
+    ZDVmYjZmOGI4MTIzNTU3MjY4YTIxMGZiZWRkZjllMjFmNzQ1NzljMTM3MDk1
+    MTdhMmUzM2U5ZThiNDkzOTJhOGI0Y2JhZmY4YTE4NzdkMWY0NDg=

data/lib/daddy/cucumber/assert.rb

@@ -5,13 +5,7 @@ module Daddy
     module Assert
       def assert_url(path, params = {})
         # スクリーンショットの保存
-        url_without_domain = remove_domain(current_url)
-      
-        begin
-          capture url_without_domain
-        rescue
-          puts "URL： #{url_without_domain}"
-        end
+        capture
       
         # パスのチェック
         re = path.gsub(/\//, '\/')
@@ -112,10 +106,7 @@ module Daddy
         end
         ret
       end
-      
-      def remove_domain(url)
-        url.sub(/http:\/\/([^\/:]+)(:[0-9]+)?\/(.+)/) { "/#{$3}" }
-      end
+
     end
   end
 end

data/lib/daddy/cucumber/capture.rb

@@ -10,10 +10,10 @@ module Daddy
       @@_screen_count = 0
       @@_browser_resized = false
     
-      def capture(url = nil)
+      def capture
         pause
-    
-        url ||= remove_domain(current_url)
+
+        url = Rack::Utils.unescape(current_url)
     
         @@_screen_count += 1
     
@@ -30,7 +30,7 @@ module Daddy
         unless @@_browser_resized
           case Capybara.current_driver
           when :poltergeist
-            # TODO
+            Capybara.current_session.driver.resize(width, height)
           when :selenium
             Capybara.current_session.driver.browser.manage.window.resize_to(width, height)
           when :webkit

data/lib/daddy/formatter/daddy.js

@@ -0,0 +1,9 @@
+function toggle_feature_dir(feature_dir) {
+  $(feature_dir).parent('div.feature_dir').nextUntil('div.feature_dir').toggle(250);
+};
+
+$(document).ready(function() {
+  $('div.feature_dir span').hover(function() {
+    $(this).css('cursor', 'pointer');
+  });
+});

data/lib/daddy/formatter/daddy_html.rb

@@ -4,6 +4,31 @@ module Daddy
   module Formatter
     module DaddyHtml
       
+      def before_menu
+        if ENV['PUBLISH']
+          @builder << "<div>"
+
+          @builder.div(:id => 'menu') do
+              @builder << make_menu_for_publish
+          end
+
+          @builder << "<div class='contents'>"
+        end
+      end
+
+      def after_menu
+        if ENV['PUBLISH']
+          @builder << '</div>'
+          @builder << '</div>'
+        end
+      end
+
+      def make_menu_for_publish
+        menu = Rails.root + '/tmp/menu.html'
+        system("erb -T - #{File.dirname(__FILE__)}/menu.html.erb > #{menu}")
+        File.readlines(menu).join
+      end
+
       def feature_dir(feature, short = false)
         ret = ''
         

data/lib/daddy/formatter/html.rb

@@ -26,6 +26,7 @@ module Daddy
         @header_red = nil
         @delayed_messages = []
         @img_id = 0
+        @inside_outline = false
       end
 
       def embed(src, mime_type, label)
@@ -44,17 +45,26 @@ module Daddy
         end
       end
 
+
       def before_features(features)
         @step_count = features.step_count
 
-        @builder.declare!(:DOCTYPE, :html)
+        # <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+        @builder.declare!(
+          :DOCTYPE,
+          :html,
+          :PUBLIC,
+          '-//W3C//DTD XHTML 1.0 Strict//EN',
+          'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
+        )
+
         @builder << '<html>'
-        @builder << '<head>'
+          @builder.head do
           @builder.meta('http-equiv' => 'Content-Type', :content => 'text/html;charset=utf-8')
-          @builder.title 'Daddy'
+          @builder.title 'Cucumber'
           inline_css
           inline_js
-        @builder << '</head>'
+        end
         @builder << '<body>'
         @builder << "<!-- Step count #{@step_count}-->"
         @builder << '<div class="cucumber">'
@@ -75,31 +85,6 @@ module Daddy
         before_menu
       end
 
-      def before_menu
-        if ENV['PUBLISH']
-          @builder << "<div>"
-  
-          @builder.div(:id => 'menu') do
-              @builder << make_menu_for_publish
-          end
-  
-          @builder << "<div class='contents'>"
-        end
-      end
-
-      def after_menu
-        if ENV['PUBLISH']
-          @builder << '</div>'
-          @builder << '</div>'
-        end
-      end
-
-      def make_menu_for_publish
-        menu = Rails.root + '/tmp/menu.html'
-        system("erb -T - #{File.dirname(__FILE__)}/menu.html.erb > #{menu}")
-        File.readlines(menu).join
-      end
-
       def after_features(features)
         after_menu
         print_stats(features)
@@ -110,13 +95,16 @@ module Daddy
 
       def before_feature(feature)
         dir = feature_dir(feature)
-        if @feature_dir != dir
-          @builder << '<div class="feature_dir"><span class="val">'
-          @builder << dir
-          @builder << '</span></div>'
-        end 
+        if dir.present?
+          if @feature_dir != dir
+            @builder << '<div class="feature_dir"><span class="val" onclick="toggle_feature_dir(this);">'
+            @builder << dir
+            @builder << '</span></div>'
+          end
+
+          @feature_dir = dir
+        end
 
-        @feature_dir = dir
         @feature = feature
         @exceptions = []
         @builder << '<div class="feature">'
@@ -233,6 +221,7 @@ module Daddy
       end
 
       def before_outline_table(outline_table)
+        @inside_outline = true
         @outline_row = 0
         @builder << '<table>'
       end
@@ -240,6 +229,7 @@ module Daddy
       def after_outline_table(outline_table)
         @builder << '</table>'
         @outline_row = nil
+        @inside_outline = false
       end
 
       def before_examples(examples)
@@ -259,7 +249,7 @@ module Daddy
       end
 
       def before_steps(steps)
-        @builder << '<ol style="display: none;">'
+        @builder << '<ol>'
       end
 
       def after_steps(steps)
@@ -293,7 +283,7 @@ module Daddy
         @status = status
         return if @hide_this_step
         set_scenario_color(status)
-        
+
         if ! @delayed_messages.empty? and status == :passed
           @builder << "<li id='#{@step_id}' class='step #{status} expand'>"
         else
@@ -415,7 +405,7 @@ module Daddy
         attributes = {:id => "#{@row_id}_#{@col_index}", :class => 'step'}
         attributes[:class] += " #{status}" if status
         build_cell(@cell_type, value, attributes)
-        set_scenario_color(status)
+        set_scenario_color(status) if @inside_outline
         @col_index += 1
       end
 
@@ -429,7 +419,7 @@ module Daddy
 
         #@builder.ol do
           @delayed_messages.each_with_index do |ann, i|
-            @builder.li(:id => "#{@step_number}_#{i}", :class => 'step message') do
+            @builder.li(:id => "#{@step_number}_#{i}", :class => 'step message', :style => 'display: none;') do
               @builder << ann
             end
           end
@@ -577,20 +567,15 @@ module Daddy
       end
 
       def inline_js
-        @builder.script do
+        @builder.script(:type => 'text/javascript') do
           @builder << inline_jquery
+          @builder << inline_daddy
           @builder << inline_js_content
+
           if should_expand
             @builder << %w{
               $(document).ready(function() {
-                $(SCENARIOS).siblings().show();
-                $('li.message').hide();
-                });
-            }.join
-          else
-            @builder << %w{
-              $(document).ready(function() {
-                $('li.message').hide();
+                $('#expander').click();
                 });
             }.join
           end
@@ -601,6 +586,10 @@ module Daddy
         File.read(File.dirname(__FILE__) + '/jquery-min.js')
       end
 
+      def inline_daddy
+        File.read(File.dirname(__FILE__) + '/daddy.js')
+      end
+
       def inline_js_content
         <<-EOF
 
@@ -615,7 +604,6 @@ module Daddy
     $("#collapser").css('cursor', 'pointer');
     $("#collapser").click(function() {
       $(SCENARIOS).siblings().hide();
-      $('li.message').hide();
     });
 
     $("#expander").css('cursor', 'pointer');
@@ -646,7 +634,7 @@ module Daddy
       end
 
       def move_progress
-        @builder << " <script>moveProgressBar('#{percent_done}');</script>"
+        @builder << " <script type=\"text/javascript\">moveProgressBar('#{percent_done}');</script>"
       end
 
       def percent_done
@@ -672,8 +660,8 @@ module Daddy
       end
 
       def print_stats(features)
-        @builder <<  "<script>document.getElementById('duration').innerHTML = \"Finished in <strong>#{format_duration(features.duration)} seconds</strong>\";</script>"
-        @builder <<  "<script>document.getElementById('totals').innerHTML = \"#{print_stat_string(features)}\";</script>"
+        @builder <<  "<script type=\"text/javascript\">document.getElementById('duration').innerHTML = \"Finished in <strong>#{format_duration(features.duration)} seconds</strong>\";</script>"
+        @builder <<  "<script type=\"text/javascript\">document.getElementById('totals').innerHTML = \"#{print_stat_string(features)}\";</script>"
       end
 
       def print_stat_string(features)
@@ -750,4 +738,4 @@ module Daddy
       end
     end
   end
-end
+end

data/lib/tasks/phantomjs.rake

@@ -7,7 +7,7 @@ namespace :dad do
 
     desc "PhantomJSをインストールします。"
     task :install do
-      name = 'phantomjs-1.9.0-linux-x86_64'
+      name = 'phantomjs-1.9.1-linux-x86_64'
       file = "#{name}.tar.bz2"
       unless File.exist?("tmp/#{file}")
         system("wget https://phantomjs.googlecode.com/files/#{file} -O tmp/#{file}")

data/lib/tasks/publish.rake

@@ -11,7 +11,7 @@ namespace :dad do
     system("mkdir -p features/reports")
     system("rm -Rf features/reports/*")
 
-    fail unless system("bundle exec rake dad:cucumber PUBLISH=true EXPAND=false features/開発日記")
+    fail unless system("bundle exec rake dad:cucumber PUBLISH=true features/開発日記")
     system("mkdir -p features/reports/diary")
     system("mv features/reports/index.html features/reports/diary")
     system("mv features/reports/images features/reports/diary")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -232,6 +232,7 @@ files:
 - lib/daddy/formatter/daddy_html.rb
 - lib/daddy/formatter/daddy.css
 - lib/daddy/formatter/cucumber.css
+- lib/daddy/formatter/daddy.js
 - lib/daddy/formatter/jquery-min.js
 - lib/daddy/railtie.rb
 - lib/daddy/models/acts_as_like.rb