model_base_generators 0.3.2 → 0.3.3

data/lib/templates/rspec/scaffold/controller_spec.rb

@@ -25,36 +25,34 @@ require 'rails_helper'
 
 <% module_namespacing do -%>
 RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:controller) %> do
-
 <%-
   required_ref_attrs  = model.columns_for(:params).select{|attr|  attr.reference && attr.required? }
   required_data_attrs = model.columns_for(:params).select{|attr| !attr.reference && attr.required? }
 -%>
   <%= model.factory_girl_let_definitions %>
-  before{ devise_user_login(user) }
-
 <%-
   unless required_ref_attrs.empty?
     extra_attributes_to_merge = ".merge(%s)" % required_ref_attrs.map{|attr| "#{attr.name}: #{attr.ref_model.full_resource_name}.id"}.join(', ')
     extra_attributes_for_factory = ", %s" % required_ref_attrs.map{|attr| "#{attr.reference.name}: #{attr.ref_model.full_resource_name}"}.join(', ')
   end
 -%>
-  let(:<%= file_name %>){ FactoryGirl.create(:<%= file_name %><%= extra_attributes_for_factory %>) }
+  let(:<%= file_name %>) { FactoryGirl.create(:<%= file_name %><%= extra_attributes_for_factory %>) }
+  before { devise_user_login(user) }
 
   # This should return the minimal set of attributes required to create a valid
   # <%= class_name %>. As you add validations to <%= class_name %>, be sure to
   # adjust the attributes here as well.
-  let(:valid_parameters) {
+  let(:valid_parameters) do
     FactoryGirl.attributes_for(:<%= file_name %>)<%= extra_attributes_to_merge %>
-  }
+  end
 
-  let(:invalid_parameters) {
+  let(:invalid_parameters) do
 <%- if !required_data_attrs.empty? -%>
     valid_parameters.symbolize_keys.merge(<%= required_data_attrs.first.name %>: '')
 <%- else -%>
-    skip("Add a hash of attributes invalid for your model")
+    skip('Add a hash of attributes invalid for your model')
 <%- end -%>
-  }
+  end
 
   # This should return the minimal set of values that should be in the session
   # in order to pass any filters (e.g. authentication) defined in
@@ -62,141 +60,155 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
   let(:valid_session) { {} }
 
 <% unless options[:singleton] -%>
-  describe "GET #index" do
-    it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
-      get :index, params: {}, session: valid_session
+  describe 'GET #index' do
+    it 'assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>' do
+      get :index, session: valid_session,
+                  params: {}
       expect(assigns(:<%= table_name %>)).to eq([<%= file_name %>])
     end
   end
 
 <% end -%>
-  describe "GET #show" do
-    it "assigns the requested <%= file_name %> as @<%= file_name %>" do
+  describe 'GET #show' do
+    it 'assigns the requested <%= file_name %> as @<%= file_name %>' do
       <%= file_name %> # To create <%= file_name %>
-      get :show, params: {:id => <%= file_name %>.to_param}, session: valid_session
+      get :show, session: valid_session,
+                 params: { id: <%= file_name %>.to_param }
       expect(assigns(:<%= file_name %>)).to eq(<%= file_name %>)
     end
   end
 
-  describe "GET #new" do
-    it "assigns a new <%= file_name %> as @<%= file_name %>" do
-      get :new, params: {}, session: valid_session
+  describe 'GET #new' do
+    it 'assigns a new <%= file_name %> as @<%= file_name %>' do
+      get :new, session: valid_session,
+                params: {}
       expect(assigns(:<%= file_name %>)).to be_a_new(<%= class_name %>)
     end
   end
 
-  describe "GET #edit" do
-    it "assigns the requested <%= file_name %> as @<%= file_name %>" do
+  describe 'GET #edit' do
+    it 'assigns the requested <%= file_name %> as @<%= file_name %>' do
       <%= file_name %> # To create <%= file_name %>
-      get :edit, params: {:id => <%= file_name %>.to_param}, session: valid_session
+      get :edit, session: valid_session,
+                 params: { id: <%= file_name %>.to_param }
       expect(assigns(:<%= file_name %>)).to eq(<%= file_name %>)
     end
   end
 
-  describe "POST #create" do
-    context "with valid params" do
-      it "creates a new <%= class_name %>" do
+  describe 'POST #create' do
+    context 'with valid params' do
+      it 'creates a new <%= class_name %>' do
         expect {
-          post :create, params: {:<%= file_name %> => valid_parameters}, session: valid_session
+          post :create, session: valid_session,
+                        params: { <%= file_name %>: valid_parameters }
         }.to change(<%= class_name %>, :count).by(1)
       end
 
-      it "assigns a newly created <%= file_name %> as @<%= file_name %>" do
-        post :create, params: {:<%= file_name %> => valid_parameters}, session: valid_session
+      it 'assigns a newly created <%= file_name %> as @<%= file_name %>' do
+        post :create, session: valid_session,
+                      params: { <%= file_name %>: valid_parameters }
         expect(assigns(:<%= file_name %>)).to be_a(<%= class_name %>)
         expect(assigns(:<%= file_name %>)).to be_persisted
       end
 
-      it "redirects to the created <%= file_name %>" do
-        post :create, params: {:<%= file_name %> => valid_parameters}, session: valid_session
+      it 'redirects to the created <%= file_name %>' do
+        post :create, session: valid_session,
+                      params: { <%= file_name %>: valid_parameters }
         expect(response).to redirect_to(<%= class_name %>.last)
       end
     end
 
-    context "with invalid params" do
-      it "assigns a newly created but unsaved <%= file_name %> as @<%= file_name %>" do
-        post :create, params: {:<%= file_name %> => invalid_parameters}, session: valid_session
+    context 'with invalid params' do
+      it 'assigns a newly created but unsaved <%= file_name %> as @<%= file_name %>' do
+        post :create, session: valid_session,
+                      params: { <%= file_name %>: invalid_parameters }
         expect(assigns(:<%= file_name %>)).to be_a_new(<%= class_name %>)
       end
 
       it "re-renders the 'new' template" do
-        post :create, params: {:<%= file_name %> => invalid_parameters}, session: valid_session
-        expect(response).to render_template("new")
+        post :create, session: valid_session,
+                      params: { <%= file_name %>: invalid_parameters }
+        expect(response).to render_template('new')
       end
     end
   end
 
-  describe "PUT #update" do
-    context "with valid params" do
+  describe 'PUT #update' do
+    context 'with valid params' do
 <%- if !required_data_attrs.empty? -%>
   <%- required_data_attrs.each do |required_data_attr| -%>
-      let(:new_<%= required_data_attr.name %>){ <%= required_data_attr.new_attribute_exp %> }
+      let(:new_<%= required_data_attr.name %>) { <%= required_data_attr.new_attribute_exp %> }
   <%- end -%>
 <%- end -%>
-
-      let(:new_parameters) {
+      let(:new_parameters) do
 <%- if !required_data_attrs.empty? -%>
         valid_parameters.merge(<%= required_data_attrs.map{|attr| "#{attr.name}: new_#{attr.name}"}.join(', ') %>)
 <%- else required_data_attrs.empty? -%>
-        skip("Add a hash of attributes valid for your model")
+        skip('Add a hash of attributes valid for your model')
 <%- end -%>
-      }
+      end
 
-      it "updates the requested <%= file_name %>" do
+      it 'updates the requested <%= file_name %>' do
         <%= file_name %> # To create <%= file_name %>
-        put :update, params: {:id => <%= file_name %>.to_param, :<%= file_name %> => new_parameters}, session: valid_session
+        put :update, session: valid_session,
+                     params: { id: <%= file_name %>.to_param, <%= file_name %>: new_parameters }
         <%= file_name %>.reload
 <%- if !required_data_attrs.empty? -%>
   <%- required_data_attrs.each do |attr| -%>
         expect(<%= file_name %>.<%= attr.name %>).to eq new_<%= attr.name %>
   <%- end -%>
 <%- else -%>
-        skip("Add assertions for updated state")
+        skip('Add assertions for updated state')
 <%- end -%>
       end
 
-      it "assigns the requested <%= file_name %> as @<%= file_name %>" do
+      it 'assigns the requested <%= file_name %> as @<%= file_name %>' do
         <%= file_name %> # To create <%= file_name %>
-        put :update, params: {:id => <%= file_name %>.to_param, :<%= file_name %> => new_parameters}, session: valid_session
+        put :update, session: valid_session,
+                     params: { id: <%= file_name %>.to_param, <%= file_name %>: new_parameters }
         expect(assigns(:<%= file_name %>)).to eq(<%= file_name %>)
       end
 
-      it "redirects to the <%= file_name %>" do
+      it 'redirects to the <%= file_name %>' do
         <%= file_name %> # To create <%= file_name %>
-        put :update, params: {:id => <%= file_name %>.to_param, :<%= file_name %> => new_parameters}, session: valid_session
+        put :update, session: valid_session,
+                     params: { id: <%= file_name %>.to_param, <%= file_name %>: new_parameters }
         expect(response).to redirect_to(<%= file_name %>)
       end
     end
 
-    context "with invalid params" do
-      it "assigns the <%= file_name %> as @<%= file_name %>" do
+    context 'with invalid params' do
+      it 'assigns the <%= file_name %> as @<%= file_name %>' do
         <%= file_name %> # To create <%= file_name %>
-        put :update, params: {:id => <%= file_name %>.to_param, :<%= file_name %> => invalid_parameters}, session: valid_session
+        put :update, session: valid_session,
+                     params: { id: <%= file_name %>.to_param, <%= file_name %>: invalid_parameters }
         expect(assigns(:<%= file_name %>)).to eq(<%= file_name %>)
       end
 
       it "re-renders the 'edit' template" do
         <%= file_name %> # To create <%= file_name %>
-        put :update, params: {:id => <%= file_name %>.to_param, :<%= file_name %> => invalid_parameters}, session: valid_session
-        expect(response).to render_template("edit")
+        put :update, session: valid_session,
+                     params: { id: <%= file_name %>.to_param, <%= file_name %>: invalid_parameters }
+        expect(response).to render_template('edit')
       end
     end
   end
 
-  describe "DELETE #destroy" do
-    it "destroys the requested <%= file_name %>" do
+  describe 'DELETE #destroy' do
+    it 'destroys the requested <%= file_name %>' do
       <%= file_name %> # To create <%= file_name %>
       expect {
-        delete :destroy, params: {:id => <%= file_name %>.to_param}, session: valid_session
+        delete :destroy, session: valid_session,
+                         params: { id: <%= file_name %>.to_param }
       }.to change(<%= class_name %>, :count).by(-1)
     end
 
-    it "redirects to the <%= table_name %> list" do
+    it 'redirects to the <%= table_name %> list' do
       <%= file_name %> # To create <%= file_name %>
-      delete :destroy, params: {:id => <%= file_name %>.to_param}, session: valid_session
+      delete :destroy, session: valid_session,
+                       params: { id: <%= file_name %>.to_param }
       expect(response).to redirect_to(<%= index_helper %>_url)
     end
   end
-
 end
 <% end -%>

data/lib/templates/rspec/scaffold/edit_spec.rb

@@ -1,15 +1,16 @@
 require 'rails_helper'
 
-RSpec.describe "<%= ns_table_name %>/edit", <%= type_metatag(:view) %> do
+RSpec.describe '<%= ns_table_name %>/edit', <%= type_metatag(:view) %> do
   <%= model.factory_girl_let_definitions %>
+  <%= model.factory_girl_let_definition %>
   before(:each) do
-    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, <%= model.factory_girl_to :create %>)
+    assign(:<%= model.full_resource_name %>, <%= model.full_resource_name %>)
   end
 
-  it "renders the edit <%= ns_file_name %> form" do
+  it 'renders the edit <%= model.full_resource_name %> form' do
     render
 
-    assert_select "form[action=?][method=?]", <%= ns_file_name %>_path(@<%= ns_file_name %>), "post" do
+    assert_select 'form[action=?][method=?]', <%= model.full_resource_name %>_path(<%= model.full_resource_name %>), 'post' do
 <% model.columns_for(:form).each do |attribute| -%>
       <%= attribute.assert_select_exp %>
 <% end -%>

data/lib/templates/rspec/scaffold/index_spec.rb

@@ -1,28 +1,28 @@
 require 'rails_helper'
 
 <% output_attributes = model.columns.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-RSpec.describe "<%= ns_table_name %>/index", <%= type_metatag(:view) %> do
+RSpec.describe '<%= ns_table_name %>/index', <%= type_metatag(:view) %> do
   <%= model.factory_girl_let_definitions %>
   before(:each) do
     assign(:<%= table_name %>, [
 <% [1,2].each_with_index do |id, model_index| -%>
   <%- if tc = model.title_column -%>
-      <%= model.factory_girl_to(:create, extra: {tc.name.to_sym => tc.sample_value(model_index + 1)}) %>,
+             <%= model.factory_girl_to(:create, extra: {tc.name.to_sym => tc.sample_value(model_index + 1)}) %>,
   <%- else -%>
-      <%= model.factory_girl_to(:create, context: :spec_index, index: id, ) %>,
+             <%= model.factory_girl_to(:create, context: :spec_index, index: id, ) %>,
   <%- end -%>
 <% end -%>
-    ])
+           ])
   end
 
-  it "renders a list of <%= ns_table_name %>" do
+  it 'renders a list of <%= ns_table_name %>' do
     render
 <% model.columns_for(:spec_index).each do |attribute| -%>
   <%- if attribute.single_sample_only? -%>
-    assert_select "tr>td", :text => <%= attribute.sample_string_exp %>, :count => 2
+    assert_select 'tr>td', text: <%= attribute.sample_string_exp %>, count: 2
   <%- else -%>
-    assert_select "tr>td", :text => <%= attribute.sample_string_exp(1) %>, :count => 1
-    assert_select "tr>td", :text => <%= attribute.sample_string_exp(2) %>, :count => 1
+    assert_select 'tr>td', text: <%= attribute.sample_string_exp(1) %>, count: 1
+    assert_select 'tr>td', text: <%= attribute.sample_string_exp(2) %>, count: 1
   <%- end -%>
 <% end -%>
   end

data/lib/templates/rspec/scaffold/new_spec.rb

@@ -1,16 +1,17 @@
 require 'rails_helper'
 
 <% output_attributes = model.columns.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-RSpec.describe "<%= ns_table_name %>/new", <%= type_metatag(:view) %> do
+RSpec.describe '<%= ns_table_name %>/new', <%= type_metatag(:view) %> do
   <%= model.factory_girl_let_definitions %>
+  <%= model.factory_girl_let_definition(action: :build) %>
   before(:each) do
-    assign(:<%= ns_file_name %>, <%= model.factory_girl_to :build %>)
+    assign(:<%= model.full_resource_name %>, <%= model.full_resource_name %>)
   end
 
-  it "renders new <%= ns_file_name %> form" do
+  it 'renders new <%= ns_file_name %> form' do
     render
 
-    assert_select "form[action=?][method=?]", <%= index_helper %>_path, "post" do
+    assert_select 'form[action=?][method=?]', <%= index_helper %>_path, 'post' do
 <% model.columns_for(:form).each do |attribute| -%>
       <%= attribute.assert_select_exp %>
 <% end -%>

data/lib/templates/rspec/scaffold/routing_spec.rb

@@ -1,45 +1,43 @@
-require "rails_helper"
+require 'rails_helper'
 
 <% module_namespacing do -%>
 RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:routing) %> do
-  describe "routing" do
-
+  describe 'routing' do
 <% unless options[:singleton] -%>
-    it "routes to #index" do
-      expect(:get => "/<%= ns_table_name %>").to route_to("<%= ns_table_name %>#index")
+    it 'routes to #index' do
+      expect(get: '/<%= ns_table_name %>').to route_to('<%= ns_table_name %>#index')
     end
 
 <% end -%>
-    it "routes to #new" do
-      expect(:get => "/<%= ns_table_name %>/new").to route_to("<%= ns_table_name %>#new")
+    it 'routes to #new' do
+      expect(get: '/<%= ns_table_name %>/new').to route_to('<%= ns_table_name %>#new')
     end
 
-    it "routes to #show" do
-      expect(:get => "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#show", :id => "1")
+    it 'routes to #show' do
+      expect(get: '/<%= ns_table_name %>/1').to route_to('<%= ns_table_name %>#show', id: '1')
     end
 
-    it "routes to #edit" do
-      expect(:get => "/<%= ns_table_name %>/1/edit").to route_to("<%= ns_table_name %>#edit", :id => "1")
+    it 'routes to #edit' do
+      expect(get: '/<%= ns_table_name %>/1/edit').to route_to('<%= ns_table_name %>#edit', id: '1')
     end
 
-    it "routes to #create" do
-      expect(:post => "/<%= ns_table_name %>").to route_to("<%= ns_table_name %>#create")
+    it 'routes to #create' do
+      expect(post: '/<%= ns_table_name %>').to route_to('<%= ns_table_name %>#create')
     end
 
-    it "routes to #update via PUT" do
-      expect(:put => "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#update", :id => "1")
+    it 'routes to #update via PUT' do
+      expect(put: '/<%= ns_table_name %>/1').to route_to('<%= ns_table_name %>#update', id: '1')
     end
 
 <% if Rails::VERSION::STRING > '4' -%>
-    it "routes to #update via PATCH" do
-      expect(:patch => "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#update", :id => "1")
+    it 'routes to #update via PATCH' do
+      expect(patch: '/<%= ns_table_name %>/1').to route_to('<%= ns_table_name %>#update', id: '1')
     end
 
 <% end -%>
-    it "routes to #destroy" do
-      expect(:delete => "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#destroy", :id => "1")
+    it 'routes to #destroy' do
+      expect(delete: '/<%= ns_table_name %>/1').to route_to('<%= ns_table_name %>#destroy', id: '1')
     end
-
   end
 end
 <% end -%>

data/lib/templates/rspec/scaffold/show_spec.rb

@@ -1,12 +1,13 @@
 require 'rails_helper'
 
-RSpec.describe "<%= ns_table_name %>/show", <%= type_metatag(:view) %> do
+RSpec.describe '<%= ns_table_name %>/show', <%= type_metatag(:view) %> do
   <%= model.factory_girl_let_definitions %>
+  <%= model.factory_girl_let_definition %>
   before(:each) do
-    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, <%= model.factory_girl_to :create %>)
+    assign(:<%= model.full_resource_name %>, <%= model.full_resource_name %>)
   end
 
-  it "renders attributes in <p>" do
+  it 'renders attributes in <p>' do
     render
 <% model.columns_for(:spec_show).each do |attribute| -%>
     expect(rendered).to match(<%= attribute.sample_value_regexp_exp %>)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_base_generators
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -111,7 +111,8 @@ dependencies:
 description: Provide generators for models with assocations.
 email:
 - akm2000@gmail.com
-executables: []
+executables:
+- model_base
 extensions: []
 extra_rdoc_files: []
 files:
@@ -126,7 +127,9 @@ files:
 - bin/console
 - bin/setup
 - example/.gitignore
+- example/.model_base/controllers
 - example/.rspec
+- example/.rubocop.yml
 - example/Gemfile
 - example/Gemfile.lock
 - example/Rakefile
@@ -270,6 +273,7 @@ files:
 - example/spec/support/controller_macros.rb
 - example/spec/support/devise.rb
 - example/spec/support/field_assertions.rb
+- example/spec/support/time_match_support.rb
 - example/spec/views/issue_comments/edit.html.erb_spec.rb
 - example/spec/views/issue_comments/index.html.erb_spec.rb
 - example/spec/views/issue_comments/new.html.erb_spec.rb
@@ -291,18 +295,22 @@ files:
 - example/spec/views/projects/new.html.erb_spec.rb
 - example/spec/views/projects/show.html.erb_spec.rb
 - example/tmp/.keep
+- exe/model_base
 - lib/generators/model_base/install_generator.rb
 - lib/generators/model_base/templates/app/controllers/concerns/authentication.rb
 - lib/generators/model_base/templates/spec/factories/users.rb
 - lib/generators/model_base/templates/spec/support/controller_macros.rb
 - lib/generators/model_base/templates/spec/support/devise.rb
 - lib/generators/model_base/templates/spec/support/field_assertions.rb
+- lib/generators/model_base/templates/spec/support/time_match_support.rb
 - lib/model_base.rb
 - lib/model_base/column_attribute.rb
 - lib/model_base/config.rb
+- lib/model_base/generators.rb
 - lib/model_base/generators/erb/scaffold.rb
 - lib/model_base/generators/factory_girl/model.rb
 - lib/model_base/generators/model_support.rb
+- lib/model_base/generators/rails/scaffold_controller.rb
 - lib/model_base/meta_model.rb
 - lib/model_base/railtie.rb
 - lib/model_base/version.rb