activeinteractor 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb4ea1ab1b182695f3eb1123b9a2d24dc417a7b9c677cd4cfcd09e5c382c2353
-  data.tar.gz: 7cccf0b3d2d91598546c9683a10f7610b3c01941ea4c4aa9a6fe283dec673203
+  metadata.gz: 62ffd94a00a7a624dc305a07dfb9347ac55d9b863b6a6acaf87d74a653bea21f
+  data.tar.gz: bf704329e8360caaa6c750fb65722e8bf3cd53c0c633d7d1ed96f1b68fd4af0b
 SHA512:
-  metadata.gz: 10f396ce895b5217010e39cd45354dba784b7216fd20aba7bb80acac9293e22711dfada8c6a573dbb8676ca961146b18bf1c215c73efdd3c351abc749c44b39a
-  data.tar.gz: fa3b9aa5f0d3b1629300003711264fd2fd61368268e579d57087592c87ed024eb46396fc316f2e5e1edf3e4043abb1c51a84334f0c645c450c80f9fda057be92
+  metadata.gz: 22600e40ed597c10695c5bc1859f7338495c25b2204d9d58f959be3c74cb1e943f98776e0669dfc12e784eaf16babab7fc0531a98e15fbf2e6a0bbd42710d693
+  data.tar.gz: f61f0ad8378ac49577e19c745566a202e5723cd107f7e867d0ed34249926c6827e258f81e42a7c617546e3e53448f106aba3a3754b1171fbb2d5c2f303217119

data/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased]
 
+## [v0.1.7] - 2019-09-10
+
+### Fixed
+
+- [#61] Ensure `Organizer` accurately reports context success
+
 ## [v0.1.6] - 2019-07-24
 
 ### Changed
@@ -68,7 +74,8 @@ and this project adheres to [Semantic Versioning].
 
 <!-- versions -->
 
-[Unreleased]: https://github.com/aaronmallen/activeinteractor/compare/v0.1.6..HEAD
+[Unreleased]: https://github.com/aaronmallen/activeinteractor/compare/v0.1.7..HEAD
+[v0.1.7]: https://github.com/aaronmallen/activeinteractor/compare/v0.1.6...v0.1.7
 [v0.1.6]: https://github.com/aaronmallen/activeinteractor/compare/v0.1.5...v0.1.6
 [v0.1.5]: https://github.com/aaronmallen/activeinteractor/compare/v0.1.4...v0.1.5
 [v0.1.4]: https://github.com/aaronmallen/activeinteractor/compare/v0.1.3...v0.1.4
@@ -91,3 +98,4 @@ and this project adheres to [Semantic Versioning].
 [#45]: https://github.com/aaronmallen/activeinteractor/pull/45
 [#48]: https://github.com/aaronmallen/activeinteractor/pull/48
 [#51]: https://github.com/aaronmallen/activeinteractor/pull/51
+[#61]: https://github.com/aaronmallen/activeinteractor/pull/61

data/README.md

@@ -33,11 +33,14 @@ gem install activeinteractor
 If you're working with a rails project you will also want to run:
 
 ```bash
-rails generate active_interactor:install
+rails generate active_interactor:install [directory]
 ```
 
+The `directory` option allows you to customize what directory interactors
+will live in within your application (defaults to 'interactors').
+
 This will create an initializer and a new class called `ApplicationInteractor`
-at `app/interactors/application_interactor.rb`
+at `app/<interactor directory>/application_interactor.rb`
 
 you can then automatically generate interactors and interactor organizers with:
 

data/lib/active_interactor/interactor/worker.rb

@@ -63,8 +63,9 @@ module ActiveInteractor
 
       def execute_context!
         perform!
-        finalize_context!
         context
+      ensure
+        finalize_context!
       end
 
       def fail_on_invalid_context!(validation_context = nil)
@@ -88,6 +89,7 @@ module ActiveInteractor
 
       def rollback_context_and_raise!(exception)
         context.rollback!
+        context.send(:mark_failed!)
         raise exception
       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.6'
+  VERSION = '0.1.7'
 end

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

@@ -5,23 +5,26 @@ require_relative '../active_interactor'
 module ActiveInteractor
   module Generators
     class InstallGenerator < Base
+      desc 'Install ActiveInteractor'
+      argument :directory, type: :string, default: 'interactors', banner: 'directory'
+
       def create_initializer
-        template 'initializer.rb', Rails.root.join('config', 'initializers', 'active_interactor.rb')
+        template 'initializer.erb', Rails.root.join('config', 'initializers', 'active_interactor.rb')
       end
 
       def create_application_interactor
-        template 'application_interactor.erb', Rails.root.join('app', app_dir_name, 'application_interactor.rb')
+        template 'application_interactor.erb', Rails.root.join('app', directory, 'application_interactor.rb')
       end
 
       def create_interactor_concerns
-        create_file Rails.root.join('app', app_dir_name, 'concerns', '.keep')
+        create_file Rails.root.join('app', directory, 'concerns', '.keep')
       end
 
       def autoload_interactors
         application do
           <<~CONFIG
              # autoload interactors
-            config.autoload_paths += %w[app/#{app_dir_name}]
+            config.autoload_paths += %w[app/#{directory}]
 
           CONFIG
         end

data/lib/rails/generators/templates/{initializer.rb → initializer.erb}

@@ -7,9 +7,9 @@ ActiveInteractor.configure do |config|
   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.
+  <%- if directory != 'interactors' -%>
+  config.dir_name = '<%= directory %>'
+  <%- else -%>
   # config.dir_name = 'interactors'
+  <%- end -%>
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeinteractor
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Aaron Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -221,7 +221,6 @@ files:
 - lib/active_interactor/configuration.rb
 - lib/active_interactor/context.rb
 - lib/active_interactor/context/attributes.rb
-- lib/active_interactor/context/errors.rb
 - lib/active_interactor/error.rb
 - lib/active_interactor/interactor.rb
 - lib/active_interactor/interactor/callbacks.rb
@@ -237,7 +236,7 @@ files:
 - lib/rails/generators/interactor/rspec_generator.rb
 - lib/rails/generators/interactor/test_unit_generator.rb
 - lib/rails/generators/templates/application_interactor.erb
-- lib/rails/generators/templates/initializer.rb
+- lib/rails/generators/templates/initializer.erb
 - lib/rails/generators/templates/interactor.erb
 - lib/rails/generators/templates/organizer.erb
 - lib/rails/generators/templates/rspec.erb
@@ -247,10 +246,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/aaronmallen/activeinteractor/issues
-  changelog_uri: https://github.com/aaronmallen/activeinteractor/blob/v0.1.6/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/activeinteractor/0.1.6
+  changelog_uri: https://github.com/aaronmallen/activeinteractor/blob/v0.1.7/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/activeinteractor/0.1.7
   hompage_uri: https://github.com/aaronmallen/activeinteractor
-  source_code_uri: https://github.com/aaronmallen/activeinteractor/tree/v0.1.6
+  source_code_uri: https://github.com/aaronmallen/activeinteractor/tree/v0.1.7
   wiki_uri: https://github.com/aaronmallen/activeinteractor/wiki
 post_install_message: 
 rdoc_options: []

data/lib/active_interactor/context/errors.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveInteractor
-  module Context
-    # Raised when an interactor context fails
-    #
-    # @deprecated Use {#ActiveInteractor::Error::ContextFailure} instead
-    #
-    # @author Aaron Allen <hello@aaronmallen.me>
-    # @since 0.0.1
-    # @version 0.2
-    #
-    # @!attribute [r] context
-    #  @return [Base] an instance of {Base}
-    class Failure < StandardError
-      attr_reader :context
-
-      # A new instance of {Failure}
-      # @param context [ActiveInteractor::Context::Base] an
-      #  instance of {ActiveInteractor::Context::Base}
-      # @return [Failure] a new instance of {Failure}
-      def initialize(context = nil)
-        @context = context
-        super
-      end
-    end
-  end
-end