command_model 2.0.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 894d328023ecf9f0a8935bfe2a198e2fa3d26a55d42b2a4c0178bfa390e9b4bf
-  data.tar.gz: c00d13c0db81fd1a1c9c49e3ff9fa473d62c0c8131ca449acf8f6dd695109a7d
+  metadata.gz: e8cf40c64412f7916aa99c30322b374dc2893635561cb4d7a3a40268795d1f19
+  data.tar.gz: 97b8da271006b44b5c5c6ab7ef3db825f7d7696e353dae93c96baa8edbb8e1f9
 SHA512:
-  metadata.gz: 016761f5657fd6b00664d0d8e3730d83055506314fa4a49a02194eaa6e7e7f680d8ae234590616a148c31ccc7ab5dfd613b63385121c8e10dafc96adc426cd9b
-  data.tar.gz: fc0b8d08827f71c8882697eeb2918f9bde7364aecd7f4796e9125727b73ceb0113022427ff76ed1ce96804c624780cc80be23823587828bcf549b6a0cc852d6b
+  metadata.gz: 31bfe745e834a943f6221f1fd736ef2e5998ab262d15b4fa621fa733bb6cd2e1f9a9f448e263dd8565da179a766334b0ab983befe784448d9b18b91a24f8b088
+  data.tar.gz: 711f2f7069e0c63b1c20fe9a46faf7e737967e6aadc7292b3e40eb64adef217df1014cf199aab1fbf3aa58b462a053c0c8094ae132f26fb03207f303bbfcce1b

data/.github/workflows/ci.yml

@@ -0,0 +1,26 @@
+name: "Ruby CI"
+on:
+  push:
+    branches: ["master"]
+  pull_request:
+    branches: ["master"]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['3.2', '3.3']
+        gemfile: [ "6.1", "7.0", "7.1" ]
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Run tests
+        run: bin/rake

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
@@ -15,3 +14,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.envrc

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+3.2.2

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.2.2

data/Gemfile.lock

@@ -0,0 +1,50 @@
+PATH
+  remote: .
+  specs:
+    command_model (2.1.1)
+      activemodel (> 6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activesupport (7.0.4.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    concurrent-ruby (1.2.2)
+    diff-lcs (1.5.1)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    minitest (5.18.0)
+    rake (13.1.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  arm64-darwin-22
+  arm64-darwin-23
+  x86_64-linux
+
+DEPENDENCIES
+  command_model!
+  rake (~> 13.1.0)
+  rspec (~> 3.13.0)
+
+BUNDLED WITH
+   2.4.3

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/jackc/command_model.svg)](https://travis-ci.org/jackc/command_model)
+[![Build Status](https://github.com/jackc/command_model/actions/workflows/ci.yml/badge.svg)](https://github.com/jackc/command_model/actions/workflows/ci.yml)
 
 # CommandModel
 
@@ -14,11 +14,13 @@ to work with once your domain operations become more complex. Domain models
 usually have richer behavior than can be represented with a typical
 ActiveRecord style update_attributes.
 
-    # yuck!
-    account.update_attributes balance: account.balance - 50
+```ruby
+# yuck!
+account.update_attributes balance: account.balance - 50
 
-    # much better
-    account.withdraw amount: 50
+# much better
+account.withdraw amount: 50
+```
 
 But there are multiple complications with the OO approach. How do we integrate
 Rails style validations? How are user-supplied strings type converted? How do we
@@ -28,27 +30,35 @@ know if the command succeeded? CommandModel solves these problems.
 
 Add this line to your application's Gemfile:
 
-    gem 'command_model'
+```ruby
+gem 'command_model'
+```
 
 And then execute:
 
-    $ bundle
+```console
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install command_model
+```console
+$ gem install command_model
+```
 
 ## Usage
 
 Create a class derived from CommandModel::Model to represent the command
 request.
 
-    class WithdrawCommand < CommandModel::Model
-      parameter :amount,
-        convert: :integer,
-        presence: true,
-        numericality: { greater_than: 0, less_than_or_equal_to: 500 }
-    end
+```ruby
+class WithdrawCommand < CommandModel::Model
+  parameter :amount,
+    convert: :integer,
+    presence: true,
+    numericality: { greater_than: 0, less_than_or_equal_to: 500 }
+end
+```
 
 Create the method to run the command. This method should instantiate and call a new command object. It must pass call
 a block that actually does the work. The block will only be called if
@@ -57,32 +67,36 @@ any further validations that only can be done during execution. If it adds
 any errors to the command object then the command will be considered to have
 failed. Finally, the call method will return self.
 
-    class Account
-      # ...
-
-      def withdraw(args)
-        WithdrawCommand.new(args).call do |command|
-          if balance >= command.amount
-            @balance -= command.amount
-          else
-            command.errors.add :amount, "is more than account balance"
-          end
-        end
-      end
+```ruby
+class Account
+  # ...
 
-      # ...
+  def withdraw(args)
+    WithdrawCommand.new(args).call do |command|
+      if balance >= command.amount
+        @balance -= command.amount
+      else
+        command.errors.add :amount, "is more than account balance"
+      end
     end
+  end
+
+  # ...
+end
+```
 
 Use example:
 
-    response = account.withdraw amount: 50
+```ruby
+response = account.withdraw amount: 50
 
-    if response.success?
-      puts "Success!"
-    else
-      puts "Errors:"
-      puts response.errors.full_messages
-    end
+if response.success?
+  puts "Success!"
+else
+  puts "Errors:"
+  puts response.errors.full_messages
+end
+```
 
 ## Mixing in Domain Logic
 
@@ -93,28 +107,73 @@ method. The execute method is called by the call method if all validations
 succeed. The following is a reimplementation of the previous example with
 internal domain logic.
 
-    class WithdrawCommand < CommandModel::Model
-      parameter :amount,
-        convert: :integer,
-        presence: true,
-        numericality: { greater_than: 0, less_than_or_equal_to: 500 }
-      parameter :account_id, presence: true
-
-      def execute
-        account = Account.find_by_id account_id
-        unless account
-          errors.add :account_id, "not found"
-          return
-        end
-
-        if account.balance >= amount
-          account.balance -= amount
-        else
-          errors.add :amount, "is more than account balance"
-        end
-      end
+```ruby
+class WithdrawCommand < CommandModel::Model
+  parameter :amount,
+    convert: :integer,
+    presence: true,
+    numericality: { greater_than: 0, less_than_or_equal_to: 500 }
+  parameter :account_id, presence: true
+
+  def execute
+    account = Account.find_by_id account_id
+    unless account
+      errors.add :account_id, "not found"
+      return
+    end
+
+    if account.balance >= amount
+      account.balance -= amount
+    else
+      errors.add :amount, "is more than account balance"
+    end
+  end
+end
+```
+
+## Dependencies
+
+Sometimes a command has requires values that are not supplied by the user. For example, a command may require the
+current user, a database connection, or a logger. These dependencies can be specified with the `dependency` method. The following example adds filtering to ensure that the current user owns the account.
+
+```ruby
+class WithdrawCommand < CommandModel::Model
+  dependency :current_user
+
+  parameter :amount,
+    convert: :integer,
+    presence: true,
+    numericality: { greater_than: 0, less_than_or_equal_to: 500 }
+  parameter :account_id, presence: true
+
+  def execute
+    account = current_user.accounts.find_by_id account_id
+    unless account
+      errors.add :account_id, "not found"
+      return
     end
 
+    if account.balance >= amount
+      account.balance -= amount
+    else
+      errors.add :amount, "is more than account balance"
+    end
+  end
+end
+```
+
+This command could be called as follows.
+
+```ruby
+WithdrawCommand.execute({amount: 200}, {current_user: current_user})
+```
+
+## Inheritance
+
+Subclasses of `CommandModel::Model` can themselves be subclassed. Parameter and dependency definitions will be copied at
+the time of subclassing. If the superclass is later modified, the parameter and dependency definitions of the subclasses
+will not be modified. This may be changed in the future.
+
 ## Other uses
 
 This could be used to wrap database generated errors into normal Rails
@@ -128,8 +187,30 @@ be doing a uniqueness check anyway.
 There is a simple Rails application in examples/bank that demonstrates the
 integration of Rails form helpers and validations with CommandModel.
 
+## Testing
+
+```console
+$ bundle install
+$ rake
+```
+
+To test against a specific version of Rails / ActiveModel set the BUNDLE_GEMFILE environment variable. For example, to
+test Rails 6.1:
+
+```console
+$ BUNDLE_GEMFILE=gemfiles/6.1.gemfile bundle install
+$ BUNDLE_GEMFILE=gemfiles/6.1.gemfile rake
+```
+
 ## Version History
 
+* 2.1.1 - April 8, 2024
+    * Dependencies are set before parameters
+* 2.1.0 - March 15, 2024
+    * Add dependencies to CommandModel::Model
+    * Allow inheritance of CommandModel::Model
+    * Require Ruby 3.2+
+    * Require Rails / ActiveModel 6.1+
 * 2.0.1 - April 3, 2023
     * Date parsing allows 5 digit years
 * 2.0 - April 11, 2018

data/Rakefile

@@ -1,10 +1,7 @@
-#!/usr/bin/env rake
+require "bundler/setup"
 require "bundler/gem_tasks"
 
-begin
-    require 'rspec/core/rake_task'
-      RSpec::Core::RakeTask.new(:spec)
-rescue LoadError
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/rake

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/command_model.gemspec

@@ -9,16 +9,15 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/JackC/command_model"
 
   gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "command_model"
   gem.require_paths = ["lib"]
   gem.version       = CommandModel::VERSION
 
-  gem.required_ruby_version = '>= 2.5.0'
+  gem.required_ruby_version = '>= 3.2.0'
 
-  gem.add_dependency 'activemodel', "> 5.0"
+  gem.add_dependency 'activemodel', "> 6.1"
 
-  gem.add_development_dependency 'rake', "~> 12.3.0"
-  gem.add_development_dependency 'rspec', "~> 3.7.0"
+  gem.add_development_dependency 'rake', "~> 13.1.0"
+  gem.add_development_dependency 'rspec', "~> 3.13.0"
 end

data/examples/bank/Gemfile

@@ -3,9 +3,9 @@ source 'https://rubygems.org'
 gem 'rails', '3.2.8'
 
 # Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
+# gem 'rails', git: 'git://github.com/rails/rails.git'
 
-gem 'command_model', :path => '../..'
+gem 'command_model', path: '../..'
 
 
 # Gems used only for assets and not required
@@ -15,7 +15,7 @@ group :assets do
   gem 'coffee-rails', '~> 3.2.1'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  # gem 'therubyracer', :platform => :ruby
+  # gem 'therubyracer', platform: :ruby
 
   gem 'uglifier', '>= 1.0.3'
 end
@@ -35,4 +35,4 @@ gem 'jquery-rails'
 # gem 'capistrano'
 
 # To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
+# gem 'ruby-debug19', require: 'ruby-debug'

data/examples/bank/app/controllers/accounts_controller.rb

@@ -7,44 +7,44 @@
     @account = Account.find_by_name params[:id]
     @deposit = Account::DepositCommand.new
   end
-  
+
   def deposit
     @account = Account.find_by_name params[:id]
     @deposit = @account.deposit params[:deposit]
-    
+
     if @deposit.success?
-      redirect_to root_path, :notice => "Deposited #{@deposit.amount} to #{@account.name}'s account."
+      redirect_to root_path, notice: "Deposited #{@deposit.amount} to #{@account.name}'s account."
     else
       render "deposit_form"
     end
   end
-  
+
   def withdraw_form
     @account = Account.find_by_name params[:id]
     @withdraw = Account::WithdrawCommand.new
-  end  
-  
+  end
+
   def withdraw
     @account = Account.find_by_name params[:id]
     @withdraw = @account.withdraw params[:withdraw]
-    
+
     if @withdraw.success?
-      redirect_to root_path, :notice => "Withdrew #{@withdraw.amount} from #{@account.name}'s account."
+      redirect_to root_path, notice: "Withdrew #{@withdraw.amount} from #{@account.name}'s account."
     else
       render "withdraw_form"
-    end  
+    end
   end
 
   def transfer_form
     @accounts = Account.all
     @transfer = Account::TransferCommand.new
   end
-  
+
   def transfer
     @transfer = Account::TransferCommand.new(params[:transfer])
-    
+
     if @transfer.call.success?
-      redirect_to root_path, :notice => "Transferred #{@transfer.amount} from #{@transfer.from.name}'s account to #{@transfer.to.name}'s account."
+      redirect_to root_path, notice: "Transferred #{@transfer.amount} from #{@transfer.from.name}'s account to #{@transfer.to.name}'s account."
     else
       @accounts = Account.all
       render "transfer_form"

data/examples/bank/app/controllers/transfers_controller.rb

@@ -3,12 +3,12 @@ class TransfersController < ApplicationController
     @accounts = Account.all
     @transfer = Account::Transfer.new
   end
-  
+
   def create
     @transfer = Account::Transfer.new(params[:transfer])
-    
+
     if @transfer.call.success?
-      redirect_to root_path, :notice => "Transferred #{@transfer.amount} from #{@transfer.from.name}'s account to #{@transfer.to.name}'s account."
+      redirect_to root_path, notice: "Transferred #{@transfer.amount} from #{@transfer.from.name}'s account to #{@transfer.to.name}'s account."
     else
       @accounts = Account.all
       render :new

data/examples/bank/app/views/accounts/deposit_form.html.erb

@@ -12,12 +12,8 @@
   </ul>
 <% end %>
 
-<%= form_for @deposit, :as => :deposit, :url => account_deposit_path(@account) do |f| %>
+<%= form_for @deposit, as: :deposit, url: account_deposit_path(@account) do |f| %>
   <%= f.label :amount %>
   <%= f.text_field :amount %>
   <%= f.submit "Deposit" %>
 <% end %>
-
-
-
-

data/examples/bank/app/views/accounts/withdraw_form.html.erb

@@ -12,12 +12,8 @@
   </ul>
 <% end %>
 
-<%= form_for @withdraw, :as => :withdraw, :url => account_withdraw_path(@account) do |f| %>
+<%= form_for @withdraw, as: :withdraw, url: account_withdraw_path(@account) do |f| %>
   <%= f.label :amount %>
   <%= f.text_field :amount %>
   <%= f.submit "Deposit" %>
 <% end %>
-
-
-
-

data/examples/bank/app/views/layouts/application.html.erb

@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>Bank</title>
-  <%= stylesheet_link_tag    "application", :media => "all" %>
+  <%= stylesheet_link_tag    "application", media: "all" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
 </head>

data/examples/bank/app/views/transfers/new.html.erb

@@ -14,11 +14,11 @@
 <%= form_for @transfer do |f| %>
   <div>
     <%= f.label :from_name %><br />
-    <%= f.select :from_name, @accounts.map { |a| ["#{a.name} - #{a.balance}", a.name] }, :selected => f.object.from_name, :include_blank => true %>
+    <%= f.select :from_name, @accounts.map { |a| ["#{a.name} - #{a.balance}", a.name] }, selected: f.object.from_name, include_blank: true %>
   </div>
   <div>
     <%= f.label :to_name %><br />
-    <%= f.select :to_name, @accounts.map { |a| ["#{a.name} - #{a.balance}", a.name] }, :selected => f.object.to_name, :include_blank => true %>
+    <%= f.select :to_name, @accounts.map { |a| ["#{a.name} - #{a.balance}", a.name] }, selected: f.object.to_name, include_blank: true %>
   </div>
   <div>
     <%= f.label :amount %><br />
@@ -26,7 +26,3 @@
   </div>
   <%= f.submit "Transfer" %>
 <% end %>
-
-
-
-

data/examples/bank/config/application.rb

@@ -10,7 +10,7 @@ require "rails/test_unit/railtie"
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  Bundler.require(*Rails.groups(assets: %w(development test)))
   # If you want your assets lazily compiled in production, use this line
   # Bundler.require(:default, :assets, Rails.env)
 end

data/examples/bank/config/routes.rb

@@ -1,11 +1,11 @@
 Bank::Application.routes.draw do
-  get "accounts/:id/withdraw" => "accounts#withdraw_form", :as => :account_withdraw_form
-  post "accounts/:id/withdraw" => "accounts#withdraw", :as => :account_withdraw
-  
-  get "accounts/:id/deposit" => "accounts#deposit_form", :as => :account_deposit_form
-  post "accounts/:id/deposit" => "accounts#deposit", :as => :account_deposit
+  get "accounts/:id/withdraw" => "accounts#withdraw_form", as: :account_withdraw_form
+  post "accounts/:id/withdraw" => "accounts#withdraw", as: :account_withdraw
+
+  get "accounts/:id/deposit" => "accounts#deposit_form", as: :account_deposit_form
+  post "accounts/:id/deposit" => "accounts#deposit", as: :account_deposit
 
   resources :transfers, only: %w[new create]
 
-  root :to => "accounts#index"
+  root to: "accounts#index"
 end

data/examples/bank/test/performance/browsing_test.rb

@@ -3,8 +3,8 @@ require 'rails/performance_test_help'
 
 class BrowsingTest < ActionDispatch::PerformanceTest
   # Refer to the documentation for all available options
-  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
-  #                          :output => 'tmp/performance', :formats => [:flat] }
+  # self.profile_options = { runs: 5, metrics: [:wall_time, :memory]
+  #                          output: 'tmp/performance', formats: [:flat] }
 
   def test_homepage
     get '/'

data/gemfiles/{5.0.gemfile → 6.1.gemfile}

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "activemodel", "~> 5.0.0"
+gem "activemodel", "~> 6.1.0"
 
 gemspec :path=>"../"

data/gemfiles/6.1.gemfile.lock

@@ -0,0 +1,52 @@
+PATH
+  remote: ..
+  specs:
+    command_model (2.1.1)
+      activemodel (> 6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.1.7.7)
+      activesupport (= 6.1.7.7)
+    activesupport (6.1.7.7)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    concurrent-ruby (1.2.3)
+    diff-lcs (1.5.1)
+    i18n (1.14.4)
+      concurrent-ruby (~> 1.0)
+    minitest (5.22.3)
+    rake (13.1.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.6.13)
+
+PLATFORMS
+  arm64-darwin-23
+  x86_64-linux
+
+DEPENDENCIES
+  activemodel (~> 6.1.0)
+  command_model!
+  rake (~> 13.1.0)
+  rspec (~> 3.13.0)
+
+BUNDLED WITH
+   2.4.3

data/gemfiles/{5.1.gemfile → 7.0.gemfile}

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "activemodel", "~> 5.1.0"
+gem "activemodel", "~> 7.0.0"
 
 gemspec :path=>"../"

data/gemfiles/7.0.gemfile.lock

@@ -0,0 +1,50 @@
+PATH
+  remote: ..
+  specs:
+    command_model (2.1.1)
+      activemodel (> 6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activesupport (7.0.4.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    concurrent-ruby (1.2.3)
+    diff-lcs (1.5.1)
+    i18n (1.14.4)
+      concurrent-ruby (~> 1.0)
+    minitest (5.22.3)
+    rake (13.1.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  arm64-darwin-23
+  x86_64-linux
+
+DEPENDENCIES
+  activemodel (~> 7.0.0)
+  command_model!
+  rake (~> 13.1.0)
+  rspec (~> 3.13.0)
+
+BUNDLED WITH
+   2.4.3

data/gemfiles/7.1.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "activemodel", "~> 7.1.0"
+
+gemspec :path=>"../"

data/gemfiles/7.1.gemfile.lock

@@ -0,0 +1,60 @@
+PATH
+  remote: ..
+  specs:
+    command_model (2.1.1)
+      activemodel (> 6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (7.1.3.2)
+      activesupport (= 7.1.3.2)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.7)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    i18n (1.14.4)
+      concurrent-ruby (~> 1.0)
+    minitest (5.22.3)
+    mutex_m (0.2.0)
+    rake (13.1.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  arm64-darwin-23
+  x86_64-linux
+
+DEPENDENCIES
+  activemodel (~> 7.1.0)
+  command_model!
+  rake (~> 13.1.0)
+  rspec (~> 3.13.0)
+
+BUNDLED WITH
+   2.4.3

data/lib/command_model/model.rb

@@ -4,7 +4,12 @@ module CommandModel
     include ActiveModel::Conversion
     extend ActiveModel::Naming
 
-    Parameter = Struct.new(:name, :converters, :validations)
+    def self.inherited(subclass)
+      subclass.instance_variable_set :@parameters, parameters.dup.freeze
+      subclass.instance_variable_set :@dependencies, dependencies.dup.freeze
+    end
+
+    Parameter = Data.define(:name, :converters, :validations)
 
     # Parameter requires one or more attributes as its first parameter(s).
     # It accepts an options hash as its last parameter.
@@ -26,11 +31,12 @@ module CommandModel
     #   parameter :height, :weight,
     #     convert: [CommandModel::Convert::StringMutator.new { |s| s.gsub(",", "")}, :integer],
     #     presence: true,
-    #     numericality: { :greater_than_or_equal_to => 0 }
+    #     numericality: { greater_than_or_equal_to: 0 }
     def self.parameter(*args)
       options = args.last.kind_of?(Hash) ? args.pop.clone : {}
       converters = options.delete(:convert)
 
+      @parameters ||= [].freeze
       args.each do |name|
         attr_reader name
 
@@ -40,13 +46,13 @@ module CommandModel
           attr_writer name
         end
         validates name, options.clone if options.present? # clone options because validates mutates the hash :(
-        parameters.push Parameter.new name, converters, options
+        @parameters = (@parameters + [Parameter.new(name, converters, options)]).freeze
       end
     end
 
     # Returns array of all parameters defined for class
     def self.parameters
-      @parameters ||= []
+      @parameters ||= [].freeze
     end
 
     def self.attr_type_converting_writer(name, converters) #:nodoc
@@ -82,6 +88,38 @@ module CommandModel
       end
     end
 
+    Dependency = Data.define(:name, :default, :allow_blank)
+
+    # Dependency requires one or more attributes as its first parameter(s). A dependency is something that is required
+    # for the command to execute that is not user supplied input. For example, a database connection, a logger, or the
+    # current user.
+    #
+    # ==== Keyword Arguments
+    #
+    # * default - An object that will be used as the default value for the dependency or a callable object that will be
+    #   called to get the default value.
+    # * allow_blank - If true, the dependency can be nil or blank. If false, the dependency must be present.
+    #
+    # ==== Examples
+    #
+    #   dependency :current_user
+    #   dependency :stdout, default: -> { $stdout }
+    def self.dependency(*names, default: nil, allow_blank: false)
+      @dependencies ||= [].freeze
+      names.each do |name|
+        name = name.to_sym
+        attr_reader name
+        private attr_writer name
+        default_callable = default.respond_to?(:call) ? default : -> { default }
+        @dependencies = (@dependencies + [Dependency.new(name, default_callable, allow_blank)]).freeze
+      end
+    end
+
+    # Returns array of all dependencies defined for class.
+    def self.dependencies
+      @dependencies ||= [].freeze
+    end
+
     # Executes a block of code if the command model is valid.
     #
     # Accepts either a command model or a hash of attributes with which to
@@ -89,18 +127,19 @@ module CommandModel
     #
     # ==== Examples
     #
-    #   RenameUserCommand.execute(:login => "john") do |command|
+    #   RenameUserCommand.execute(login: "john") do |command|
     #     if allowed_to_rename_user?
     #       self.login = command.login
     #     else
     #       command.errors.add :base, "not allowed to rename"
     #     end
     #   end
-    def self.execute(attributes_or_command, &block)
+    def self.execute(attributes_or_command, dependencies={}, &block)
       command = if attributes_or_command.kind_of? self
+        raise ArgumentError, "cannot pass dependencies with already initialized command" if dependencies.present?
         attributes_or_command
       else
-        new(attributes_or_command)
+        new(attributes_or_command, dependencies)
       end
 
       command.call &block
@@ -129,7 +168,21 @@ module CommandModel
     # Accepts a parameters hash or another of the same class. If another
     # instance of the same class is passed in then the parameters are copied
     # to the new object.
-    def initialize(parameters={})
+    def initialize(parameters={}, dependencies={})
+      dependencies = dependencies.symbolize_keys
+      self.class.dependencies.each do |dependency|
+        value = dependencies.fetch(dependency.name, dependency.default.call)
+        if value.blank? && !dependency.allow_blank
+          raise ArgumentError, "Dependency #{dependency.name} cannot be blank"
+        end
+        self.send "#{dependency.name}=", dependencies.fetch(dependency.name, dependency.default.call)
+      end
+
+      unknown_dependencies = dependencies.keys - self.class.dependencies.map(&:name)
+      if unknown_dependencies.present?
+        raise ArgumentError, "Unknown dependencies: #{bad_dependencies.join(", ")}"
+      end
+
       @type_conversion_errors = {}
       set_parameters parameters
     end

data/lib/command_model/version.rb

@@ -1,3 +1,3 @@
 module CommandModel
-  VERSION = "2.0.1"
+  VERSION = "2.1.1"
 end

data/spec/model_spec.rb

@@ -6,7 +6,7 @@ class ExampleCommand < CommandModel::Model
 end
 
 describe CommandModel::Model do
-  let(:example_command) { ExampleCommand.new :name => "John" }
+  let(:example_command) { ExampleCommand.new name: "John" }
   let(:invalid_example_command) { ExampleCommand.new }
 
   describe "self.parameter" do
@@ -38,7 +38,7 @@ describe CommandModel::Model do
     end
 
     it "accepts multiple attributes with convert" do
-      klass.parameter :foo, :bar, :convert => :integer
+      klass.parameter :foo, :bar, convert: :integer
       expect(klass.new.methods).to include(:foo)
       expect(klass.new.methods).to include(:foo=)
       expect(klass.new.methods).to include(:bar)
@@ -46,7 +46,7 @@ describe CommandModel::Model do
     end
 
     it "accepts multiple attributes with validation" do
-      klass.parameter :foo, :bar, :presence => true
+      klass.parameter :foo, :bar, presence: true
       expect(klass.new.methods).to include(:foo)
       expect(klass.new.methods).to include(:foo=)
       expect(klass.new.methods).to include(:bar)
@@ -72,6 +72,27 @@ describe CommandModel::Model do
       expect(instance).to_not be_valid
       expect(instance.errors[:name]).to be_present
     end
+
+    it "works when model is inherited" do
+      klass.parameter :foo
+      expect(klass.parameters.map(&:name)).to eq([:foo])
+
+      klass_b = Class.new(klass)
+      expect(klass_b.parameters.map(&:name)).to eq([:foo])
+      klass_b.parameter :bar
+      expect(klass.parameters.map(&:name)).to eq([:foo])
+      expect(klass_b.parameters.map(&:name)).to eq([:foo, :bar])
+
+      klass_c = Class.new(klass_b)
+      expect(klass.parameters.map(&:name)).to eq([:foo])
+      expect(klass_b.parameters.map(&:name)).to eq([:foo, :bar])
+      expect(klass_c.parameters.map(&:name)).to eq([:foo, :bar])
+
+      klass_c.parameter :baz
+      expect(klass.parameters.map(&:name)).to eq([:foo])
+      expect(klass_b.parameters.map(&:name)).to eq([:foo, :bar])
+      expect(klass_c.parameters.map(&:name)).to eq([:foo, :bar, :baz])
+    end
   end
 
   describe "self.parameters" do
@@ -89,13 +110,65 @@ describe CommandModel::Model do
     end
   end
 
+  describe "self.dependency" do
+    let(:klass) { Class.new(CommandModel::Model) }
+
+    it "creates an attribute reader" do
+      klass.dependency :foo, allow_blank: true
+      expect(klass.new.methods).to include(:foo)
+    end
+
+    it "accepts multiple attributes" do
+      klass.dependency :foo, :bar, allow_blank: true
+      expect(klass.new.methods).to include(:foo)
+      expect(klass.new.methods).to include(:bar)
+    end
+
+    it "accepts multiple attributes with default" do
+      klass.dependency :foo, :bar, default: -> { "baz" }
+      expect(klass.new.methods).to include(:foo)
+      expect(klass.new.methods).to include(:bar)
+    end
+
+    it "works when model is inherited" do
+      klass.dependency :foo
+      expect(klass.dependencies.map(&:name)).to eq([:foo])
+
+      klass_b = Class.new(klass)
+      expect(klass_b.dependencies.map(&:name)).to eq([:foo])
+      klass_b.dependency :bar
+      expect(klass.dependencies.map(&:name)).to eq([:foo])
+      expect(klass_b.dependencies.map(&:name)).to eq([:foo, :bar])
+
+      klass_c = Class.new(klass_b)
+      expect(klass.dependencies.map(&:name)).to eq([:foo])
+      expect(klass_b.dependencies.map(&:name)).to eq([:foo, :bar])
+      expect(klass_c.dependencies.map(&:name)).to eq([:foo, :bar])
+
+      klass_c.dependency :baz
+      expect(klass.dependencies.map(&:name)).to eq([:foo])
+      expect(klass_b.dependencies.map(&:name)).to eq([:foo, :bar])
+      expect(klass_c.dependencies.map(&:name)).to eq([:foo, :bar, :baz])
+    end
+  end
+
+  describe "self.dependencies" do
+    it "returns all dependencies in class" do
+      klass = Class.new(CommandModel::Model)
+      klass.dependency :foo
+      klass.dependency :bar
+
+      expect(klass.dependencies.map(&:name)).to eq([:foo, :bar])
+    end
+  end
+
   describe "self.execute" do
     it "accepts object of same kind and returns it" do
       expect(ExampleCommand.execute(example_command) {}).to eq(example_command)
     end
 
     it "accepts attributes, creates object, and returns it" do
-      c = ExampleCommand.execute(:name => "John") {}
+      c = ExampleCommand.execute(name: "John") {}
       expect(c).to be_kind_of(ExampleCommand)
       expect(c.name).to eq("John")
     end
@@ -129,6 +202,25 @@ describe CommandModel::Model do
 
       expect(example_command).to_not be_success
     end
+
+    it "uses default dependencies when not provided" do
+      klass = Class.new(CommandModel::Model)
+      klass.dependency :stdout, default: -> { $stdout }
+      klass.parameter :name
+      m = klass.execute(name: "John")
+      expect(m.stdout).to eq($stdout)
+      expect(m.execution_attempted?).to eq(true)
+    end
+
+    it "accepts dependencies from arguments" do
+      klass = Class.new(CommandModel::Model)
+      klass.dependency :stdout, default: -> { $stdout }
+      klass.parameter :name
+      writer = StringIO.new
+      m = klass.execute({name: "John"}, stdout: writer)
+      expect(m.stdout).to eq(writer)
+      expect(m.execution_attempted?).to eq(true)
+    end
   end
 
   describe "self.success" do
@@ -151,15 +243,46 @@ describe CommandModel::Model do
 
   describe "initialize" do
     it "assigns parameters from hash" do
-      m = ExampleCommand.new :name => "John"
+      m = ExampleCommand.new name: "John"
       expect(m.name).to eq("John")
     end
 
     it "assigns parameters from other CommandModel" do
-      other = ExampleCommand.new :name => "John"
+      other = ExampleCommand.new name: "John"
       m = ExampleCommand.new other
       expect(m.name).to eq(other.name)
     end
+
+    it "assigns default dependencies when not provided" do
+      klass = Class.new(CommandModel::Model)
+      klass.dependency :stdout, default: -> { $stdout }
+      klass.parameter :name
+      m = klass.new name: "John"
+      expect(m.stdout).to eq($stdout)
+    end
+
+    it "assigns dependencies from arguments" do
+      klass = Class.new(CommandModel::Model)
+      klass.dependency :stdout, default: -> { $stdout }
+      klass.parameter :name
+      writer = StringIO.new
+      m = klass.new({name: "John"}, stdout: writer)
+      expect(m.stdout).to eq(writer)
+    end
+
+    it "raises error when dependency is missing" do
+      klass = Class.new(CommandModel::Model)
+      klass.dependency :stdout
+      klass.parameter :name
+      expect { klass.new name: "John" }.to raise_error(StandardError)
+    end
+
+    it "does not raise error when allow blank dependency is missing" do
+      klass = Class.new(CommandModel::Model)
+      klass.dependency :stdout, allow_blank: true
+      klass.parameter :name
+      expect { klass.new name: "John" }.to_not raise_error
+    end
   end
 
   describe "call" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command_model
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.1
 platform: ruby
 authors:
 - Jack Christensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-03 00:00:00.000000000 Z
+date: 2024-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: 13.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: 13.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.13.0
 description: CommandModel - when update_attributes isn't enough.
 email:
 - jack@jackchristensen.com
@@ -59,14 +59,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
+- ".tool-versions"
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- bin/rake
 - command_model.gemspec
 - examples/bank/.gitignore
 - examples/bank/Gemfile
@@ -128,8 +131,12 @@ files:
 - examples/bank/vendor/assets/javascripts/.gitkeep
 - examples/bank/vendor/assets/stylesheets/.gitkeep
 - examples/bank/vendor/plugins/.gitkeep
-- gemfiles/5.0.gemfile
-- gemfiles/5.1.gemfile
+- gemfiles/6.1.gemfile
+- gemfiles/6.1.gemfile.lock
+- gemfiles/7.0.gemfile
+- gemfiles/7.0.gemfile.lock
+- gemfiles/7.1.gemfile
+- gemfiles/7.1.gemfile.lock
 - lib/command_model.rb
 - lib/command_model/convert.rb
 - lib/command_model/model.rb
@@ -148,14 +155,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: CommandModel integrates Rails validations with command objects. This allows

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - 2.5.0
-gemfile:
-  - gemfiles/5.0.gemfile
-  - gemfiles/5.1.gemfile