wire-framework 0.1.5.2 → 0.1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec09ae1db5056dace28e0d574e44b42f96b54558
-  data.tar.gz: a47551aae8e917c6e48e417931fad6a7c11b5af7
+  metadata.gz: 57b6276466fdde480be64d03871a923b517ba4d5
+  data.tar.gz: 085314f7a229be60dfdb3ad8c8445fa4a993da23
 SHA512:
-  metadata.gz: 3547a7e673112f1adaf7264511afcc1c350bf00bbd981d31393858bcbbba240bc2b36db37146bf033c3bf7f4ab5331d3405ff35bc12e8a3d16ecfc5280f1a09e
-  data.tar.gz: a6b7b0cfa9a7e5a688a1a799b2c2d935d92cd49ec802c294ecb28c1013d908e8c4ff5447684bebf83e3da1240892d9c3eacc4a8b227b44faf08086dda98b8e3b
+  metadata.gz: d3a6db1b191dd99b39d6dd32756caf687842d3602bec051575374f8d25ad5c0c67bcd67e2be21e28bfacc9620b461515fdadbc396c9fbb98801e754a3f02f948
+  data.tar.gz: 3cc276cf1e8f171f1176d2d6423cd25738ca2d1506bc035bf1e9718f7a25479a36a04b09ce8bf492af4d2e69ad7e3836a736f1e428d3c8e0c12c16c91224b153

data/lib/app/db.rb

@@ -77,13 +77,6 @@ module DB
         415
       end
     else
-      #TODO user_id needs to happen in the context
-      if model.respond_to? :updated_by_id
-        context.json[:updated_by_id] = context.user
-      end
-      if model.respond_to? :created_by_id
-        context.json[:created_by_id] = context.user
-      end
       begin
         instance = model.create(context.json)
         instance.save
@@ -104,20 +97,16 @@ module DB
   # @param [Hash] context the context for this request
   # @return [Response] all objects, or status code
   def self.do_read_all(context)
-    return 404 unless context.resource
     model = context.config['models'][context.resource]
-    if model
-      hash = '[ '
-      model.each do |e|
-        hash << e.to_json
-        hash << ','
-      end
-      hash = hash[0...-1]
-      hash << ']'
-      [200, {}, hash]
-    else
-      404
+    return 404 unless model
+    hash = '[ '
+    model.each do |e|
+      hash << e.to_json
+      hash << ','
     end
+    hash = hash[0...-1]
+    hash << ']'
+    [200, {}, hash]
   end
 
   # Get a specific object from the DB table
@@ -130,13 +119,10 @@ module DB
     if id.eql?('new') or id.eql? 'upload'
       return '{}'
     end
-    if model
-      object = model[id]
-      if object
-        return [200, {}, object.to_json]
-      end
+    object = model[id]
+    if object
+      return [200, {}, object.to_json]
     end
-    [404, {}, []]
   end
 
   # Update a specific object in the DB table
@@ -145,17 +131,8 @@ module DB
   def self.do_update(context)
     model = context.config['models'][context.resource]
     return 404 unless model
-
-    id = context.id
-    if model
-      if model.respond_to?(:updated_by_id)
-        context.json[:updated_by_id] = context.user
-      end
-      instance = model[id]
-      instance.update(context.json)
-    else
-      404
-    end
+    instance = model[context.id]
+    instance.update(context.json)
   end
 
   # Remove a specific object from the DB table
@@ -164,18 +141,12 @@ module DB
   def self.do_delete(context)
     model = context.config['models'][context.resource]
     return 404 unless model
-
-    id = context.id
-    if model
-      instance = model[id]
-      if instance
-        if instance.destroy
-          200
-        else
-          [500, {}, 'Failed to delete instance']
-        end
+    instance = model[context.id]
+    if instance
+      if instance.delete
+        200
       else
-        404
+        [500, {}, 'Failed to delete instance']
       end
     else
       404

data/lib/app/render/page.rb

@@ -44,7 +44,7 @@ module Render
                 # do nothing
             end
           else
-            uri += "#{s}"
+            uri += "/#{s}"
           end
           temp = []
           if go_ahead
@@ -58,7 +58,7 @@ module Render
             end
           end
         end
-        message = template[:path].render(self, hash)
+        message = template['file'].render(self, hash)
         if template['use_layout']
           message = render_template(actions, context, $wire_templates['layout'], message)
         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.2'
+  VERSION = '0.1.5.3'
 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.2
+  version: 0.1.5.3
 platform: ruby
 authors:
 - Bryan T. Meyers