daddy 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f142153fb20a1e67c0736ce49e1c8da9c5dd4659
-  data.tar.gz: c330563953f11d762ea2c7ce15f398e49f4ff769
+  metadata.gz: 68b78966f137f5270877d47e65e5581e55d4a3dd
+  data.tar.gz: c3a72820a52f321b055d1b646537c989ccc0874f
 SHA512:
-  metadata.gz: 7ec28b26bc2a9eb5c916df39fdf0b7af53b825827b254fd8de9e1d30337fe1eb4f0dd974b5df171ae998be835e52e4c2c5fa277b34ab451d35f5fca55c3e86f8
-  data.tar.gz: 23613cd11cd440a21b1ea96c870bbf4a41b404852d17b24a2e6c00e9f9eccd97f9ef28374fc235c392599097b3cb0248011f1beaa561aadcecec4d79eb781de7
+  metadata.gz: 714c8bd97ad7173ec6cd44dc6f7d6f71d703e19c2033d3865aed6feb4ad279021ba1658414c29cab4763bfea1e08a4099d179dcf9c8a60b2af90f5211ce71bbc
+  data.tar.gz: 189c7b55ce25e53658a6ae97a0ac01f73b15a0daf6336eb70b4e66d135b7e06302ad44ba63a27154229c96c4c7ca77409f875dbfb6842b3ecb0a3371be4e0898

data/lib/daddy/formatter/html.rb

@@ -19,12 +19,31 @@ module Daddy
         @buffer = {}
         @builder = create_builder(@io)
         @feature_number = 0
+        @scenario_number = 0
         @step_number = 0
         @header_red = nil
         @delayed_messages = []
+        @img_id = 0
         @inside_outline = false
       end
 
+      def embed(src, mime_type, label)
+        case(mime_type)
+        when /^image\/(png|gif|jpg|jpeg)/
+          embed_image(src, label)
+        end
+      end
+
+      def embed_image(src, label)
+        id = "img_#{@img_id}"
+        @img_id += 1
+        @builder.span(:class => 'embed') do |pre|
+          pre << %{<a href="" onclick="img=document.getElementById('#{id}'); img.style.display = (img.style.display == 'none' ? 'block' : 'none');return false">#{label}</a><br>&nbsp;
+          <img id="#{id}" style="display: none" src="#{src}"/>}
+        end
+      end
+
+
       def before_features(features)
         @step_count = features.step_count
 
@@ -118,7 +137,7 @@ module Daddy
       def feature_name(keyword, name)
         title = feature_dir(@feature, true) + @feature.file.split('/').last.gsub(/\.feature/, '')
         lines = name.split(/\r?\n/)
-
+        return if lines.empty?
         @builder.h2 do |h2|
           @builder.span(:class => 'val') do
             @builder << title
@@ -159,6 +178,7 @@ module Daddy
       end
 
       def before_feature_element(feature_element)
+        @scenario_number+=1
         @scenario_red = false
         css_class = {
           ::Cucumber::Ast::Scenario        => 'scenario',
@@ -229,6 +249,7 @@ module Daddy
       end
 
       def before_step(step)
+        @step_id = step.dom_id
         @step_number += 1
         @step = step
       end
@@ -333,7 +354,7 @@ module Daddy
       def doc_string(string)
         return if @hide_this_step
         @builder.pre(:class => 'val') do |pre|
-          @builder << string
+          @builder << h(string).gsub("\n", '&#x000A;')
         end
       end
 
@@ -390,7 +411,7 @@ module Daddy
         return if @delayed_messages.empty?
 
         #@builder.ol do
-          @delayed_messages.each_with_index do |ann, i|
+          @delayed_messages.each do |ann|
             @builder.li(:class => 'message', :style => 'display: none;') do
               @builder << ann
             end
@@ -439,7 +460,7 @@ module Daddy
       end
 
       def set_scenario_color(status)
-        if status == :undefined or status == :pending
+        if status.nil? or status == :undefined or status == :pending
           set_scenario_color_pending
         end
         if status == :failed
@@ -504,7 +525,9 @@ module Daddy
         end
 
         @builder.div(:class => 'step_file') do |div|
-          @builder << step_file
+          @builder.span do
+            @builder << step_file
+          end
         end
       end
 
@@ -517,7 +540,7 @@ module Daddy
       end
 
       def inline_css
-        @builder.style do
+        @builder.style(:type => 'text/css') do
           @builder << File.read(File.dirname(__FILE__) + '/cucumber.css')
           @builder << File.read(File.dirname(__FILE__) + '/daddy.css')
           if File.exist?('features/support/daddy.css')
@@ -576,8 +599,11 @@ module Daddy
       $(SCENARIOS).siblings().show();
       $('li.message').show();
     });
-  });
+  })
 
+  function moveProgressBar(percentDone) {
+    $("cucumber-header").css('width', percentDone +"%");
+  }
   function makeRed(element_id) {
     $('#'+element_id).css('background', '#C40D0D');
     $('#'+element_id).css('color', '#FFFFFF');
@@ -591,6 +617,7 @@ module Daddy
       end
 
       def move_progress
+        @builder << " <script type=\"text/javascript\">moveProgressBar('#{percent_done}');</script>"
       end
 
       def percent_done
@@ -616,8 +643,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)

data/lib/daddy/model.rb

@@ -14,7 +14,7 @@ module Daddy
 
     def method_missing(method, *params)
       method_name = method.to_s
-      if method_name.last == "="
+      if method_name.last == '='
         self[method_name[0..-2]] = params.first
       else
         self[method_name]

data/lib/daddy/models/crud_extension.rb

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 module Daddy
   module Models
     

metadata

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