wire-framework 0.1.3.9 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d75b13cbad991d78864514fb544f1de7089fec6
-  data.tar.gz: 554b88453478582491e7cc6e2cccb15802e87955
+  metadata.gz: 9156ed687ffe7062a0bff85e0bc97cbb7deb8e6f
+  data.tar.gz: 7c2baa963043f78f34d5a82489e016124f8c2082
 SHA512:
-  metadata.gz: ea3d3ece9fc459ae55201030e7e1281313511e374367c8d7ca701ae45b032cfe883df819c95f97d544b2f78e47a9dcf379447251db3b605a4a02a2e5cdb4e507
-  data.tar.gz: e449b217817e5b4a87d4bed3beacd94c7bf58185b4c2af6861738c5f38890fb1a830ea36fa33e5446aaadcbe06bb7fa38e6d61f905ec064ba646558e6144a203
+  metadata.gz: 77d111e4c49c4bb5d88bf6093caab235ab2de24db63ea5d0c022e5a3c0111911372d72dc43fdf9d88ed7ae531bebafb6b4ed8e0405ae784cdedefade7abd3351
+  data.tar.gz: f94c19a099f2a9a421fc55ecd631aaa947fd456c8a41c9ed50f41b894c45f127a6f1e3d2d278e7ce966af1fbde417c96c7b159b203ded83132a60a80e2e4fc3c

data/lib/app/render.rb

@@ -7,6 +7,7 @@ require 'json'
 require_relative '../wire'
 require_relative 'render/document'
 require_relative 'render/editor'
+require_relative 'render/error'
 require_relative 'render/instant'
 require_relative 'render/page'
 require_relative 'render/partial'

data/lib/app/render/document.rb

@@ -22,8 +22,8 @@ module Render
 				else
 					response
 				end
-			rescue RestClient::ResourceNotFound
-				[404, {}, $apps[404][:template][:path].render(self, locals = { actions: actions, context: context })]
+			rescue RestClient::ResourceNotFound => e
+				[404, {}, [e.response]]
 			end
 		end
 

data/lib/app/render/error.rb

@@ -0,0 +1,56 @@
+require_relative '../render'
+
+module Render
+	module Error
+		extend Render
+
+		def self.error(match, path)
+			unless $current_app[:errors]
+				$current_app[:errors] = {}
+			end
+			$current_app[:errors][match] = Tilt.new(path, 1, { ugly: true })
+		end
+
+		def self.error_check(actions, context, result)
+			errors = context.app[:errors]
+			if errors
+				template = errors[result.first]
+				if template
+					result[2] = template.render(self, {actions: actions, context: context, result: result})
+				end
+			end
+			result
+		end
+
+		def self.invoke(actions, context)
+			begin
+				case context.action
+					when :create
+						result = forward(:create, context)
+					when :read
+						if context.uri[3]
+							result = forward(:read, context)
+						else
+							result = forward(:readAll, context)
+						end
+					when :update
+						result = forward(:update, context)
+					else
+						result = 405
+				end
+				if result.is_a? Fixnum
+					result = [result,{},[]]
+				else
+					headers = {}
+					result.headers.each do |k,v|
+						headers[k.to_s.capitalize] = v
+					end
+					result = [result.code,headers,[result.to_s]]
+				end
+			rescue RestClient::ResourceNotFound => e
+				result = [404,{},e.to_s]
+			end
+			error_check(actions, context, result)
+		end
+	end
+end

data/lib/wire.rb

@@ -24,5 +24,5 @@ end
 # @author Bryan T. Meyers
 module Wire
 	# Current version of the Wire Gem
-	VERSION = '0.1.3.9'
+	VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wire-framework
 version: !ruby/object:Gem::Version
-  version: 0.1.3.9
+  version: 0.1.4
 platform: ruby
 authors:
 - Bryan T. Meyers
@@ -168,6 +168,7 @@ files:
 - lib/app/render.rb
 - lib/app/render/document.rb
 - lib/app/render/editor.rb
+- lib/app/render/error.rb
 - lib/app/render/instant.rb
 - lib/app/render/page.rb
 - lib/app/render/partial.rb