wire-framework 0.1.5.4 → 0.1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b5de5f8f3c28bf3c2ef3b16bef0bafe113e1051
-  data.tar.gz: 5b544c2cedf9eecb08b7be6a03bfa7e74f1f89b4
+  metadata.gz: 1de513e0952b185809c295af2ad4626e6ab110c3
+  data.tar.gz: 852e93f18f3635ec0f9c2ab2d4b37e8ee8e71e93
 SHA512:
-  metadata.gz: 6bf313c114a0f4290cb63b6a71a8bba334eef09766d666fbe21245d2040b96f1bc3944b6764f8476fae9ac80f601b5b85f51961c5c4ab8dca8dd26d938fafdc9
-  data.tar.gz: 7855b60d903c318c3ed4eb537eb859e4b78da08e792cc59925ceab335570d0cc6719d82e800ab15ef239c43b47ecfc4af6430ff9333646e0d38d6c5ce88ae22b
+  metadata.gz: b74027d84c68f4b4c8183e7fa5a6d33e7b44c7083cf522efef74d424806d9c87c1e2acbbf714b928867f97dc710dccd0bd28299cf056275787568cac080fcfac
+  data.tar.gz: 538320181f48a3f45b2dbc5c45beee80e94603855419235ece206f9ee40e6c4cb71217e79dec50b0e954df5b08d9bf47b3769a77b1a43b3d75957875646bacf9

data/lib/app.rb

@@ -38,7 +38,7 @@ module Wire
     # Read all of the configs in './configs/apps'
     # @return [void]
     def self.read_configs
-      $wire_apps = Wire::Config.read_config_dir('config/apps', method(:configure))
+      Wire::Config.read_config_dir('config/apps', method(:configure))
     end
   end
 end

data/lib/app/cache.rb

@@ -19,12 +19,12 @@ require 'lmdb'
 module Cache
   module Memory
 
-    $cache = {}
+    @@cache = {}
 
     def self.update_cached(context)
       uri = context.uri.join('/')
       all = context.uri[0..2].join('/')
-      env = $cache[context.config['remote']]
+      env = @@cache[context.config['remote']]
       db  = env.database
       if context.id
         result = context.forward(:read)
@@ -55,7 +55,7 @@ module Cache
 
     def self.get_cached(context)
       uri    = context.uri.join('/')
-      env    = $cache[context.config['remote']]
+      env    = @@cache[context.config['remote']]
       db     = env.database
       result = nil
       env.transaction do
@@ -66,7 +66,7 @@ module Cache
 
     def self.purge_cached(context)
       uri    = context.uri.join('/')
-      env    = $cache[context.config['remote']]
+      env    = @@cache[context.config['remote']]
       db     = env.database
       result = 200
       env.transaction do
@@ -82,8 +82,8 @@ module Cache
     def self.invoke(actions, context)
 
       # Create Cache if not set up
-      unless $cache[context.config['remote']]
-        $cache[context.config['remote']] = LMDB.new("/tmp/cache/#{context.config['remote']}", mapsize: 2**30)
+      unless @@cache[context.config['remote']]
+        @@cache[context.config['remote']] = LMDB.new("/tmp/cache/#{context.config['remote']}", mapsize: 2**30)
       end
 
       case context.action

data/lib/app/db.rb

@@ -25,7 +25,7 @@ module DB
   # @param [Hash] conf the existing configuration
   # @return [Hash] post-processed configuration
   def self.configure(conf)
-    conf['models'].each do |m,k|
+    conf['models'].each do |m, k|
       conf['models'][m] = Object.const_get(k)
     end
     conf
@@ -79,7 +79,6 @@ module DB
     else
       begin
         instance = model.create(context.json)
-        instance.save
         if instance.modified?
           200
         else

data/lib/app/file.rb

@@ -25,8 +25,7 @@ module Static
   # @return [Response] a listing, or status code
   def self.do_read_all(context)
     path = context.config['path']
-    if path
-      return 404 unless File.exists?(path)
+    if path and File.exists?(path)
       if File.directory? path
         Dir.entries(path).sort.to_s
       else

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/document.rb

@@ -27,14 +27,13 @@ module Render
     def self.do_read(actions, context, specific)
       response = context.forward(specific)
       mime     = response[1]['content-type']
-      #TODO: Fix lookup
-      renderer = $wire_renderers[mime]
+      renderer = context.closet.renderers[mime]
       if renderer
         template = renderer['partial']
-        template.render(self, { actions:  actions,
-                                context:  context,
-                                mime:     mime,
-                                response: response[2] })
+        template.render(self, {actions:  actions,
+                               context:  context,
+                               mime:     mime,
+                               response: response[2]})
       else
         response
       end

data/lib/app/render/editor.rb

@@ -35,13 +35,13 @@ module Render
         return [404, {}, 'EDITOR: Document type not set for new document']
       end
       #TODO: Fix lookup
-      template = $wire_editors[mime]
+      template = context.closet.editors[mime]
       if template
-        template.render(self, { actions:  actions,
-                                resource: context.resource,
-                                id:       context.id,
-                                mime:     mime,
-                                response: body })
+        template.render(self, {actions:  actions,
+                               resource: context.resource,
+                               id:       context.id,
+                               mime:     mime,
+                               response: body})
       else
         body
       end

data/lib/app/render/error.rb

@@ -24,7 +24,7 @@ module Render
     # @return [Hash] post-processed configuration
     def self.configure(conf)
       conf['errors'].each do |k, v|
-        conf['errors'][k] = Tilt.new(v, 1, { ugly: true })
+        conf['errors'][k] = Tilt.new(v, 1, {ugly: true})
       end
       conf
     end
@@ -34,9 +34,9 @@ module Render
       if errors
         template = errors[result[0]]
         if template
-          result[2] = template.render(self, { actions: actions,
-                                              context: context,
-                                              result:  result })
+          result[2] = template.render(self, {actions: actions,
+                                             context: context,
+                                             result:  result})
         end
       end
       result

data/lib/app/render/instant.rb

@@ -25,8 +25,8 @@ module Render
     # @return [Response] a Rack Response triplet, or status code
     def self.do_update(actions, context)
       ## Default to not found
-      message  = ''
-      status   = 404
+      message = ''
+      status  = 404
       if context.resource
         body = context.body
         if body
@@ -38,19 +38,19 @@ module Render
           ## Assume unsupported mime type
           status   = 415
           message  = 'INSTANT: Unsupported MIME Type'
-          renderer = $wire_renderers["#{context.resource}/#{context.id}"]
+          renderer = context.closet.renderers["#{context.resource}/#{context.id}"]
           if renderer
-            template = $wire_templates[renderer]
-            result   = template.render(self, { actions:  actions,
-                                               context:  context,
-                                               mime:     "#{context.resource}/#{context.id}",
-                                               response: body, })
-            #TODO: Fix template lookup
-            template = context.app[:template]
+            template = context.closet.templates[renderer]
+            result   = template.render(self, {actions:  actions,
+                                              context:  context,
+                                              mime:     "#{context.resource}/#{context.id}",
+                                              response: body, })
+            name     = context.config['template']
+            template = context.closet.templates[name]
             if template
-              message = template[:path].render(self, { actions: actions,
+              message = template['file'].render(self, {actions: actions,
                                                        context: context,
-                                                       content: result })
+                                                       content: result})
             else
               message = result
             end

data/lib/app/render/page.rb

@@ -62,7 +62,7 @@ module Render
         end
         message = template['file'].render(self, hash)
         if template['use_layout']
-          message = render_template(actions, context, $wire_templates['layout'], message)
+          message = render_template(actions, context, context.closet.templates['layout'], message)
         end
       else
         message = 'Invalid Template'
@@ -78,9 +78,8 @@ module Render
     def self.do_read(actions, context, specific)
       if context.resource
         result   = context.forward(specific)
-        #TODO: fix lookup
         name     = context.config['template']
-        template = $wire_templates[name]
+        template = context.closet.templates[name]
         if template
           result[1]['Content-Type'] = 'text/html'
           result[2]                 = render_template(actions, context, template, result[2])

data/lib/app/render/partial.rb

@@ -31,7 +31,6 @@ module Render
           conf['resources'][k]['multiple'] = Tilt.new(v['multiple'], 1, {ugly: true})
           conf['resources'][k]['single']   = Tilt.new(v['single'], 1, {ugly: true})
         elsif v.is_a? String
-          #TODO: fix needless duplication
           conf['resources'][k] = {'all' => Tilt.new(v, 1, {ugly: true})}
         end
       end
@@ -64,16 +63,22 @@ module Render
                 response: body}
         if resource['extras']
           resource['extras'].each do |k, v|
-            hash[k] = RL.request(:get,
-                                 "http://#{context.config['remote']}/#{v}",
-                                 {remote_user: context.user}
+            temp = RL.request(:get,
+                              "http://#{context.config['remote'].split('/')[0]}/#{v}",
+                              {remote_user: context.user}
             )[2]
+            begin
+              hash[k.to_sym] = JSON.parse_clean(temp)
+            rescue
+              hash[k.to_sym] = temp
+            end
+
           end
         end
         mime = 'text/html'
         body = template.render(self, hash)
       end
-      [200, {'Content-Type': mime}, body]
+      [200, {'Content-Type' => mime}, body]
     end
 
     # Read a Partial and render it to HTML
@@ -105,13 +110,18 @@ module Render
                 response: body}
         if resource['extras']
           resource['extras'].each do |k, v|
-            hash[k] = RL.request(:get, "http://#{context.config[:remote_host]}/#{v}")[2]
+            temp = RL.request(:get, "http://#{context.config['remote'].split('/')[0]}/#{v}")[2]
+            begin
+              hash[k.to_sym] = JSON.parse_clean(temp)
+            rescue
+              hash[k.to_sym] = temp
+            end
           end
         end
         mime = 'text/html'
         body = template.render(self, hash)
       end
-      [200, {'Content-Type': mime}, body]
+      [200, {'Content-Type' => mime}, body]
     end
 
     # Proxy method used when routing

data/lib/app/repo.rb

@@ -26,7 +26,7 @@ module Repo
   # @param [Hash] conf the raw configuration
   # @return [Hash] post-processed configuration
   def self.configure(conf)
-    conf['listing'] = Tilt.new(conf['listing'], 1, { ugly: true })
+    conf['listing'] = Tilt.new(conf['listing'], 1, {ugly: true})
     conf
   end
 
@@ -51,10 +51,10 @@ module Repo
   # @param [Hash] context the context for this request
   # @return [Response] the listing, or status code
   def do_read_all(context)
-    mime     = 'text/html'
-    list     = do_read_listing(context.config['web'],
-                               context.config['repos'],
-                               context.resource)
+    mime = 'text/html'
+    list = do_read_listing(context.config['web'],
+                           context.config['repos'],
+                           context.resource)
     if list == 404
       return 404
     end
@@ -64,9 +64,9 @@ module Repo
                                resource: context.resource,
                                id:       '',
                                referrer: context.referer)
-    headers  = { 'Content-Type':  mime,
-                 'Cache-Control': 'public',
-                 'Expires':       "#{(Time.now + 1000).utc}" }
+    headers  = {'Content-Type'  => mime,
+                'Cache-Control' => 'public',
+                'Expires'       => "#{(Time.now + 1000).utc}"}
     [200, headers, [list]]
   end
 
@@ -101,9 +101,9 @@ module Repo
       end
       mime = do_read_mime(rev, web, repos, path, id)
     end
-    headers = { 'Content-Type':  mime,
-                'Cache-Control': 'public',
-                'Expires':       "#{(Time.now + 1000).utc}" }
+    headers = {'Content-Type'  => mime,
+               'Cache-Control' => 'public',
+               'Expires'       => "#{(Time.now + 1000).utc}"}
     [200, headers, [body]]
   end
 

data/lib/app/repo/svn.rb

@@ -18,30 +18,25 @@ require 'nori'
 require 'fileutils'
 require_relative '../repo'
 
-# Force Nori to convert tag names to Symbols
-$nori = Nori.new :convert_tags_to => lambda { |tag| tag.snakecase.to_sym }
-
 module Repo
   # Repo::SVN is a connector for svnserve
   # @author Bryan T. Meyers
   module SVN
     extend Repo
 
+    # Force Nori to convert tag names to Symbols
+    @@nori = Nori.new :convert_tags_to => lambda { |tag| tag.snakecase.to_sym }
+
     # Make a new SVN repo
     # @param [String] path the path to the repositories
     # @param [String] repo the new repo name
     # @return [Integer] status code
     def self.do_create_file(path, repo)
-      result = 200
       `svnadmin create #{path}/#{repo}`
-      if $?.exitstatus != 0
-        return 500
-      end
-
       if $?.exitstatus != 0
         500
       else
-        result
+        200
       end
     end
 
@@ -94,7 +89,7 @@ module Repo
       unless $?.exitstatus == 0
         return 404
       end
-      list = $nori.parse(list)
+      list = @@nori.parse(list)
       list[:lists][:list][:entry]
     end
 
@@ -119,7 +114,7 @@ module Repo
       unless $?.exitstatus == 0
         return 404
       end
-      info = $nori.parse(info)
+      info = @@nori.parse(info)
       info[:info][:entry]
     end
 
@@ -140,11 +135,10 @@ module Repo
       else
         mime = `svn propget #{options} -r #{rev} --xml svn:mime-type 'svn://localhost/#{repo}/#{web}/#{id}'`
       end
-
       unless $?.success?
         return 500
       end
-      mime = $nori.parse(mime)
+      mime = @@nori.parse(mime)
       if mime[:properties].nil?
         'application/octet-stream'
       else
@@ -165,9 +159,9 @@ module Repo
     def self.do_update_file(web, path, repo, id, content, message, mime, user)
       options = "--username #{$environment[:repos_user]} --password #{$environment[:repos_password]}"
       status  = 500
-      id        = id.split('/')
+      id      = id.split('/')
       id.pop
-      id       = id.join('/')
+      id = id.join('/')
       if web.nil?
         repo_path = "/tmp/svn/#{repo}/#{id}"
       else
@@ -180,9 +174,9 @@ module Repo
       `svn checkout #{options} 'svn://localhost/#{repo}' '/tmp/svn/#{repo}'`
       id = CGI.unescape(id)
       if $?.exitstatus == 0
-        id        = id.split('/')
+        id = id.split('/')
         id.pop
-        id       = id.join('/')
+        id = id.join('/')
         if web.nil?
           file_path = "/tmp/svn/#{repo}/#{id}"
         else

data/lib/closet.rb

@@ -28,13 +28,15 @@ module Wire
   class Closet
     include Wire::Auth
 
+    attr_reader :apps, :editors, :renderers, :templates
+
     # Create an empty Closet
     # @return [Wire::Closet] the new closet
     def initialize
-      $wire_apps      = {}
-      $wire_editors   = {}
-      $wire_renderers = {}
-      $wire_templates = {}
+      @apps      = {}
+      @editors   = {}
+      @renderers = {}
+      @templates = {}
     end
 
     # Route a Request to the correct Wire::App
@@ -54,7 +56,7 @@ module Wire
     # @return [Response] a Rack Response triplet, or status code
     def call(env)
       begin
-        context  = Wire::Context.new(env)
+        context  = Wire::Context.new(self, env)
         response = route(context)
       rescue Exception => e
         $stderr.puts e.message
@@ -62,10 +64,8 @@ module Wire
         response = [500, {}, e.message]
       end
       if response.is_a? Array
-        if response[2]
-          unless response[2].is_a? Array
-            response[2] = [response[2]]
-          end
+        if response[2] and not response[2].is_a? Array
+          response[2] = [response[2]]
         end
       else
         if response.is_a? Integer
@@ -86,8 +86,8 @@ module Wire
         $stderr.puts 'Starting Up Wire...'
         $stderr.puts 'Starting Apps...'
       end
-      Wire::App.read_configs
-      Wire::Renderer.read_configs
+      @apps                            = Wire::App.read_configs
+      @editors, @renderers, @templates = Wire::Renderer.read_configs
       if ENV['RACK_ENV'].eql? 'development'
         closet.info
       end
@@ -98,7 +98,7 @@ module Wire
     # @return [void]
     def info
       $stderr.puts "Apps:\n"
-      $wire_apps.each do |app, config|
+      @apps.each do |app, config|
         $stderr.puts "\u{2502}"
         $stderr.puts "\u{251c} Name: #{app}"
         if config['auth_handler']

data/lib/closet/context.rb

@@ -49,9 +49,9 @@ module Wire
     #@!attribute [r] verb
     #		@return [Symbol] the HTTP verb
 
-    attr_reader :action, :app, :body, :config, :id, :json, :query,
-                :query_string, :rack_env, :referer, :resource,
-                :uri, :user, :verb
+    attr_reader :action, :app, :body, :closet, :config, :id,
+                :json, :query, :query_string, :rack_env,
+                :referer, :resource, :uri, :user, :verb
     attr_writer :referer
 
     # Maps HTTP verbs to actions
@@ -85,9 +85,11 @@ module Wire
     end
 
     # Builds a new Context
+    # @param [Closet] closet the Wire::Closet
     # @param [Hash] env the Rack environment
     # @return [Context] a new Context
-    def initialize(env)
+    def initialize(closet, env)
+      @closet   = closet
       @rack_env = update_session(env)
       @user     = env['rack.session']['user']
       @verb     = HTTP_VERBS[env['REQUEST_METHOD'].to_sym]
@@ -98,7 +100,7 @@ module Wire
       else
         @referer = ['http:', '', env['HTTP_HOST']].concat(@uri[1...@uri.length])
       end
-      @config = $wire_apps[@uri[1]]
+      @config = @closet.apps[@uri[1]]
       if @config
         @app      = @uri[1]
         @resource = @uri[2]
@@ -134,8 +136,8 @@ module Wire
     # @param [Symbol] method the action to use when forwarding
     # @return [Response] a Rack Response triplet, or status code
     def forward(method)
-      headers = { referer:     @referer.join('/'),
-                  remote_user: @user }
+      headers = {referer:     @referer.join('/'),
+                 remote_user: @user}
       verb    = CONVERT[method]
       uri     = "http://#{@config['remote']}/#{@resource}"
       if [:update, :read, :delete].include?(method)

data/lib/closet/renderer.rb

@@ -26,7 +26,7 @@ module Wire
     # @param [Hash] conf the raw configuration
     # @return [Hash] post-processed configuration
     def self.configure_partial(conf)
-      conf['partial'] = Tilt.new(conf['partial'], 1, { ugly: true })
+      conf['partial'] = Tilt.new(conf['partial'], 1, {ugly: true})
       conf
     end
 
@@ -34,16 +34,17 @@ module Wire
     # @param [Hash] conf the raw configuration
     # @return [Hash] post-processed configuration
     def self.configure_template(conf)
-      conf['file'] = Tilt.new(conf['file'], 1, { ugly: true })
+      conf['file'] = Tilt.new(conf['file'], 1, {ugly: true})
       conf
     end
 
     # Read all of the configs in './configs/apps'
     # @return [void]
     def self.read_configs
-      $wire_editors   = Wire::Config.read_config_dir('config/editors', method(:configure_template))
-      $wire_renderers = Wire::Config.read_config_dir('config/renderers', method(:configure_partial))
-      $wire_templates = Wire::Config.read_config_dir('config/templates', method(:configure_template))
+      editors   = Wire::Config.read_config_dir('config/editors', method(:configure_template))
+      renderers = Wire::Config.read_config_dir('config/renderers', method(:configure_partial))
+      templates = Wire::Config.read_config_dir('config/templates', method(:configure_template))
+      [editors, renderers, templates]
     end
   end
 end

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.4'
+  VERSION = '0.1.5.5'
 end
 
 require_relative 'app'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wire-framework
 version: !ruby/object:Gem::Version
-  version: 0.1.5.4
+  version: 0.1.5.5
 platform: ruby
 authors:
 - Bryan T. Meyers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print