Release 0.0.8

lib/pathway.rb

@@ -1,7 +1,7 @@
 require 'forwardable'
 require 'inflecto'
+require 'contextualizer'
 require 'pathway/version'
-require 'pathway/initializer'
 require 'pathway/result'
 
 module Pathway
@@ -13,10 +13,15 @@ def self.plugin(name)
 
       self.extend plugin::ClassMethods if plugin.const_defined? :ClassMethods
       self.include plugin::InstanceMethods if plugin.const_defined? :InstanceMethods
+      # TODO: Separate DSL per operation hierarchy
+      DSL.include plugin::DSLMethods if plugin.const_defined? :DSLMethods
       plugin.apply(self) if plugin.respond_to?(:apply)
     end
   end
 
+  class DSL
+  end
+
   class Error < StandardError
     attr_reader :type, :message, :details
     singleton_class.send :attr_accessor, :default_messages
@@ -40,25 +45,34 @@ def default_message_for(type)
     end
   end
 
-  module Plugins
-    module Scope
-      module ClassMethods
-        def scope(*attrs)
-          include Initializer[*attrs]
-        end
-      end
+  class State
+    extend Forwardable
 
-      module InstanceMethods
-        def initialize(*)
-        end
+    def initialize(operation, values = {})
+      @hash = operation.context.merge(values)
+      @result_key = operation.result_key
+    end
 
-        def context
-          @context || {}
-        end
-      end
+    delegate %i([] []= fetch store include?) => :@hash
+
+    def update(kargs)
+      @hash.update(kargs)
+      self
+    end
+
+    def result
+      @hash[@result_key]
+    end
+
+    def to_hash
+      @hash
     end
 
-    module Flow
+    alias :to_h :to_hash
+  end
+
+  module Plugins
+    module Base
       module ClassMethods
         attr_accessor :result_key
 
@@ -102,10 +116,11 @@ def wrap_if_present(value, type: :not_found, message: nil, details: [])
       end
 
       def self.apply(klass)
+        klass.extend Contextualizer
         klass.result_key = :value
       end
 
-      class DSL
+      module DSLMethods
         def initialize(operation, input)
           @result = wrap(State.new(operation, input: input))
           @operation = operation
@@ -170,35 +185,8 @@ def _callable(callable)
           end
         end
       end
-
-      class State
-        extend Forwardable
-
-        def initialize(operation, values = {})
-          @hash = operation.context.merge(values)
-          @result_key = operation.result_key
-        end
-
-        delegate %i([] []= fetch store include?) => :@hash
-
-        def update(kargs)
-          @hash.update(kargs)
-          self
-        end
-
-        def result
-          @hash[@result_key]
-        end
-
-        def to_hash
-          @hash
-        end
-
-        alias :to_h :to_hash
-      end
     end
   end
 
-  Operation.plugin Plugins::Scope
-  Operation.plugin Plugins::Flow
+  Operation.plugin Plugins::Base
 end

lib/pathway/plugins/sequel_models.rb

@@ -13,10 +13,6 @@ def transaction(&bl)
         end
       end
 
-      def self.apply(*)
-        Flow::DSL.include(DSLMethods)
-      end
-
       module InstanceMethods
         module Finder
           def self.[](model_class, by: :id)

lib/pathway/version.rb

@@ -1,3 +1,3 @@
 module Pathway
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

pathway.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.4.0"
 
   spec.add_dependency "inflecto"
+  spec.add_dependency "contextualizer", "~> 0.0.3"
 
   spec.add_development_dependency "dry-validation", "~> 0.10.7"
   spec.add_development_dependency "bundler", ">= 1.14.0"

spec/operation_spec.rb

@@ -7,7 +7,7 @@ class SimpleOperation < Operation
       plugin :authorization
       plugin :responder
 
-      scope :user, :repository
+      context :user, :repository
 
       authorization { user.role == :root }
 
@@ -149,7 +149,8 @@ def create_model(params:, profile:,**)
         Class.new(Operation) do
           plugin :authorization
 
-          scope :role
+          context :role
+
           authorization { role == :admin }
         end
       end
@@ -160,19 +161,6 @@ def create_model(params:, profile:,**)
       end
     end
 
-    describe ".scope" do
-      subject(:operation_class) do
-        Class.new(Operation) { scope :foo, :bar }
-      end
-
-      it "includes an Scope module defining the scope dependencies" do
-        operation = operation_class.new(foo: "XXX", bar: "YYY")
-
-        expect(operation.foo).to eq("XXX")
-        expect(operation.bar).to eq("YYY")
-      end
-    end
-
     describe ".call" do
       let(:ctx)    { { user: double("User", role: :root), repository: double("Repo") } }
       let(:params) { { name: "Paul Smith", email: "psmith@email.com" } }