wire-framework 0.1.5.9 → 0.1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2858d57db2bf499296459695b344266fc2ec03ad
-  data.tar.gz: 0d07178f4f4af3365e42b41b963d618e7eed237e
+  metadata.gz: 8029fd3239ff8f787957849338915e540da75f87
+  data.tar.gz: 79cb78ab379a3686efca80e827c5c43834b8a71e
 SHA512:
-  metadata.gz: 7f9ddc12f09de5f0826b5c1484a00ebad077bbe01651aa068b98907675c9f05626737cba9168b00a0d59eebd3aa84a4653e13eaea516c14b818acc102f213c60
-  data.tar.gz: 23aca561ecc20cc1d9473500d0b22c97f1b6450a54ff34948c7e43325439d40127e6dfdcd134003292e876ba17789629ef9844383816360c1a1f57a018bb54e2
+  metadata.gz: 557fbc73d49212fe4469d81dfa39d29ead0ffe3325f366fbed9fd88f6df66cc2acf4230c17e1056335b1f840399ae6773f004cd4978a77531e9a5311ccbf61c3
+  data.tar.gz: 06c3444d8a889a930122e5472e69836586b706f34f86cdd647961af951e5ce130a6494d57cbf63a097c86ddec723ae345b85b0caf99359381bca4fb383e3e3b0

data/lib/app/cache.rb

@@ -17,10 +17,25 @@
 require 'lmdb'
 
 module Cache
-  module Memory
+  # Cache::LMDB is a Wire::App for cache arbitrary HTTP responses in an LMDB
+  # @author Bryan T. Meyers
+  module LMDB
 
     @@cache = {}
 
+    # Cache-specific configuration
+    # @param [Hash] conf the existing configuration
+    # @return [Hash] post-processed configuration
+    def self.configure(conf)
+      unless @@cache[conf['remote']]
+        @@cache[conf['remote']] = LMDB.new("#{conf['cache']}/#{conf['remote']}", mapsize: 2**30)
+      end
+      conf
+    end
+
+    # Add or Update a cached response
+    # @param [Hash] context the context for this request
+    # @return [Response] a valid Rack response triplet, or status code
     def self.update_cached(context)
       uri = context.uri.join('/')
       all = context.uri[0..2].join('/')
@@ -53,6 +68,9 @@ module Cache
       result
     end
 
+    # Read a cached response
+    # @param [Hash] context the context for this request
+    # @return [Response] a valid Rack response triplet, or status code
     def self.get_cached(context)
       uri    = context.uri.join('/')
       env    = @@cache[context.config['remote']]
@@ -64,6 +82,9 @@ module Cache
       result
     end
 
+    # Remove a cached response
+    # @param [Hash] context the context for this request
+    # @return [Response] a valid Rack response triplet, or status code
     def self.purge_cached(context)
       uri    = context.uri.join('/')
       env    = @@cache[context.config['remote']]
@@ -79,13 +100,11 @@ module Cache
       result
     end
 
+    # Proxy method used when routing
+    # @param [Array] actions the allowed actions for this URI
+    # @param [Hash] context the context for this request
+    # @return [Response] a Rack Response triplet, or status code
     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)
-      end
-
       case context.action
         when :create, :update, :delete
           result = context.forward(context.action)

data/lib/app/db.rb

@@ -39,11 +39,10 @@ module DB
     conf.each do |k,v|
       config[k.to_sym] = v
     end
-    config['db'] = Sequel.connect(config)
-    config
+    Sequel.connect(config)
   end
 
-  # Read all of the configs in './configs/dbs'
+  # Read all of the configs in './config/dbs'
   # @return [void]
   def self.read_configs
     Wire::Config.read_config_dir('config/dbs', method(:init_db))
@@ -132,7 +131,7 @@ module DB
   def self.do_read(context)
     model = context.config['models'][context.resource]
     return 404 unless model
-    id = context.uri[3]
+    id = context.id
     if id.eql?('new') or id.eql? 'upload'
       return '{}'
     end
@@ -147,7 +146,7 @@ module DB
   def self.do_update(context)
     model = context.config['models'][context.resource]
     return 404 unless model
-    instance = model[context.uri[3]]
+    instance = model[context.id]
     return 404 unless instance
     instance.update(context.json)
   end
@@ -158,9 +157,10 @@ module DB
   def self.do_delete(context)
     model = context.config['models'][context.resource]
     return 404 unless model
-    instance = model[context.uri[3]]
+    instance = model[context.id]
     if instance
-      if instance.destroy
+      instance = instance.destroy
+      if instance.errors.length == 0
         200
       else
         [500, {}, 'Failed to delete instance']

data/lib/app/render/document.rb

@@ -27,7 +27,12 @@ module Render
     def self.do_read(actions, context, specific)
       response = context.forward(specific)
       mime     = response[1]['content-type']
-      renderer = context.closet.renderers[mime]
+      renderer = nil
+      context.closet.renderers.each do |k,c|
+        if c['mimes'].include? mime
+          renderer = c
+	end
+      end
       if renderer
         template = renderer['partial']
         template.render(self, { actions:  actions,
@@ -58,4 +63,4 @@ module Render
       end
     end
   end
-end
+end

data/lib/app/render/instant.rb

@@ -30,7 +30,6 @@ module Render
       if context.resource
         body = context.body
         if body
-          #TODO: This looks off...
           body = body.split('=')[1]
           if body
             body = URI.decode(body)
@@ -38,12 +37,18 @@ module Render
           ## Assume unsupported mime type
           status   = 415
           message  = 'INSTANT: Unsupported MIME Type'
-          renderer = context.closet.renderers["#{context.resource}/#{context.id}"]
+          mime     = "#{context.resource}/#{context.id}"
+          renderer = nil
+          context.closet.renderers.each do |k, v|
+            if v['mimes'].include? mime
+              renderer = v['partial']
+              break
+            end
+          end
           if renderer
-            template = context.closet.templates[renderer]
-            result   = template.render(self, { actions:  actions,
+            result   = renderer.render(self, { actions:  actions,
                                                context:  context,
-                                               mime:     "#{context.resource}/#{context.id}",
+                                               mime:     mime,
                                                response: body, })
             name     = context.config['template']
             template = context.closet.templates[name]

data/lib/app/render/partial.rb

@@ -58,6 +58,7 @@ module Render
       end
       if template
         hash = { actions:  actions,
+                 context:  context,
                  resource: resource,
                  mime:     mime,
                  response: body }
@@ -103,9 +104,8 @@ module Render
       end
       if template
         hash = { actions:  actions,
-                 app:      context.app,
-                 resource: context.resource,
-                 id:       context.id,
+                 context:  context,
+                 resource: resource,
                  mime:     mime,
                  response: body }
         if resource['extras']

data/lib/app/repo/svn.rb

@@ -139,43 +139,52 @@ module Repo
     # @param [String] username the Author of this change
     # @return [Integer] status code
     def self.do_update_file(conf, repo, id, content, message, mime, username)
-      options = "--depth empty --username #{conf['user']} --password #{conf['password']}"
-      status  = 500
+      options   = "--username #{conf['user']} --password #{conf['password']}"
+      status    = 500
       repo_path = "/tmp/#{username}/#{repo}"
       unless Dir.exist? repo_path
         FileUtils.mkdir_p(repo_path)
       end
 
-      `svn checkout #{options} '#{conf['protocol']}://#{conf['host']}/#{repo}' '#{repo_path}'`
+      `svn checkout --depth empty #{options} '#{conf['protocol']}://#{conf['host']}/#{repo}' '#{repo_path}'`
 
       if $?.exitstatus == 0
-        file_path = CGI.unescape(id)
-        if conf['web_folder']
-          file_path = "#{conf['web_folder']}/#{file_path}"
+        Dir.chdir(repo_path) do
+          file_path = CGI.unescape(id)
+          if conf['web_folder']
+            file_path = "#{conf['web_folder']}/#{file_path}"
+          end
+          folder_path = file_path.split('/')
+          folder_path.pop
+          folder_path = folder_path.join('/')
+          `svn update --parents #{options} #{file_path}`
+          unless Dir.exist? folder_path
+            FileUtils.mkdir_p(folder_path)
+          end
+          file = File.open(file_path, 'w')
+          file.syswrite(content)
+          file.close
+          `svn add --force *`
+          $stderr.puts `svn status`
+          `svn propset svn:mime-type '#{mime ? mime : 'application/octet-stream'}' #{file_path}`
+          if $?.exitstatus != 0
+            break
+          end
+          `svn commit #{options} -m "#{message}"`
+          if $?.exitstatus != 0
+            break
+          end
+          `svn propset #{options} --revprop -r HEAD svn:author '#{username}'`
         end
-        folder_path = file_path.split('/')
-        folder_path.pop
-        folder_path = folder_path.join('/')
-
-        unless Dir.exist? folder_path
-          FileUtils.mkdir_p(folder_path)
-        end
-
-        file = File.open(file_path, 'w+')
-        file.syswrite(content)
-        file.close
-        `svn add --force "#{repo_path}/*"`
-        `svn propset svn:mime-type "#{mime}" "#{file_path}"`
-        `svn commit #{options} -m "#{message}" "#{repo_path}"`
-        if $?.exitstatus == 0
-          status = 200
-        end
-        `svn propset #{options} --revprop -r HEAD svn:author '#{username}' "#{repo_path}"`
       end
       `rm -R '#{repo_path}'`
+      if $?.exitstatus == 0
+        status = 200
+      end
       status
     end
 
+
     # Create a single file
     # @param [String] conf the repo config
     # @param [String] repo the new repo name

data/lib/closet.rb

@@ -43,11 +43,11 @@ module Wire
       if @mode.eql? 'development'
         $stderr.puts 'Reading DB Configs...'
       end
-      @dbs = Wire::DB.read_configs
+      @dbs = DB.read_configs
       if @mode.eql? 'development'
         $stderr.puts 'Reading Repo Configs...'
       end
-      @repos = Wire::Repo.read_configs
+      @repos = Repo.read_configs
     end
 
     # Setup the closet

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.9'
+  VERSION = '0.1.6.0'
 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.9
+  version: 0.1.6.0
 platform: ruby
 authors:
 - Bryan T. Meyers