daddy 0.1.17 → 0.1.18

data/lib/daddy/formatter/daddy.js

@@ -1,3 +1,8 @@
 function toggle_feature_dir(feature_dir) {
   $(feature_dir).parent('div.feature_dir').nextUntil('div.feature_dir').toggle(250);
 };
+
+function toggle_step_file(step_file) {
+  $(step_file).closest('li').next('.step_contents').toggle(250);
+  event.stopPropagation();
+};

data/lib/daddy/formatter/html.rb

@@ -5,6 +5,7 @@ require 'cucumber/formatter/ordered_xml_markup'
 require 'cucumber/formatter/duration'
 require 'cucumber/formatter/io'
 require 'daddy/formatter/daddy_html'
+require 'daddy/utils/string_utils'
 
 module Daddy
   module Formatter
@@ -29,23 +30,6 @@ module Daddy
         @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
 
@@ -250,7 +234,7 @@ module Daddy
       end
 
       def before_step(step)
-        @step_id = step.dom_id
+        @step_id = step.dom_id + '_' + Daddy::Utils::StringUtils.current_time
         @step_number += 1
         @step = step
       end
@@ -521,21 +505,11 @@ module Daddy
             step_file = "daddy: " + $1[index..-1]
           end
 
-          step_file = "<span id=\"step_file_#{@step_id}\">#{step_file}:#{$2}</span>"
+          step_file = "<span style=\"cursor: pointer;\" onclick=\"toggle_step_file(this);\">#{step_file}:#{$2}</span>"
         end
 
         @builder.div(:class => 'step_file') do |div|
-          @builder.span do
-            @builder << step_file
-            @builder.script do |script|
-              script << "$(function() {"
-              script << "  $('#step_file_#{@step_id}').css('cursor', 'pointer').click(function(e) {"
-              script << "    $(this).closest('li').next('.step_contents').toggle(250);"
-              script << "    e.stopImmediatePropagation();"
-              script << "  });"
-              script << "});"
-            end
-          end
+          @builder << step_file
         end
       end
 
@@ -560,16 +534,8 @@ module Daddy
       def inline_js
         @builder.script(:type => 'text/javascript') do
           @builder << inline_jquery
-          @builder << inline_daddy
           @builder << inline_js_content
-
-          if should_expand
-            @builder << %w{
-              $(document).ready(function() {
-                $('#expander').click();
-                });
-            }.join
-          end
+          @builder << inline_daddy
         end
       end
 
@@ -578,13 +544,23 @@ module Daddy
       end
 
       def inline_daddy
-        File.read(File.dirname(__FILE__) + '/daddy.js')
+        ret = File.read(File.dirname(__FILE__) + '/daddy.js')
+
+        if should_expand
+          ret << %w{
+            $(document).ready(function() {
+              $('#expander').click();
+              });
+          }.join
+        end
+        
+        ret
       end
 
       def inline_js_content
         <<-EOF
 
-  SCENARIOS = "h3[id*='_scenario_'],h3[id*='_background_']";
+  SCENARIOS = "div.scenario h3";
 
   $(document).ready(function() {
     $(SCENARIOS).css('cursor', 'pointer');
@@ -602,7 +578,7 @@ module Daddy
     $("#expander").click(function() {
       $(SCENARIOS).siblings().show();
     });
-  })
+  });
 
   function moveProgressBar(percentDone) {
     $("cucumber-header").css('width', percentDone +"%");
@@ -724,4 +700,4 @@ module Daddy
       end
     end
   end
-end
+end

data/lib/daddy/http_client.rb

@@ -8,7 +8,7 @@ module Daddy
     def initialize(url, options = {})
       @url = url
       @options = options
-      @cookie = nil
+      @cookie = options[:cookie]
       Rails.logger.debug "[HttpClient] url: #{@url}"
     end
     
@@ -18,11 +18,14 @@ module Daddy
 
       response = connection.get(path, params) do |request|
         if @options[:auth_user] and @options[:auth_password]
-          basic = Base64.encode64(@options[:auth_user] + ':' + @options[:auth_password])
-          request.headers['Authorization'] = 'Basic ' + basic
+          basic = 'Basic ' + Base64.encode64(@options[:auth_user] + ':' + @options[:auth_password])
+          Rails.logger.debug "[HttpClient] authorization: #{basic}"
+
+          request.headers['Authorization'] = basic
         end
         
         if @cookie
+          Rails.logger.debug "[HttpClient] cookie: #{@cookie}"
           request.headers['Cookie'] = @cookie
         end
         
@@ -44,7 +47,7 @@ module Daddy
     def post(path, params = {})
       response = connection.post(path, params)
     end
-
+    
     private
   
     def connection

data/lib/daddy/utils/string_utils.rb

@@ -0,0 +1,45 @@
+# coding: UTF-8
+
+require 'nkf'
+
+module Daddy
+  module Utils
+    class StringUtils
+
+      def self.to_hiragana(s)
+        return s if is_empty(s)
+        NKF::nkf('-Ww --hiragana', s)
+      end
+    
+      def self.to_katakana(s)
+        return s if is_empty(s)
+        NKF::nkf('-Ww --katakana', s)
+      end
+    
+      def self.to_zen(s)
+        return s if is_empty(s)
+        NKF::nkf('-WwXm0', s)
+      end
+    
+      def self.to_han(s)
+        return s if is_empty(s)
+        NKF::nkf('-Wwxm0Z0', s)
+      end
+    
+      def self.current_time(now = nil)
+        now = Time.now unless now
+        now.instance_eval { '%s%03d' % [strftime('%Y%m%d%H%M%S'), (usec / 1000.0).round] }
+      end
+    
+      def self.rand(length = 8)
+        chars = ("a".."z").to_a + ("A".."Z").to_a + (0..9).to_a
+        ret = []
+        length.times do |i|
+          ret[i] = chars[rand(chars.size)]
+        end
+        ret.join
+      end
+
+    end
+  end
+end

data/lib/tasks/publish.rake

@@ -42,11 +42,18 @@ namespace :dad do
 
     # 開発日記を統合
     if branch == 'master'
-      features = []
-      features += dad_publish_extract_features(base_dir + '/master')
-
-      Dir[base_dir + '/p*'].sort{|a, b| File.basename(b)[1..-1].to_i <=> File.basename(a)[1..-1].to_i}.each do |dir|
-        features += dad_publish_extract_features(dir)
+      features = {}
+      dad_publish_sprint_dirs(base_dir).each do |dir|
+        dad_publish_extract_features(dir).each do |div|
+          feature = features[div['id']]
+          if feature
+            div.css('div.scenario').each do |scenario|
+              feature.add_child(scenario)
+            end
+          else
+            features[div['id']] = div
+          end
+        end
       end
 
       # 空HTMLを生成
@@ -54,8 +61,8 @@ namespace :dad do
 
       doc = Nokogiri::HTML(File.read('features/reports/index.html'))
       contents_div = doc.css('div.contents').first
-      features.sort{|a, b| a['id'] <=> b['id']}.each do |div|
-        contents_div.add_child(div)
+      features.keys.sort.each do |key|
+        contents_div.add_child(features[key])
       end
       File.write("#{base_dir}/index.html", doc)
     end
@@ -63,6 +70,12 @@ namespace :dad do
   
 end
 
+def self.dad_publish_sprint_dirs(base_dir)
+  ret = Dir[base_dir + '/p*'].sort{|a, b| File.basename(a)[1..-1].to_i <=> File.basename(b)[1..-1].to_i}
+  ret << base_dir + '/master'
+  ret
+end
+
 def self.dad_publish_extract_features(dir)
   ret = []
   return [] unless File.exist?(dir) and File.directory?(dir)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -328,6 +328,7 @@ files:
 - lib/daddy/capistrano/remote_cache_subdir.rb
 - lib/daddy/helpers/html_helper.rb
 - lib/daddy/utils/sql_utils.rb
+- lib/daddy/utils/string_utils.rb
 - lib/daddy/http_client.rb
 - lib/daddy/model.rb
 - lib/daddy/cucumber.rb