wire-framework 0.1.5 → 0.1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9ec40053b39b66168983b0a0bd2caad4c9c9df6
-  data.tar.gz: 5cb4f96aca08bb0cd0c2def9130abf24538f179e
+  metadata.gz: 92621fc1ec6c39754a7cdf8aa7ba7180f04f03e7
+  data.tar.gz: 732f884d1680027efcaab41faf3bb7e650a7a1e2
 SHA512:
-  metadata.gz: 940a76b8b34e9e116a4d7c3e4b5f09a9d5ef951a4aabd0801a4139753a61100f05ce9e8844ec4952b36f29d98bdbb954015eefb6fee0cfd1a5019f149798195f
-  data.tar.gz: bb76a91e639f899ed5f0a6fa4737673d82e757b9f8a0d5557ddaa2870e622a79b05496b0f074b344dfbd06ba30ced838922c7992aba7ce96a1b7e549a3f2aa59
+  metadata.gz: a9dcf07be1af9b4278057de3431c815959b025cc69d5bc2a66f6c3ef834d2ead9d210d619b0f854e2fad52c6fb898e6efeb6d1d5a0f578e2c30188e0aa167ddd
+  data.tar.gz: 23f89e3fecdc342e8e3a86a6a478a9bab47d4c7936083af564fa13769ef0c920cd643ade852b0c65e9d23fbcd598d2baa0d1d0b4e035387dd75bba9a99f4ca5a

data/lib/app.rb

@@ -29,6 +29,9 @@ module Wire
       if conf['type'].respond_to? :configure
         conf = conf['type'].configure(conf)
       end
+      if conf['auth_handler']
+        conf['auth_handler'] = Object.const_get(conf['auth_handler'])
+      end
       conf
     end
 

data/lib/app/db.rb

@@ -25,9 +25,8 @@ module DB
   # @param [Hash] conf the existing configuration
   # @return [Hash] post-processed configuration
   def self.configure(conf)
-    Sequel.connect($environment['db'][conf['db']])
-    conf['models'].each do |m|
-      conf['models'][m] = Object.const_get(m)
+    conf['models'].each do |m,k|
+      conf['models'][m] = Object.const_get(k)
     end
     conf
   end

data/lib/app/render/partial.rb

@@ -32,8 +32,10 @@ module Render
           conf['resources'][k]['single']   = Tilt.new(v['single'], 1, { ugly: true })
         elsif v.is_a? String
           #TODO: fix needless duplication
-          conf['resources'][k]['multiple'] = Tilt.new(v, 1, { ugly: true })
-          conf['resources'][k]['single']   = Tilt.new(v, 1, { ugly: true })
+          conf['resources'][k] = {
+              'multiple': Tilt.new(v, 1, { ugly: true }),
+              'single':   Tilt.new(v, 1, { ugly: true })
+          }
         end
       end
       conf

data/lib/closet/config.rb

@@ -22,7 +22,7 @@ module Wire
       configs = {}
       Dir[File.join(dir, '*.yaml')].each do |entry|
         name   = File.basename(entry, '.yaml')
-        config = YAML.load_file(File.join(dir, entry))
+        config = YAML.load_file(entry)
         if callback
           config = callback.call(config)
         end

data/lib/closet/context.rb

@@ -49,8 +49,8 @@ module Wire
     #@!attribute [r] verb
     #		@return [Symbol] the HTTP verb
 
-    attr_reader :action, :app, :body, :rack_env, :json, :query,
-                :query_string, :referer, :resource, :type,
+    attr_reader :action, :app, :body, :config, :id, :json, :query,
+                :query_string, :rack_env, :referer, :resource,
                 :uri, :user, :verb
     attr_writer :referer
 
@@ -90,8 +90,8 @@ module Wire
     def initialize(env)
       @rack_env = update_session(env)
       @user     = env['rack.session']['user']
-      @verb     = HTTP_VERBS[env['REQUEST_METHOD']]
-      @action   = HTTP_ACTIONS[env['REQUEST_METHOD']]
+      @verb     = HTTP_VERBS[env['REQUEST_METHOD'].to_sym]
+      @action   = HTTP_ACTIONS[env['REQUEST_METHOD'].to_sym]
       @uri      = env['REQUEST_URI'].split('?')[0].split('/')
       if env['HTTP_REFERER']
         @referer = env['HTTP_REFERER'].split('/')
@@ -102,7 +102,7 @@ module Wire
       if @config
         @app      = @uri[1]
         @resource = @uri[2]
-        @id       = context.uri[3...context.uri.length].join('/')
+        @id       = @uri[3...@uri.length].join('/')
       else
         throw Exception.new("App: #{@uri[1]} is Undefined")
       end

data/lib/closet/renderer.rb

@@ -34,14 +34,14 @@ module Wire
     # @param [Hash] conf the raw configuration
     # @return [Hash] post-processed configuration
     def self.configure_template(conf)
-      conf['partial'] = 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_partial))
+      $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))
     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'
+  VERSION = '0.1.5.1'
 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
+  version: 0.1.5.1
 platform: ruby
 authors:
 - Bryan T. Meyers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print