wire-framework 0.1.4.16 → 0.1.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eea3c0482d64af86058b1aedb0f7db041125b326
-  data.tar.gz: f65c26db02144d4bf72eae3c963db99c91ec69a9
+  metadata.gz: 31488ea17a2f14658a5b2cfec8f9cce0c448d25b
+  data.tar.gz: 59d3c8eca477e01101b73549e2fad9b46eec7304
 SHA512:
-  metadata.gz: 9d8ae75a3d7d99b00423e518f3846b1e9bc18c8152afe563feea1487f427a767dae0f923f9a534ef5b5128843e66997925b565f2c45608d2b1c327086d1ad8e4
-  data.tar.gz: 89f722fc74dd12e378cdab09c6ad6a7d331948b5837b14a2b6314e46f5f0bb7e0418f03fd0ad56abc67016cf64c1cbaefee21d04241f5409acc8f2b61b460e2e
+  metadata.gz: 279b13e750a99b13c66693e0402fa0a1d4d07fda7e0b39e598c69936d8e98daf2a6e6ea0bab996f68e05cdaa765cd12bdfec105f9376473fb12090d70a668929
+  data.tar.gz: 75c708d0ad8411ba489a9c695925298272b06c90c35207ff5f52d37d513efd12ea4dc7ebabc0903c67b127dd89227ebf15ee0610f4c27462dbbeb12983b861b5

data/lib/app/cache.rb

@@ -85,11 +85,9 @@ module Cache
 					unless cached
 						cached = update_cached(context)
 					end
-					if cached
-						[200,{},cached]
-					else
-						404
-					end
+					cached
+				else
+					403
 			end
 		end
 	end

data/lib/app/db.rb

@@ -116,7 +116,7 @@ module DB
 				end
 			end
 			hash << ']'
-			hash
+			[200,{},hash]
 		else
 			404
 		end
@@ -135,10 +135,10 @@ module DB
 		if model
 			object = model.get(id)
 			if object
-				return object.to_json
+				return [200,{},object.to_json]
 			end
 		end
-		404
+		[404,{},[]]
 	end
 
 	# Update a specific object in the DB table
@@ -198,4 +198,4 @@ module DB
 				403
 		end
 	end
-end
+end

data/lib/app/render.rb

@@ -109,7 +109,7 @@ module Render
 		headers = {referer: referer, remote_user: context.user}
 		verb = CONVERT[method]
 		uri = "http://#{host}/#{path}/#{resource}"
-		uri += id if [:update,:get,:delete].include?( method )
+		uri += "/#{id}" if [:update,:read,:delete].include?( method )
 		uri += q
 		body = [:create,:update].include?(method) ? context.body : nil
 		$stderr.puts "#{verb.upcase}: Forward Request to #{uri}"

data/lib/app/render/page.rb

@@ -29,9 +29,9 @@ module Render
 					end
 					temp = nil
 					if go_ahead
-							temp = RL.request(:get, uri)[2]
+							temp = RL.request(:get, uri)
 					end
-					hash[k] = temp
+					hash[k] = (temp[0] == 200) ? temp[2] : nil
 				end
 				message = template[:path].render(self, hash)
 				if template[:use_layout]
@@ -55,7 +55,7 @@ module Render
 				template = context.app[:template]
 				if template
 					result[1]['Content-Type'] = 'text/html'
-					result[2] = render_template(actions, context, template, result)
+					result[2] = render_template(actions, context, template, result[2])
 				end
 			else
 				result = [401,{},'Resource not specified']
@@ -82,4 +82,4 @@ module Render
 			end
 		end
 	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.4.16'
+	VERSION = '0.1.4.17'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wire-framework
 version: !ruby/object:Gem::Version
-  version: 0.1.4.16
+  version: 0.1.4.17
 platform: ruby
 authors:
 - Bryan T. Meyers