activeinteractor 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4872bd78ecedca5b6277acdca57fd623b66823adb067fa002f00208e2128ce98
-  data.tar.gz: 3445c265ef4ba5a9338f67e5ef347cf63bf60412a6320de2250c697fe6b049f6
+  metadata.gz: e933d8615e2b55bf47049e291b801193e2341b03e3c0a29bb8d8f7c8166adee3
+  data.tar.gz: afc759ee08f37bbbba50e2ac6c1508afb0d303c0f37ca5cdfcf75d6347e210b0
 SHA512:
-  metadata.gz: 7f8ff6addc793b5179d67d6f522a0c1527c3bcede0b851a8a6e5dd7c833c2fd2d27b7480c39525deb7fcaad294313563f2fdd72bf34c29ad86b5563d511c1940
-  data.tar.gz: ef2a2ef6abe7aaf86b84cdf9ca99bc19d97aca78b85bf6c83c50862d40520c2a80209ec91b178bd4c1a1673a122d08f538ca0313464077c82af89fb21080472a
+  metadata.gz: 8edc74485608e067bb6e9e9df3a19d9c0651df4351c9e56239b41ce1fb39fa4d7595e08366799fcbcfa79390e0fe1a1f1b0a652e01f8855905d93dcc53d05b69
+  data.tar.gz: 0d8b82c2ebfce20b413a4563eb0244081b1ca3910186de9ad9880cc246408df68e282ef0ec21adb4f89eda7947fe79c62555f1c24c8795a08dff15bd7dec621d

data/CHANGELOG.md

@@ -7,12 +7,18 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased]
 
+## [v0.1.2] - 2019-04-01
+
+### Added
+
+- #22: Allow the directory interactors are generated in to be configurable
+
 ## [v0.1.1] - 2019-03-30
 
 ### Fixed
 
-- #15: NameError (uninitialized constant ActiveInteractor::Organizer)
-- #16: NoMethodError (undefined method `merge' for #<ActiveInteractor::Context::Base>)
+- #15: `NameError` (uninitialized constant `ActiveInteractor::Organizer`)
+- #16: `NoMethodError` (undefined method `merge` for `ActiveInteractor::Context::Base`)
 
 ## v0.1.0 - 2019-03-30
 
@@ -21,5 +27,6 @@ and this project adheres to [Semantic Versioning].
 [Keep a Changelog]: https://keepachangelog.com/en/1.0.0/
 [Semantic Versioning]: https://semver.org/spec/v2.0.0.html
 
-[Unreleased]: https://github.com/aaronmallen/activeinteractor/compare/v0.1.1...HEAD
+[Unreleased]: https://github.com/aaronmallen/activeinteractor/compare/v0.1.2...HEAD
+[v0.1.2]: https://github.com/aaronmallen/activeinteractor/compare/v0.1.1...v0.1.2
 [v0.1.1]: https://github.com/aaronmallen/activeinteractor/compare/v0.1.0...v0.1.1

data/lib/active_interactor/base.rb

@@ -8,6 +8,7 @@ module ActiveInteractor
   # @version 0.1
   class Base
     include Interactor
+
     # A new instance of {Base}
     # @param context [Hash, nil] the properties of the context
     # @return [ActiveInteractor::Base] a new instance of {Base}

data/lib/active_interactor/configuration.rb

@@ -12,11 +12,14 @@ module ActiveInteractor
   class Configuration
     # The default configuration options for {Configuration}
     # @return [Hash{Symbol => *}]
+    #  * :logger - The Logger instance to use for logging
+    #  * :dir_name - The directory interactors are generated in
     DEFAULTS = {
-      logger: Logger.new(STDOUT)
+      logger: Logger.new(STDOUT),
+      dir_name: 'interactors'
     }.freeze
 
-    attr_accessor :logger
+    attr_accessor :logger, :dir_name
 
     # A new instance of {Configuration}
     # @param options [Hash{Symbol => *}] the options to initialize the

data/lib/active_interactor/interactor/execution.rb

@@ -5,14 +5,8 @@ module ActiveInteractor
     module Execution
       extend ActiveSupport::Concern
 
-      DELEGATED_WORKER_METHODS = %i[
-        execute_perform
-        execute_perform!
-        execute_rollback
-      ].freeze
-
       included do
-        delegate(*DELEGATED_WORKER_METHODS, to: :worker)
+        delegate :execute_perform, :execute_perform!, :execute_rollback, to: :worker
       end
 
       private

data/lib/active_interactor/organizer.rb

@@ -38,7 +38,9 @@ module ActiveInteractor
     #  in favor of this default implementation.
     def perform
       self.class.organized.each do |interactor|
-        self.context = interactor.new(context).tap(&:skip_clean_context!).execute_perform!
+        self.context = interactor.new(context)
+                                 .tap(&:skip_clean_context!)
+                                 .execute_perform!
       end
     end
   end

data/lib/active_interactor/version.rb

@@ -3,5 +3,5 @@
 module ActiveInteractor
   # The ActiveInteractor gem version
   # @return [String] the gem version
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/rails/generators/active_interactor/install_generator.rb

@@ -6,22 +6,22 @@ module ActiveInteractor
   module Generators
     class InstallGenerator < Base
       def create_initializer
-        template 'initializer.rb', File.join('config', 'initializers', 'active_interactor.rb')
+        template 'initializer.rb', Rails.root.join('config', 'initializers', 'active_interactor.rb')
       end
 
       def create_application_interactor
-        template 'application_interactor.erb', File.join('app', 'interactors', 'application_interactor.rb')
+        template 'application_interactor.erb', Rails.root.join('app', app_dir_name, 'application_interactor.rb')
       end
 
       def create_interactor_concerns
-        create_file 'app/interactors/concerns/.keep'
+        create_file Rails.root.join('app', app_dir_name, 'concerns', '.keep')
       end
 
       def autoload_interactors
         application do
           <<~CONFIG
              # autoload interactors
-            config.autoload_paths += %w[app/interactors]
+            config.autoload_paths += %w[app/#{app_dir_name}]
 
           CONFIG
         end

data/lib/rails/generators/active_interactor.rb

@@ -11,7 +11,7 @@ module ActiveInteractor
       extend ActiveSupport::Concern
 
       class_methods do
-        def self.base_root
+        def base_root
           __dir__
         end
 
@@ -19,6 +19,10 @@ module ActiveInteractor
           File.expand_path('templates', __dir__)
         end
       end
+
+      def app_dir_name
+        ActiveInteractor.configuration.dir_name
+      end
     end
 
     class Base < ::Rails::Generators::Base

data/lib/rails/generators/interactor/interactor_generator.rb

@@ -6,7 +6,7 @@ class InteractorGenerator < ActiveInteractor::Generators::NamedBase
   desc 'Generate an interactor'
 
   def create_interactor
-    template 'interactor.erb', File.join('app', 'interactors', class_path, "#{file_name}.rb")
+    template 'interactor.erb', Rails.root.join('app', app_dir_name, File.join(class_path), "#{file_name}.rb")
   end
 
   hook_for :test_framework, in: :interactor

data/lib/rails/generators/interactor/organizer_generator.rb

@@ -9,7 +9,7 @@ module Interactor
       argument :interactors, type: :array, default: [], banner: 'name name'
 
       def create_organizer
-        template 'organizer.erb', File.join('app', 'interactors', class_path, "#{file_name}.rb")
+        template 'organizer.erb', Rails.root.join('app', app_dir_name, File.join(class_path), "#{file_name}.rb")
       end
 
       hook_for :test_framework, in: :interactor

data/lib/rails/generators/interactor/rspec_generator.rb

@@ -8,7 +8,7 @@ module Interactor
       desc 'Generate an interactor spec'
 
       def create_spec
-        template 'rspec.erb', File.join('spec', 'interactors', class_path, "#{file_name}_spec.rb")
+        template 'rspec.erb', Rails.root.join('spec', app_dir_name, File.join(class_path), "#{file_name}_spec.rb")
       end
     end
   end

data/lib/rails/generators/interactor/test_unit_generator.rb

@@ -8,7 +8,7 @@ module Interactor
       desc 'Generate an interactor unit test'
 
       def create_test
-        template 'test_unit.erb', File.join('test', 'interactors', class_path, "#{file_name}_test.rb")
+        template 'test_unit.erb', Rails.root.join('test', app_dir_name, File.join(class_path), "#{file_name}_test.rb")
       end
     end
   end

data/lib/rails/generators/templates/initializer.rb

@@ -5,4 +5,11 @@ require 'active_interactor'
 ActiveInteractor.configure do |config|
   # Set the ActiveInteractor.logger to Rails.logger
   config.logger = Rails.logger
+
+  # Set the default directory for interactors
+  # NOTE: if this is changed after `active_interactor:install`
+  # is generated you will need to update
+  # config/application.rb autoload paths with the
+  # new directory name.
+  # config.dir_name = 'interactors'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeinteractor
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Aaron Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-30 00:00:00.000000000 Z
+date: 2019-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -244,10 +244,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/aaronmallen/activeinteractor/issues
-  changelog_uri: https://github.com/aaronmallen/activeinteractor/blob/v0.1.1/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/activeinteractor/0.1.1
+  changelog_uri: https://github.com/aaronmallen/activeinteractor/blob/v0.1.2/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/activeinteractor/0.1.2
   hompage_uri: https://github.com/aaronmallen/activeinteractor
-  source_code_uri: https://github.com/aaronmallen/activeinteractor/tree/v0.1.1
+  source_code_uri: https://github.com/aaronmallen/activeinteractor/tree/v0.1.2
   wiki_uri: https://github.com/aaronmallen/activeinteractor/wiki
 post_install_message: 
 rdoc_options: []