daddy 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecb6adb5b397bfb763d5451e0913459fd8b6a64b
-  data.tar.gz: cb020d0962a0cc40b54b2cbbd98b94aa66c13738
+  metadata.gz: 8aeac8bf25bd609ea29610b0bce2c16f774d1589
+  data.tar.gz: 189af199b7ded6a1fa1e5db857619c4084943129
 SHA512:
-  metadata.gz: db51c044c618d0ccbdbdbd8d5d7acc12c4ba62040678b039ab6b135a67ab8a7b54a9a8b511ed6ebc158598df099c56a96f4e04cf1072a6300df5eaeb29516273
-  data.tar.gz: c506f05ca7742bf1f233cd8feac0970519cb2e871cda8d91778533cf09e2b127c3721fad134704fcab75e77cb1338899fe482b8ba0f7431ed09b849d2d36324a
+  metadata.gz: c627c940ee573cbd552fc5cc4e5cc4fee859a771ed30b7c7000cfa4ba3eb63bee706d5872b18e1a4deeae441ce0f02162247edf455a92996f6a5477e102f99fe
+  data.tar.gz: c50962006c4ce222e56df474d3b4fda7d19009d932d49971c6fb98d6c18bbe6f39677dfc282509353fec30252fd6f5c761b6eca2dcffbb8919a00fff5e4d90c3

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.3.3'.freeze
 end

data/lib/tasks/database.yml.erb

@@ -2,7 +2,7 @@
   app_name_short = ENV['APP_NAME'][0..15]
 -%>
 # MySQL.  Versions 4.1 and 5.0 are recommended.
-# 
+#
 # Install the MYSQL driver
 #   gem install mysql2
 #
@@ -14,7 +14,6 @@
 development:
   adapter: mysql2
   encoding: utf8
-  reconnect: false
   database: <%= app_name_short %>_dev
   pool: 5
   username: <%= app_name_short %>
@@ -27,7 +26,6 @@ development:
 test:
   adapter: mysql2
   encoding: utf8
-  reconnect: false
   database: <%= app_name_short %>_test
   pool: 5
   username: <%= app_name_short %>
@@ -37,7 +35,6 @@ test:
 production:
   adapter: mysql2
   encoding: utf8
-  reconnect: false
   database: <%= app_name_short %>_pro
   pool: 5
   username: <%= app_name_short %>

data/lib/tasks/db_config.rake

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 require 'rake'
 
 namespace :dad do

data/lib/tasks/generate/controller.rake

@@ -1,5 +1,5 @@
 require 'rake'
-require 'erb'
+require_relative '../task_helper'
 
 namespace :dad do
   namespace :generate do
@@ -19,7 +19,7 @@ namespace :dad do
       @model_class = @resource.classify.constantize
       @controller_name = @resources.split('_').map{|a| a.capitalize}.join
 
-      template = File.join(File.dirname(__FILE__), 'templates', 'controller.rb.erb')
+      template = File.join(template_dir, 'app', 'controllers', 'controller.rb.erb')
       controller_file = "#{Rails.root}/app/controllers/#{@resources}_controller.rb"
       File.write(controller_file, ERB.new(File.read(template)).result)
     end

data/lib/tasks/generate/view.rake

@@ -1,7 +1,4 @@
-# coding: UTF-8
-
 require 'rake'
-require 'erb'
 
 namespace :dad do
   namespace :generate do
@@ -23,7 +20,7 @@ namespace :dad do
       @tag_begin = '<%'
       @tag_end = '%>'
 
-      Dir[File.join(File.dirname(__FILE__), 'templates/*.html.erb')].each do |template|
+      Dir[File.join(template_dir, 'app', 'views', '*.html.erb')].each do |template|
         view_dir = "#{Rails.root}/app/views/#{@resources}"
         FileUtils.mkdir_p(view_dir)
 

data/lib/tasks/jenkins.rake

@@ -1,8 +1,4 @@
-# coding: UTF-8
-
 require 'rake'
-require 'term/ansicolor'
-include Term::ANSIColor
 
 namespace :dad do
   namespace :jenkins do
@@ -22,7 +18,7 @@ namespace :dad do
         "sudo chown jenkins:jenkins /var/lib/jenkins/plugins",
       ]
       commands.each do |command|
-        print blue, bold, command, reset, "\n"
+        puts command
         system(command)
       end
 
@@ -38,12 +34,12 @@ namespace :dad do
 
         unless File.exist?(download_path)
           command = "sudo wget http://updates.jenkins-ci.org/download/plugins/#{p[:name]}/#{p[:version]}/#{p[:name]}.hpi -O #{download_path}"
-          print blue, bold, command, reset, "\n"
+          puts command
           system(command)
         end
         
         command = "sudo cp -f #{download_path} /var/lib/jenkins/plugins/#{p[:name]}.hpi"
-        print blue, bold, command, reset, "\n"
+        puts command
         system(command)
       end
     end

data/lib/tasks/task_helper.rb

@@ -12,3 +12,7 @@ end
 def self.app_name
   YAML.load_file("#{rails_root}/config/database.yml")[Rails.env]['database']
 end
+
+def self.template_dir
+  File.join(File.dirname(File.dirname(File.dirname(__FILE__))), 'templates')
+end

data/templates/Gemfile.erb

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gem 'rails', '<%= RAILS_VERSION %>'
 
 gem 'coffee-rails', '~> 4.0.0'
-gem 'daddy', '~> 0.3.0'
+gem 'daddy', '~> 0.3'
 gem 'jbuilder', '~> 1.2'
 gem 'jquery-rails'
 gem 'mysql2'

data/{lib/tasks/generate/templates → templates/app/controllers}/controller.rb.erb

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 class <%= @controller_name %>Controller < ApplicationController
 
   def index
@@ -15,8 +13,8 @@ class <%= @controller_name %>Controller < ApplicationController
   end
 
   def create
-    @<%= @resource %> = <%= @model_class.name %>.new(params[:<%= @resource %>])
-    
+    @<%= @resource %> = <%= @model_class.name %>.new(<%= @resource %>_params)
+
     begin
       @<%= @resource %>.transaction do
         @<%= @resource %>.save!
@@ -35,10 +33,10 @@ class <%= @controller_name %>Controller < ApplicationController
 
   def update
     @<%= @resource %> = <%= @model_class.name %>.find(params[:id])
-    
+    @<%= @resource %>.attributes = params[:<%= @resource %>_params]
+
     begin
       @<%= @resource %>.transaction do
-        @<%= @resource %>.attributes = params[:<%= @resource %>]
         @<%= @resource %>.save!
       end
 
@@ -51,12 +49,18 @@ class <%= @controller_name %>Controller < ApplicationController
 
   def destroy
     @<%= @resource %> = <%= @model_class.name %>.find(params[:id])
-    
+
     @<%= @resource %>.transaction do
       @<%= @resource %>.destroy_logically!
     end
-    
+
     redirect_to :action => 'index'
   end
 
+  private
+
+  def <%= @resource %>_params
+    params.require(:<%= @resource %>).permit!
+  end
+
 end

data/templates/app/views/_form.html.erb

@@ -0,0 +1,22 @@
+<%= @tag_begin %>= form_for @<%= @resource %> do |f| <%= @tag_end %>
+  <%= @tag_begin %> if @<%= @resource %>.errors.any? <%= @tag_end %>
+    <div class="errors">
+      <ul>
+        <%= @tag_begin %> @<%= @resource %>.errors.full_messages.each do |msg| <%= @tag_end %>
+          <li><%= @tag_begin %>= msg <%= @tag_end %></li>
+        <%= @tag_begin %> end <%= @tag_end %>
+      </ul>
+    </div>
+  <%= @tag_begin %> end <%= @tag_end %>
+
+  <table>
+<% @model_class.columns.each do |column| -%>
+<% next if %w{ id deleted created_at updated_at }.include?(column.name.to_s) -%>
+    <tr>
+      <th><%= @tag_begin %>= f.label :<%= column.name %> <%= @tag_end %></th>
+      <td><%= @tag_begin %>= f.text_field :<%= column.name %> <%= @tag_end %></td>
+    </tr>
+<% end -%>
+  </table>
+  <%= @tag_begin %>= f.submit <%= @tag_end %>
+<%= @tag_begin %> end <%= @tag_end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - ichy
@@ -180,16 +180,22 @@ dependencies:
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
@@ -330,12 +336,6 @@ files:
 - lib/tasks/fluentd.repo
 - lib/tasks/fluentd_nginx.conf.erb
 - lib/tasks/generate/controller.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/show.html.erb
 - lib/tasks/generate/view.rake
 - lib/tasks/god.rake
 - lib/tasks/god/god
@@ -366,6 +366,12 @@ files:
 - lib/tasks/unicorn.rb.erb
 - lib/tax.rb
 - templates/Gemfile.erb
+- templates/app/controllers/controller.rb.erb
+- templates/app/views/_form.html.erb
+- templates/app/views/edit.html.erb
+- templates/app/views/index.html.erb
+- templates/app/views/new.html.erb
+- templates/app/views/show.html.erb
 - templates/config/routes.rb.erb
 - vendor/assets/javascripts/jquery-ui/ympicker-ja.js
 - vendor/assets/javascripts/jquery-ui/ympicker.js

data/lib/tasks/generate/templates/_form.html.erb

@@ -1,12 +0,0 @@
-<%= @tag_begin %>= form_for @<%= @resources.singularize %> do |f| <%= @tag_end %>
-  <table>
-<% @model_class.columns.each do |column| -%>
-<% next if %w{ id deleted created_at updated_at }.include?(column.name.to_s) -%>
-    <tr>
-      <th><%= @tag_begin %>= f.label :<%= column.name %> <%= @tag_end %></th>
-      <td><%= @tag_begin %>= f.text_field :<%= column.name %> <%= @tag_end %></td>
-    </tr>
-<% end -%>
-  </table>
-  <%= @tag_begin %>= f.submit <%= @tag_end %>
-<%= @tag_begin %> end <%= @tag_end %>