appfuel 0.5.16 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 331cd1aa71078ef100073a648bfac5eca51d638b
-  data.tar.gz: cde5c43a46185a1dd993ad96cb6bfa87a5be679d
+  metadata.gz: 3feb73535c4eb07de3fcca35f7b37ec547cec376
+  data.tar.gz: 5cc4db87f924c4f7f32f27a9def34dfd2d9181be
 SHA512:
-  metadata.gz: b0ae1714c7b54995a642ca34781797670f58967a6be934751a013e9665668a2c02817a9f81e95fe16011a5059be4ddbd6aae01117089b7136030cac23486485e
-  data.tar.gz: 72aca40e39055e98494a73b3c439840595f6dd6a8082bc21e90d55d45162e705f930407b5d6c9f4cdeb18a3566eaa90f8bfa49e04958dda875e4e15355519175
+  metadata.gz: d3f2383b9f7e3dd1596ff198b65a291e42cceaf8d5742906956ae6de0dcfcfeee6de5d5bbb9f275b0beff917ee5ab24997099f18eea6bd24fed04eeb4e597a79
+  data.tar.gz: 8277b5082e0717a1120437bb75925494941f7bcebfae0ea10123c92e4af404fd141abd57cc65eaf56c31ddd346cb1d5e76d331f4d4d4f9804b93ab98c7a4c706

data/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. (Pending ap
 
 
 # Releases
+## [[0.6.0]](https://github.com/rsb/appfuel/releases/tag/0.6.0) 2017-08-10
+### Added
+- Validation to handlers
+- Dispatching actions to other actions added to the handler
+- New mixin `Application::FeatureHelper` to aid in feature initialization
+
 ## [[0.5.16]](https://github.com/rsb/appfuel/releases/tag/0.5.16) 2017-08-08
 ### Fixed
 - response handler no longer has double error keys

data/lib/appfuel.rb

@@ -146,15 +146,10 @@ module Appfuel
 
       exclude.map! {|item| item.to_s}
       namespace    = "#{key}.initializers"
-      finished_key = "#{key}.initialized"
       runlist_key  = "#{namespace}.run"
       env          = container['env']
       config       = container['config']
 
-      if container.key?(finished_key) && container[finished_key] == true
-        return false
-      end
-
       runlist = []
       if container.key?(runlist_key)
         runlist = container[runlist_key]
@@ -181,7 +176,6 @@ module Appfuel
           raise error
         end
       end
-      container.register(finished_key, true)
 
       container
     end

data/lib/appfuel/application.rb

@@ -1,4 +1,5 @@
 require_relative 'application/dispatcher'
+require_relative 'application/feature_helper'
 require_relative 'application/app_container'
 require_relative 'application/root'
 require_relative 'application/container_class_registration'

data/lib/appfuel/application/app_container.rb

@@ -7,6 +7,7 @@ module Appfuel
       def self.included(base)
         base.extend(ClassMethods)
         base.extend(ContainerClassRegistration)
+        base.extend(FeatureHelper)
       end
 
       module ClassMethods
@@ -230,7 +231,6 @@ module Appfuel
         def app_container
           Appfuel.app_container(container_root_name)
         end
-
       end
 
       # Instance methods
@@ -242,6 +242,10 @@ module Appfuel
         self.class.app_container
       end
 
+      def feature_name
+        self.class.feature_name
+      end
+
     end
   end
 end

data/lib/appfuel/application/feature_helper.rb

@@ -0,0 +1,28 @@
+module Appfuel
+  module Application
+    module FeatureHelper
+      def feature_initialized?(key)
+        key       = extract_feature_name(key)
+        flag_key  = "#{key}.initialized"
+        container = Appfuel.app_container
+        return false unless container.key?(flag_key)
+
+        container[flag_key] == true
+      end
+
+      def initialize_feature(key)
+        key = extract_feature_name(key)
+        container = Appfuel.app_container
+
+        initializer = container[:feature_initializer]
+        initializer.call(key, container)
+      end
+
+      def extract_feature_name(key)
+        return key unless key.include?('.')
+        parts = key.split('.')
+        parts[0] == 'features' ? parts[1] : parts[0]
+      end
+    end
+  end
+end

data/lib/appfuel/feature/initializer.rb

@@ -14,7 +14,11 @@ module Appfuel
       def call(name, container)
         name = name.to_s.underscore
         feature_key  = "features.#{name}"
-        return false if initialized?(container, feature_key)
+        finished_key = "#{feature_key}.initialized"
+
+        if container.key?(finished_key) && container[finished_key] == true
+          return false
+        end
 
         unless container.key?(feature_key)
           Appfuel.setup_container_dependencies(feature_key, container)
@@ -39,6 +43,7 @@ module Appfuel
 
 
         Appfuel.run_initializers(feature_key, container)
+        container.register(finished_key, true)
         true
       end
 
@@ -47,11 +52,6 @@ module Appfuel
         disable_key = "#{feature_key}.disable_require"
         container.key?(disable_key) && container[disable_key] == true
       end
-
-      def initialized?(container, feature_key)
-        init_key = "#{feature_key}.initialized"
-        container.key?(init_key) && container[init_key] == true
-      end
     end
   end
 end

data/lib/appfuel/handler/action.rb

@@ -15,6 +15,22 @@ module Appfuel
           "actions.#{super}"
         end
       end
+
+      def dispatch(route, payload = {})
+        route = route.to_s
+        fail "route can not be empty" if route.empty?
+
+        route = "#{feature_name}/#{route}" unless route.include?('/')
+        root  = app_container[:root]
+        root.call(route, payload)
+      end
+
+      def dispatch!(route, payload = {})
+        response = dispatch(route, payload)
+        fail_handler!(response) if response.failure?
+
+        response.ok
+      end
     end
   end
 end

data/lib/appfuel/handler/base.rb

@@ -74,6 +74,7 @@ module Appfuel
         end
       end
 
+      # Instance methods
       attr_reader :data
 
       def initialize(container = Dry::Container.new)
@@ -117,6 +118,12 @@ module Appfuel
 
         container[key].call(data, inputs)
       end
+
+      private
+
+      def fail_handler!(response)
+        self.class.fail_handler!(response)
+      end
     end
   end
 end

data/lib/appfuel/handler/validator_dsl.rb

@@ -68,12 +68,16 @@ module Appfuel
     #   call: run the lamda
     module ValidatorDsl
 
+      def validator_keys
+        @validator_keys ||= []
+      end
+
       def validators(*args)
         @validators ||= []
         return @validators if args.empty?
 
         args.each do |arg|
-          @validators << load_validator(arg)
+          validator_keys << convert_to_container_key(arg)
         end
       end
 
@@ -94,33 +98,18 @@ module Appfuel
       # @return [Nil]
       def validator(key = nil, opts = {}, &block)
         key  = default_validator_name if key.nil?
-        validators << build_validator(key, opts, &block)
-        nil
-      end
-
-      # load a validator with the given key from the app container.
-      #
-      # @note the key is encode and will be decoded first
-      #       @see ValidatorDsl#convert_to_container_key for details
-      #
-      # @param key [String]
-      # @param opts [Hash]
-      # @return Appfuel::Validation::Validator
-      def load_validator(key, opts = {})
-        fail "validator must have a key" if key.nil?
-
-        container_key = convert_to_container_key(key)
-        container = Appfuel.app_container
-        unless container.key?(container_key)
-          fail "Could not locate validator with (#{container_key})"
+        unless block_given?
+          validator_keys << convert_to_container_key(key)
+          return
         end
 
-        container[container_key]
+        validators << Appfuel::Validation.build_validator(key, opts, &block)
+        nil
       end
 
       # return [Bool]
       def validators?
-        !validators.empty?
+        !(validators.empty? && validator_keys.empty?)
       end
 
       # Used when resolving inputs to determine if we should apply any
@@ -139,6 +128,15 @@ module Appfuel
         @skip_validation = true
       end
 
+      def load_validators
+        list = validators
+        return list unless list.empty?
+        validator_keys.each do |key|
+          @validators << load_validator(key, no_context: true)
+        end
+        validators
+      end
+
       # Validate all inputs using the list of validators that were assigned
       # using the dsl methods.
       #
@@ -150,7 +148,7 @@ module Appfuel
 
         response = nil
         has_failed = false
-        validators.each do |validator|
+        load_validators.each do |validator|
           if validator.pipe?
             result = handle_validator_pipe(validator, inputs)
             inputs = result unless result == false
@@ -173,6 +171,23 @@ module Appfuel
         response
       end
 
+      def load_validator(key, opts = {})
+        unless opts[:no_context] == true
+          key = convert_to_container_key(key)
+        end
+
+        container = app_container
+        feature_name = extract_feature_name(key)
+        unless feature_initialized?(feature_name)
+          initialize_feature(feature_name)
+        end
+
+        unless container.key?(key)
+          fail "Could not locate validator with (#{key})"
+        end
+        container[key]
+      end
+
       private
 
       # Decodes the given key into a dependency injection namespace that is
@@ -182,35 +197,28 @@ module Appfuel
       # @param key [String]
       # #return [String]
       def convert_to_container_key(key)
+        # normalize the key to the current feature when no feature
+        # is specified
+        unless key.include?('.')
+          key = "#{container_feature_name}.#{key}"
+        end
         parts = key.to_s.split('.')
         last  = parts.last
         first = parts.first
+        prefix = container_feature_key
+        if first != 'global' && first != container_feature_name
+          prefix = "#{container_features_root_name}.#{first}"
+        end
+
         case first
-          when 'global'
-            "global.validators.#{last}"
-          when 'global-pipe'
-            "global.validator-pipes.#{last}"
-          when 'pipe'
-            "#{container_feature_key}.validator-pipes.#{last}"
+          when 'global'      then "global.validators.#{last}"
+          when 'global-pipe' then "global.validator-pipes.#{last}"
+          when 'pipe'        then "#{prefix}.validator-pipes.#{last}"
           else
-            "#{container_feature_key}.validators.#{first}"
+            "#{prefix}.validators.#{last}"
         end
       end
 
-      # Create a validator for the handler or load it from the container
-      # depending on if a block is given
-      #
-      # @param key [String] key used to identify the item
-      # @param opts [Hash]
-      # @return [
-      #   Appfuel::Validation::Validator,
-      #   Appfuel::Validation::ValidatorPipe
-      #   ]
-      def build_validator(key, opts = {}, &block)
-        return load_validator(key, opts)  unless block_given?
-
-        Appfuel::Validation.build_validator(key, opts, &block)
-      end
 
       # Creates a response the first time otherwise it merges the results
       # from the last validator into the response

data/lib/appfuel/validation.rb

@@ -3,7 +3,9 @@ require_relative 'validation/validator_pipe'
 
 module Appfuel
   module Validation
+    extend Appfuel::Application::FeatureHelper
     class << self
+
       # Dsl used create and register validators in the app container. The key
       # needs to be the fully qualified feature or global.
       #
@@ -30,6 +32,20 @@ module Appfuel
         container.register(key, validator)
       end
 
+      def load_schema(key)
+        feature   = extract_feature_name(key)
+        container = Appfuel.app_container
+        key, _basename = build_validator_key(key)
+        unless feature_initialized?(feature)
+          initialize_feature(feature)
+        end
+
+        unless container.key?(key)
+          fail "Could not load validator key #{key}"
+        end
+        container[key]
+      end
+
       # Turns the block of code given into a Dry::Validation schema or formi
       # which is then used to create our validator.
       #

data/lib/appfuel/version.rb

@@ -1,3 +1,3 @@
 module Appfuel
-  VERSION = "0.5.16"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appfuel
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.6.1
 platform: ruby
 authors:
 - Robert Scott-Buccleuch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -288,6 +288,7 @@ files:
 - lib/appfuel/application/app_container.rb
 - lib/appfuel/application/container_class_registration.rb
 - lib/appfuel/application/dispatcher.rb
+- lib/appfuel/application/feature_helper.rb
 - lib/appfuel/application/root.rb
 - lib/appfuel/cli_msg_request.rb
 - lib/appfuel/config.rb