appfuel 0.2.3 → 0.2.4

data/lib/appfuel/storage/db/mapper.rb

@@ -2,37 +2,47 @@ module Appfuel
   module Db
     class Mapper < Appfuel::Repository::Mapper
 
-      # Determines if an domain entity exists for this key
-      #
-      # @param key [String, Symbol]
-      # @return [Boolean]
-      def entity_mapped?(name)
-        registry.entity?(name)
+      def search(domain_name, criteria, opts = {})
+
       end
 
-      # Returns the active record model from a map for a given entity
+      # Return qualified db column name from entity expression.
       #
-      # @raise [RuntimeError] if entity key does not exist
-      # @raise [RuntimeError] if map key does not exist
+      # @param expr [SpCore::Domain::Expr]
+      # @return db column name [String]
+      def qualified_db_column(expr, entry = nil)
+        table_name, column = db_table_column(expr, entry)
+        "#{table_name}.#{column}"
+      end
+
+      # Determine Domain Mapentry and DbModel from entity expression.
       #
-      # @param entity [String] encoded "feature.entity"
-      # @param domain_attr [String] attribute of entity
-      # @return [DbModel]
-      def db_class_key(entity_name, entity_attr)
-        entry = find(entity_name, entity_attr)
-        db_class_key = entry.storage(:db)
+      # @param expr [SpCore::Domain::Expr]
+      # @return [table_name, column] [Array]
+      def db_table_column(expr, entry = nil)
+        entry ||= find(expr.domain_name, expr.domain_attr)
+        db  = storage_class_from_entry(entry, :db)
 
-        mapp.storage(entity, domain_attr)
+        [db.table_name, entry.storage_attr]
       end
 
-      # Converts an entity expression into a valid active record expresion with
-      # string expresion (array canditions) and value(s)
+      # Converts an entity expression into a valid active record expresion
+      # expression.
       #
       # @param expr [Domain::Expr]
-      # @param results [Hash]
-      # @return [DbExpr] Returns a valid active record expresion
-      def create_db_expr(expr)
-        DbExpr.new(qualified_db_column(expr), expr.op, expr.value)
+      # @param entry [Repository::MappingEntry] optional
+      # @return [Array] The first index is the expr string using ? for values
+      #                 The second index is the actual value(s)
+      def convert_expr(expr, entry = nil)
+        column = qualified_db_column(expr, entry)
+        op     = expr.op
+        arg    = case expr.op
+                 when 'in', 'not in' then '(?)'
+                 when 'between', 'not between' then '? AND ?'
+                 else
+                   '?'
+                 end
+        ["#{column} #{op} #{arg}", expr.value]
       end
 
       # Validates if a record exists in the table that matches the array with
@@ -40,14 +50,15 @@ module Appfuel
       #
       # @param criteria [Criteria]
       # @return [Boolean]
-      def exists?(criteria)
-        domain_expr = criteria.exists_expr
+      def exists?(domain_expr)
         domain_name = domain_expr.domain_name
         domain_attr = domain_expr.domain_attr
 
-        db_expr     = create_db_expr(domain_expr)
-        db_model    = registry.db_class(domain_name, domain_attr)
-        db_model.exists?([db_expr.string, db_expr.values])
+        entry = find(domain_name, domain_attr)
+        db_expr, values = convert_expr(domain_expr, entry)
+        db = storage_class_from_entry(entry, :db)
+
+        db.exists?([db_expr, values])
       end
 
       # Build a where expression from the mapped db class using the criteria.Ï
@@ -70,25 +81,6 @@ module Appfuel
         relation
       end
 
-      # Return qualified db column name from entity expression.
-      #
-      # @param expr [SpCore::Domain::Expr]
-      # @return db column name [String]
-      def qualified_db_column(expr)
-        table_name, column = db_table_column(expr)
-        "#{table_name}.#{column}"
-      end
-
-      # Determine Domain Mapentry and DbModel from entity expression.
-      #
-      # @param expr [SpCore::Domain::Expr]
-      # @return [table_name, column] [Array]
-      def db_table_column(expr)
-        entry = registry.find(expr.domain_name, expr.domain_attr)
-        db    = registry.db_class_constant(entry.db_class)
-        [db.table_name, entry.db_column]
-      end
-
       # Build an order by expression for the given db relation based on the
       # criteria
       #
@@ -129,85 +121,6 @@ module Appfuel
         db_expr = create_db_expr(domain_expr)
         relation.where([db_expr.string, db_expr.values])
       end
-
-      # Convert the entity into a hash of db tables that represent
-      # that entity. Each table has its own hash of mapped columns.
-      #
-      # @param domain [Appfuel::Domain::Entity]
-      # @param opts [Hash]
-      # @option exclued [Array] list of columns to exclude from mapping
-      #
-      # @return [Hash] each key is a table with a hash of column name/value
-      def to_storage(domain, opts = {})
-        excluded = opts[:exclude] || []
-        data = {}
-        each_entity_attr(domain.domain_name) do |entry|
-          column   = entry.storage_attr
-          db_class = entry.storage(:db)
-          next if excluded.include?(column) || entry.skip?
-
-          data[db_class] = {} unless data.key?(db_class)
-          data[db_class][column] = entity_value(domain, entry)
-        end
-        data
-      end
-
-      # Handles entity value by checking if its a computed property,
-      # fetching the value and converting undefined values to nil.
-      #
-      # @param domain [Appfuel::Domain::Entity]
-      # @param map_entry [MappingEntity]
-      # @return the value
-      def entity_value(domain, entry)
-        value = retrieve_entity_value(domain, entry.domain_attr)
-        if entry.computed_attr?
-          value = entry.compute_attr(value)
-        end
-
-        value = nil if undefined?(value)
-
-        value
-      end
-
-      # @params value [mixed]
-      # @return [Boolean]
-      def undefined?(value)
-        value == Types::Undefined
-      end
-
-      # Fetch the value for the entity attribute. When the attribute name
-      # contains a '.' then traverse the dots and call the last attribute
-      # for the value
-      #
-      # @param domain [Appfuel::Domain::Entity]
-      # @param entity_attribute [String]
-      # @return the value
-      def retrieve_entity_value(domain, entity_attr)
-        chain  = entity_attr.split('.')
-        target = domain
-        chain.each do |attr_method|
-          unless target.respond_to?(attr_method)
-            return nil
-          end
-
-          target = target.public_send(attr_method)
-        end
-        target
-      end
-
-      # Create nested hashes from string
-      #
-      # @param domain_attr [String]
-      # @param entity_value [String]
-      # @return [nested hash]
-      def create_entity_hash(domain_attr, entity_value)
-        domain_attr.split('.').reverse.inject(entity_value) { |a,n| {n => a}}
-      end
-
-      def model_attributes(relation)
-        ap relation
-        relation.attributes.select {|_, value| !value.nil?}
-      end
     end
   end
 end

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

@@ -2,8 +2,12 @@ module Appfuel
   module Db
     class Repository < Appfuel::Repository::Base
       class << self
+        def container_class_type
+          "#{super}.db"
+        end
+
         def create_mapper(maps = nil)
-          Mapper.new(maps)
+          Mapper.new(container_root_name, maps)
         end
       end
 
@@ -116,14 +120,6 @@ module Appfuel
         apply_query_conditions(criteria, relation)
       end
 
-      # Factory method to create a pagination result
-      #
-      # @param data [Hash]
-      # @return [SpCore::Pagination::Result]
-      def create_pager_result(data)
-        Appfuel::Pagination::Result.new(data)
-      end
-
       # Factory method to create a domain entity
       #
       # @param domain_name [String]
@@ -197,7 +193,7 @@ module Appfuel
       #
       # @param criteria [SpCore::Criteria]
       # @return [SpCore::Domain::Entity, SpCore::Domain::EntityCollection]
-      def query(criteria)
+      def search(criteria)
         return execute_criteria(criteria) if criteria.exec?
 
         begin

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

@@ -3,6 +3,10 @@ module Appfuel
     class Repository < Appfuel::Repository::Base
 
       class << self
+        def container_class_type
+          "#{super}.memory"
+        end
+
         def create_mapper(maps = nil)
           Mapper.new(maps)
         end

data/lib/appfuel/types.rb

@@ -44,7 +44,6 @@ module Types
         fail "Domain must be a Appfuel::Entity or respond to :domain_name"
       end
       name = opts.key?(:as) ? opt[:as] : klass.domain_name
-      p name
       return if key?(name) && self[name] == klass
 
       register(name, klass)

data/lib/appfuel/version.rb

@@ -1,3 +1,3 @@
 module Appfuel
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/appfuel.rb

@@ -29,16 +29,6 @@ require "appfuel/validation"
 # Dependency management for actions, commands and repos
 require "appfuel/root_module"
 
-require "appfuel/presenter"
-
-require "appfuel/repository"
-require "appfuel/db_model"
-require "appfuel/repository_runner"
-require "appfuel/storage"
-
-# callable operations
-require "appfuel/handler"
-
 module Appfuel
   # The appfuel top level interface mainly deals with interacting with both
   # the application dependency injection container and the framework di
@@ -206,5 +196,11 @@ end
 
 # Domain Entities
 require "appfuel/domain"
+require "appfuel/presenter"
+require "appfuel/repository"
+require "appfuel/repository_runner"
+require "appfuel/storage"
+require "appfuel/handler"
+
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appfuel
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Robert Scott-Buccleuch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: parslet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -232,6 +246,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - README.md
@@ -239,12 +254,11 @@ files:
 - appfuel.gemspec
 - bin/console
 - bin/setup
+- docs/images/appfuel_basic_flow.png
 - lib/appfuel.rb
 - lib/appfuel/application.rb
 - lib/appfuel/application/app_container.rb
 - lib/appfuel/application/container_class_registration.rb
-- lib/appfuel/application/container_key.rb
-- lib/appfuel/application/qualify_container_key.rb
 - lib/appfuel/application/root.rb
 - lib/appfuel/cli_msg_request.rb
 - lib/appfuel/configuration.rb
@@ -252,14 +266,20 @@ files:
 - lib/appfuel/configuration/file_loader.rb
 - lib/appfuel/configuration/populate.rb
 - lib/appfuel/configuration/search.rb
-- lib/appfuel/db_model.rb
 - lib/appfuel/domain.rb
-- lib/appfuel/domain/criteria.rb
+- lib/appfuel/domain/base_criteria.rb
+- lib/appfuel/domain/criteria_builder.rb
+- lib/appfuel/domain/criteria_settings.rb
 - lib/appfuel/domain/domain_name_parser.rb
 - lib/appfuel/domain/dsl.rb
 - lib/appfuel/domain/entity.rb
 - lib/appfuel/domain/entity_collection.rb
+- lib/appfuel/domain/exists_criteria.rb
 - lib/appfuel/domain/expr.rb
+- lib/appfuel/domain/expr_conjunction.rb
+- lib/appfuel/domain/expr_parser.rb
+- lib/appfuel/domain/expr_transform.rb
+- lib/appfuel/domain/search_criteria.rb
 - lib/appfuel/domain/value_object.rb
 - lib/appfuel/errors.rb
 - lib/appfuel/feature.rb
@@ -283,7 +303,6 @@ files:
 - lib/appfuel/repository/mapper.rb
 - lib/appfuel/repository/mapping_dsl.rb
 - lib/appfuel/repository/mapping_entry.rb
-- lib/appfuel/repository/mapping_registry.rb
 - lib/appfuel/repository_runner.rb
 - lib/appfuel/request.rb
 - lib/appfuel/response.rb

data/lib/appfuel/application/container_key.rb

@@ -1,201 +0,0 @@
-module Appfuel
-  module Application
-    # Mixins to allow you to handle application container keys. The application
-    # container operates based on certain conventions which we take into account
-    # here.
-    module ContainerKey
-      # Parse the namespace assuming it is a ruby namespace and assign
-      # the list to container_path_list
-      #
-      # @param namespace [String]
-      # @return [Array]
-      def load_path_from_ruby_namespace(namespace)
-        self.container_path = parse_list_string(namespace, '::')
-      end
-
-      # Parse the namespace assuming it is a dry container namespace and
-      # assign the list to container_path_list
-      #
-      # @param namespace [String]
-      # @return [Array]
-      def load_path_from_container_namespace(namespace)
-        self.container_path = parse_list_string(namespace, '.')
-      end
-
-      # @param namespace [String] encoded string that represents a path
-      # @param char [String] character used to split the keys into a list
-      # @return [Array] an array of lower case snake cased strings
-      def parse_list_string(namespace, char)
-        fail "split char must be '.' or '::'" unless ['.', '::'].include?(char)
-        namespace.to_s.split(char).map {|i| i.underscore }
-      end
-
-      # return [Boolean]
-      def container_path?
-        !@container_path.nil?
-      end
-
-      # @param list [Array] list of container namespace parts including root
-      # @return [Array]
-      def container_path=(list)
-        fail "container path list must be an array" unless list.is_a?(Array)
-        @container_path = list
-        @container_path.freeze
-      end
-
-      # An array representation of the application container namespace, where
-      # the root is the name of the application and not part of the namespace
-      # and the rest is hierarchical path to features or globals
-      #
-      # @return [Array]
-      def container_path
-        load_path_from_ruby_namespace(self.to_s) unless container_path?
-        @container_path
-      end
-
-      # This is the application name used to identify the application container
-      # that is stored in the framework container
-      #
-      # @return string
-      def container_root_name
-        @container_root_name ||= container_path.first
-      end
-
-      # All root namespace for anything inside features, use this name. It is
-      # important to note that to avoid long namespace in ruby features are the
-      # name of the module directly below the root.
-      #
-      # @return [String]
-      def container_features_root_name
-        @container_features_root_name ||= 'features'
-      end
-
-      # The actual name of the feature
-      #
-      # @return [String]
-      def container_feature_name
-        container_path[1]
-      end
-
-      # The feature name is the second item in the path, that is always prexfix
-      # with "features"
-      #
-      # @return [String]
-      def container_feature_key
-        @container_feature_key ||= (
-          "#{container_features_root_name}.#{container_feature_name}"
-        )
-      end
-
-      # Container key relative from feature or global, depending on which class
-      # this is mixed into
-      #
-      # @return [String]
-      def container_relative_key
-         @container_relative_key ||= container_path[2..-1].join('.')
-      end
-
-      # This refers to either the global path or the path to a particular
-      # feature
-      #
-      # @return [String]
-      def top_container_key
-        container_global_path? ? container_global_name : container_feature_key
-      end
-
-      def container_key_basename
-        @container_path.last
-      end
-
-      # Fully qualified key, meaning you can access the class this was mixed into
-      # if you stored it into the container using this key
-      #
-      # @return [String]
-      def container_qualified_key
-        @container_qualified_key ||= (
-          "#{top_container_key}.#{container_relative_key}"
-        )
-      end
-
-      # Determines if the container path represents a global glass
-      #
-      # @return [Boolean]
-      def container_global_path?
-        container_path[1] == container_global_name
-      end
-
-      # @return [String]
-      def container_global_name
-        @container_global_name ||= 'global'
-      end
-
-      # Convert the injection key to a fully qualified namespaced key that
-      # is used to pull an item out of the app container.
-      #
-      # Rules:
-      #   1) split the injection key by '.'
-      #   2) use the feature_key as the initial namespace
-      #   3) when the first part of the key is "global" use that instead of
-      #      the feature_key
-      #   4) append the type_key to the namespace unless it is "container"
-      #      type_key like "repositories" or "commands" removes the need for
-      #      the user to have to specify it since they already did that when
-      #      they used the type param.
-      #
-      #
-      #   note: feature_key in these examples will be "features.my-feature"
-      #   @example of a feature repository named foo
-      #
-      #       convert_to_qualified_container_key('foo', 'repositories')
-      #
-      #       returns 'features.my-feature.repositories.foo'
-      #
-      #   @example of a global command names bar
-      #
-      #       convert_to_qualified_container_key('global.bar', 'commands')
-      #
-      #       returns 'gloval.commands.bar'
-      #
-      #   @example of a container item baz
-      #     NOTE: feature container items are not in any namespace, they are any item
-      #           that can resolve from the namespace given by "feature_key"
-      #
-      #      convert_to_qualified_container_key('baz', 'container')
-      #
-      #      returns 'features.my-feature.baz'
-      #
-      #   @example of a global container item baz
-      #     NOTE: global container items are not in any namespace, they are any item
-      #           you can resolve from the application container.
-      #
-      #     convert_to_qualified_container_key('global.baz', 'container')
-      #
-      #     returns 'baz'
-      #
-      # @param key [String] partial key to be built into fully qualified key
-      # @param type_ns [String] namespace for key
-      # @return [String] fully qualified namespaced key
-      def qualify_container_key(key, type_ns)
-        parts     = key.to_s.split('.')
-        namespace = "#{container_feature_key}."
-        if parts[0].downcase == 'global'
-          namespace = 'global.'
-          parts.shift
-        elsif parts[0] == container_feature_name
-          parts.shift
-        end
-
-        # when the key is a global container the namespace is only the path
-        if type_ns == "container"
-          namespace = '' if namespace == 'global.'
-          type_ns = ''
-        else
-          type_ns = "#{type_ns}."
-        end
-
-        path = parts.join('.')
-        "#{namespace}#{type_ns}#{path}"
-      end
-    end
-  end
-end

data/lib/appfuel/application/qualify_container_key.rb

@@ -1,76 +0,0 @@
-module Appfuel
-  module Application
-    # Mixins to allow you to handle application container keys. The application
-    # container operates based on certain conventions which we take into account
-    # here.
-    module QualifyContainerKey
-      # Convert the injection key to a fully qualified namespaced key that
-      # is used to pull an item out of the app container.
-      #
-      # Rules:
-      #   1) split the injection key by '.'
-      #   2) use the feature_key as the initial namespace
-      #   3) when the first part of the key is "global" use that instead of
-      #      the feature_key
-      #   4) append the type_key to the namespace unless it is "container"
-      #      type_key like "repositories" or "commands" removes the need for
-      #      the user to have to specify it since they already did that when
-      #      they used the type param.
-      #
-      #
-      #   note: feature_key in these examples will be "features.my-feature"
-      #   @example of a feature repository named foo
-      #
-      #       convert_to_qualified_container_key('foo', 'repositories')
-      #
-      #       returns 'features.my-feature.repositories.foo'
-      #
-      #   @example of a global command names bar
-      #
-      #       convert_to_qualified_container_key('global.bar', 'commands')
-      #
-      #       returns 'gloval.commands.bar'
-      #
-      #   @example of a container item baz
-      #     NOTE: feature container items are not in any namespace, they are any item
-      #           that can resolve from the namespace given by "feature_key"
-      #
-      #      convert_to_qualified_container_key('baz', 'container')
-      #
-      #      returns 'features.my-feature.baz'
-      #
-      #   @example of a global container item baz
-      #     NOTE: global container items are not in any namespace, they are any item
-      #           you can resolve from the application container.
-      #
-      #     convert_to_qualified_container_key('global.baz', 'container')
-      #
-      #     returns 'baz'
-      #
-      # @param key [String] partial key to be built into fully qualified key
-      # @param type_ns [String] namespace for key
-      # @return [String] fully qualified namespaced key
-      def qualify_container_key(key, type_ns)
-        parts     = key.to_s.split('.')
-        namespace = "#{container_feature_key}."
-        if parts[0].downcase == 'global'
-          namespace = 'global.'
-          parts.shift
-        elsif parts[0] == container_feature_name
-          parts.shift
-        end
-
-        # when the key is a global container the namespace is only the path
-        if type_ns == "container"
-          namespace = '' if namespace == 'global.'
-          type_ns = ''
-        else
-          type_ns = "#{type_ns}."
-        end
-
-        path = parts.join('.')
-        "#{namespace}#{type_ns}#{path}"
-      end
-    end
-  end
-end

data/lib/appfuel/db_model.rb

@@ -1,16 +0,0 @@
-module Appfuel
-  class DbModel < ActiveRecord::Base
-    self.abstract_class = true
-    extend Appfuel::Application::ContainerKey
-    extend Appfuel::Application::ContainerClassRegistration
-
-    def self.inherited(klass)
-      super
-      register_container_class(klass)
-    end
-
-    def entity_attributes
-      attributes.symbolize_keys.select {|_,value| !value.nil?}
-    end
-  end
-end