appfuel 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b872574eb5144fa78c7334c325d1329308c97ea
-  data.tar.gz: dbdaa30f3fc8dbea57efe547a1c32d84cf869ff3
+  metadata.gz: c05007c52cdadfd45cb0a021ddd43f8e2d96875a
+  data.tar.gz: db7c77243472aa7c6f35339a7b24fbac384fcc02
 SHA512:
-  metadata.gz: d588321d6a7c4ce57573ed3e60d9aaa6bfc474fde2abaccc191ccc90dda1698c18d211ec2a777aa9cf5728bf93fedbb6d4bdc9eaa321c797b4fdd0feea592ed7
-  data.tar.gz: 598e3156b838624e479879370fbde73c2127cdd0d49fddf2673773fb8f89c778be7e842026e1e6c0b20506b37441da096e18ddd844d8d82c34075de19fc42b89
+  metadata.gz: b7764d6b15834ddae5d2e2916cdb50a313b98cf6d2d03d9965589e721e6a5335649def32835a6360cf674db9cc79bcdd5b1dba97b526741a81a9de43bf0ff7f8
+  data.tar.gz: c5bcdc614ee39ab5964a979d6d4fd5bde21cba7295f39c28e361d0f043e4a905021df23eef4b7de90ecbe8e13a16fd54e438e3e92d6a6dcf36925573a51656e5

data/CHANGELOG.md

@@ -5,7 +5,16 @@ All notable changes to this project will be documented in this file. (Pending ap
 
 
 # Releases
-## [[0.5.6]] (https://github.com/rsb/appfuel/releases/tag/0.5.5) 2017-07-11
+## [[0.5.7]] (https://github.com/rsb/appfuel/releases/tag/0.5.7) 2017-07-18
+### Changed
+- domain entity `attr_typed!` will always converts the type name to a symbol
+
+### Fixed
+- web_api http model handles exceptions
+- fixed `entity_value` in repo mapper it had an old interface
+- mapping_dsl was missing `skip` property
+
+## [[0.5.6]] (https://github.com/rsb/appfuel/releases/tag/0.5.6) 2017-07-11
 ### Fixed
 - Fixed registering classes in the feature initializer, it now skips when
   already registered

data/lib/appfuel/domain/entity.rb

@@ -65,7 +65,7 @@ module Appfuel
       end
 
       def attr_typed!(name, value)
-        self.class.schema[name][value]
+        self.class.schema[name.to_sym][value]
       end
 
       def data_typed!(type_name, value)

data/lib/appfuel/feature/initializer.rb

@@ -24,8 +24,10 @@ module Appfuel
           feature_path = "#{container[:features_path]}/#{name}"
           begin
             require feature_path
-          rescue LoadError => _e
-            raise "[#{feature_key} initialize] could not load #{feature_path}"
+          rescue LoadError => e
+            trace = e.backtrace.join("\n")
+            raise "[#{feature_key} initialize] could not load " +
+                  "#{feature_path}: #{e.message} #{trace}"
           end
         end
 

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

@@ -137,10 +137,10 @@ module Appfuel
         excluded     = opts[:exclude] || []
         data         = {}
         domain_name  = domain.domain_name
-        map.each_attr(domain_name, type) do |domain_attr, storage_attr, skip|
+        map.each_attr(type, domain_name) do |domain_attr, storage_attr, skip|
           next if excluded.include?(storage_attr) || skip == true
 
-          data[storage_attr] = entity_value(domain, entry)
+          data[storage_attr] = entity_value(domain, domain_attr)
         end
 
         data
@@ -166,12 +166,8 @@ module Appfuel
         end
       end
 
-      def entity_value(domain, map_entry)
-        value = resolve_entity_value(domain, map_entry.domain_attr)
-        if map_entry.computed_attr?
-          value = map_entry.computed_attr(value, domain)
-        end
-
+      def entity_value(domain, domain_attr)
+        value = resolve_entity_value(domain, domain_attr)
         value = nil if undefined?(value)
 
         value
@@ -191,8 +187,8 @@ module Appfuel
         value == Types::Undefined
       end
 
-      def resolve_entity_value(domain, entity_attr)
-        chain  = entity_attr.split('.')
+      def resolve_entity_value(domain, domain_attr)
+        chain  = domain_attr.split('.')
         target = domain
         chain.each do |attr_method|
           return nil unless target.respond_to?(attr_method)

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

@@ -54,9 +54,12 @@ module Appfuel
 
         domain_attr = name if domain_attr.nil?
 
+        skip = opts[:skip] == true ? true : false
+
         data = opts.merge({
           domain_attr: domain_attr,
           storage_attr: name,
+          skip: skip
         })
 
         entries << data

data/lib/appfuel/storage/web_api/http_model.rb

@@ -25,18 +25,6 @@ module Appfuel
         end
 
         def load_http_adapter
-          container = app_container
-          if container.key?('web_api.http_adapter')
-            container['web_api.http_adapter']
-          else
-            load_default_http_adapter
-          end
-        end
-
-        def load_default_http_adapter
-          unless Kernel.const_defined?(:RestClient)
-            require 'rest-client'
-          end
           RestClient
         end
 
@@ -63,20 +51,40 @@ module Appfuel
       def request(method, path, options = {})
         add_content_type(options)
         http_url = url(path)
+        if options[:relative_url] === false
+          http_url = path
+          options.delete(:relative_url)
+        end
+
         begin
           data = options.merge({method: method, url: http_url })
           response = adapter::Request.execute(data)
-          parse_json = options.delete(:json)
-          if parse_json == true
-            response = json(response.body)
-          end
-        rescue => err
-          raise err.exception("[#{http_url}] #{err.message}")
+          response = handle_response(response, options[:headers])
+        rescue RestClient::ExceptionWithResponse => err
+          data = handle_response(err.response, options[:headers])
+          handle_http_error(err.http_code, data, http_url, err.message)
         end
 
         response
       end
 
+
+      def handle_http_error(code, body, url, msg)
+        if body.is_a?(Hash)
+          body = body.map{|k,v| "#{k}: #{v}"}.join('&')
+        end
+        str = "[#{url} #{code}] #{msg} #{body}"
+        raise str
+      end
+
+      def handle_response(response, headers = {})
+        if content_type == :json || headers[:content_type] == :json
+          return json(response.body)
+        end
+
+        response.body
+      end
+
       def json(data)
         JSON.parse(data)
       end

data/lib/appfuel/version.rb

@@ -1,3 +1,3 @@
 module Appfuel
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appfuel
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Robert Scott-Buccleuch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord