appfuel 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 259df454a7a765d3b8bb73cbb7f0c512ef507e9e
-  data.tar.gz: ead4fce377496bf073d1cf08a19fa2aa3cc41de8
+  metadata.gz: bccec5e07ac5df9b023b7b6df825ec5267a54f3b
+  data.tar.gz: 263e81d457c6e413467e228ac4d47d5e97e3be97
 SHA512:
-  metadata.gz: 9ec7d761b53d31b9751f47e6b54d5cbd99d7a93aa40af9b00501fd33f52ab55aff255ffd60cb6850013cba81cac5ef0ed7c3606c1375c6567b77d4732d6d21c7
-  data.tar.gz: 54bb42b0bffe6c7a2d81e0d736c57ab6bc7aea25d1ec32dbdfa751a43e80da6f42ec843d27a6ca85db99726fdae442ddc5e9f3b7f966aa9b692743fec4b37954
+  metadata.gz: 299cdbec29d85211e5cf4a54609ed4af6bdb90a18846c7626bf537c630d22a4dfcfb7a9318000f3ac6b017545c71a8bd257f5f7bc4792639e152e2b67b024004
+  data.tar.gz: 9c7c6e7a4e8281a3dedc20ccbc7f5934a3f75614b9986f1a2fb5f9297421d776ec6f01f4fd431e33cd5c4ec642876a831342d4353fe758f9261216ff054f8afe

data/CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. (Pending ap
 
 
 # Releases
+## [[0.5.2]] (https://github.com/rsb/appfuel/releases/tag/0.5.3) 2017-07-10
+### Fixed
+- response object not working when `ok` key is a string
+
 ## [[0.5.2]] (https://github.com/rsb/appfuel/releases/tag/0.5.2) 2017-07-03
 ### Fixed
 - aws initialization fails when no endpoint

data/lib/appfuel/response.rb

@@ -10,9 +10,28 @@ module Appfuel
       # @param  result Hash the successfull resultset
       # @reuturn Response
       def ok(result = nil)
+        result = ok_data(result) if ok_key?(result)
         self.new(ok: result)
       end
 
+      def ok_key?(data)
+        return false unless data.is_a?(Hash)
+        data.key?(:ok) || data.key?("ok")
+      end
+
+      def error_key?(data)
+        return false unless data.is_a?(Hash)
+        data.key?(:errors) || data.key?("errors")
+      end
+
+      def ok_data(data)
+        data[:ok] || data['ok']
+      end
+
+      def error_data(data)
+        data[:errors] || data['errors']
+      end
+
       # Convience method for creating an error response. It understands
       # how to handle a SpCore::Error object. Any thing that
       # is not a hash or can't be converted to a hash is assumed to be
@@ -45,18 +64,16 @@ module Appfuel
     # @return [Response]
     def initialize(data = {})
       result = format_result_hash(data)
-
-      # when no ok key and no errors key the assume
+      # when no ok key and no errors key then assume
       # it is a successfull response
-      if !result.key?(:ok) && !result.key?(:errors)
-        result = {ok: result}
-      end
-
-      @ok = result[:ok]
+      @ok = nil
       @errors = nil
-      if result.key?(:errors)
-        @ok = nil
-        @errors = Errors.new(result[:errors])
+      if self.class.ok_key?(result)
+        @ok = self.class.ok_data(result)
+      elsif self.class.error_key?(result)
+        @errors = Errors.new(self.class.error_data(result))
+      else
+        @ok = result
       end
     end
 

data/lib/appfuel/response_handler.rb

@@ -7,8 +7,15 @@ module Appfuel
     end
 
     def create_response(data)
-      return data        if response?(data)
-      return error(data) if error_data?(data)
+      if response?(data)
+        return data
+      end
+
+      if error_data?(data)
+        return error(data)
+      end
+
+      # TODO normalize ok key symbol or string here
       ok(data)
     end
 

data/lib/appfuel/version.rb

@@ -1,3 +1,3 @@
 module Appfuel
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

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