rails_ops 1.4.1 → 1.4.3

data/test/unit/rails_ops/generators/operation_generator_test.rb

@@ -10,12 +10,10 @@ class OperationGeneratorTest < Rails::Generators::TestCase
 
     # Add an empty routes file
     Dir.mkdir(File.join(destination_root, 'config'))
-    File.open(File.join(destination_root, 'config', 'routes.rb'), 'w') do |f|
-      f.write <<~ROUTES
-        Rails.application.routes.draw do
-        end
-      ROUTES
-    end
+    File.write(File.join(destination_root, 'config', 'routes.rb'), <<~ROUTES)
+      Rails.application.routes.draw do
+      end
+    ROUTES
   end
 
   def test_all
@@ -34,6 +32,104 @@ class OperationGeneratorTest < Rails::Generators::TestCase
     assert_routes
   end
 
+  def test_no_index_action
+    run_generator ['User', '--skip-index']
+
+    # Check that the index view is not created
+    assert_no_file 'app/views/users/index.html.haml'
+
+    # Check that the index route is not created
+    assert_file 'config/routes.rb' do |routes|
+      assert_match(/resources :users, except: \[:index\]/, routes)
+    end
+
+    # Check that the controller action is not created
+    assert_file 'app/controllers/users_controller.rb' do |controller|
+      assert_no_match(/def index/, controller)
+    end
+  end
+
+  def test_no_show_action
+    run_generator ['User', '--skip-show']
+
+    # Check that the show view is not created
+    assert_no_file 'app/views/users/show.html.haml'
+
+    # Check that the show route is not created
+    assert_file 'config/routes.rb' do |routes|
+      assert_match(/resources :users, except: \[:show\]/, routes)
+    end
+
+    # Check that the controller action is not created
+    assert_file 'app/controllers/users_controller.rb' do |controller|
+      assert_no_match(/def show/, controller)
+    end
+
+    # Check that the load operation is not created
+    assert_no_file 'app/operations/users/load.rb'
+  end
+
+  def test_no_create_action
+    run_generator ['User', '--skip-create']
+
+    # Check that the new and create view are not created
+    assert_no_file 'app/views/users/new.html.haml'
+    assert_no_file 'app/views/users/create.html.haml'
+
+    # Check that the new, create route is not created
+    assert_file 'config/routes.rb' do |routes|
+      assert_match(/resources :users, except: \[:new, :create\]/, routes)
+    end
+
+    # Check that the controller actions are not created
+    assert_file 'app/controllers/users_controller.rb' do |controller|
+      assert_no_match(/def new/, controller)
+      assert_no_match(/def create/, controller)
+    end
+
+    # Check that the load operation is not created
+    assert_no_file 'app/operations/users/create.rb'
+  end
+
+  def test_no_update_action
+    run_generator ['User', '--skip-update']
+
+    # Check that the edit and update view are not created
+    assert_no_file 'app/views/users/edit.html.haml'
+    assert_no_file 'app/views/users/update.html.haml'
+
+    # Check that the edit, update route is not created
+    assert_file 'config/routes.rb' do |routes|
+      assert_match(/resources :users, except: \[:edit, :update\]/, routes)
+    end
+
+    # Check that the controller actions are not created
+    assert_file 'app/controllers/users_controller.rb' do |controller|
+      assert_no_match(/def edit/, controller)
+      assert_no_match(/def update/, controller)
+    end
+
+    # Check that the load operation is not created
+    assert_no_file 'app/operations/users/update.rb'
+  end
+
+  def test_no_destory_action
+    run_generator ['User', '--skip-destroy']
+
+    # Check that the destroy view is not created
+    assert_no_file 'app/views/users/destroy.html.haml'
+
+    # Check that the destroy route is not created
+    assert_file 'config/routes.rb' do |routes|
+      assert_match(/resources :users, except: \[:destroy\]/, routes)
+    end
+
+    # Check that the controller action is not created
+    assert_file 'app/controllers/users_controller.rb' do |controller|
+      assert_no_match(/def destroy/, controller)
+    end
+  end
+
   def test_no_views
     run_generator ['User', '--skip-views']
 
@@ -42,7 +138,7 @@ class OperationGeneratorTest < Rails::Generators::TestCase
     assert_routes
 
     # Check that the views were skipped
-    %w(index show new edit).each do |view|
+    %w[index show new edit].each do |view|
       assert_no_file "app/views/users/#{view}.html.haml"
     end
   end
@@ -85,7 +181,7 @@ class OperationGeneratorTest < Rails::Generators::TestCase
     end
 
     # Check that the views were skipped
-    %w(index show new edit).each do |view|
+    %w[index show new edit].each do |view|
       assert_no_file "app/views/users/#{view}.html.haml"
     end
   end
@@ -104,7 +200,7 @@ class OperationGeneratorTest < Rails::Generators::TestCase
     end
 
     # Check that the views were skipped
-    %w(index show new edit).each do |view|
+    %w[index show new edit].each do |view|
       assert_no_file "app/views/users/#{view}.html.haml"
     end
   end
@@ -154,7 +250,7 @@ class OperationGeneratorTest < Rails::Generators::TestCase
       end
 
       # Check that views are generated
-      %w(index show new edit).each do |view|
+      %w[index show new edit].each do |view|
         assert_file "app/views/admin/users/#{view}.html.haml"
       end
 
@@ -195,7 +291,7 @@ class OperationGeneratorTest < Rails::Generators::TestCase
     end
 
     # Check that views are generated
-    %w(index show new edit).each do |view|
+    %w[index show new edit].each do |view|
       assert_file "app/views/admin/foo/users/#{view}.html.haml"
     end
 
@@ -235,7 +331,7 @@ class OperationGeneratorTest < Rails::Generators::TestCase
   end
 
   def assert_views
-    %w(index show new edit).each do |view|
+    %w[index show new edit].each do |view|
       assert_file "app/views/users/#{view}.html.haml"
     end
   end

data/test/unit/rails_ops/mixins/model/deep_nesting_test.rb

@@ -25,6 +25,28 @@ class RailsOps::Mixins::Model::DeepNestingTest < ActiveSupport::TestCase
     nest_model_op :mainboard, MAINBOARD_CREATION_OP
   end
 
+  CPU_UPDATE_OP = Class.new(RailsOps::Operation::Model::Update) do
+    model Cpu do
+      validates :name, presence: true
+    end
+  end
+
+  MAINBOARD_UPDATE_OP = Class.new(RailsOps::Operation::Model::Update) do
+    model Mainboard do
+      validates :name, presence: true
+    end
+
+    nest_model_op :cpu, CPU_UPDATE_OP
+  end
+
+  COMPUTER_UPDATE_OP = Class.new(RailsOps::Operation::Model::Update) do
+    model Computer do
+      validates :name, presence: true
+    end
+
+    nest_model_op :mainboard, MAINBOARD_UPDATE_OP
+  end
+
   def test_create_cpu
     assert_nothing_raised do
       CPU_CREATION_OP.run!(cpu: { name: 'CPU' })
@@ -35,7 +57,7 @@ class RailsOps::Mixins::Model::DeepNestingTest < ActiveSupport::TestCase
     assert_nothing_raised do
       MAINBOARD_CREATION_OP.run!(
         mainboard: {
-          name: 'Mainboard',
+          name:           'Mainboard',
           cpu_attributes: {
             name: 'CPU'
           }
@@ -48,10 +70,10 @@ class RailsOps::Mixins::Model::DeepNestingTest < ActiveSupport::TestCase
     model = assert_nothing_raised do
       COMPUTER_CREATION_OP.run!(
         computer: {
-          name: 'Computer',
+          name:                 'Computer',
 
           mainboard_attributes: {
-            name: 'Mainboard',
+            name:           'Mainboard',
 
             cpu_attributes: {
               name: 'CPU'
@@ -74,7 +96,7 @@ class RailsOps::Mixins::Model::DeepNestingTest < ActiveSupport::TestCase
     op = COMPUTER_CREATION_OP.new(
       computer: {
         mainboard_attributes: {
-          name: 'Mainboard',
+          name:           'Mainboard',
 
           cpu_attributes: {
             name: 'CPU'
@@ -94,7 +116,7 @@ class RailsOps::Mixins::Model::DeepNestingTest < ActiveSupport::TestCase
   def test_create_computer_level_2_validation_error
     op = COMPUTER_CREATION_OP.new(
       computer: {
-        name: 'Computer',
+        name:                 'Computer',
 
         mainboard_attributes: {
           cpu_attributes: {
@@ -108,7 +130,7 @@ class RailsOps::Mixins::Model::DeepNestingTest < ActiveSupport::TestCase
       op.run!
     end
 
-    assert_equal ["Mainboard is invalid"], op.model.errors.full_messages
+    assert_equal ['Mainboard is invalid'], op.model.errors.full_messages
     refute op.model.persisted?
 
     assert_equal ["Name can't be blank"], op.model.mainboard.errors.full_messages
@@ -118,10 +140,10 @@ class RailsOps::Mixins::Model::DeepNestingTest < ActiveSupport::TestCase
   def test_create_computer_level_3_validation_error
     op = COMPUTER_CREATION_OP.new(
       computer: {
-        name: 'Computer',
+        name:                 'Computer',
 
         mainboard_attributes: {
-          name: 'Mainboard',
+          name:           'Mainboard',
 
           cpu_attributes: {}
         }
@@ -132,13 +154,50 @@ class RailsOps::Mixins::Model::DeepNestingTest < ActiveSupport::TestCase
       op.run!
     end
 
-    assert_equal ["Mainboard is invalid"], op.model.errors.full_messages
+    assert_equal ['Mainboard is invalid'], op.model.errors.full_messages
     refute op.model.persisted?
 
-    assert_equal ["Cpu is invalid"], op.model.mainboard.errors.full_messages
+    assert_equal ['Cpu is invalid'], op.model.mainboard.errors.full_messages
     refute op.model.mainboard.persisted?
 
     assert_equal ["Name can't be blank"], op.model.mainboard.cpu.errors.full_messages
     refute op.model.mainboard.cpu.persisted?
   end
+
+  def test_update_validation_error
+    create_op = COMPUTER_CREATION_OP.new(
+      computer: {
+        name:                 'Computer',
+
+        mainboard_attributes: {
+          name:           'Mainboard',
+
+          cpu_attributes: {
+            name: 'CPU'
+          }
+        }
+      }
+    )
+
+    create_op.run!
+
+    update_op = COMPUTER_UPDATE_OP.new(
+      id:       Computer.first,
+      computer: {
+        name:                 'Computer',
+
+        mainboard_attributes: {
+          name:           '',
+
+          cpu_attributes: {
+            name: 'CPU'
+          }
+        }
+      }
+    )
+
+    refute update_op.run
+    assert_equal :name, update_op.model.mainboard.errors.first.attribute
+    assert_equal :blank, update_op.model.mainboard.errors.first.type
+  end
 end

data/test/unit/rails_ops/mixins/param_authorization_test.rb

@@ -32,9 +32,9 @@ class RailsOps::Mixins::ParamAuthorizationTest < ActiveSupport::TestCase
 
       model ::Group
 
-      authorize_param %i(foo), :foo, :subject_1
-      authorize_param %i(bar), :bar, :subject_1
-      authorize_param %i(bar baz), :baz, :subject_1
+      authorize_param %i[foo], :foo, :subject_1
+      authorize_param %i[bar], :bar, :subject_1
+      authorize_param %i[bar baz], :baz, :subject_1
 
       def perform
         # Do nothing

data/test/unit/rails_ops/mixins/policies_test.rb

@@ -29,7 +29,7 @@ class RailsOps::Mixins::PoliciesTest < ActiveSupport::TestCase
       end
     end
 
-    assert_equal %i(on_init default before_perform perform after_perform),
+    assert_equal %i[on_init default before_perform perform after_perform],
                  op.run!.sequence
   end
 
@@ -52,7 +52,7 @@ class RailsOps::Mixins::PoliciesTest < ActiveSupport::TestCase
       def perform; end
     end
 
-    assert_equal %i(before_perform_1 before_perform_2),
+    assert_equal %i[before_perform_1 before_perform_2],
                  op.run!.sequence
   end
 end

data/test/unit/rails_ops/operation/update_auth_test.rb

@@ -20,6 +20,8 @@ class RailsOps::Operation::UpdateLazyAuthTest < ActiveSupport::TestCase
     include CanCan::Ability
 
     def initialize(read: false, update: false)
+      super()
+
       can :read, Group if read
       can :update, Group if update
     end

data/test/unit/rails_ops/operation/update_lazy_auth_test.rb

@@ -20,6 +20,7 @@ class RailsOps::Operation::UpdateLazyAuthTest < ActiveSupport::TestCase
     include CanCan::Ability
 
     def initialize(read: false, update: false)
+      super()
       can :read, Group if read
       can :update, Group if update
     end

data/test/unit/rails_ops/operation_test.rb

@@ -99,7 +99,7 @@ class RailsOps::OperationTest < ActiveSupport::TestCase
   end
 
   def test_params
-    params = { a: 1, 'b': 1 }
+    params = { a: 1, b: 1 }
     op = BASIC_OP.new(params)
 
     # ---------------------------------------------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_ops
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.3
 platform: ruby
 authors:
 - Sitrox
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-21 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.47.1
+        version: 1.45.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.47.1
+        version: 1.45.1
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
@@ -212,8 +212,8 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '3.1'
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -236,6 +236,7 @@ files:
 - lib/generators/operation/USAGE
 - lib/generators/operation/operation_generator.rb
 - lib/generators/operation/templates/controller.erb
+- lib/generators/operation/templates/controller_wrapper.erb
 - lib/generators/operation/templates/create.erb
 - lib/generators/operation/templates/destroy.erb
 - lib/generators/operation/templates/load.erb
@@ -373,10 +374,10 @@ files:
 - test/unit/rails_ops/operation/update_auth_test.rb
 - test/unit/rails_ops/operation/update_lazy_auth_test.rb
 - test/unit/rails_ops/operation_test.rb
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -391,8 +392,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.4.6
+signing_key:
 specification_version: 4
 summary: An operations service layer for rails projects.
 test_files: