nested_scaffold 0.2.1 → 1.0.0

data/lib/generators/scaffold_controller/templates/controller.rb

@@ -1,90 +1,68 @@
 class <%= controller_class_name %>Controller < ApplicationController
+  before_action :set_<%= plural_name %>
+  before_action :set_<%= singular_table_name %>, only: [:show, :edit, :update, :destroy]
+
   # GET <%= plural_nested_parent_name %>/1/<%= plural_name %>
-  # GET <%= plural_nested_parent_name %>/1/<%= plural_name %>.json
   def index
-    @<%= nested_parent_name %> = <%= orm_class.find(nested_parent_class_name, "params[:#{nested_parent_id}]") %>
     <%= "@#{plural_name} = @#{nested_parent_name}.#{plural_name}" %>
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render :json => @<%= plural_name %> }
-    end
   end
 
   # GET <%= plural_nested_parent_name %>/1/<%= plural_name %>/1
-  # GET <%= plural_nested_parent_name %>/1/<%= plural_name %>/1.json
   def show
-    @<%= nested_parent_name %> = <%= orm_class.find(nested_parent_class_name, "params[:#{nested_parent_id}]") %>
-    <%= "@#{singular_name} = @#{nested_parent_name}.#{plural_name}.find(params[:id])" %>
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render :json => @<%= singular_name %> }
-    end
   end
 
   # GET <%= plural_nested_parent_name %>/1/<%= plural_name %>/new
-  # GET <%= plural_nested_parent_name %>/1/<%= plural_name %>/new.json
   def new
-    @<%= nested_parent_name %> = <%= orm_class.find(nested_parent_class_name, "params[:#{nested_parent_id}]") %>
     <%= "@#{singular_name} = @#{nested_parent_name}.#{plural_name}.build" %>
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render :json => @<%= singular_name %> }
-    end
   end
 
   # GET <%= plural_nested_parent_name %>/1/<%= plural_name %>/1/edit
   def edit
-    @<%= nested_parent_name %> = <%= orm_class.find(nested_parent_class_name, "params[:#{nested_parent_id}]") %>
-    <%= "@#{singular_name} = @#{nested_parent_name}.#{plural_name}.find(params[:id])" %>
   end
 
   # POST <%= plural_nested_parent_name %>/1/<%= plural_name %>
-  # POST <%= plural_nested_parent_name %>/1/<%= plural_name %>.json
   def create
-    @<%= nested_parent_name %> = <%= orm_class.find(nested_parent_class_name, "params[:#{nested_parent_id}]") %>
-    <%= "@#{singular_name} = @#{nested_parent_name}.#{plural_name}.build(params[:#{singular_name}])" %>
+    <%= "@#{singular_name} = @#{nested_parent_name}.#{plural_name}.build(#{singular_name}_params)" %>
 
-    respond_to do |format|
-      if @<%= singular_name %>.save
-        format.html { redirect_to([@<%= singular_name %>.<%= nested_parent_name %>, @<%= singular_name %>], :notice => '<%= human_name %> was successfully created.') }
-        format.json { render :json => @<%= singular_name %>, :status => :created, :location => [@<%= singular_name %>.<%= nested_parent_name %>, @<%= singular_name %>] }
-      else
-        format.html { render :action => "new" }
-        format.json { render :json => @<%= singular_name %>.errors, :status => :unprocessable_entity }
-      end
+    if @<%= singular_name %>.save
+      redirect_to([@<%= singular_name %>.<%= nested_parent_name %>, @<%= singular_name %>], notice: '<%= human_name %> was successfully created.')
+    else
+      render action: 'new'
     end
   end
 
   # PUT <%= plural_nested_parent_name %>/1/<%= plural_name %>/1
-  # PUT <%= plural_nested_parent_name %>/1/<%= plural_name %>/1.json
   def update
-    @<%= nested_parent_name %> = <%= orm_class.find(nested_parent_class_name, "params[:#{nested_parent_id}]") %>
-    <%= "@#{singular_name} = @#{nested_parent_name}.#{plural_name}.find(params[:id])" %>
-
-    respond_to do |format|
-      if @<%= singular_name %>.update_attributes(params[:<%= singular_name %>])
-        format.html { redirect_to([@<%= singular_name %>.<%= nested_parent_name %>, @<%= singular_name %>], :notice => '<%= human_name %> was successfully updated.') }
-        format.json { head :ok }
-      else
-        format.html { render :action => "edit" }
-        format.json { render :json => @<%= singular_name %>.errors, :status => :unprocessable_entity }
-      end
+    if @<%= singular_name %>.update_attributes(<%= singular_name %>_params)
+      redirect_to([@<%= singular_name %>.<%= nested_parent_name %>, @<%= singular_name %>], notice: '<%= human_name %> was successfully updated.')
+    else
+      render action: 'edit'
     end
   end
 
   # DELETE <%= plural_nested_parent_name %>/1/<%= plural_name %>/1
-  # DELETE <%= plural_nested_parent_name %>/1/<%= plural_name %>/1.json
   def destroy
-    @<%= nested_parent_name %> = <%= orm_class.find(nested_parent_class_name, "params[:#{nested_parent_id}]") %>
-    <%= "@#{singular_name} = @#{nested_parent_name}.#{plural_name}.find(params[:id])" %>
     @<%= singular_name %>.destroy
 
-    respond_to do |format|
-      format.html { redirect_to <%= nested_parent_name %>_<%= index_helper %>_url(<%= nested_parent_name %>) }
-      format.json { head :ok }
-    end
+    redirect_to <%= nested_parent_name %>_<%= index_helper %>_url(@<%= nested_parent_name %>)
   end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_<%= plural_name %>
+      @<%= nested_parent_name %> = <%= orm_class.find(nested_parent_class_name, "params[:#{nested_parent_id}]") %>
+    end
+
+    def set_<%= singular_table_name %>
+      <%= "@#{singular_name} = @#{nested_parent_name}.#{plural_name}.find(params[:id])" %>
+    end
+
+    # Only allow a trusted parameter "white list" through.
+    def <%= "#{singular_table_name}_params" %>
+      <%- if attributes_names.empty? -%>
+      params.fetch(:<%= singular_table_name %>, {})
+      <%- else -%>
+      params.require(:<%= singular_table_name %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
+      <%- end -%>
+    end
 end

data/lib/generators/test_unit/model_generator.rb

@@ -8,6 +8,15 @@ module NestedScaffold
         include ::NestedScaffold::Base
 
         source_root superclass.source_root
+
+        def initialize(*)
+          super
+
+          unless attributes.map {|a| [a.name, a.type.to_s]}.include? [nested_parent_name, 'references']
+            #DIRTY HACK add 'references' attribute
+            attributes.insert 0, Rails::Generators::GeneratedAttribute.new(nested_parent_name, :references)
+          end
+        end
       end
     end
   end

data/lib/generators/test_unit/templates/functional_test.rb

@@ -7,42 +7,41 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   end
 
   test "should get index" do
-    get :index, :<%= nested_parent_id %> => @<%= nested_parent_name %>
+    get :index, params: { <%= nested_parent_id %>: @<%= nested_parent_name %> }
     assert_response :success
-    assert_not_nil assigns(:<%= table_name %>)
   end
 
   test "should get new" do
-    get :new, :<%= nested_parent_id %> => @<%= nested_parent_name %>
+    get :new, params: { <%= nested_parent_id %>: @<%= nested_parent_name %> }
     assert_response :success
   end
 
   test "should create <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count') do
-      post :create, :<%= nested_parent_id %> => @<%= nested_parent_name %>, :<%= singular_table_name %> => @<%= singular_table_name %>.attributes
+      post :create, params: { <%= nested_parent_id %>: @<%= nested_parent_name %>, <%= singular_table_name %>: @<%= singular_table_name %>.attributes }
     end
 
-    assert_redirected_to <%= nested_parent_name %>_<%= singular_table_name %>_path(@<%= nested_parent_name %>, assigns(:<%= singular_table_name %>))
+    assert_redirected_to <%= nested_parent_name %>_<%= singular_table_name %>_path(@<%= nested_parent_name %>, <%= class_name %>.last)
   end
 
   test "should show <%= singular_table_name %>" do
-    get :show, :<%= nested_parent_id %> => @<%= nested_parent_name %>, :id => @<%= singular_table_name %>.to_param
+    get :show, params: { <%= nested_parent_id %>: @<%= nested_parent_name %>, id: @<%= singular_table_name %> }
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, :<%= nested_parent_id %> => @<%= nested_parent_name %>, :id => @<%= singular_table_name %>.to_param
+    get :edit, params: { <%= nested_parent_id %>: @<%= nested_parent_name %>, id: @<%= singular_table_name %> }
     assert_response :success
   end
 
   test "should update <%= singular_table_name %>" do
-    put :update, :<%= nested_parent_id %> => @<%= nested_parent_name %>, :id => @<%= singular_table_name %>.to_param, :<%= singular_table_name %> => @<%= singular_table_name %>.attributes
-    assert_redirected_to <%= nested_parent_name %>_<%= singular_table_name %>_path(@<%= nested_parent_name %>, assigns(:<%= singular_table_name %>))
+    put :update, params: { <%= nested_parent_id %>: @<%= nested_parent_name %>, id: @<%= singular_table_name %>, <%= singular_table_name %>: @<%= singular_table_name %>.attributes }
+    assert_redirected_to <%= nested_parent_name %>_<%= singular_table_name %>_path(@<%= nested_parent_name %>, <%= class_name %>.last)
   end
 
   test "should destroy <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, :<%= nested_parent_id %> => @<%= nested_parent_name %>, :id => @<%= singular_table_name %>.to_param
+      delete :destroy, params: { <%= nested_parent_id %>: @<%= nested_parent_name %>, id: @<%= singular_table_name %> }
     end
 
     assert_redirected_to <%= nested_parent_name %>_<%= index_helper %>_path(@<%= nested_parent_name %>)

data/nested_scaffold.gemspec

@@ -0,0 +1,26 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+Gem::Specification.new do |spec|
+  spec.name          = "nested_scaffold"
+  spec.version       = '1.0.0'
+  spec.authors       = ["Akira Matsuda"]
+  spec.email         = ["ronnie@dio.jp"]
+
+  spec.summary       = 'Nested scaffold generator for Rails'
+  spec.description   = 'Nested scaffold generator for Rails'
+  spec.homepage      = 'http://github.com/amatsuda/nested_scaffold'
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency 'rails'
+  spec.add_development_dependency 'sqlite3'
+end

metadata

@@ -1,46 +1,104 @@
 --- !ruby/object:Gem::Specification
 name: nested_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2010-12-12 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70184308227520 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.2
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *70184308227520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70184308225620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184308225620
-description: Nested scaffold generator for Rails 3.2
-email: ronnie@dio.jp
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Nested scaffold generator for Rails
+email:
+- ronnie@dio.jp
 executables: []
 extensions: []
-extra_rdoc_files:
+extra_rdoc_files: []
+files:
+- ".document"
+- ".gitignore"
+- ".travis.yml"
+- Gemfile
 - LICENSE.txt
 - README.rdoc
-files:
+- Rakefile
+- gemfiles/Gemfile-rails.4.2.x
+- gemfiles/Gemfile-rails.4.2.x.lock
+- gemfiles/Gemfile-rails.5.0.0.beta3
+- gemfiles/Gemfile-rails.5.0.0.beta3.lock
+- lib/generators/USAGE
 - lib/generators/active_record/active_record_generator.rb
 - lib/generators/base.rb
 - lib/generators/erb/erb_generator.rb
@@ -64,132 +122,29 @@ files:
 - lib/generators/test_unit/model_generator.rb
 - lib/generators/test_unit/scaffold_generator.rb
 - lib/generators/test_unit/templates/functional_test.rb
-- lib/generators/USAGE
-- LICENSE.txt
-- Rakefile
-- README.rdoc
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/javascripts/boxes.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/stylesheets/boxes.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/boxes_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/helpers/boxes_helper.rb
-- test/dummy/app/models/box.rb
-- test/dummy/app/views/boxes/_form.html.erb
-- test/dummy/app/views/boxes/edit.html.erb
-- test/dummy/app/views/boxes/index.html.erb
-- test/dummy/app/views/boxes/new.html.erb
-- test/dummy/app/views/boxes/show.html.erb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config.ru
-- test/dummy/db/migrate/20120313224522_create_boxes.rb
-- test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
-- test/dummy/script/rails
-- test/dummy/test/fixtures/boxes.yml
-- test/dummy/test/functional/boxes_controller_test.rb
-- test/dummy/test/unit/box_test.rb
-- test/dummy/test/unit/helpers/boxes_helper_test.rb
-- test/nested_scaffold_test.rb
-- test/test_helper.rb
+- nested_scaffold.gemspec
 homepage: http://github.com/amatsuda/nested_scaffold
 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'
-      segments:
-      - 0
-      hash: 4091906991971113874
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 2.6.1
 signing_key: 
-specification_version: 3
-summary: Nested scaffold generator for Rails 3.2
-test_files:
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/javascripts/boxes.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/stylesheets/boxes.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/boxes_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/helpers/boxes_helper.rb
-- test/dummy/app/models/box.rb
-- test/dummy/app/views/boxes/_form.html.erb
-- test/dummy/app/views/boxes/edit.html.erb
-- test/dummy/app/views/boxes/index.html.erb
-- test/dummy/app/views/boxes/new.html.erb
-- test/dummy/app/views/boxes/show.html.erb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config.ru
-- test/dummy/db/migrate/20120313224522_create_boxes.rb
-- test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
-- test/dummy/script/rails
-- test/dummy/test/fixtures/boxes.yml
-- test/dummy/test/functional/boxes_controller_test.rb
-- test/dummy/test/unit/box_test.rb
-- test/dummy/test/unit/helpers/boxes_helper_test.rb
-- test/nested_scaffold_test.rb
-- test/test_helper.rb
+specification_version: 4
+summary: Nested scaffold generator for Rails
+test_files: []