appfuel 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c8b9e19b1a6eb8dc07f3ddb296f5e4af70fe848
-  data.tar.gz: 8b746ca541b5e33c99ee2d719452f1c84265718c
+  metadata.gz: 01694bfb7b1b82467a7416337c19a837a8eb47e4
+  data.tar.gz: 70eff28c04fa90216add52b3a443af8697c41404
 SHA512:
-  metadata.gz: aac076ef608c55b1b55674c8ea37d9b576d037bad0404e1a888ddbb66b5e19e8bf6668c923a02e3a3fdc1a55369b67c5df3a5c70e32ec0ff86c27aa05e70339e
-  data.tar.gz: 84e50e4263cec503206c0b5843e49b32c5484cc6314ea9878e28a2655969a74da387b34ef35035deff306267fb57b1842c5f6e22c61475d91c7439a3df62fa9d
+  metadata.gz: 5e88d8348a698285e0443f61b26a5bf2be05b689b63eb4d079b63416f0981bb04e9a473027a7baf1900b04837c6e1311a1298a4511de9efd8234402c897e4644
+  data.tar.gz: 7fab691e8d97d7a35c875b890869f9be117713faa63f66efe977cf3f28fa7febe6330bd6441a3708bf2f15f456f0247536a92117ccf120edf3dd053899d4bc4b

data/CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file. (Pending ap
 
 
 # Releases
+## [[0.5.9]](https://github.com/rsb/appfuel/releases/tag/0.5.8) 2017-07-27
+### Added
+- Adding a `run!` to handler which deals with failures
+- Adding a HandlerFailure has for when the handler fails
+- New interfaces for the aws dynamo db adapter
+
+### Fixed
+- Domain dsl attribute with  array member and default is now working
+- Updating dry-validations & dry-types
 
 ## [[0.5.8]](https://github.com/rsb/appfuel/releases/tag/0.5.8) 2017-07-20
 ### Fixed

data/appfuel.gemspec

@@ -25,9 +25,9 @@ Gem::Specification.new do |spec|
   # or the way I am using it.
   spec.add_dependency "activerecord",     "~> 5.1.1"
   spec.add_dependency "pg",               "~> 0.20"
-  spec.add_dependency "dry-types",        "0.9.2"
+  spec.add_dependency "dry-types",        "0.11"
   spec.add_dependency "dry-container",    "~> 0.6"
-  spec.add_dependency "dry-validation",   "~> 0.10.5"
+  spec.add_dependency "dry-validation",   "~> 0.11"
   spec.add_dependency "dry-monads",       "~> 0.2"
   spec.add_dependency "dry-configurable", "~> 0.6"
   spec.add_dependency "parslet",          "~> 1.8.0"

data/lib/appfuel/application/dispatcher.rb

@@ -7,6 +7,8 @@ module Appfuel
           container[:feature_initializer].call(request.feature, container)
           action   = container[:action_loader].call(request.namespace, container)
           response = action.run(request.inputs)
+        rescue Appfuel::Handler::HandlerFailure => e
+          response = e.response
         rescue => e
           handler = Appfuel::ResponseHandler.new
           response = handler.error(e)

data/lib/appfuel/domain/dsl.rb

@@ -85,11 +85,8 @@ module Appfuel
       def build_type(type_str, **options)
         base = type_str.split('.').last
         type = Types[type_str]
-        type = apply_defaults(type, options)
         type = apply_optional(type, options)
-
         nil_is_allowed = allow_nil?(options)
-
         type = case base
                when 'hash'  then handle_hash(type, options)
                when 'array' then handle_array(type, options)
@@ -97,6 +94,7 @@ module Appfuel
                  type
                end
 
+        type = apply_defaults(type, options)
         type = apply_constraints(type, options)
 
         # You have to apply all the contraints before summing nil
@@ -208,23 +206,20 @@ module Appfuel
       end
 
       def handle_array(type, options)
-        if options.key?(:member)
-          member = options.delete(:member)
-          member = member.is_a?(String) ? Types[member] : member
-          type = type.member(member)
-        end
-        type
+        return type unless options.key?(:member)
+        member = options.delete(:member)
+        member = member.is_a?(String) ? Types[member] : member
+        type.member(member)
       end
 
       def apply_defaults(type, options)
         return type unless options.key?(:default)
-
-        type.default(options.delete(:default))
+        default_value = options.delete(:default)
+        type.default(default_value)
       end
 
       def apply_optional(type, options)
         return type unless options.key?(:optional)
-
         options.delete(:optional)
         type.optional
       end

data/lib/appfuel/domain/entity.rb

@@ -189,10 +189,9 @@ module Appfuel
       end
 
       def initialize_value(key, type, input)
-        if input == Types::Undefined && type.default?
+        if (input == Types::Undefined || input == nil) && type.default?
           input = type[nil]
         end
-
         # manual overrides have to manually type check themselves
         setter = "#{key}="
         return send(setter, input) if respond_to?(setter)

data/lib/appfuel/handler/base.rb

@@ -41,6 +41,13 @@ module Appfuel
           result
         end
 
+        def run!(inputs = {}, container = Dry::Container.new)
+          result = run(inputs, container)
+          fail_handler!(result) if result.failure?
+
+          result.ok
+        end
+
         def error(*args)
           response_handler.error(*args)
         end
@@ -57,6 +64,14 @@ module Appfuel
           response_handler.create_response(data)
         end
 
+        def fail_handler!(response)
+          raise create_handler_failure(response)
+        end
+
+        def create_handler_failure(response)
+          title = "#{container_class_path} Failed:"
+          HandlerFailure.new(title, response)
+        end
       end
 
       attr_reader :data

data/lib/appfuel/handler/command.rb

@@ -5,17 +5,6 @@ module Appfuel
         def container_class_type
           'commands'
         end
-
-        def resolve_dependencies(results = Dry::Container.new)
-=begin
-          super
-          resolve_container(results)
-          resolve_domains(results)
-          resolve_db_models(results)
-          resolve_repos(results)
-          results
-=end
-        end
       end
     end
   end

data/lib/appfuel/handler/handler_failure.rb

@@ -0,0 +1,11 @@
+module Appfuel
+  module Handler
+    class HandlerFailure < StandardError
+      attr_reader :response
+      def initialize(msg = "Unknown handler error", response)
+        @response = response
+        super(msg)
+      end
+    end
+  end
+end

data/lib/appfuel/handler.rb

@@ -1,6 +1,7 @@
 require_relative 'handler/validator_dsl'
 require_relative 'handler/inject_dsl'
 
+require_relative 'handler/handler_failure'
 require_relative 'handler/base'
 require_relative 'handler/action'
 require_relative 'handler/command'

data/lib/appfuel/initializers/all.rb

@@ -1,4 +1,4 @@
 require_relative 'logging'
 require_relative 'db'
 require_relative 'web_api'
-require_relative 'aws_dynamodb'
+require_relative 'dynamodb'

data/lib/appfuel/initializers/{aws_dynamodb.rb → dynamodb.rb}

@@ -1,6 +1,6 @@
-Appfuel::Initialize.define('global.aws_dynamodb') do |config, container|
+Appfuel::Initialize.define('global.dynamodb') do |config, container|
   require 'aws-sdk'
-  require 'appfuel/storage/aws_dynamodb'
+  require 'appfuel/storage/dynamodb'
 
   env = config[:env]
   endpoint = config[:aws][:dynamodb][:endpoint]
@@ -14,5 +14,5 @@ Appfuel::Initialize.define('global.aws_dynamodb') do |config, container|
 
 
   client = Aws::DynamoDB::Client.new
-  container.register(Appfuel::AwsDynamodb::CLIENT_CONTAINER_KEY, client)
+  container.register(Appfuel::Dynamodb::CLIENT_CONTAINER_KEY, client)
 end

data/lib/appfuel/storage/dynamodb/adapter.rb

@@ -0,0 +1,140 @@
+module Appfuel
+  module Dynamodb
+    CLIENT_CONTAINER_KEY = 'aws.dynamodb.client'
+
+    class NoSqlModel
+      include Appfuel::Application::AppContainer
+
+      class << self
+        def container_class_type
+          'dynamodb'
+        end
+
+        def config_key(value = nil)
+          return @config_key if value.nil?
+          @config_key = value.to_s
+        end
+
+        def load_config
+          config = app_container[:config]
+          key = config_key.to_s
+          if key.include?('.')
+            keys = key.split('.').map {|k| k.to_sym}
+          else
+            keys = [config_key]
+          end
+
+          @config ||= keys.each.inject(config) do |c, k|
+            unless c.key?(k)
+              fail "[dynamodb] config key (#{k}) not found - #{self}"
+            end
+            c[k]
+          end
+        end
+
+        def config
+          @config ||= load_config
+        end
+
+        def table_prefix
+          @table_prefex ||= config[:table_prefix]
+        end
+
+        def client
+          @client ||= app_container[CLIENT_CONTAINER_KEY]
+        end
+
+        def indexes
+          @indexes ||= {}
+        end
+
+        def table_name(value = nil)
+          return @table_name if value.nil?
+          @table_name = "#{table_prefix}#{value}"
+        end
+
+        def index(index_key, index_name)
+          indexes[index_key.to_sym] = "#{table_prefix}#{index_name}"
+        end
+
+        def inherited(klass)
+          stage_class_for_registration(klass)
+        end
+
+        def primary_key(hash_key, hash_type, range_key = nil, range_type = nil)
+          @primary_key = [ {hash_key => hash_type.to_s.downcase} ]
+          unless range_key.nil?
+            fail "range type is required" if range_type.nil?
+            @primary_key << { range_key => range_type }
+          end
+        end
+      end
+
+      # Instance methods
+
+      def client
+        self.class.client
+      end
+
+      def table_name
+        self.class.table_name
+      end
+
+      def table_prefix
+        self.class.table_prefix
+      end
+
+      def index_name(key)
+        unless self.class.indexes.key?(key)
+          fail "index #{key} has not been registered"
+        end
+        self.class.indexes[key]
+      end
+
+      def put_params(data)
+        {
+          table_name: table_name,
+          item: data
+        }
+      end
+
+      def table_params(keys ={})
+        {
+          table_name: table_name,
+          key: keys
+        }
+      end
+
+      def query_select_map(type)
+        case type
+        when :all_attrs     then 'ALL_ATTRIBUTES'
+        when :all_projected then 'ALL_PROJECTED_ATTRIBUTES'
+        when :count         then 'COUNT'
+        when :specific      then 'SPECIFIC_ATTRIBUTES'
+        end
+      end
+
+      def select_index_params(key, attrs_returned, key_expr, values = {})
+        {
+          table_name: table_name,
+          index_name: index_name(key),
+          select:      query_select_map(attrs_returned),
+          key_condition_expression: key_expr,
+          expression_attribute_values: values
+        }
+      end
+
+      def select_index(key, select, key_expr, values = {})
+        params = select_index_params(key, select, key_expr, values)
+        client.query(params)
+      end
+
+      def index_query_params(key, opts = {})
+        if opts.key?(:select)
+          params[:select] = query_select_map(opts[:select])
+        end
+
+      end
+    end
+  end
+end

data/lib/appfuel/storage/{aws_dynamodb → dynamodb}/repository.rb

@@ -1,18 +1,23 @@
 module Appfuel
-  module AwsDynamodb
+  module Dynamodb
     class Repository < Appfuel::Repository::Base
       class << self
         def container_class_type
-          "#{super}.aws.dynamodb"
+          "#{super}.dynamodb"
         end
       end
 
       def storage_class(domain_name)
-        mapper.storage_class('aws.dynamodb', domain_name)
+        mapper.storage_class('dynamodb', domain_name)
       end
 
       def to_entity(domain_name, storage)
-        super(domain_name, 'aws.dynamodb', storage)
+        super(domain_name, 'dynamodb', storage)
+      end
+
+
+      def to_storage(domain, opts = {})
+        super(domain, 'dynamodb', opts)
       end
     end
   end

data/lib/appfuel/storage/dynamodb.rb

@@ -0,0 +1,2 @@
+require_relative 'dynamodb/repository'
+require_relative 'dynamodb/adapter'

data/lib/appfuel/storage/repository/base.rb

@@ -191,8 +191,8 @@ module Appfuel
         mapper.exists?(expr)
       end
 
-      def to_storage(entity, exclude = [])
-        mapper.to_storage(entity, exclude)
+      def to_storage(entity, type, opts = {})
+        mapper.to_storage(entity, type, opts)
       end
 
       def to_entity(domain_name, type, storage)

data/lib/appfuel/version.rb

@@ -1,3 +1,3 @@
 module Appfuel
-  VERSION = "0.5.8"
+  VERSION = "0.5.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appfuel
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Robert Scott-Buccleuch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: dry-container
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.5
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.5
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
@@ -311,13 +311,14 @@ files:
 - lib/appfuel/handler/action.rb
 - lib/appfuel/handler/base.rb
 - lib/appfuel/handler/command.rb
+- lib/appfuel/handler/handler_failure.rb
 - lib/appfuel/handler/inject_dsl.rb
 - lib/appfuel/handler/validator_dsl.rb
 - lib/appfuel/initialize.rb
 - lib/appfuel/initialize/initializer.rb
 - lib/appfuel/initializers/all.rb
-- lib/appfuel/initializers/aws_dynamodb.rb
 - lib/appfuel/initializers/db.rb
+- lib/appfuel/initializers/dynamodb.rb
 - lib/appfuel/initializers/logging.rb
 - lib/appfuel/initializers/web_api.rb
 - lib/appfuel/log_formatter.rb
@@ -331,9 +332,6 @@ files:
 - lib/appfuel/root_module.rb
 - lib/appfuel/run_error.rb
 - lib/appfuel/storage.rb
-- lib/appfuel/storage/aws_dynamodb.rb
-- lib/appfuel/storage/aws_dynamodb/no_sql_model.rb
-- lib/appfuel/storage/aws_dynamodb/repository.rb
 - lib/appfuel/storage/db.rb
 - lib/appfuel/storage/db/active_record_model.rb
 - lib/appfuel/storage/db/mapper.rb
@@ -342,6 +340,9 @@ files:
 - lib/appfuel/storage/db/migration_tasks.rb
 - lib/appfuel/storage/db/repository.rb
 - lib/appfuel/storage/db/repository_query.rb
+- lib/appfuel/storage/dynamodb.rb
+- lib/appfuel/storage/dynamodb/adapter.rb
+- lib/appfuel/storage/dynamodb/repository.rb
 - lib/appfuel/storage/file.rb
 - lib/appfuel/storage/file/base.rb
 - lib/appfuel/storage/memory.rb

data/lib/appfuel/storage/aws_dynamodb/no_sql_model.rb

@@ -1,60 +0,0 @@
-module Appfuel
-  module AwsDynamodb
-    CLIENT_CONTAINER_KEY = 'aws.dynamodb.client'
-    class NoSqlModel
-      include Appfuel::Application::AppContainer
-
-      class << self
-        def container_class_type
-          'aws.dynamodb'
-        end
-
-        def config_key(value = nil)
-          return @config_key if value.nil?
-          @config_key = value.to_sym
-        end
-
-        def load_config
-          config = app_container[:config]
-          key = config_key.to_s
-          if key.contains?('.')
-            keys = config_key.split('.').map {|k| k.to_sym}
-          else
-            keys = [config_key]
-          end
-
-          keys.each.inject(config) do |c, k|
-            unless c.key?(k)
-              fail "[aws_dynamodb] config key (#{k}) not found - #{self}"
-            end
-            c[k]
-          end
-        end
-
-        def load_client
-          app_container[CLIENT_CONTAINER_KEY]
-        end
-
-        def table_name(value = nil)
-          return @table_name if value.nil?
-
-          prefix = load_config[:table_prefix]
-          @table_name = "#{prefix}#{value}"
-        end
-
-        def inherited(klass)
-          stage_class_for_registration(klass)
-        end
-      end
-
-      attr_reader :config, :client
-
-      def initialize
-        @client = self.class.load_client
-        @config = self.class.load_config
-        @table_prefix = @config.fetch(:table_prefix) { '' }
-      end
-
-    end
-  end
-end

data/lib/appfuel/storage/aws_dynamodb.rb

@@ -1,2 +0,0 @@
-require_relative 'aws_dynamodb/repository'
-require_relative 'aws_dynamodb/no_sql_model'