Use camelize instead of classify to safe_constantize (#171)

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased]
 
+### Fixed
+
+- [\#168](https://github.com/aaronmallen/activeinteractor/issues/168) `#classify` is called on const arguments
+
 ## [v1.0.2] - 2020-02-04
 
 ### Added

lib/active_interactor/context/loader.rb

@@ -22,7 +22,7 @@ module Loader
       # @param interactor_class [Const] an {ActiveInteractor::Base interactor} class
       # @return [Const] a class that inherits from {Base}
       def self.create(context_class_name, interactor_class)
-        interactor_class.const_set(context_class_name.to_s.classify, Class.new(BASE_CONTEXT))
+        interactor_class.const_set(context_class_name.to_s.camelize, Class.new(BASE_CONTEXT))
       end
 
       # Find or create a {Base context} class for a given {ActiveInteractor::Base interactor}. If a class exists

lib/active_interactor/interactor/context.rb

@@ -211,7 +211,7 @@ def context_class
         # @return [Const] the {Base interactor} class' {ActiveInteractor::Context::Base context} class
         def contextualize_with(klass)
           @context_class = begin
-            context_class = klass.to_s.classify.safe_constantize
+            context_class = klass.to_s.camelize.safe_constantize
             raise(ActiveInteractor::Error::InvalidContextClass, klass) unless context_class
 
             context_class

lib/active_interactor/organizer/interactor_interface.rb

@@ -40,7 +40,7 @@ class InteractorInterface
       #  {Interactor::Perform::ClassMethods#perform .perform}. See {Interactor::Perform::Options}.
       # @return [InteractorInterface] a new instance of {InteractorInterface}
       def initialize(interactor_class, options = {})
-        @interactor_class = interactor_class.to_s.classify.safe_constantize
+        @interactor_class = interactor_class.to_s.camelize.safe_constantize
         @filters = options.select { |key, _value| CONDITIONAL_FILTERS.include?(key) }
         @perform_options = options.reject { |key, _value| CONDITIONAL_FILTERS.include?(key) }
       end

lib/rails/generators/templates/organizer.erb

@@ -6,8 +6,8 @@ class <%= class_name %> < ApplicationOrganizer
 
 <%- end -%>
 <%- if interactors.any? -%>
-  organize <%= interactors.map(&:classify).join(", ") %>
+  organize <%= interactors.join(", ") %>
 <%- else -%>
-  # organize Interactor1, Interactor2
+  # organize :interactor_1, :interactor_2
 <%- end -%>
 end

spec/active_interactor/base_spec.rb

@@ -27,6 +27,17 @@
           subject
           expect(described_class.context_class).to eq TestContext
         end
+
+        # https://github.com/aaronmallen/activeinteractor/issues/168
+        context 'when singularized' do
+          let!(:singularized_class) { build_context('PlaceData') }
+          let(:klass) { 'PlaceData' }
+
+          it 'is expected to assign the appropriate context class' do
+            subject
+            expect(described_class.context_class).to eq PlaceData
+          end
+        end
       end
 
       context 'when passed as a symbol' do
@@ -36,6 +47,17 @@
           subject
           expect(described_class.context_class).to eq TestContext
         end
+
+        # https://github.com/aaronmallen/activeinteractor/issues/168
+        context 'when singularized' do
+          let!(:singularized_class) { build_context('PlaceData') }
+          let(:klass) { :place_data }
+
+          it 'is expected to assign the appropriate context class' do
+            subject
+            expect(described_class.context_class).to eq PlaceData
+          end
+        end
       end
 
       context 'when passed as a constant' do
@@ -45,6 +67,17 @@
           subject
           expect(described_class.context_class).to eq TestContext
         end
+
+        # https://github.com/aaronmallen/activeinteractor/issues/168
+        context 'when singularized' do
+          let!(:singularized_class) { build_context('PlaceData') }
+          let(:klass) { PlaceData }
+
+          it 'is expected to assign the appropriate context class' do
+            subject
+            expect(described_class.context_class).to eq PlaceData
+          end
+        end
       end
     end
   end