daddy 0.1.26 → 0.2.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NTZjZmQxODc2YWMyYmQyNWJjYTMwYWU3ZDViNzFiNzQ4MmUxZTZiYw==
-  data.tar.gz: !binary |-
-    NGQwNjExMGNmYjM0NjAyOWVkZjk5NTIxM2U5MjAyZjU0ZTdlMGRiOQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NDNmNDg2NGRiNWFmMjA4YWNhZjBkYTYyZjgxZWYzNTNhYWU2ZDAwNWQyOGUy
-    OTUyMzI2NzJlNTExNTQ2YTI2ZGVmMzNjODZhYzQ1ZWJiODllMDVhNTA0NjE5
-    MjQ4YjkwODAxZGU0ODIxYTc5OGYzM2MxMzA3ODdjOTgyYWMxMmI=
-  data.tar.gz: !binary |-
-    YTI3YWNjOGMzZTdiNmMxMjE5MGFmMDM5YjJmZjE2MTJhYzFiNmM1YzdiODNm
-    YTQwZGIwNDM1M2RhOTIyMjlkNmEwZmMzMmJkYWNhNDI3NjliOWQxMWVjYmFk
-    YjE1ZjJjY2U5MDUyNGZiODdkOWFlMDU1ZDViODkxMjE5NGUxYTQ=
+SHA1:
+  metadata.gz: 921d4d355837267758f68e0e9aa026528f11114b
+  data.tar.gz: 880bb2227eea932c261258ba9e3d593bdca3b822
+SHA512:
+  metadata.gz: 709552deea9399e5bc1650e377a1f4f944553ff123a8c25bc7ccb29f8dc677db22cdd4d80bf2fe1339db8e51e7321addf8017ace9bc0cf5be6ae5c9c74372582
+  data.tar.gz: f973b7f8c8e613deadc447ca9570745e96e15ae6ab6cee0d494cf0d909f9bada01e5f590e5b3f588bbe39e9fa84f1c4ec418f996c334edc7c7590226749615a7

data/lib/daddy.rb

@@ -11,6 +11,13 @@ end
 
 require 'sql_builder'
 require 'tax'
+require 'daddy/utils/string_utils'
 
 module Daddy
+  require 'daddy/config'
+
+  def self.config
+    @_config ||= Daddy::Config.new(config_file = File.join('config', 'daddy.yml'))
+  end
+
 end

data/lib/daddy/config.rb

@@ -0,0 +1,19 @@
+# coding: UTF-8
+
+class Daddy::Config
+  
+  def initialize(config_file)
+    if @config.nil?
+      
+      if File.exist?(config_file)
+        @config = YAML.load_file(config_file)
+      end
+    end
+    @config
+  end
+
+  def use_feature_name?
+    @config && @config['cucumber'] && !!@config['use_feature_name']
+  end
+
+end

data/lib/daddy/formatter/html.rb

@@ -5,7 +5,6 @@ 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
@@ -126,9 +125,11 @@ module Daddy
           @builder.span(:class => 'val') do
             @builder << title
 
-            subtitle = lines.first.to_s.strip 
-            unless subtitle.blank?
-              @builder.span('(' + subtitle + ')', :class => 'feature_subtitle')
+            if Daddy.config.use_feature_name?
+              subtitle = lines.first.to_s.strip 
+              unless subtitle.blank?
+                @builder.span('(' + subtitle + ')', :class => 'feature_subtitle')
+              end
             end
           end
         end
@@ -283,7 +284,7 @@ module Daddy
 
             file = $1.force_encoding('UTF-8')
             if file.start_with?('daddy-') or file.start_with?('/daddy-')
-              file = '/usr/local/lib/ruby/gems/1.9.1/gems/' + file
+              file = '/usr/local/lib/ruby/gems/2.0.0/gems/' + file
             end
 
             File.readlines(File.expand_path(file))[line_index..-1].each do |line|

data/lib/daddy/http_client.rb

@@ -3,29 +3,23 @@
 require 'faraday'
 
 module Daddy
+  
   class HttpClient
   
     def initialize(url, options = {})
       @url = url
       @options = options
       @cookie = options[:cookie]
-      Rails.logger.debug "[HttpClient] url: #{@url}"
     end
     
     def get(path, params = {})
-      Rails.logger.debug "[HttpClient] path: #{path}"
-      Rails.logger.debug "[HttpClient] params: #{params}"
-
       response = connection.get(path, params) do |request|
         if @options[:auth_user] and @options[:auth_password]
           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
         
@@ -39,7 +33,6 @@ module Daddy
       if block_given?
         yield response
       else
-        Rails.logger.debug "[HttpClient] stutus: #{response.status}"
         response.body.force_encoding('UTF-8')
       end
     end

data/vendor/assets/javascripts/tax.js

@@ -27,13 +27,11 @@ tax.getRateOn = function(date) {
   return 0;
 };
 
-tax.calcTaxAmount = function(taxType, date, amount) {
+tax.calcTaxAmount = function(taxType, rate, amount) {
   if ( isNaN( amount ) ) {
     return '';
   }
 
-  var rate = this.getRateOn(date);
-
   if ( taxType == tax.TAX_TYPE_INCLUSIVE ) {
     return parseInt(amount * rate / (1 + rate));
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.2.1
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -157,7 +157,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
@@ -167,7 +167,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
@@ -261,83 +261,83 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/dad
 - lib/daddy.rb
+- lib/daddy/config.rb
 - lib/daddy/cucumber.rb
-- lib/daddy/cucumber/pause.rb
-- lib/daddy/cucumber/puts.rb
+- lib/daddy/cucumber/assert.rb
 - lib/daddy/cucumber/capture.rb
+- lib/daddy/cucumber/diff.rb
 - lib/daddy/cucumber/formatting.rb
-- lib/daddy/cucumber/html.rb
 - lib/daddy/cucumber/hooks/database.rb
-- lib/daddy/cucumber/step_definitions/fill_in.rb
-- lib/daddy/cucumber/step_definitions/select.rb
+- lib/daddy/cucumber/html.rb
+- lib/daddy/cucumber/pause.rb
+- lib/daddy/cucumber/puts.rb
 - lib/daddy/cucumber/step_definitions/click.rb
 - lib/daddy/cucumber/step_definitions/common.rb
-- lib/daddy/cucumber/assert.rb
+- lib/daddy/cucumber/step_definitions/fill_in.rb
+- lib/daddy/cucumber/step_definitions/select.rb
 - lib/daddy/cucumber/table.rb
-- lib/daddy/cucumber/diff.rb
-- lib/daddy/helpers/html_helper.rb
-- lib/daddy/capistrano/remote_cache_subdir.rb
-- lib/daddy/http_client.rb
-- lib/daddy/ocr.rb
-- lib/daddy/git.rb
-- lib/daddy/rails/engine.rb
-- lib/daddy/rails/railtie.rb
-- lib/daddy/rails/quiet_assets.rb
-- lib/daddy/model.rb
-- lib/daddy/formatter/menu.html.erb
-- lib/daddy/formatter/html.rb
-- lib/daddy/formatter/daddy_html.rb
-- lib/daddy/formatter/daddy.css
+- lib/daddy/differ/html_patch.rb
 - lib/daddy/formatter/cucumber.css
+- lib/daddy/formatter/daddy.css
 - lib/daddy/formatter/daddy.js
+- lib/daddy/formatter/daddy_html.rb
+- lib/daddy/formatter/html.rb
 - lib/daddy/formatter/jquery-min.js
+- lib/daddy/formatter/menu.html.erb
+- lib/daddy/git.rb
+- lib/daddy/helpers/html_helper.rb
+- lib/daddy/http_client.rb
+- lib/daddy/model.rb
 - lib/daddy/models/crud_extension.rb
 - lib/daddy/models/query_extension.rb
-- lib/daddy/differ/html_patch.rb
+- lib/daddy/ocr.rb
+- lib/daddy/rails/engine.rb
+- lib/daddy/rails/quiet_assets.rb
+- lib/daddy/rails/railtie.rb
 - lib/daddy/utils/sql_utils.rb
 - lib/daddy/utils/string_utils.rb
 - lib/sql_builder.rb
-- lib/tax.rb
 - lib/ssl/cert.pem
-- lib/tasks/tesseract.rake
-- lib/tasks/jenkins
-- lib/tasks/nginx.repo
-- lib/tasks/nginx.jenkins.conf.erb
-- lib/tasks/jenkins.rake
+- lib/tasks/cucumber.rake
+- lib/tasks/cucumber_install.rake
+- lib/tasks/cucumber_steps.rake
 - lib/tasks/dad.rake
+- lib/tasks/database.yml.erb
 - lib/tasks/db_config.rake
-- lib/tasks/publish.rake
-- lib/tasks/cucumber_steps.rake
-- lib/tasks/unicorn.rb.erb
+- lib/tasks/db_create.rake
 - lib/tasks/db_fixtures.rake
-- lib/tasks/cucumber.rake
-- lib/tasks/nginx.rake
-- lib/tasks/jenkins.conf
-- lib/tasks/generate/routes.rake
+- lib/tasks/diary.rake
 - lib/tasks/generate/controller.rake
-- lib/tasks/generate/view.rake
-- lib/tasks/generate/templates/index.html.erb
-- lib/tasks/generate/templates/show.html.erb
-- lib/tasks/generate/templates/routes.rb.erb
+- lib/tasks/generate/routes.rake
+- lib/tasks/generate/templates/_form.html.erb
+- lib/tasks/generate/templates/controller.rb.erb
 - lib/tasks/generate/templates/edit.html.erb
+- lib/tasks/generate/templates/index.html.erb
 - lib/tasks/generate/templates/new.html.erb
-- lib/tasks/generate/templates/controller.rb.erb
-- lib/tasks/generate/templates/_form.html.erb
-- lib/tasks/cucumber_install.rake
-- lib/tasks/unicorn.rake
-- lib/tasks/diary.rake
-- lib/tasks/db_create.rake
-- lib/tasks/unicorn.erb
-- lib/tasks/test.rake
-- lib/tasks/phantomjs.rake
-- lib/tasks/database.yml.erb
+- lib/tasks/generate/templates/routes.rb.erb
+- lib/tasks/generate/templates/show.html.erb
+- lib/tasks/generate/view.rake
+- lib/tasks/jenkins
+- lib/tasks/jenkins.conf
+- lib/tasks/jenkins.rake
 - lib/tasks/nginx.app.conf.erb
 - lib/tasks/nginx.conf.erb
-- vendor/assets/javascripts/tax.js
+- lib/tasks/nginx.jenkins.conf.erb
+- lib/tasks/nginx.rake
+- lib/tasks/nginx.repo
+- lib/tasks/phantomjs.rake
+- lib/tasks/publish.rake
+- lib/tasks/tesseract.rake
+- lib/tasks/test.rake
+- lib/tasks/unicorn.erb
+- lib/tasks/unicorn.rake
+- lib/tasks/unicorn.rb.erb
+- lib/tax.rb
 - vendor/assets/javascripts/daddy.js
 - vendor/assets/javascripts/string.js
-- bin/dad
+- vendor/assets/javascripts/tax.js
 homepage: https://github.com/ichylinux/daddy
 licenses:
 - MIT
@@ -348,17 +348,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: My rails dad

data/lib/daddy/capistrano/remote_cache_subdir.rb

@@ -1,32 +0,0 @@
-# coding: UTF-8
-
-require 'capistrano/recipes/deploy/strategy/remote_cache'
-
-module Daddy
-  module Capistrano
-    class RemoteCacheSubdir < ::Capistrano::Deploy::Strategy::RemoteCache
-    
-      private
-    
-      def repository_cache_subdir
-        if configuration[:deploy_subdir]
-          File.join(repository_cache, configuration[:deploy_subdir])
-        else
-          repository_cache
-        end
-      end
-    
-      def copy_repository_cache
-        logger.trace "copying the cached version to #{configuration[:release_path]}"
-        if copy_exclude.empty? 
-          run "cp -RPp #{repository_cache_subdir} #{configuration[:release_path]} && #{mark}"
-        else
-          exclusions = copy_exclude.map { |e| "--exclude=\"#{e}\"" }.join(' ')
-          run "rsync -lrpt #{exclusions} #{repository_cache_subdir}/* #{configuration[:release_path]} && #{mark}"
-        end
-      end
-    
-    end
-  end
-end
-