wire-framework 0.1.5.1 → 0.1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92621fc1ec6c39754a7cdf8aa7ba7180f04f03e7
-  data.tar.gz: 732f884d1680027efcaab41faf3bb7e650a7a1e2
+  metadata.gz: ec09ae1db5056dace28e0d574e44b42f96b54558
+  data.tar.gz: a47551aae8e917c6e48e417931fad6a7c11b5af7
 SHA512:
-  metadata.gz: a9dcf07be1af9b4278057de3431c815959b025cc69d5bc2a66f6c3ef834d2ead9d210d619b0f854e2fad52c6fb898e6efeb6d1d5a0f578e2c30188e0aa167ddd
-  data.tar.gz: 23f89e3fecdc342e8e3a86a6a478a9bab47d4c7936083af564fa13769ef0c920cd643ade852b0c65e9d23fbcd598d2baa0d1d0b4e035387dd75bba9a99f4ca5a
+  metadata.gz: 3547a7e673112f1adaf7264511afcc1c350bf00bbd981d31393858bcbbba240bc2b36db37146bf033c3bf7f4ab5331d3405ff35bc12e8a3d16ecfc5280f1a09e
+  data.tar.gz: a6b7b0cfa9a7e5a688a1a799b2c2d935d92cd49ec802c294ecb28c1013d908e8c4ff5447684bebf83e3da1240892d9c3eacc4a8b227b44faf08086dda98b8e3b

data/lib/app/db.rb

@@ -109,7 +109,7 @@ module DB
     if model
       hash = '[ '
       model.each do |e|
-        hash << (e.to_json)
+        hash << e.to_json
         hash << ','
       end
       hash = hash[0...-1]

data/lib/app/login.rb

@@ -23,7 +23,7 @@ module Login
   # @param [Hash] context the context for this request
   # @return [Response] a redirect message returning to the previous page
   def self.invoke(actions, context)
-    [307, { 'Location': context.referer.join('/') }, ['Login Redirect']]
+    [307, { 'Location' => context.referer.join('/') }, ['Login Redirect']]
   end
 
 end

data/lib/app/render/page.rb

@@ -25,26 +25,26 @@ module Render
     # @param [Tilt::Template] template a pre-loaded Tilt template to render
     # @param [String] content the content to render into the page
     # @return [Response] a Rack Response triplet, or status code
-    def render_template(actions, context, template, content)
+    def self.render_template(actions, context, template, content)
       if template['file']
         hash = { actions: actions, context: context, content: content }
         template['sources'].each do |k, s|
-          uri      = "http://#{context.app[:remote_host]}"
+          uri      = "http://#{context.config['remote'].split('/')[0]}"
           go_ahead = true
           if s.is_a? Hash
-            uri += "/#{hash['uri']}"
+            uri += "/#{s['uri']}"
             case s['key']
               when 'user'
                 go_ahead = (context.user and !context.user.empty?)
                 uri      += "/#{context.user}"
               when 'resource'
-                go_ahead = (context.uri[2] and !context.uri[2].empty?)
-                uri      += "/#{context.uri[2]}"
+                go_ahead = (context.resource and !context.resource.empty?)
+                uri      += "/#{context.resource}"
               else
                 # do nothing
             end
           else
-            uri += s
+            uri += "#{s}"
           end
           temp = []
           if go_ahead
@@ -52,15 +52,15 @@ module Render
           end
           if temp[0] == 200
             begin
-              hash[k] = JSON.parse_clean(temp[2])
+              hash[k.to_sym] = JSON.parse_clean(temp[2])
             rescue
-              hash[k] = temp[2]
+              hash[k.to_sym] = temp[2]
             end
           end
         end
         message = template[:path].render(self, hash)
         if template['use_layout']
-          message = render_template(actions, context, $wire_apps[:global][:template], message)
+          message = render_template(actions, context, $wire_templates['layout'], message)
         end
       else
         message = 'Invalid Template'
@@ -73,11 +73,12 @@ module Render
     # @param [Hash] context the context for this request
     # @param [Symbol] specific the kind of read to perform
     # @return [Response] a Rack Response triplet, or status code
-    def do_read(actions, context, specific)
+    def self.do_read(actions, context, specific)
       if context.resource
         result   = context.forward(specific)
         #TODO: fix lookup
-        template = context.app[:template]
+        name = context.config['template']
+        template = $wire_templates[name]
         if template
           result[1]['Content-Type'] = 'text/html'
           result[2]                 = render_template(actions, context, template, result[2])
@@ -97,7 +98,7 @@ module Render
         when :create, :update, :delete
           context.forward(context.action)
         when :read
-          if context.uri[3]
+          if context.id
             do_read(actions, context, :read)
           else
             do_read(actions, context, :readAll)

data/lib/app/render/style.rb

@@ -35,9 +35,8 @@ 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)
-      resource = context.uri[2]
-      template = context.app['styles'][resource]
-      headers  = {'Cache-Control': 'public,max-age=3600'}
+      template = context.config['styles'][context.resource]
+      headers  = {'Cache-Control' => 'public,max-age=3600'}
       if template
         headers['Content-Type'] = 'text/css'
         [200, headers, [template]]

data/lib/closet/context.rb

@@ -102,7 +102,7 @@ module Wire
       if @config
         @app      = @uri[1]
         @resource = @uri[2]
-        @id       = @uri[3...@uri.length].join('/')
+        @id       = @uri.length > 3 ? @uri[3...@uri.length].join('/') : nil
       else
         throw Exception.new("App: #{@uri[1]} is Undefined")
       end
@@ -137,9 +137,9 @@ module Wire
       headers = { referer:     @referer.join('/'),
                   remote_user: @user }
       verb    = CONVERT[method]
-      uri     = "http://#{@app['remote']}/#{@uri[2]}"
+      uri     = "http://#{@config['remote']}/#{@resource}"
       if [:update, :read, :delete].include?(method)
-        uri += "/#{@uri[3...@uri.length].join('/')}"
+        uri += "/#{@id}"
       end
       uri  += '?' + @query_string
       body = [:create, :update].include?(method) ? @body : nil

data/lib/wire.rb

@@ -33,7 +33,7 @@ end
 # @author Bryan T. Meyers
 module Wire
   # Current version of the Wire Gem
-  VERSION = '0.1.5.1'
+  VERSION = '0.1.5.2'
 end
 
 require_relative 'app'

metadata

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