subroutine 1.0.0.rc4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bd9cb93ba6c09a520b8db4d79b6aa2e5eefee2046b5b8d768976864dd4a7c89
-  data.tar.gz: d5d0be02650acb97a25b3663f2722ace66f38ad2cb5457208da7ad1e3a2a9e0d
+  metadata.gz: 25c11b61b2c6af19a7be888c2ba66284cb799cf72131e9f7a7893ccf188babd6
+  data.tar.gz: b22a8fec39573b99429fb27ad07340c1e0fa3133562a5190b8d6d088eeb9dbab
 SHA512:
-  metadata.gz: f4eaa685e8fff642d134ba9f97b0050c1eee01639b4429ebe2d4a522ff88de544f58a4080372af3f91f210f656efbf9c37c8a6fbdea1f36468067408e5615913
-  data.tar.gz: e6b4c7fbadbaf6a1b8b8d765d962aed0acb7ba8c8f661b5b5c70da6b20d49458013d0f31ab34e0c4a7519452a568f8f9e51ee85f18be0a119ba62af1e24b1d94
+  metadata.gz: 559745dc62dde51e43bde01b4b5fd2598a40edf6b02945abc2f7d71a0b948e5c76d259ac8239ba91fe8aadd4f23db4569feeaf01320287744b25dd9b168b4c29
+  data.tar.gz: b8bb15b169ddd8fe7a8e64bb4dcd8f6815b458fda0dc6f035310c2e2ea483a92196357f4893945f982ed661e1dd01ca4d51a43a9250e4b96fd5eeda1459ff22f

data/Gemfile

@@ -5,4 +5,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in subroutine.gemspec
 gemspec
 
-gem "activemodel", "~> 4.2.11"
+eval_gemfile "gemfiles/am60.gemfile"

data/README.md

@@ -12,27 +12,38 @@ class SignupOp < ::Subroutine::Op
   string :name
   string :email
   string :password
+  
+  string :company_name
 
   validates :name, presence: true
   validates :email, presence: true
   validates :password, presence: true
+  validates :company_name, presence: true
 
-  outputs :signed_up_user
+  outputs :user
+  outputs :business
 
   protected
 
   def perform
     u = create_user!
-    deliver_welcome_email!(u)
+    b = create_business!(u)
+    
+    deliver_welcome_email(u)
 
-    output :signed_up_user, u
+    output :user, u
+    output :business, b
   end
 
   def create_user!
-    User.create!(params)
+    User.create!(name: name, email: email, password: password)
   end
+  
+  def create_business!(owner)
+    Business.create!(company_name: company_name, owner: owner)
+   end
 
-  def deliver_welcome_email!(u)
+  def deliver_welcome_email(u)
     UserMailer.welcome(u.id).deliver_later
   end
 end

data/gemfiles/am41.gemfile

@@ -2,4 +2,6 @@ source 'https://rubygems.org'
 
 gemspec :path => '../'
 
-gem 'activemodel', '~> 4.1.9'
+gem 'rack'
+gem 'activemodel', '~> 4.1.0'
+gem 'actionpack', '~> 4.1.0'

data/gemfiles/am42.gemfile

@@ -2,4 +2,6 @@ source 'https://rubygems.org'
 
 gemspec :path => '../'
 
+gem 'rack'
 gem 'activemodel', '~> 4.2.0'
+gem 'actionpack', '~> 4.2.0'

data/gemfiles/am50.gemfile

@@ -2,4 +2,5 @@ source 'https://rubygems.org'
 
 gemspec :path => '../'
 
-gem 'activemodel', '~> 5.0.7.2'
+gem 'activemodel', '~> 5.0.0'
+gem 'actionpack', '~> 5.0.0'

data/gemfiles/am51.gemfile

@@ -2,4 +2,5 @@ source 'https://rubygems.org'
 
 gemspec :path => '../'
 
-gem 'activemodel', '~> 5.1.7'
+gem 'activemodel', '~> 5.1.0'
+gem 'actionpack', '~> 5.1.0'

data/gemfiles/am52.gemfile

@@ -2,4 +2,5 @@ source 'https://rubygems.org'
 
 gemspec :path => '../'
 
-gem 'activemodel', '~> 5.2.3'
+gem 'activemodel', '~> 5.2.0'
+gem 'actionpack', '~> 5.2.0'

data/gemfiles/am60.gemfile

@@ -2,4 +2,5 @@ source 'https://rubygems.org'
 
 gemspec :path => '../'
 
-gem 'activemodel', '~> 6.0.0.rc1'
+gem 'activemodel', '~> 6.0.0'
+gem 'actionpack', '~> 6.0.0'

data/lib/subroutine/auth.rb

@@ -85,17 +85,24 @@ module Subroutine
     def initialize(*args, &block)
       raise Subroutine::Auth::AuthorizationNotDeclaredError unless self.class.authorization_declared
 
-      super(args.extract_options!, &block)
-
       @skip_auth_checks = false
 
+      inputs = case args.last
+      when *::Subroutine::Fields.allowed_input_classes
+        args.pop
+      else
+        {}
+      end
+
+      super(inputs, &block)
+
       user = args.shift
 
-      if self.class.supported_user_class_names.include?(user.class.name)
-        @current_user = user
-      else
+      unless self.class.supported_user_class_names.include?(user.class.name)
         raise ArgumentError, "current_user must be one of the following types {#{self.class.supported_user_class_names.join(",")}} but was #{user.class.name}"
       end
+
+      @current_user = user
     end
 
     def skip_auth_checks!

data/lib/subroutine/fields.rb

@@ -14,6 +14,18 @@ module Subroutine
 
     extend ActiveSupport::Concern
 
+    def self.allowed_input_classes
+      @allowed_input_classes ||= begin
+        out = [Hash]
+        out << ActionController::Parameters if action_controller_params_loaded?
+        out
+      end
+    end
+
+    def self.action_controller_params_loaded?
+      defined?(::ActionController::Parameters)
+    end
+
     included do
       class_attribute :field_configurations
       self.field_configurations = {}
@@ -141,6 +153,9 @@ module Subroutine
     end
 
     def setup_fields(inputs = {})
+      if ::Subroutine::Fields.action_controller_params_loaded? && inputs.is_a?(::ActionController::Parameters)
+        inputs = inputs.to_unsafe_h if inputs.respond_to?(:to_unsafe_h)
+      end
       @provided_fields = {}.with_indifferent_access
       param_groups[:original] = inputs.with_indifferent_access
       mass_assign_initial_params

data/lib/subroutine/version.rb

@@ -5,7 +5,7 @@ module Subroutine
   MAJOR = 1
   MINOR = 0
   PATCH = 0
-  PRE   = "rc4"
+  PRE   = nil
 
   VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
 

data/subroutine.gemspec

@@ -1,15 +1,16 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'subroutine/version'
+require "subroutine/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "subroutine"
   spec.version       = Subroutine::VERSION
   spec.authors       = ["Mike Nelson"]
   spec.email         = ["mike@mnelson.io"]
-  spec.summary       = %q{Feature-driven operation objects.}
-  spec.description   = %q{An interface for creating feature-driven operations.}
+  spec.summary       = "Feature-driven operation objects."
+  spec.description   = "An interface for creating feature-driven operations."
   spec.homepage      = "https://github.com/mnelson/subroutine"
   spec.license       = "MIT"
 
@@ -19,12 +20,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activemodel", ">= 4.0.0"
+  spec.add_dependency "activesupport", ">= 4.0.0"
 
+  spec.add_development_dependency "actionpack", ">= 4.0"
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "m"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "minitest-reporters"
   spec.add_development_dependency "mocha"
-  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "rake"
 end

data/test/subroutine/auth_test.rb

@@ -118,5 +118,17 @@ module Subroutine
       RequireUserOp.new(user.id)
     end
 
+    def test_actioncontroller_parameters_can_be_provided
+      raw_params = { some_input: "foobarbaz" }.with_indifferent_access
+      params = ::ActionController::Parameters.new(raw_params)
+      op = RequireUserOp.new(user, params)
+      op.submit!
+
+      assert_equal "foobarbaz", op.some_input
+
+      assert_equal raw_params, op.params
+      assert_equal user, op.current_user
+    end
+
   end
 end

data/test/subroutine/base_test.rb

@@ -304,5 +304,17 @@ module Subroutine
       end
     end
 
+    def test_actioncontroller_parameters_can_be_provided
+      raw_params = { email: "foo@bar.com", password: "password123!" }.with_indifferent_access
+      params = ::ActionController::Parameters.new(raw_params)
+      op = SignupOp.new(params)
+      op.submit!
+
+      assert_equal "foo@bar.com", op.email
+      assert_equal "password123!", op.password
+
+      assert_equal raw_params, op.params
+    end
+
   end
 end

data/test/support/ops.rb

@@ -177,6 +177,8 @@ class RequireUserOp < OpWithAuth
 
   require_user!
 
+  string :some_input
+
 end
 
 class RequireNoUserOp < OpWithAuth

data/test/test_helper.rb

@@ -1,16 +1,17 @@
 # frozen_string_literal: true
 
-require 'subroutine'
-require 'minitest/autorun'
-require 'minitest/unit'
+require "subroutine"
+require "minitest/autorun"
+require "minitest/unit"
 
-require 'minitest/reporters'
-require 'mocha/minitest'
+require "minitest/reporters"
+require "mocha/minitest"
 
 require "byebug"
+require "action_controller"
 
 Minitest::Reporters.use!([Minitest::Reporters::DefaultReporter.new])
 
 class TestCase < ::Minitest::Test; end
 
-require_relative 'support/ops'
+require_relative "support/ops"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc4
+  version: 1.0.0
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -185,9 +213,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: