Laid out operations modules to implement plugins easier

lib/pathway/operation/authorization.rb

@@ -7,21 +7,24 @@ def authorization(&block)
         end
       end
 
-      def self.included(klass)
-        klass.extend ClassMethods
-      end
+      module InstanceMethods
+        def authorize(state)
+          authorize_with(state.result).then { state }
+        end
 
-      def authorize(state)
-        authorize_with(state.result).then { state }
-      end
+        def authorize_with(*objs)
+          objs = objs.first if objs.size <= 1
+          authorized?(*objs) ? wrap(objs) : error(:forbidden)
+        end
 
-      def authorize_with(*objs)
-        objs = objs.first if objs.size <= 1
-        authorized?(*objs) ? wrap(objs) : error(:forbidden)
+        def authorized?(*_)
+          true
+        end
       end
 
-      def authorized?(*_)
-        true
+      def self.included(klass)
+        klass.extend ClassMethods
+        klass.include InstanceMethods
       end
     end
   end

lib/pathway/operation/flow.rb

@@ -22,17 +22,22 @@ def inherited(subclass)
         end
       end
 
-      extend Forwardable
+      module InstanceMethods
+        def result_key
+          self.class.result_key
+        end
 
-      delegate :result_key => 'self.class'
+        def sequence(&bl)
+          # TODO: Implement
+        end
+      end
 
       def self.included(klass)
         klass.extend ClassMethods
+        klass.include InstanceMethods
         klass.result_key = :value
       end
 
-      def sequence(&bl)
-      end
     end
   end
 end

lib/pathway/operation/scoped.rb

@@ -9,15 +9,18 @@ def scope(*attrs)
         end
       end
 
-      def self.included(klass)
-        klass.extend ClassMethods
-      end
+      module InstanceMethods
+        def initialize(*)
+        end
 
-      def initialize(*)
+        def context
+          @context || {}
+        end
       end
 
-      def context
-        @context || {}
+      def self.included(klass)
+        klass.extend ClassMethods
+        klass.include InstanceMethods
       end
     end
   end

lib/pathway/operation/validation.rb

@@ -42,25 +42,28 @@ def _opts(opts = {})
         end
       end
 
-      extend Forwardable
+      module InstanceMethods
+        extend Forwardable
 
-      def self.included(klass)
-        klass.extend ClassMethods
-        klass.form_class = Pathway::Form
-      end
+        delegate :build_form => 'self.class'
+        alias :form :build_form
 
-      delegate :build_form => 'self.class'
-      alias :form :build_form
+        def validate(state)
+          validate_with(state[:input])
+            .then { |params| state.update(params: params) }
+        end
 
-      def validate(state)
-        validate_with(state[:input])
-          .then { |params| state.update(params: params) }
-      end
+        def validate_with(params, opts = {})
+          val = form(opts).call(params)
 
-      def validate_with(params, opts = {})
-        val = form(opts).call(params)
+          val.success? ? wrap(val.output) : error(:validation, details: val.messages)
+        end
+      end
 
-        val.success? ? wrap(val.output) : error(:validation, details: val.messages)
+      def self.included(klass)
+        klass.extend ClassMethods
+        klass.include InstanceMethods
+        klass.form_class = Pathway::Form
       end
     end
   end