model_base_generators 0.3.2 → 0.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (96) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +23 -0
  3. data/example/.gitignore +1 -0
  4. data/example/.model_base/controllers +5 -0
  5. data/example/.rubocop.yml +31 -0
  6. data/example/Gemfile +1 -1
  7. data/example/Gemfile.lock +14 -1
  8. data/example/app/controllers/concerns/authentication.rb +2 -2
  9. data/example/app/models/ability.rb +1 -2
  10. data/example/app/models/issue.rb +0 -1
  11. data/example/app/models/user.rb +3 -2
  12. data/example/app/views/issue_comments/_issue_comment.json.jbuilder +1 -1
  13. data/example/app/views/issue_comments/_table.html.erb +1 -1
  14. data/example/app/views/issue_comments/index.html.erb +1 -1
  15. data/example/app/views/issue_comments/index.json.jbuilder +1 -1
  16. data/example/app/views/issue_comments/show.json.jbuilder +1 -1
  17. data/example/app/views/issues/_table.html.erb +1 -1
  18. data/example/app/views/issues/index.html.erb +1 -1
  19. data/example/app/views/phases/_table.html.erb +1 -1
  20. data/example/app/views/phases/index.html.erb +1 -1
  21. data/example/app/views/project_assignments/_table.html.erb +1 -1
  22. data/example/app/views/project_assignments/index.html.erb +1 -1
  23. data/example/app/views/projects/_table.html.erb +1 -1
  24. data/example/app/views/projects/index.html.erb +1 -1
  25. data/example/config/application.rb +1 -1
  26. data/example/config/environments/development.rb +1 -1
  27. data/example/config/environments/production.rb +2 -2
  28. data/example/config/environments/test.rb +1 -1
  29. data/example/config/initializers/pretty_validation.rb +1 -1
  30. data/example/config/puma.rb +3 -3
  31. data/example/db/schema.rb +9 -9
  32. data/example/spec/controllers/issue_comments_controller_spec.rb +73 -61
  33. data/example/spec/controllers/issues_controller_spec.rb +71 -59
  34. data/example/spec/controllers/phases_controller_spec.rb +72 -60
  35. data/example/spec/controllers/project_assignments_controller_spec.rb +72 -60
  36. data/example/spec/controllers/projects_controller_spec.rb +70 -58
  37. data/example/spec/factories/issue_comments.rb +1 -1
  38. data/example/spec/factories/issues.rb +1 -1
  39. data/example/spec/factories/phases.rb +3 -3
  40. data/example/spec/factories/project_assignments.rb +2 -2
  41. data/example/spec/factories/projects.rb +1 -1
  42. data/example/spec/factories/users.rb +2 -2
  43. data/example/spec/rails_helper.rb +1 -1
  44. data/example/spec/requests/issue_comments_spec.rb +4 -4
  45. data/example/spec/routing/issue_comments_routing_spec.rb +18 -20
  46. data/example/spec/routing/issues_routing_spec.rb +18 -20
  47. data/example/spec/routing/phases_routing_spec.rb +18 -20
  48. data/example/spec/routing/project_assignments_routing_spec.rb +18 -20
  49. data/example/spec/routing/projects_routing_spec.rb +18 -20
  50. data/example/spec/spec_helper.rb +47 -49
  51. data/example/spec/support/controller_macros.rb +3 -3
  52. data/example/spec/support/devise.rb +2 -2
  53. data/example/spec/support/time_match_support.rb +9 -0
  54. data/example/spec/views/issue_comments/edit.html.erb_spec.rb +12 -11
  55. data/example/spec/views/issue_comments/index.html.erb_spec.rb +12 -12
  56. data/example/spec/views/issue_comments/new.html.erb_spec.rb +12 -11
  57. data/example/spec/views/issue_comments/show.html.erb_spec.rb +7 -6
  58. data/example/spec/views/issues/edit.html.erb_spec.rb +12 -11
  59. data/example/spec/views/issues/index.html.erb_spec.rb +13 -13
  60. data/example/spec/views/issues/new.html.erb_spec.rb +12 -11
  61. data/example/spec/views/issues/show.html.erb_spec.rb +6 -5
  62. data/example/spec/views/phases/edit.html.erb_spec.rb +9 -8
  63. data/example/spec/views/phases/index.html.erb_spec.rb +12 -12
  64. data/example/spec/views/phases/new.html.erb_spec.rb +9 -8
  65. data/example/spec/views/phases/show.html.erb_spec.rb +8 -7
  66. data/example/spec/views/project_assignments/edit.html.erb_spec.rb +10 -9
  67. data/example/spec/views/project_assignments/index.html.erb_spec.rb +11 -11
  68. data/example/spec/views/project_assignments/new.html.erb_spec.rb +10 -9
  69. data/example/spec/views/project_assignments/show.html.erb_spec.rb +8 -7
  70. data/example/spec/views/projects/edit.html.erb_spec.rb +9 -8
  71. data/example/spec/views/projects/index.html.erb_spec.rb +10 -10
  72. data/example/spec/views/projects/new.html.erb_spec.rb +9 -8
  73. data/example/spec/views/projects/show.html.erb_spec.rb +5 -4
  74. data/exe/model_base +33 -0
  75. data/lib/generators/model_base/install_generator.rb +1 -0
  76. data/lib/generators/model_base/templates/app/controllers/concerns/authentication.rb +2 -2
  77. data/lib/generators/model_base/templates/spec/support/time_match_support.rb +9 -0
  78. data/lib/model_base/column_attribute.rb +2 -2
  79. data/lib/model_base/config.rb +6 -0
  80. data/lib/model_base/generators/model_support.rb +8 -0
  81. data/lib/model_base/generators/rails/scaffold_controller.rb +25 -0
  82. data/lib/model_base/generators.rb +33 -0
  83. data/lib/model_base/meta_model.rb +2 -2
  84. data/lib/model_base/railtie.rb +1 -1
  85. data/lib/model_base/version.rb +1 -1
  86. data/lib/model_base.rb +24 -13
  87. data/lib/templates/erb/scaffold/_table.html.erb +1 -1
  88. data/lib/templates/erb/scaffold/index.html.erb +1 -1
  89. data/lib/templates/factory_girl/factory.rb +1 -1
  90. data/lib/templates/rspec/scaffold/controller_spec.rb +71 -59
  91. data/lib/templates/rspec/scaffold/edit_spec.rb +5 -4
  92. data/lib/templates/rspec/scaffold/index_spec.rb +8 -8
  93. data/lib/templates/rspec/scaffold/new_spec.rb +5 -4
  94. data/lib/templates/rspec/scaffold/routing_spec.rb +18 -20
  95. data/lib/templates/rspec/scaffold/show_spec.rb +4 -3
  96. metadata +11 -3
@@ -1,19 +1,20 @@
1
1
  require 'rails_helper'
2
2
 
3
- RSpec.describe "project_assignments/new", type: :view do
4
- let(:user){ FactoryGirl.create(:user) }
5
- let(:project){ FactoryGirl.create(:project, owner: user) }
3
+ RSpec.describe 'project_assignments/new', type: :view do
4
+ let(:user) { FactoryGirl.create(:user) }
5
+ let(:project) { FactoryGirl.create(:project, owner: user) }
6
+ let(:project_assignment) { FactoryGirl.build(:project_assignment, project: project, user: user) }
6
7
  before(:each) do
7
- assign(:project_assignment, FactoryGirl.build(:project_assignment, project: project, user: user))
8
+ assign(:project_assignment, project_assignment)
8
9
  end
9
10
 
10
- it "renders new project_assignment form" do
11
+ it 'renders new project_assignment form' do
11
12
  render
12
13
 
13
- assert_select "form[action=?][method=?]", project_assignments_path, "post" do
14
- assert_select "input#project_assignment_id[name=?]", "project_assignment[id]"
15
- assert_select "select#project_assignment_project_id[name=?]", "project_assignment[project_id]"
16
- assert_select "select#project_assignment_user_id[name=?]", "project_assignment[user_id]"
14
+ assert_select 'form[action=?][method=?]', project_assignments_path, 'post' do
15
+ assert_select 'input#project_assignment_id[name=?]', 'project_assignment[id]'
16
+ assert_select 'select#project_assignment_project_id[name=?]', 'project_assignment[project_id]'
17
+ assert_select 'select#project_assignment_user_id[name=?]', 'project_assignment[user_id]'
17
18
  assert_select_datetime_field :project_assignment, :started_at
18
19
  assert_select_datetime_field :project_assignment, :finished_at
19
20
  end
@@ -1,17 +1,18 @@
1
1
  require 'rails_helper'
2
2
 
3
- RSpec.describe "project_assignments/show", type: :view do
4
- let(:user){ FactoryGirl.create(:user) }
5
- let(:project){ FactoryGirl.create(:project, owner: user) }
3
+ RSpec.describe 'project_assignments/show', type: :view do
4
+ let(:user) { FactoryGirl.create(:user) }
5
+ let(:project) { FactoryGirl.create(:project, owner: user) }
6
+ let(:project_assignment) { FactoryGirl.create(:project_assignment, project: project, user: user) }
6
7
  before(:each) do
7
- @project_assignment = assign(:project_assignment, FactoryGirl.create(:project_assignment, project: project, user: user))
8
+ assign(:project_assignment, project_assignment)
8
9
  end
9
10
 
10
- it "renders attributes in <p>" do
11
+ it 'renders attributes in <p>' do
11
12
  render
12
13
  expect(rendered).to match(/project1/)
13
14
  expect(rendered).to match(/user1@example.com/)
14
- expect(rendered).to match(Regexp.new(Regexp.escape(localize(Time.zone.parse('2020-03-22 09:50:00 +09:00')))))
15
- expect(rendered).to match(Regexp.new(Regexp.escape(localize(Time.zone.parse('2020-03-22 23:40:00 +09:00')))))
15
+ expect(rendered).to match(localized_time_re('2020-03-22 09:50:00 +09:00'))
16
+ expect(rendered).to match(localized_time_re('2020-03-22 23:40:00 +09:00'))
16
17
  end
17
18
  end
@@ -1,18 +1,19 @@
1
1
  require 'rails_helper'
2
2
 
3
- RSpec.describe "projects/edit", type: :view do
4
- let(:user){ FactoryGirl.create(:user) }
3
+ RSpec.describe 'projects/edit', type: :view do
4
+ let(:user) { FactoryGirl.create(:user) }
5
+ let(:project) { FactoryGirl.create(:project, owner: user) }
5
6
  before(:each) do
6
- @project = assign(:project, FactoryGirl.create(:project, owner: user))
7
+ assign(:project, project)
7
8
  end
8
9
 
9
- it "renders the edit project form" do
10
+ it 'renders the edit project form' do
10
11
  render
11
12
 
12
- assert_select "form[action=?][method=?]", project_path(@project), "post" do
13
- assert_select "select#project_owner_id[name=?]", "project[owner_id]"
14
- assert_select "input#project_name[name=?]", "project[name]"
15
- assert_select "input#project_closed[name=?]", "project[closed]"
13
+ assert_select 'form[action=?][method=?]', project_path(project), 'post' do
14
+ assert_select 'select#project_owner_id[name=?]', 'project[owner_id]'
15
+ assert_select 'input#project_name[name=?]', 'project[name]'
16
+ assert_select 'input#project_closed[name=?]', 'project[closed]'
16
17
  end
17
18
  end
18
19
  end
@@ -1,19 +1,19 @@
1
1
  require 'rails_helper'
2
2
 
3
- RSpec.describe "projects/index", type: :view do
4
- let(:user){ FactoryGirl.create(:user) }
3
+ RSpec.describe 'projects/index', type: :view do
4
+ let(:user) { FactoryGirl.create(:user) }
5
5
  before(:each) do
6
6
  assign(:projects, [
7
- FactoryGirl.create(:project, owner: user, name: 'project1'),
8
- FactoryGirl.create(:project, owner: user, name: 'project2'),
9
- ])
7
+ FactoryGirl.create(:project, owner: user, name: 'project1'),
8
+ FactoryGirl.create(:project, owner: user, name: 'project2'),
9
+ ])
10
10
  end
11
11
 
12
- it "renders a list of projects" do
12
+ it 'renders a list of projects' do
13
13
  render
14
- assert_select "tr>td", :text => 'user1@example.com', :count => 2
15
- assert_select "tr>td", :text => 'project1', :count => 1
16
- assert_select "tr>td", :text => 'project2', :count => 1
17
- assert_select "tr>td", :text => 'false', :count => 2
14
+ assert_select 'tr>td', text: 'user1@example.com', count: 2
15
+ assert_select 'tr>td', text: 'project1', count: 1
16
+ assert_select 'tr>td', text: 'project2', count: 1
17
+ assert_select 'tr>td', text: 'false', count: 2
18
18
  end
19
19
  end
@@ -1,18 +1,19 @@
1
1
  require 'rails_helper'
2
2
 
3
- RSpec.describe "projects/new", type: :view do
4
- let(:user){ FactoryGirl.create(:user) }
3
+ RSpec.describe 'projects/new', type: :view do
4
+ let(:user) { FactoryGirl.create(:user) }
5
+ let(:project) { FactoryGirl.build(:project, owner: user) }
5
6
  before(:each) do
6
- assign(:project, FactoryGirl.build(:project, owner: user))
7
+ assign(:project, project)
7
8
  end
8
9
 
9
- it "renders new project form" do
10
+ it 'renders new project form' do
10
11
  render
11
12
 
12
- assert_select "form[action=?][method=?]", projects_path, "post" do
13
- assert_select "select#project_owner_id[name=?]", "project[owner_id]"
14
- assert_select "input#project_name[name=?]", "project[name]"
15
- assert_select "input#project_closed[name=?]", "project[closed]"
13
+ assert_select 'form[action=?][method=?]', projects_path, 'post' do
14
+ assert_select 'select#project_owner_id[name=?]', 'project[owner_id]'
15
+ assert_select 'input#project_name[name=?]', 'project[name]'
16
+ assert_select 'input#project_closed[name=?]', 'project[closed]'
16
17
  end
17
18
  end
18
19
  end
@@ -1,12 +1,13 @@
1
1
  require 'rails_helper'
2
2
 
3
- RSpec.describe "projects/show", type: :view do
4
- let(:user){ FactoryGirl.create(:user) }
3
+ RSpec.describe 'projects/show', type: :view do
4
+ let(:user) { FactoryGirl.create(:user) }
5
+ let(:project) { FactoryGirl.create(:project, owner: user) }
5
6
  before(:each) do
6
- @project = assign(:project, FactoryGirl.create(:project, owner: user))
7
+ assign(:project, project)
7
8
  end
8
9
 
9
- it "renders attributes in <p>" do
10
+ it 'renders attributes in <p>' do
10
11
  render
11
12
  expect(rendered).to match(/user1@example.com/)
12
13
  expect(rendered).to match(/project1/)
data/exe/model_base ADDED
@@ -0,0 +1,33 @@
1
+ #!/usr/bin/env ruby
2
+
3
+ APP_PATH = File.expand_path('config/application')
4
+ require APP_PATH
5
+
6
+ require 'thor'
7
+
8
+ class ModelBaseCli < Thor
9
+ desc "each controller COMMAND [ARG1...]", "Call command with each controller"
10
+ long_desc [
11
+ "Run COMMAND with each controller. ",
12
+ "For example, `bundle exec model_base each controller rails g scaffold_controller`",
13
+ " runs `rails g scaffold_controller CONTROLLER`. ",
14
+ "All of CONTROLLER are loaded from .model_base/controllers",
15
+ ].join("\n")
16
+ def each(type, command, *args)
17
+ names =
18
+ case type
19
+ when 'controller' then # OK
20
+ ModelBase.generated_controllers
21
+ else raise "type must `controller` now"
22
+ end
23
+ names.each do |name|
24
+ cmd = "#{command.shellescape} #{args.map(&:shellescape).join(' ')} #{name}"
25
+ puts "\e[34m#{cmd}\e[0m"
26
+ Bundler.with_clean_env do
27
+ exit(1) unless system(cmd)
28
+ end
29
+ end
30
+ end
31
+ end
32
+
33
+ ModelBaseCli.start(ARGV)
@@ -13,6 +13,7 @@ module ModelBase
13
13
  'spec/support/controller_macros.rb',
14
14
  'spec/support/devise.rb',
15
15
  'spec/support/field_assertions.rb',
16
+ 'spec/support/time_match_support.rb',
16
17
  ].each{|f| template f, f }
17
18
  end
18
19
  end
@@ -2,11 +2,11 @@ module Authentication
2
2
  def self.included(klass)
3
3
  klass.class_eval do
4
4
  before_action :authenticate_user!
5
- around_action :set_current_user
5
+ around_action :assign_current_user
6
6
  end
7
7
  end
8
8
 
9
- def set_current_user(&block)
9
+ def assign_current_user(&block)
10
10
  User.current(current_user, &block)
11
11
  end
12
12
  end
@@ -0,0 +1,9 @@
1
+ module TimeMatchSupport
2
+ def localized_time_re(time_str)
3
+ Regexp.new(Regexp.escape(localize(Time.zone.parse(time_str))))
4
+ end
5
+ end
6
+
7
+ RSpec.configure do |config|
8
+ config.include TimeMatchSupport
9
+ end
@@ -112,7 +112,7 @@ module ModelBase
112
112
  def sample_value_regexp_exp(idx = 1)
113
113
  case type
114
114
  when :datetime, :timestamp, :time
115
- 'Regexp.new(Regexp.escape(%s))' % sample_string_exp(idx)
115
+ "localized_time_re('%s')" % sample_value(idx)
116
116
  else
117
117
  '/%s/' % sample_value(idx)
118
118
  end
@@ -124,7 +124,7 @@ module ModelBase
124
124
  when :datetime, :timestamp, :time
125
125
  "assert_select_datetime_field :#{model_name}, :#{name}"
126
126
  else
127
- "assert_select \"#{ input_type }##{ model_name }_#{ name }[name=?]\", \"#{ model_name }[#{ name }]\""
127
+ "assert_select '#{ input_type }##{ model_name }_#{ name }[name=?]', '#{ model_name }[#{ name }]'"
128
128
  end
129
129
  end
130
130
 
@@ -4,6 +4,8 @@ module ModelBase
4
4
  class Configuration
5
5
  include ActiveSupport::Configurable
6
6
 
7
+ config_accessor(:home_dir){ ::Rails.root.join('.model_base').to_s }
8
+
7
9
  config_accessor(:disabled){ false }
8
10
 
9
11
  base_exclusions =
@@ -28,6 +30,10 @@ module ModelBase
28
30
  ['name', 'title', 'email', 'display_name', 'display_title', /_name\z/, /_title\z/]
29
31
  end
30
32
 
33
+ config_accessor(:skipped_files) do
34
+ []
35
+ end
36
+
31
37
  config_accessor(:base_time) do
32
38
  '2020-01-01 00:00:00'
33
39
  end
@@ -15,6 +15,14 @@ module ModelBase
15
15
  @model_name = @model_name.camelize
16
16
  end
17
17
 
18
+ def template(src, dest, *args, &block)
19
+ if ModelBase.skipped_file?(dest)
20
+ $stderr.puts("\e[34m#{dest} was SKIPPED\e[0m")
21
+ return
22
+ end
23
+ super
24
+ end
25
+
18
26
  protected
19
27
 
20
28
  def model
@@ -0,0 +1,25 @@
1
+ require "model_base"
2
+
3
+ require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
4
+
5
+ module ModelBase
6
+ module Generators
7
+ module Rails
8
+
9
+ module ScaffoldController
10
+ def self.enable!
11
+ ::Rails::Generators::ScaffoldControllerGenerator.prepend(self)
12
+ end
13
+
14
+ def create_controller_files
15
+ name =
16
+ File.join(controller_class_path, controller_file_name).
17
+ strip.sub(/\A\//, '')
18
+ ModelBase.add_generated_controller(name)
19
+ super
20
+ end
21
+ end
22
+
23
+ end
24
+ end
25
+ end
@@ -0,0 +1,33 @@
1
+ require 'model_base'
2
+
3
+ module ModelBase
4
+ module Generators
5
+ autoload :ModelSupport, 'model_base/generators/model_support'
6
+
7
+ module Erb
8
+ autoload :Scaffold, 'model_base/generators/erb/scaffold'
9
+ end
10
+
11
+ module FactoryGirl
12
+ autoload :Model, 'model_base/generators/factory_girl/model'
13
+ end
14
+
15
+ module Rails
16
+ autoload :ScaffoldController, 'model_base/generators/rails/scaffold_controller'
17
+ end
18
+
19
+ class << self
20
+ def enable!
21
+ ::Rails::Generators::NamedBase.prepend(ModelSupport)
22
+ templates_dir = File::expand_path('../../templates', __FILE__)
23
+ ::Rails::Generators.templates_path.unshift(templates_dir)
24
+ ::Rails::Generators.lookup(["rails:scaffold_controller"])
25
+ ::Rails::Generators::ScaffoldControllerGenerator.source_paths.unshift(templates_dir)
26
+ Erb::Scaffold.enable!
27
+ FactoryGirl::Model.enable!
28
+ Rails::ScaffoldController.enable!
29
+ end
30
+ end
31
+
32
+ end
33
+ end
@@ -132,8 +132,8 @@ module ModelBase
132
132
  factory_girl_method(name, extra)
133
133
  end
134
134
 
135
- def factory_girl_let_definition
136
- 'let(:%s){ %s }' % [full_resource_name, factory_girl_to(:create)]
135
+ def factory_girl_let_definition(action: :create)
136
+ 'let(:%s) { %s }' % [full_resource_name, factory_girl_to(action)]
137
137
  end
138
138
 
139
139
  def factory_girl_let_definitions(spacer = " ")
@@ -5,7 +5,7 @@ module ModelBase
5
5
 
6
6
  generators do |g|
7
7
  unless ModelBase.config.disabled
8
- ModelBase.enable!
8
+ ModelBase::Generators.enable!
9
9
  end
10
10
  end
11
11
 
@@ -1,3 +1,3 @@
1
1
  module ModelBase
2
- VERSION = "0.3.2"
2
+ VERSION = "0.3.3"
3
3
  end
data/lib/model_base.rb CHANGED
@@ -4,6 +4,7 @@ module ModelBase
4
4
 
5
5
  autoload :ColumnAttribute, 'model_base/column_attribute'
6
6
  autoload :Configuration, 'model_base/config'
7
+ autoload :Generators , 'model_base/generators'
7
8
  autoload :MetaModel , 'model_base/meta_model'
8
9
 
9
10
  class << self
@@ -15,22 +16,32 @@ module ModelBase
15
16
  @config ||= Configuration.new
16
17
  end
17
18
 
18
- def enable!
19
- require 'model_base/generators/model_support'
20
- ::Rails::Generators::NamedBase.prepend(::ModelBase::Generators::ModelSupport)
21
- templates_dir = File::expand_path('../templates', __FILE__)
22
- Rails::Generators.templates_path.unshift(templates_dir)
23
- Rails::Generators.lookup(["rails:scaffold_controller"])
24
- Rails::Generators::ScaffoldControllerGenerator.source_paths.unshift(templates_dir)
25
- require 'model_base/generators/erb/scaffold'
26
- ::ModelBase::Generators::Erb::Scaffold.enable!
27
- require 'model_base/generators/factory_girl/model'
28
- ::ModelBase::Generators::FactoryGirl::Model.enable!
29
- end
30
-
31
19
  def base_time
32
20
  Time.zone.parse(config.base_time)
33
21
  end
22
+
23
+ def skipped_file?(path)
24
+ config.skipped_files.any? do |ptn|
25
+ File.fnmatch?(ptn, path, File::FNM_EXTGLOB)
26
+ end
27
+ end
28
+
29
+ def generated_controllers_path
30
+ File.join(ModelBase.config.home_dir, 'controllers').to_s
31
+ end
32
+
33
+ def generated_controllers
34
+ path = generated_controllers_path
35
+ File.readable?(path) ? File.read(path).lines.map(&:strip) : []
36
+ end
37
+
38
+ def add_generated_controller(name)
39
+ path = ModelBase.generated_controllers_path
40
+ FileUtils.mkdir_p(File.dirname(path))
41
+ names = generated_controllers
42
+ names << name
43
+ open(path, 'w'){|f| f.puts(names.uniq.join("\n")) }
44
+ end
34
45
  end
35
46
  end
36
47
  require 'model_base/railtie' if defined?(Rails)
@@ -9,7 +9,7 @@
9
9
  </tr>
10
10
  </thead>
11
11
  <tbody>
12
- <%% @<%= model.plural_full_resource_name %>.each do |<%= model.full_resource_name %>| %>
12
+ <%% <%= model.plural_full_resource_name %>.each do |<%= model.full_resource_name %>| %>
13
13
  <tr>
14
14
  <%- model.columns_for(:index).each do |column| -%>
15
15
  <%- if column.linkable? -%>
@@ -2,7 +2,7 @@
2
2
  <div class="page-header">
3
3
  <h1><%%=t '.title', :default => model_class.model_name.human.pluralize.titleize %></h1>
4
4
  </div>
5
- <%%= render '<%= plural_table_name %>/table' %>
5
+ <%%= render '<%= plural_table_name %>/table', <%= plural_table_name %>: @<%= plural_table_name %> %>
6
6
 
7
7
  <%%= link_to t('.new', :default => t("helpers.links.new")),
8
8
  new_<%= singular_controller_routing_path %>_path,
@@ -8,7 +8,7 @@ FactoryGirl.define do
8
8
  <%= col.reference.name %> nil
9
9
  <%- end -%>
10
10
  <%- else -%>
11
- <%= col.name %> <%= col.sample_value(context: :factory).inspect %>
11
+ <%= col.name %> <%= col.sample_value(context: :factory).inspect.gsub(/\A\"|\"\z/, "'") %>
12
12
  <%- end -%>
13
13
  <%- end -%>
14
14
  end