daddy 0.1.8 → 0.1.9

data/lib/daddy/formatter/daddy.css

@@ -1,23 +1,18 @@
-h2 {
-  font-size: 1.4em;
-}
-
 #menu {
   float: left;
   background: #FFFFFF;
   color: #000000;
-  margin-top: -10px;
 }
 
 #menu ol {
   margin: 0;
   padding: 0;
+  border-left: 5px solid #65c400;
 }
 
 #menu ol li.sprint {
   margin: 0;
   padding: 0 5px;
-  border-left: 5px solid #65c400;
   border-bottom: 1px solid #65c400;
   line-height: 40px;
   vertical-align: middle;
@@ -29,7 +24,6 @@ h2 {
 #menu ol li.sub_menu {
   margin: 0;
   padding: 0 5px;
-  border-left: 5px solid #65c400;
   border-bottom: 1px solid #65c400;
   line-height: 30px;
   text-align: right;
@@ -95,6 +89,10 @@ div.background ol {
   margin-left: 20px;
 }
 
+div.contents {
+  padding-top: 10px;
+}
+
 div.feature .narrative {
   margin-left: 10px;
 }
@@ -104,7 +102,7 @@ div.scenario .narrative {
 }
 
 div.scenario {
-  margin: 20px;
+  margin: 10px 10px 10px 20px;
 }
 
 div.scenario ol {

data/lib/daddy/formatter/html.rb

@@ -486,7 +486,6 @@ module Daddy
         @builder.script do
           unless @header_red
             @builder.text!("makeRed('cucumber-header');")
-            @builder.text!("makeMenuRed();")
           end
           @header_red = true
           @builder.text!("makeRed('scenario_#{@scenario_number}');") unless @scenario_red
@@ -498,7 +497,6 @@ module Daddy
         @builder.script do
           unless @header_red
             @builder.text!("makeYellow('cucumber-header');")
-            @builder.text!("makeMenuYellow();")
           end
           @builder.text!("makeYellow('scenario_#{@scenario_number}');") unless @scenario_red
         end
@@ -625,9 +623,6 @@ module Daddy
       $('#'+element_id).prev('.scenario_file').css('color', '#FFFFFF');
     }
   }
-  function makeMenuRed() {
-    $('#menu .sprint').css('border-color', '#C40D0D');
-  }
   function makeYellow(element_id) {
     $('#'+element_id).css('background', '#FAF834');
     $('#'+element_id).css('color', '#000000');
@@ -636,10 +631,6 @@ module Daddy
       $('#'+element_id).prev('.scenario_file').css('color', '#000000');
     }
   }
-  function makeMenuYellow() {
-    $('#menu .sprint').css('border-color', '#FAF834');
-  }
-
         EOF
       end
 

data/lib/daddy/models/crud_extension.rb

@@ -0,0 +1,25 @@
+# coding: UTF-8
+
+module Daddy
+  module Models
+    
+    module CrudExtension
+      def self.included(base)
+        base.extend(ClassMethods)
+        base.__send__(:include, InstanceMethods)
+      end
+
+      module InstanceMethods
+        def destroy_logically!
+          self.deleted = true
+          save!
+        end
+      end
+
+      module ClassMethods
+      end
+
+    end
+
+  end
+end

data/lib/daddy/models/{acts_as_like.rb → query_extension.rb}

@@ -3,9 +3,10 @@
 module Daddy
   module Models
     
-    module ActsAsLike
+    module QueryExtension
       def self.included(base)
         base.extend(ClassMethods)
+        base.__send__(:include, InstanceMethods)
       end
 
       module InstanceMethods
@@ -13,7 +14,10 @@ module Daddy
 
       module ClassMethods
         require 'daddy/utils/sql_utils'
-        include ActsAsLike::InstanceMethods
+
+        def not_deleted
+          where(:deleted => false)
+        end
 
         def like(columns, keywords)
           where(Daddy::Utils::SqlUtils.like(columns, keywords))

data/lib/daddy/railtie.rb

@@ -18,13 +18,15 @@ end
 
 require 'daddy/model'
 require 'daddy/helpers/html_helper'
-require 'daddy/models/acts_as_like'
 
 module Daddy
   class Railtie < Rails::Railtie
-    initializer 'acts_as_like' do
+    initializer 'active_record_extension' do
       ActiveSupport.on_load :active_record do
-        ActiveRecord::Base.send(:include, Daddy::Models::ActsAsLike)
+        require 'daddy/models/crud_extension'
+        require 'daddy/models/query_extension'
+        ActiveRecord::Base.send(:include, Daddy::Models::CrudExtension)
+        ActiveRecord::Base.send(:include, Daddy::Models::QueryExtension)
       end
     end
 

data/lib/tasks/cucumber.rake

@@ -25,7 +25,7 @@ namespace :dad do
     output = "features/reports/index.html"
     output = "features/reports" if format == 'junit'
 
-    command = "bundle exec cucumber --guess --quiet --no-multiline -r features --format #{format} --out #{output} #{features.join(' ')} #{options}"
+    command = "bundle exec cucumber --guess --quiet --no-multiline -r features --format pretty --format #{format} --out #{output} #{features.join(' ')} #{options}"
     #puts command
     ret = system(command)
     fail unless ret

data/lib/tasks/publish.rake

@@ -4,6 +4,8 @@ require 'daddy/git'
 
 namespace :dad do
   task :publish do
+    fail('環境編集 TITLE を指定してください。') unless ENV['TITLE'] and not ENV['TITLE'].blank?
+
     if File.exist?("#{Rails.root}/db/schema.rb")
       fail unless system("bundle exec rake db:schema:load RAILS_ENV=test")
     end
@@ -28,7 +30,7 @@ namespace :dad do
       current_branch = git.current_branch
     end
 
-    dir = '/var/lib/daddy/spec'
+    dir = '/var/lib/daddy/spec/' + title_to_dirname(ENV['TITLE']) 
     system("sudo mkdir -p #{dir}")
     system("sudo chown -R #{ENV['USER']}:#{ENV['USER']} #{dir}") 
 
@@ -39,3 +41,7 @@ namespace :dad do
   end
   
 end
+
+def self.title_to_dirname(title)
+  title.sub(' ', '_').downcase
+end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
+  prerelease: 
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: differ
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,23 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: execjs
+  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
@@ -97,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +150,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +166,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,6 +182,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +190,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +198,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +206,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,6 +214,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -181,6 +222,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -188,6 +230,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -195,6 +238,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -202,6 +246,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -209,6 +254,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-csv-fixtures
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -216,88 +262,90 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Dadday helps me build rails applications since daddy knows some good
-  practices.
+description: Daddy helps me build rails applications since daddy knows some good practices.
 email: ichylinux@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/daddy.rb
-- lib/daddy/cucumber.rb
-- lib/daddy/cucumber/pause.rb
-- lib/daddy/cucumber/capture.rb
+- lib/tasks/dad.rake
+- lib/tasks/db_config.rake
+- lib/tasks/unicorn.erb
+- lib/tasks/jenkins
+- lib/tasks/nginx.rake
+- lib/tasks/db_fixtures.rake
+- lib/tasks/cucumber.rake
+- lib/tasks/jenkins.conf
+- lib/tasks/unicorn.rb
+- lib/tasks/cucumber_install.rake
+- lib/tasks/database.yml.erb
+- lib/tasks/nginx.repo
+- lib/tasks/phantomjs.rake
+- lib/tasks/test.rake
+- lib/tasks/nginx.conf.erb
+- lib/tasks/db_create.rake
+- lib/tasks/publish.rake
+- lib/tasks/jenkins.rake
+- lib/tasks/cucumber_steps.rake
+- lib/tasks/unicorn.rake
+- lib/tasks/diary.rake
+- lib/daddy/railtie.rb
+- lib/daddy/cucumber/diff.rb
 - lib/daddy/cucumber/html.rb
-- lib/daddy/cucumber/step_definitions/fill_in.rb
-- lib/daddy/cucumber/step_definitions/select.rb
+- lib/daddy/cucumber/capture.rb
+- lib/daddy/cucumber/assert.rb
+- lib/daddy/cucumber/pause.rb
 - lib/daddy/cucumber/step_definitions/click.rb
+- lib/daddy/cucumber/step_definitions/select.rb
+- lib/daddy/cucumber/step_definitions/fill_in.rb
 - lib/daddy/cucumber/step_definitions/common.rb
-- lib/daddy/cucumber/assert.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/git.rb
-- lib/daddy/rails/quiet_assets.rb
-- lib/daddy/model.rb
-- lib/daddy/formatter/menu.html.erb
+- lib/daddy/formatter/daddy.js
+- lib/daddy/formatter/cucumber.css
 - lib/daddy/formatter/html.rb
-- lib/daddy/formatter/daddy_html.rb
 - lib/daddy/formatter/daddy.css
-- lib/daddy/formatter/cucumber.css
-- lib/daddy/formatter/daddy.js
+- lib/daddy/formatter/menu.html.erb
+- lib/daddy/formatter/daddy_html.rb
 - lib/daddy/formatter/jquery-min.js
-- lib/daddy/railtie.rb
-- lib/daddy/models/acts_as_like.rb
+- lib/daddy/rails/quiet_assets.rb
+- lib/daddy/models/crud_extension.rb
+- lib/daddy/models/query_extension.rb
+- lib/daddy/git.rb
+- lib/daddy/capistrano/remote_cache_subdir.rb
+- lib/daddy/helpers/html_helper.rb
 - lib/daddy/utils/sql_utils.rb
+- lib/daddy/model.rb
+- lib/daddy/cucumber.rb
+- lib/daddy.rb
 - lib/sql_builder.rb
-- lib/tasks/jenkins
-- lib/tasks/nginx.repo
-- lib/tasks/unicorn.rb
-- lib/tasks/jenkins.rake
-- lib/tasks/dad.rake
-- lib/tasks/db_config.rake
-- lib/tasks/publish.rake
-- lib/tasks/cucumber_steps.rake
-- lib/tasks/db_fixtures.rake
-- lib/tasks/cucumber.rake
-- lib/tasks/nginx.rake
-- lib/tasks/jenkins.conf
-- 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/nginx.conf.erb
 homepage: https://github.com/ichylinux/daddy
 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'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: My rails dad
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGJmMjBjOWJjOGIyNzNkZDkyZWRlOTdhNGU5MWQ0YzQ4NzNiNzg2NQ==
-  data.tar.gz: !binary |-
-    ZmE5ZjdmZmUwZWFmMzk0NDYyMjc1YTMyZjNkMzBiNjdhMDczNmU0Nw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MWNmZTFjZmUwMDFiNGNmOTc1NmYwM2U2MTY1OTNlYjY3MDg0MmM3MmViNjNl
-    NWFlZWUxMzQ3ODE5MjA2YzRlMDQ0ZmE3ZWZiZGEyNWJhZGI0MTU4MGU4Mzdm
-    ZGIyZDVjODE4M2E2NjcxZTUxNWJmZWNjZmFjYjkyM2FmMWU0OWE=
-  data.tar.gz: !binary |-
-    ZjJlZDliOGFiZmIwZTkxMTkyZDM5MzQ5OGMwNjEwYTc1OTU2NDcxNTg0MTA0
-    ZGIzOThkZTA4ZGQ0ZGU3NTA3NjQ4ZmMwZjYyZjUwYmU3MGZmYmUzNTZlN2Nk
-    YTk2MGZiZDhlODc5YWYzOTlmZjg1NWJjMmQ2N2U4OGJlNmUxMTE=