model_base_generators 0.3.2 → 0.3.3

data/example/spec/views/project_assignments/new.html.erb_spec.rb

@@ -1,19 +1,20 @@
 require 'rails_helper'
 
-RSpec.describe "project_assignments/new", type: :view do
-  let(:user){ FactoryGirl.create(:user) }
-  let(:project){ FactoryGirl.create(:project, owner: user) }
+RSpec.describe 'project_assignments/new', type: :view do
+  let(:user) { FactoryGirl.create(:user) }
+  let(:project) { FactoryGirl.create(:project, owner: user) }
+  let(:project_assignment) { FactoryGirl.build(:project_assignment, project: project, user: user) }
   before(:each) do
-    assign(:project_assignment, FactoryGirl.build(:project_assignment, project: project, user: user))
+    assign(:project_assignment, project_assignment)
   end
 
-  it "renders new project_assignment form" do
+  it 'renders new project_assignment form' do
     render
 
-    assert_select "form[action=?][method=?]", project_assignments_path, "post" do
-      assert_select "input#project_assignment_id[name=?]", "project_assignment[id]"
-      assert_select "select#project_assignment_project_id[name=?]", "project_assignment[project_id]"
-      assert_select "select#project_assignment_user_id[name=?]", "project_assignment[user_id]"
+    assert_select 'form[action=?][method=?]', project_assignments_path, 'post' do
+      assert_select 'input#project_assignment_id[name=?]', 'project_assignment[id]'
+      assert_select 'select#project_assignment_project_id[name=?]', 'project_assignment[project_id]'
+      assert_select 'select#project_assignment_user_id[name=?]', 'project_assignment[user_id]'
       assert_select_datetime_field :project_assignment, :started_at
       assert_select_datetime_field :project_assignment, :finished_at
     end

data/example/spec/views/project_assignments/show.html.erb_spec.rb

@@ -1,17 +1,18 @@
 require 'rails_helper'
 
-RSpec.describe "project_assignments/show", type: :view do
-  let(:user){ FactoryGirl.create(:user) }
-  let(:project){ FactoryGirl.create(:project, owner: user) }
+RSpec.describe 'project_assignments/show', type: :view do
+  let(:user) { FactoryGirl.create(:user) }
+  let(:project) { FactoryGirl.create(:project, owner: user) }
+  let(:project_assignment) { FactoryGirl.create(:project_assignment, project: project, user: user) }
   before(:each) do
-    @project_assignment = assign(:project_assignment, FactoryGirl.create(:project_assignment, project: project, user: user))
+    assign(:project_assignment, project_assignment)
   end
 
-  it "renders attributes in <p>" do
+  it 'renders attributes in <p>' do
     render
     expect(rendered).to match(/project1/)
     expect(rendered).to match(/user1@example.com/)
-    expect(rendered).to match(Regexp.new(Regexp.escape(localize(Time.zone.parse('2020-03-22 09:50:00 +09:00')))))
-    expect(rendered).to match(Regexp.new(Regexp.escape(localize(Time.zone.parse('2020-03-22 23:40:00 +09:00')))))
+    expect(rendered).to match(localized_time_re('2020-03-22 09:50:00 +09:00'))
+    expect(rendered).to match(localized_time_re('2020-03-22 23:40:00 +09:00'))
   end
 end

data/example/spec/views/projects/edit.html.erb_spec.rb

@@ -1,18 +1,19 @@
 require 'rails_helper'
 
-RSpec.describe "projects/edit", type: :view do
-  let(:user){ FactoryGirl.create(:user) }
+RSpec.describe 'projects/edit', type: :view do
+  let(:user) { FactoryGirl.create(:user) }
+  let(:project) { FactoryGirl.create(:project, owner: user) }
   before(:each) do
-    @project = assign(:project, FactoryGirl.create(:project, owner: user))
+    assign(:project, project)
   end
 
-  it "renders the edit project form" do
+  it 'renders the edit project form' do
     render
 
-    assert_select "form[action=?][method=?]", project_path(@project), "post" do
-      assert_select "select#project_owner_id[name=?]", "project[owner_id]"
-      assert_select "input#project_name[name=?]", "project[name]"
-      assert_select "input#project_closed[name=?]", "project[closed]"
+    assert_select 'form[action=?][method=?]', project_path(project), 'post' do
+      assert_select 'select#project_owner_id[name=?]', 'project[owner_id]'
+      assert_select 'input#project_name[name=?]', 'project[name]'
+      assert_select 'input#project_closed[name=?]', 'project[closed]'
     end
   end
 end

data/example/spec/views/projects/index.html.erb_spec.rb

@@ -1,19 +1,19 @@
 require 'rails_helper'
 
-RSpec.describe "projects/index", type: :view do
-  let(:user){ FactoryGirl.create(:user) }
+RSpec.describe 'projects/index', type: :view do
+  let(:user) { FactoryGirl.create(:user) }
   before(:each) do
     assign(:projects, [
-      FactoryGirl.create(:project, owner: user, name: 'project1'),
-      FactoryGirl.create(:project, owner: user, name: 'project2'),
-    ])
+             FactoryGirl.create(:project, owner: user, name: 'project1'),
+             FactoryGirl.create(:project, owner: user, name: 'project2'),
+           ])
   end
 
-  it "renders a list of projects" do
+  it 'renders a list of projects' do
     render
-    assert_select "tr>td", :text => 'user1@example.com', :count => 2
-    assert_select "tr>td", :text => 'project1', :count => 1
-    assert_select "tr>td", :text => 'project2', :count => 1
-    assert_select "tr>td", :text => 'false', :count => 2
+    assert_select 'tr>td', text: 'user1@example.com', count: 2
+    assert_select 'tr>td', text: 'project1', count: 1
+    assert_select 'tr>td', text: 'project2', count: 1
+    assert_select 'tr>td', text: 'false', count: 2
   end
 end

data/example/spec/views/projects/new.html.erb_spec.rb

@@ -1,18 +1,19 @@
 require 'rails_helper'
 
-RSpec.describe "projects/new", type: :view do
-  let(:user){ FactoryGirl.create(:user) }
+RSpec.describe 'projects/new', type: :view do
+  let(:user) { FactoryGirl.create(:user) }
+  let(:project) { FactoryGirl.build(:project, owner: user) }
   before(:each) do
-    assign(:project, FactoryGirl.build(:project, owner: user))
+    assign(:project, project)
   end
 
-  it "renders new project form" do
+  it 'renders new project form' do
     render
 
-    assert_select "form[action=?][method=?]", projects_path, "post" do
-      assert_select "select#project_owner_id[name=?]", "project[owner_id]"
-      assert_select "input#project_name[name=?]", "project[name]"
-      assert_select "input#project_closed[name=?]", "project[closed]"
+    assert_select 'form[action=?][method=?]', projects_path, 'post' do
+      assert_select 'select#project_owner_id[name=?]', 'project[owner_id]'
+      assert_select 'input#project_name[name=?]', 'project[name]'
+      assert_select 'input#project_closed[name=?]', 'project[closed]'
     end
   end
 end

data/example/spec/views/projects/show.html.erb_spec.rb

@@ -1,12 +1,13 @@
 require 'rails_helper'
 
-RSpec.describe "projects/show", type: :view do
-  let(:user){ FactoryGirl.create(:user) }
+RSpec.describe 'projects/show', type: :view do
+  let(:user) { FactoryGirl.create(:user) }
+  let(:project) { FactoryGirl.create(:project, owner: user) }
   before(:each) do
-    @project = assign(:project, FactoryGirl.create(:project, owner: user))
+    assign(:project, project)
   end
 
-  it "renders attributes in <p>" do
+  it 'renders attributes in <p>' do
     render
     expect(rendered).to match(/user1@example.com/)
     expect(rendered).to match(/project1/)

data/exe/model_base

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+
+APP_PATH = File.expand_path('config/application')
+require APP_PATH
+
+require 'thor'
+
+class ModelBaseCli < Thor
+  desc "each controller COMMAND [ARG1...]", "Call command with each controller"
+  long_desc [
+    "Run COMMAND with each controller. ",
+    "For example, `bundle exec model_base each controller rails g scaffold_controller`",
+    " runs `rails g scaffold_controller CONTROLLER`. ",
+    "All of CONTROLLER are loaded from .model_base/controllers",
+  ].join("\n")
+  def each(type, command, *args)
+    names =
+      case type
+      when 'controller' then # OK
+        ModelBase.generated_controllers
+      else raise "type must `controller` now"
+      end
+    names.each do |name|
+      cmd = "#{command.shellescape} #{args.map(&:shellescape).join(' ')} #{name}"
+      puts "\e[34m#{cmd}\e[0m"
+      Bundler.with_clean_env do
+        exit(1) unless system(cmd)
+      end
+    end
+  end
+end
+
+ModelBaseCli.start(ARGV)

data/lib/generators/model_base/install_generator.rb

@@ -13,6 +13,7 @@ module ModelBase
         'spec/support/controller_macros.rb',
         'spec/support/devise.rb',
         'spec/support/field_assertions.rb',
+        'spec/support/time_match_support.rb',
       ].each{|f| template f, f }
     end
   end

data/lib/generators/model_base/templates/app/controllers/concerns/authentication.rb

@@ -2,11 +2,11 @@ module Authentication
   def self.included(klass)
     klass.class_eval do
       before_action :authenticate_user!
-      around_action :set_current_user
+      around_action :assign_current_user
     end
   end
 
-  def set_current_user(&block)
+  def assign_current_user(&block)
     User.current(current_user, &block)
   end
 end

data/lib/generators/model_base/templates/spec/support/time_match_support.rb

@@ -0,0 +1,9 @@
+module TimeMatchSupport
+  def localized_time_re(time_str)
+    Regexp.new(Regexp.escape(localize(Time.zone.parse(time_str))))
+  end
+end
+
+RSpec.configure do |config|
+  config.include TimeMatchSupport
+end

data/lib/model_base/column_attribute.rb

@@ -112,7 +112,7 @@ module ModelBase
     def sample_value_regexp_exp(idx = 1)
       case type
       when :datetime, :timestamp, :time
-        'Regexp.new(Regexp.escape(%s))' % sample_string_exp(idx)
+        "localized_time_re('%s')" % sample_value(idx)
       else
         '/%s/' % sample_value(idx)
       end
@@ -124,7 +124,7 @@ module ModelBase
       when :datetime, :timestamp, :time
         "assert_select_datetime_field :#{model_name}, :#{name}"
       else
-        "assert_select \"#{ input_type }##{ model_name }_#{ name }[name=?]\", \"#{ model_name }[#{ name }]\""
+        "assert_select '#{ input_type }##{ model_name }_#{ name }[name=?]', '#{ model_name }[#{ name }]'"
       end
     end
 

data/lib/model_base/config.rb

@@ -4,6 +4,8 @@ module ModelBase
   class Configuration
     include ActiveSupport::Configurable
 
+    config_accessor(:home_dir){ ::Rails.root.join('.model_base').to_s }
+
     config_accessor(:disabled){ false }
 
     base_exclusions =
@@ -28,6 +30,10 @@ module ModelBase
       ['name', 'title', 'email', 'display_name', 'display_title', /_name\z/, /_title\z/]
     end
 
+    config_accessor(:skipped_files) do
+      []
+    end
+
     config_accessor(:base_time) do
       '2020-01-01 00:00:00'
     end

data/lib/model_base/generators/model_support.rb

@@ -15,6 +15,14 @@ module ModelBase
         @model_name = @model_name.camelize
       end
 
+      def template(src, dest, *args, &block)
+        if ModelBase.skipped_file?(dest)
+          $stderr.puts("\e[34m#{dest} was SKIPPED\e[0m")
+          return
+        end
+        super
+      end
+
       protected
 
       def model

data/lib/model_base/generators/rails/scaffold_controller.rb

@@ -0,0 +1,25 @@
+require "model_base"
+
+require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
+
+module ModelBase
+  module Generators
+    module Rails
+
+      module ScaffoldController
+        def self.enable!
+          ::Rails::Generators::ScaffoldControllerGenerator.prepend(self)
+        end
+
+        def create_controller_files
+          name =
+            File.join(controller_class_path, controller_file_name).
+              strip.sub(/\A\//, '')
+          ModelBase.add_generated_controller(name)
+          super
+        end
+      end
+
+    end
+  end
+end

data/lib/model_base/generators.rb

@@ -0,0 +1,33 @@
+require 'model_base'
+
+module ModelBase
+  module Generators
+    autoload :ModelSupport, 'model_base/generators/model_support'
+
+    module Erb
+      autoload :Scaffold, 'model_base/generators/erb/scaffold'
+    end
+
+    module FactoryGirl
+      autoload :Model, 'model_base/generators/factory_girl/model'
+    end
+
+    module Rails
+      autoload :ScaffoldController, 'model_base/generators/rails/scaffold_controller'
+    end
+
+    class << self
+      def enable!
+        ::Rails::Generators::NamedBase.prepend(ModelSupport)
+        templates_dir = File::expand_path('../../templates', __FILE__)
+        ::Rails::Generators.templates_path.unshift(templates_dir)
+        ::Rails::Generators.lookup(["rails:scaffold_controller"])
+        ::Rails::Generators::ScaffoldControllerGenerator.source_paths.unshift(templates_dir)
+        Erb::Scaffold.enable!
+        FactoryGirl::Model.enable!
+        Rails::ScaffoldController.enable!
+      end
+    end
+
+  end
+end

data/lib/model_base/meta_model.rb

@@ -132,8 +132,8 @@ module ModelBase
       factory_girl_method(name, extra)
     end
 
-    def factory_girl_let_definition
-      'let(:%s){ %s }' % [full_resource_name, factory_girl_to(:create)]
+    def factory_girl_let_definition(action: :create)
+      'let(:%s) { %s }' % [full_resource_name, factory_girl_to(action)]
     end
 
     def factory_girl_let_definitions(spacer = "  ")

data/lib/model_base/railtie.rb

@@ -5,7 +5,7 @@ module ModelBase
 
     generators do |g|
       unless ModelBase.config.disabled
-        ModelBase.enable!
+        ModelBase::Generators.enable!
       end
     end
 

data/lib/model_base/version.rb

@@ -1,3 +1,3 @@
 module ModelBase
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/model_base.rb

@@ -4,6 +4,7 @@ module ModelBase
 
   autoload :ColumnAttribute, 'model_base/column_attribute'
   autoload :Configuration, 'model_base/config'
+  autoload :Generators   , 'model_base/generators'
   autoload :MetaModel    , 'model_base/meta_model'
 
   class << self
@@ -15,22 +16,32 @@ module ModelBase
       @config ||= Configuration.new
     end
 
-    def enable!
-      require 'model_base/generators/model_support'
-      ::Rails::Generators::NamedBase.prepend(::ModelBase::Generators::ModelSupport)
-      templates_dir = File::expand_path('../templates', __FILE__)
-      Rails::Generators.templates_path.unshift(templates_dir)
-      Rails::Generators.lookup(["rails:scaffold_controller"])
-      Rails::Generators::ScaffoldControllerGenerator.source_paths.unshift(templates_dir)
-      require 'model_base/generators/erb/scaffold'
-      ::ModelBase::Generators::Erb::Scaffold.enable!
-      require 'model_base/generators/factory_girl/model'
-      ::ModelBase::Generators::FactoryGirl::Model.enable!
-    end
-
     def base_time
       Time.zone.parse(config.base_time)
     end
+
+    def skipped_file?(path)
+      config.skipped_files.any? do |ptn|
+        File.fnmatch?(ptn, path, File::FNM_EXTGLOB)
+      end
+    end
+
+    def generated_controllers_path
+      File.join(ModelBase.config.home_dir, 'controllers').to_s
+    end
+
+    def generated_controllers
+      path = generated_controllers_path
+      File.readable?(path) ? File.read(path).lines.map(&:strip) : []
+    end
+
+    def add_generated_controller(name)
+      path = ModelBase.generated_controllers_path
+      FileUtils.mkdir_p(File.dirname(path))
+      names = generated_controllers
+      names << name
+      open(path, 'w'){|f| f.puts(names.uniq.join("\n")) }
+    end
   end
 end
 require 'model_base/railtie' if defined?(Rails)

data/lib/templates/erb/scaffold/_table.html.erb

@@ -9,7 +9,7 @@
     </tr>
   </thead>
   <tbody>
-    <%% @<%= model.plural_full_resource_name %>.each do |<%= model.full_resource_name %>| %>
+    <%% <%= model.plural_full_resource_name %>.each do |<%= model.full_resource_name %>| %>
       <tr>
         <%- model.columns_for(:index).each do |column| -%>
           <%- if column.linkable? -%>

data/lib/templates/erb/scaffold/index.html.erb

@@ -2,7 +2,7 @@
 <div class="page-header">
   <h1><%%=t '.title', :default => model_class.model_name.human.pluralize.titleize %></h1>
 </div>
-<%%= render '<%= plural_table_name %>/table' %>
+<%%= render '<%= plural_table_name %>/table', <%= plural_table_name %>: @<%= plural_table_name %> %>
 
 <%%= link_to t('.new', :default => t("helpers.links.new")),
             new_<%= singular_controller_routing_path %>_path,

data/lib/templates/factory_girl/factory.rb

@@ -8,7 +8,7 @@ FactoryGirl.define do
     <%= col.reference.name %> nil
     <%- end -%>
   <%- else -%>
-    <%= col.name %> <%= col.sample_value(context: :factory).inspect %>
+    <%= col.name %> <%= col.sample_value(context: :factory).inspect.gsub(/\A\"|\"\z/, "'") %>
   <%- end -%>
 <%- end -%>
   end