wire-framework 0.1.5.7 → 0.1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd4274e5b145b99f303b5fab714b9950a296e783
-  data.tar.gz: 727b2beca939b042ea2d16d1d38bc0edd53d6361
+  metadata.gz: 2d79aa2208acd914eb50a86bd6f577a9144509e0
+  data.tar.gz: 1bd6db517477eabc4f522dbf1322198664109ac4
 SHA512:
-  metadata.gz: ed6e45a2c421be5bc7c4b9e716c1b5dc484d9ee379e67ee53f155788ffc3b2a335192ecd6843c6e3b1ecfad0e89e2b9148c8e000e4799798f290f60a095690dc
-  data.tar.gz: 4f35ee62abcb5eacda644e51efa8f5709c776be1da523f28f5a2af71d144bfa57c0c820fa300699ed641c7d2b7a56fb6ad6a0fa5453410762fe1794ba62396ca
+  metadata.gz: ff82b680ab9e22972050943e833bac2be76010fd0a6446c2912e84c7e6619acefcc8738d5776f72e9ff3fcdd49dffe309667582d1c86fbfb997b76c1200cc3ac
+  data.tar.gz: 2e23a270bbdb9de4f1e5ecc1ed81b53ee826d3d3a1fc2e1b8afd722fdcee452ff15602d7f48a22b47633aa5250aa0bee6e9a18688d053ed71b7f4469e6909e92

data/lib/app/db.rb

@@ -79,7 +79,7 @@ module DB
     else
       begin
         instance = model.create(context.json)
-        if instance.modified?
+        if instance.exists?
           200
         else
           errors = ''
@@ -142,7 +142,7 @@ module DB
     return 404 unless model
     instance = model[context.uri[3]]
     if instance
-      if instance.delete
+      if instance.destroy
         200
       else
         [500, {}, 'Failed to delete instance']

data/lib/app/history.rb

@@ -35,6 +35,8 @@ module History
   def do_read(actions, context)
     list = get_log(context.config['host'],
                    context.resource,
+                   context.config['user'],
+                   context.config['pass'],
                    context.config['web_folder'],
                    context.id)
     if list == 404

data/lib/app/history/svn.rb

@@ -26,11 +26,13 @@ module History
     # Get the log information for any part of a Repo
     # @param [String] host the name of the host to connect to
     # @param [String] repo the name of the repository to access
+    # @param [String] user the username for connecting to SVN
+    # @param [String] pass the password for connecting to SVN
     # @param [String] web the web path of the repo
     # @param [String] id the sub-URI of the item to access
     # @return [Hash] the history entries
-    def self.get_log(host, repo, web, id = nil)
-      options = "--username #{$environment[:repos_user]} --password #{$environment[:repos_password]}"
+    def self.get_log(host, repo, user, pass, web, id = nil)
+      options = "--username #{user} --password #{pass}"
       uri     = "svn://#{host}/#{repo}"
       if id
         if web

data/lib/app/render/error.rb

@@ -30,7 +30,7 @@ module Render
     end
 
     def self.error_check(actions, context, result)
-      errors = context.app['errors']
+      errors = context.config['errors']
       if errors
         template = errors[result[0]]
         if template

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
 
@@ -53,6 +53,8 @@ module Repo
   def do_read_all(context)
     mime = 'text/html'
     list = do_read_listing(context.config['web'],
+                           context.config['user'],
+                           context.config['pass'],
                            context.config['repos'],
                            context.resource)
     if list == 404
@@ -64,9 +66,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
 
@@ -74,36 +76,38 @@ module Repo
   # @param [Hash] context the context for this request
   # @return [Response] the file, listing, or status code
   def do_read(context)
-    path     = context.resource
+    user     = context.config['user']
+    pass     = context.config['pass']
+    repo     = context.resource
     referrer = context.referer
-    repos    = context.config['repos']
+    path     = context.config['repos']
     web      = context.config['web']
     rev      = context.query[:rev]
     id       = context.id
-    info     = do_read_info(rev, web, repos, path, id)
+    info     = do_read_info(rev, web, user, pass, path, repo, id)
     if info == 404
       return 404
     end
     type = info[:@kind]
     if type.eql? 'dir'
       mime     = 'text/html'
-      list     = do_read_listing(web, repos, path, id)
+      list     = do_read_listing(web, user, pass, path, repo, id)
       template = context.config['listing']
       body     = template.render(self,
                                  list:     list,
-                                 resource: path,
+                                 resource: repo,
                                  id:       id,
                                  referrer: referrer)
     else
-      body = do_read_file(rev, web, repos, path, id)
+      body = do_read_file(rev, web, user, pass, path, repo, id)
       if body == 500
         return body
       end
-      mime = do_read_mime(rev, web, repos, path, id)
+      mime = do_read_mime(rev, web, user, pass, path, repo, 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
 
@@ -111,8 +115,10 @@ module Repo
   # @param [Hash] context the context for this request
   # @return [Response] status code
   def do_update(context)
-    path    = context.resource
-    repos   = context.config['repos']
+    user     = context.config['user']
+    pass     = context.config['pass']
+    repo    = context.resource
+    path   = context.config['repos']
     web     = context.config['web']
     content = context.json
     id      = context.id
@@ -124,9 +130,9 @@ module Repo
       else
         mime = content[:file][:mime]
       end
-      do_update_file(web, repos, path, id, file, content[:message], mime, context.user)
+      do_update_file(web, user, pass, path, repo, id, file, content[:message], mime, context.user)
     else
-      do_update_file(web, repos, path, id, URI.unescape(content[:updated]), content[:message], context.query[:type], context.user)
+      do_update_file(web, user, pass, path, repo, id, URI.unescape(content[:updated]), content[:message], context.query[:type], context.user)
     end
   end
 

data/lib/app/repo/svn.rb

@@ -43,12 +43,14 @@ module Repo
     # Read a single file
     # @param [String] rev the revision number to access
     # @param [String] web the subdirectory for web content
+    # @param [String] user the username for connecting to SVN
+    # @param [String] pass the password for connecting to SVN
     # @param [String] path the path to the repositories
     # @param [String] repo the new repo name
     # @param [String] id the relative path to the file
     # @return [String] the file
-    def self.do_read_file(rev, web, path, repo, id)
-      options = "--username #{$environment[:repos_user]} --password #{$environment[:repos_password]}"
+    def self.do_read_file(rev, web, user, pass, path, repo, id)
+      options = "--username #{user} --password #{pass}"
       if rev.nil?
         rev = 'HEAD'
       end
@@ -67,12 +69,14 @@ module Repo
 
     # Read a directory listing
     # @param [String] web the subdirectory for web content
+    # @param [String] user the username for connecting to SVN
+    # @param [String] pass the password for connecting to SVN
     # @param [String] path the path to the repositories
     # @param [String] repo the new repo name
     # @param [String] id the relative path to the file
     # @return [Array] the directory listing
-    def self.do_read_listing(web, path, repo, id = nil)
-      options = "--username #{$environment[:repos_user]} --password #{$environment[:repos_password]}"
+    def self.do_read_listing(web, user, pass, path, repo, id = nil)
+      options = "--username #{user} --password #{pass}"
       if web.nil?
         if id.nil?
           list = `svn list #{options} --xml 'svn://localhost/#{repo}'`
@@ -96,12 +100,14 @@ module Repo
     # Read Metadata for a single file
     # @param [String] rev the revision number to access
     # @param [String] web the subdirectory for web content
+    # @param [String] user the username for connecting to SVN
+    # @param [String] pass the password for connecting to SVN
     # @param [String] path the path to the repositories
     # @param [String] repo the new repo name
     # @param [String] id the relative path to the file
     # @return [Hash] the metadata
-    def self.do_read_info(rev, web, path, repo, id)
-      options = "--username #{$environment[:repos_user]} --password #{$environment[:repos_password]}"
+    def self.do_read_info(rev, web, user, pass, path, repo, id)
+      options = "--username #{user} --password #{pass}"
       if rev.nil?
         rev = 'HEAD'
       end
@@ -121,12 +127,14 @@ module Repo
     # Get a file's MIME type
     # @param [String] rev the revision number to access
     # @param [String] web the subdirectory for web content
+    # @param [String] user the username for connecting to SVN
+    # @param [String] pass the password for connecting to SVN
     # @param [String] path the path to the repositories
     # @param [String] repo the new repo name
     # @param [String] id the relative path to the file
     # @return [String] the MIME type
-    def self.do_read_mime(rev, web, path, repo, id)
-      options = "--username #{$environment[:repos_user]} --password #{$environment[:repos_password]}"
+    def self.do_read_mime(rev, web, user, pass, path, repo, id)
+      options = "--username #{user} --password #{pass}"
       if rev.nil?
         rev = 'HEAD'
       end
@@ -148,16 +156,18 @@ module Repo
 
     # Update a single file
     # @param [String] web the subdirectory for web content
+    # @param [String] user the username for connecting to SVN
+    # @param [String] pass the password for connecting to SVN
     # @param [String] path the path to the repositories
     # @param [String] repo the new repo name
     # @param [String] id the relative path to the file
     # @param [String] content the updated file
     # @param [String] message the commit message
     # @param [String] mime the mime-type to set
-    # @param [String] user the Author of this change
+    # @param [String] username the Author of this change
     # @return [Integer] status code
-    def self.do_update_file(web, path, repo, id, content, message, mime, user)
-      options = "--username #{$environment[:repos_user]} --password #{$environment[:repos_password]}"
+    def self.do_update_file(web, user, pass, path, repo, id, content, message, mime, username)
+      options = "--username #{user} --password #{pass}"
       status  = 500
       id      = id.split('/')
       id.pop
@@ -196,7 +206,7 @@ module Repo
         if $?.exitstatus == 0
           status = 200
         end
-        `svn propset #{options} --revprop -r HEAD svn:author '#{user}' "/tmp/svn/#{repo}"`
+        `svn propset #{options} --revprop -r HEAD svn:author '#{username}' "/tmp/svn/#{repo}"`
       end
       `rm -R '/tmp/svn/#{repo}'`
       status

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.7'
+  VERSION = '0.1.5.8'
 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.7
+  version: 0.1.5.8
 platform: ruby
 authors:
 - Bryan T. Meyers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print