wire-framework 0.1.4.15 → 0.1.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6271e0ac06b81c61e4f513b5da0e6b1906c76e7a
-  data.tar.gz: 063da839e2c171038dae1310ff0a6cd569302a86
+  metadata.gz: eea3c0482d64af86058b1aedb0f7db041125b326
+  data.tar.gz: f65c26db02144d4bf72eae3c963db99c91ec69a9
 SHA512:
-  metadata.gz: 449b727a32d73540e78bf00b46be3fc6ba08ce3af85cd78283e2ac5fc0327fa55bb9e91d7b7cec41a5a874d66a861db7a3bac0031356eaf627d350d8ab6343d5
-  data.tar.gz: 13765d584afa7121cc61109c68cd10a2b0a39525601761116942fc1d019c7594a812638696ac99682f8e55983b3889e3079185f34b47c0e5f997a8584b9e1ceb
+  metadata.gz: 9d8ae75a3d7d99b00423e518f3846b1e9bc18c8152afe563feea1487f427a767dae0f923f9a534ef5b5128843e66997925b565f2c45608d2b1c327086d1ad8e4
+  data.tar.gz: 89f722fc74dd12e378cdab09c6ad6a7d331948b5837b14a2b6314e46f5f0bb7e0418f03fd0ad56abc67016cf64c1cbaefee21d04241f5409acc8f2b61b460e2e

data/lib/app/cache.rb

@@ -17,40 +17,33 @@ module Cache
 			all = context.uri[0..2].join('/')
 			env = $cache[context.app[:remote_uri]]
 			db = env.database
-			begin
-
-				if context.uri[3]
-					result = forward(:read,context)
-				else
-					result = forward(:readAll,context)
-				end
-				if (result != nil) and (result.code == 200)
-					env.transaction do
-						if context.action == :delete
-							db.destroy(uri)
-						else
-							db[uri] = result
-						end
+			if context.uri[3]
+				result = forward(:read,context)
+			else
+				result = forward(:readAll,context)
+			end
+			if result[0] == 200
+				env.transaction do
+					if context.action == :delete
+						db.destroy(uri)
+					else
+						db[uri] = result[2]
 					end
 				end
-				if [:create,:update,:delete].include? context.action
-					thing = forward(:readAll,context)
-				end
-				if (thing != nil) and (thing.code == 200)
+			end
+			if [:create,:update,:delete].include? context.action
+				thing = forward(:readAll,context)
+				if thing[0] == 200
 					env.transaction do
-						db[all] = thing
+						db[all] = thing[2]
 					end
 				end
-			rescue RestClient::ResourceNotFound
-				# gracefully ignore
-				result = 404
 			end
 			result
 		end
 
 		def self.get_cached(context)
 			uri = context.uri.join('/')
-
 			env = $cache[context.app[:remote_uri]]
 			db = env.database
 			result = nil
@@ -82,7 +75,6 @@ module Cache
 				$cache[context.app[:remote_uri]] = LMDB.new("/tmp/cache/#{context.app[:remote_uri]}", mapsize: 2**30)
 			end
 
-			begin
 			case context.action
 				when :create,:update,:delete
 					result = forward(context.action,context)
@@ -94,14 +86,11 @@ module Cache
 						cached = update_cached(context)
 					end
 					if cached
-						cached
+						[200,{},cached]
 					else
 						404
 					end
 			end
-			rescue RestClient::ResourceNotFound
-				404
-			end
 		end
 	end
 end

data/lib/app/db.rb

@@ -1,3 +1,4 @@
+require 'data_objects'
 require 'dm-serializer/to_json'
 require_relative '../app'
 require_relative '../closet/resource'
@@ -63,7 +64,6 @@ module DB
 							end
 						end
 						if errors.length > 0
-							ap errors
 							[400, nil, errors]
 						else
 							200
@@ -79,12 +79,21 @@ module DB
 				if model.instance_methods.include?(:created_by)
 					context.json[:created_by] = context.user
 				end
-				instance = model.create(context.json)
-				instance.save
-				if instance.saved?
-					200
-				else
-					[504,{}, instance.errors]
+				begin
+					instance = model.create(context.json)
+					instance.save
+					if instance.saved?
+						200
+					else
+						[504,{}, instance.errors]
+					end
+				rescue => e
+					case e.class
+						when DataObjects::IntegrityError.class
+							[400,{},e.message]
+						else
+							[500,{},e.message]
+					end
 				end
 			end
 		else

data/lib/app/history/svn.rb

@@ -16,18 +16,13 @@ module History
 		# @return [Hash] the history entries
 		def self.get_log(web, repo, id = nil)
 			options = "--username #{$environment[:repos_user]} --password #{$environment[:repos_password]}"
-			if id.nil?
-				log = `svn log #{options} -v --xml 'svn://localhost/#{repo}'`
-			else
-				if web.nil?
-					log = `svn log #{options} -v --xml 'svn://localhost/#{repo}/#{id}'`
-				else
-					log = `svn log #{options} -v --xml 'svn://localhost/#{repo}/#{web}/#{id}'`
-				end
-			end
-			unless $?.exitstatus == 0
-				return 404
+			uri = "svn://localhost/#{repo}"
+			if id
+				uri += "/#{web}" if web
+				uri += "/#{id}"
 			end
+			log = `svn log #{options} -v --xml '#{uri}'`
+			return 404 if $?.exitstatus != 0
 			log = CobraVsMongoose.xml_to_hash(log)
 			log['log']['logentry']
 		end

data/lib/app/render.rb

@@ -1,6 +1,6 @@
 require 'nokogiri'
-require 'rest-client'
 require 'awesome_print'
+require 'rest-less'
 require 'docile'
 require 'tilt'
 require 'json'
@@ -87,6 +87,14 @@ module Render
 		single(template)
 	end
 
+	CONVERT = {
+			create: :post,
+			read: :get,
+			readAll: :get,
+			update: :put,
+			delete: :delete
+	}
+
 	# Proxy method used when forwarding requests
 	# @param [Symbol] method the action to use when forwarding
 	# @param [Hash] context the context for this request
@@ -99,24 +107,12 @@ module Render
 		q  = '?' + context.query_string
 		id = context.uri[3...context.uri.length].join('/')
 		headers = {referer: referer, remote_user: context.user}
-		case (method)
-			when :create
-				$stderr.puts "POST: Forward Request to https://#{host}/#{path}/#{resource}#{q}"
-				RestClient.post "http://#{host}/#{path}/#{resource}#{q}", context.body, headers
-			when :update
-				$stderr.puts "PUT: Forward Request to https://#{host}/#{path}/#{resource}/#{id}#{q}"
-				RestClient.put "http://#{host}/#{path}/#{resource}/#{id}#{q}", context.body , headers
-			when :readAll
-				$stderr.puts "GET: Forward Request to https://#{host}/#{path}/#{resource}#{q}"
-				RestClient.get "http://#{host}/#{path}/#{resource}#{q}", headers
-			when :read
-				$stderr.puts "GET: Forward Request to https://#{host}/#{path}/#{resource}/#{id}#{q}"
-				RestClient.get "http://#{host}/#{path}/#{resource}/#{id}#{q}", headers
-			when :delete
-				$stderr.puts "DELETE: Forward Request to https://#{host}/#{path}/#{resource}/#{id}#{q}"
-				RestClient.delete "http://#{host}/#{path}/#{resource}/#{id}#{q}" , headers
-			else
-				401
-		end
+		verb = CONVERT[method]
+		uri = "http://#{host}/#{path}/#{resource}"
+		uri += id if [:update,:get,:delete].include?( method )
+		uri += q
+		body = [:create,:update].include?(method) ? context.body : nil
+		$stderr.puts "#{verb.upcase}: Forward Request to #{uri}"
+		RL.request verb, uri, headers, body
 	end
 end

data/lib/app/render/document.rb

@@ -12,18 +12,14 @@ module Render
 		# @param [Symbol] specific the type of read to perform
 		# @return [Response] a Rack Response triplet, or status code
 		def self.do_read(actions, context, specific)
-			begin
-				response = forward(specific, context)
-				mime     = response.headers[:content_type]
-				renderer = $renderers[mime]
-				if renderer
-					template = $templates[renderer]
-					template.render(self, { actions: actions, context: context, mime: mime, response: response.body })
-				else
-					response
-				end
-			rescue RestClient::ResourceNotFound => e
-				[404, {}, [e.response]]
+			response = forward(specific, context)
+			mime     = response[1][:content_type]
+			renderer = $renderers[mime]
+			if renderer
+				template = $templates[renderer]
+				template.render(self, { actions: actions, context: context, mime: mime, response: response[2] })
+			else
+				response
 			end
 		end
 
@@ -33,18 +29,14 @@ module Render
 		# @return [Response] a Rack Response triplet, or status code
 		def self.invoke(actions, context)
 			case context.action
-				when :create
-					forward(:create, context)
+				when :create,:update,:delete
+					forward(context.action, context)
 				when :read
 					if context.uri[3]
 						do_read(actions, context, :read)
 					else
 						do_read(actions, context, :readAll)
 					end
-				when :update
-					forward(:update, context)
-				when :delete
-					forward(:delete, context)
 				else
 					405
 			end

data/lib/app/render/editor.rb

@@ -15,17 +15,13 @@ module Render
 			resource = context.uri[2]
 			query    = context.query
 			id       = context.uri[3...context.uri.length].join('/')
-			body     = ''
-			begin
-				response = forward(:read, context)
-				mime     = response.headers[:content_type]
-				body     = response.body
-			rescue RestClient::ResourceNotFound
-				if query[:type]
-					mime = query[:type]
-				else
-					return [404, {}, 'EDITOR: Document type not set for new document']
-				end
+			response = forward(:read, context)
+			return response if response[0] != 200
+			body     = response[2]
+			if query[:type]
+				mime = query[:type]
+			else
+				return [404, {}, 'EDITOR: Document type not set for new document']
 			end
 			template = $editors[mime]
 			if template
@@ -41,12 +37,10 @@ module Render
 		# @return [Response] a Rack Response triplet, or status code
 		def self.invoke(actions, context)
 			case context.action
-				when :create
-					forward(:create, context)
+				when :create,:update
+					forward(context.action, context)
 				when :read
 					do_read(actions, context)
-				when :update
-					forward(:update, context)
 				else
 					405
 			end

data/lib/app/render/error.rb

@@ -14,7 +14,7 @@ module Render
 		def self.error_check(actions, context, result)
 			errors = context.app[:errors]
 			if errors
-				template = errors[result.first]
+				template = errors[result[0]]
 				if template
 					result[2] = template.render(self, {actions: actions, context: context, result: result})
 				end
@@ -23,32 +23,17 @@ module Render
 		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)
+			case context.action
+				when :create,:update
+					result = forward(context.action, context)
+				when :read
+					if context.uri[3]
+						result = forward(:read, 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
+						result = forward(:readAll, context)
 					end
-					result = [result.code,headers,[result.to_s]]
-				end
-			rescue RestClient::ResourceNotFound => e
-				result = [404,{},e.to_s]
+				else
+					result = 405
 			end
 			error_check(actions, context, result)
 		end

data/lib/app/render/page.rb

@@ -29,11 +29,7 @@ module Render
 					end
 					temp = nil
 					if go_ahead
-						begin
-							temp = RestClient.get uri
-						rescue RestClient::ResourceNotFound
-							temp = nil
-						end
+							temp = RL.request(:get, uri)[2]
 					end
 					hash[k] = temp
 				end
@@ -53,26 +49,18 @@ module Render
 		# @param [Symbol] specific the kind of read to perform
 		# @return [Response] a Rack Response triplet, or status code
 		def do_read(actions, context, specific)
-			template = context.app[:template]
 			resource = context.uri[2]
-			message  = 'Resource not specified'
-			headers  = {}
 			if resource
-				begin
-					result = forward(specific, context)
-					status = 200
-				rescue RestClient::ResourceNotFound => e
-					result = e.response
-					status = 404
-				end
+				result = forward(specific, context)
+				template = context.app[:template]
 				if template
-					message = [status,{},render_template(actions, context, template, result)]
-				else
-					headers['Content-Type'] = result.headers[:content_type]
-					message                 = [status, headers, result]
+					result[1]['Content-Type'] = 'text/html'
+					result[2] = render_template(actions, context, template, result)
 				end
+			else
+				result = [401,{},'Resource not specified']
 			end
-			message
+			result
 		end
 
 		# Proxy method used when routing
@@ -81,18 +69,14 @@ module Render
 		# @return [Response] a Rack Response triplet, or status code
 		def self.invoke(actions, context)
 			case context.action
-				when :create
-					forward(:create, context)
+				when :create,:update,:delete
+					forward(context.action, context)
 				when :read
 					if context.uri[3]
 						do_read(actions, context, :read)
 					else
 						do_read(actions, context, :readAll)
 					end
-				when :update
-					forward(:update, context)
-				when :delete
-					forward(:delete, context)
 				else
 					405
 			end

data/lib/app/render/partial.rb

@@ -29,33 +29,26 @@ module Render
 		# @return [Response] a Rack Response triplet, or status code
 		def self.do_read_all(actions, context)
 			resource = context.uri[2]
-			begin
-				mime = ''
-				body = ''
-				if context.resource[:forward]
-					response = forward(:readAll, context)
-					mime     = response.headers[:content_type]
-					body     = response.body
-				else
-					body = 401
-				end
-
-				template = context.resource[:multiple]
+			body = ''
+			mime = ''
+			if context.resource[:forward]
+				response = forward(:readAll, context)
+				return response if response[0] != 200
+				mime     = response[1][:content_type]
+				body     = response[2]
+			end
+			template = context.resource[:multiple]
+			if template
 				hash     = { actions: actions, resource: resource, mime: mime, response: body }
 				if context.resource[:sources]
 					context.resource[:sources].each do |k, v|
-						hash[k] = RestClient.get("http://#{context.app[:remote_host]}/#{v}")
+						hash[k] = RL.request(:get, "http://#{context.app[:remote_host]}/#{v}")[2]
 					end
 				end
 				mime = 'text/html'
-				if template
-					[200, { 'Content-Type' => mime }, [template.render(self, hash)]]
-				else
-					[200, { 'Content-Type' => mime }, [body]]
-				end
-			rescue RestClient::ResourceNotFound
-				404
+				body = template.render(self,hash)
 			end
+			[200,{'Content-Type' => mime },body]
 		end
 
 		# Read a Partial and render it to HTML
@@ -63,27 +56,29 @@ module Render
 		# @param [Hash] context the context for this request
 		# @return [Response] a Rack Response triplet, or status code
 		def self.do_read(actions, context)
-			app      = context.app[:uri]
+			app      = context.uri[1]
 			resource = context.uri[2]
-			begin
+			id       = context.uri[3...context.uri.length].join('/')
+			body = ''
+			mime = ''
+			if context.resource[:forward]
 				response = forward(:read, context)
-				mime     = response.headers[:content_type]
-				template = context.resource[:single]
-				id       = context.uri[3...context.uri.length].join('/')
-				hash     = { actions: actions, app: app, id: id, resource: resource, mime: mime, response: response.body }
+				return response if response[0] != 200
+				mime     = response[1][:content_type]
+				body     = response[2]
+			end
+			template = context.resource[:single]
+			if template
+				hash     = { actions: actions, app: app, resource: resource, id: id, mime: mime, response: body }
 				if context.resource[:sources]
 					context.resource[:sources].each do |k, v|
-						hash[k] = RestClient.get("http://#{context.app[:remote_host]}/#{v}")
+						hash[k] = RL.request(:get, "http://#{context.app[:remote_host]}/#{v}")[2]
 					end
 				end
-				if template
-					[200, { 'Content-Type' => 'text/html' }, [template.render(self, hash)]]
-				else
-					[200, { 'Content-Type' => 'text/plain' }, [response.body]]
-				end
-			rescue RestClient::ResourceNotFound
-				404
+				mime = 'text/html'
+				body = template.render(self,hash)
 			end
+			[200,{'Content-Type' => mime },body]
 		end
 
 		# Proxy method used when routing
@@ -92,18 +87,14 @@ module Render
 		# @return [Response] a Rack Response triplet, or status code
 		def self.invoke(actions, context)
 			case context.action
-				when :create
-					forward(:create, context)
+				when :create,:update,:delete
+					forward(context.action, context)
 				when :read
 					if context.uri[3]
 						do_read(actions, context)
 					else
 						do_read_all(actions, context)
 					end
-				when :update
-					forward(:update, context)
-				when :delete
-					forward(:delete, context)
 				else
 					403
 			end

data/lib/app/render/style.rb

@@ -21,17 +21,13 @@ module Render
 		# @param [Hash] context the context for this request
 		# @return [Response] a Rack Response triplet, or status code
 		def self.do_read_all(context)
-			begin
-				resource = context.uri[2]
-				template = context.app[:styles][resource]
-				headers  = {'Cache-Control' => 'public,max-age=3600'}
-				if template
-					headers['Content-Type'] = 'text/css'
-					[200, headers, [template]]
-				else
-					500
-				end
-			rescue RestClient::ResourceNotFound
+			resource = context.uri[2]
+			template = context.app[:styles][resource]
+			headers  = {'Cache-Control' => 'public,max-age=3600'}
+			if template
+				headers['Content-Type'] = 'text/css'
+				[200, headers, [template]]
+			else
 				404
 			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.15'
+	VERSION = '0.1.4.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wire-framework
 version: !ruby/object:Gem::Version
-  version: 0.1.4.15
+  version: 0.1.4.16
 platform: ruby
 authors:
 - Bryan T. Meyers
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: rest-less
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="