proxes 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 701cef47d840b7a98b029c49b0669549df8d24fe
-  data.tar.gz: beefb8e479b990c177976245a03d2f401d10861a
+  metadata.gz: a432c5f7cf196ae210e756336857117d3fe59a85
+  data.tar.gz: c7a4e4dd8fee71ebc927256e2d7a3eb531ee2be7
 SHA512:
-  metadata.gz: d95b0bf8b05afe16014fdeb90c88c8860462d5c240f0e5f0c0483f869403430e81e8724b9d6fa031dd5777cb466a0992dbbd93192fb45f5b799968cf3ee219e9
-  data.tar.gz: aa3fffe5fe4deb819ecaa8e2f13562da5e881dca04e4c2e0ea449c239d1d16d27fc1e2b6b06dc6e05a8f28ec5bdd8f8474fcad11c20be981fcc83d1d8102764d
+  metadata.gz: e545194da1aa7c629959d8a8d12334e44d959f12f98fef5eccaf97d39912660a0751a13407c84761b67a595216da757f34fc2f0d32368304978c724cf9a101f9
+  data.tar.gz: 22377b50360e7658ebb3f175d8024cef68415103538b767549d02eb2e1edc0fdaef21bd6959023118fd11e5d4b34206a060f4c3e55bc63c03eb2949a048d0b79

data/.rubocop.yml

@@ -10,3 +10,6 @@ Style/NumericPredicate:
 Style/LeadingCommentSpace:
   Exclude:
     - 'config.ru'
+
+AllCops:
+  TargetRubyVersion: 1.9

data/lib/proxes.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'proxes/version'
 require 'proxes/container'
 require 'proxes/db'

data/lib/proxes/app.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'proxes/controllers/application'
 
 module ProxES

data/lib/proxes/container.rb

@@ -14,20 +14,20 @@ module ProxES
 
       # Make getting value from underlying hash thread safe.
       def [](key)
-        @mutex.synchronize{@hash[key]}
+        @mutex.synchronize { @hash[key] }
       end
 
       # Make setting value in underlying hash thread safe.
       def []=(key, value)
-        @mutex.synchronize{@hash[key] = value}
+        @mutex.synchronize { @hash[key] = value }
       end
 
       def map(&block)
-        @mutex.synchronize{@hash.map(&block)}
+        @mutex.synchronize { @hash.map(&block) }
       end
 
       def inject(memo, &block)
-        @mutex.synchronize{@hash.inject(memo, &block)}
+        @mutex.synchronize { @hash.inject(memo, &block) }
       end
     end
 
@@ -70,7 +70,7 @@ module ProxES
           #   Container.plugin PluginModule
           #   Container.plugin :csrf
           def plugin(plugin, *args, &block)
-            raise ContainerError, "Cannot add a plugin to a frozen Container class" if frozen?
+            raise ContainerError, 'Cannot add a plugin to a frozen Container class' if frozen?
             plugin = Plugins.load_plugin(plugin) if plugin.is_a?(Symbol)
             plugin.load_dependencies(self, *args, &block) if plugin.respond_to?(:load_dependencies)
             include(plugin::InstanceMethods) if defined?(plugin::InstanceMethods)
@@ -88,11 +88,11 @@ module ProxES
           def routes
             Plugins.plugins.inject({}) do |memo, plugin|
               memo.merge!(plugin[1].route_mappings) if plugin[1].respond_to?(:route_mappings)
-              memo
             end
           end
 
-          # Return an ordered list of navigation items: `[{order:0, link:'/users/', text:'Users'}, {order:1, link:'/roles/', text:'Roles'}]
+          # Return an ordered list of navigation items:
+          # `[{order:0, link:'/users/', text:'Users'}, {order:1, link:'/roles/', text:'Roles'}]
           def navigation
             Plugins.plugins.map do |_key, plugin|
               plugin.nav_items if plugin.respond_to?(:nav_items)
@@ -110,6 +110,12 @@ module ProxES
               plugin.seeder if plugin.respond_to?(:seeder)
             end.compact
           end
+
+          def workers
+            Plugins.plugins.map do |_key, plugin|
+              plugin.run_workers if plugin.respond_to?(:run_workers)
+            end.compact
+          end
         end
 
         module InstanceMethods

data/lib/proxes/controllers/application.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'wisper'
 require 'sinatra/base'
 require 'sinatra/flash'
@@ -52,10 +53,10 @@ module ProxES
       redirect '/auth/identity'
     end
 
-    before (/.*/) do
-      if request.url.match(/.json/)
+    before(/.*/) do
+      if request.url =~ /.json/
         request.accept.unshift('application/json')
-        request.path_info = request.path_info.gsub(/.json/,'')
+        request.path_info = request.path_info.gsub(/.json/, '')
       end
     end
   end

data/lib/proxes/controllers/audit_logs.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'proxes/controllers/component'
 require 'proxes/models/audit_log'
 require 'proxes/policies/audit_log_policy'

data/lib/proxes/controllers/auth_identity.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'proxes/controllers/application'
 
 module ProxES

data/lib/proxes/controllers/component.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'proxes/controllers/application'
 require 'proxes/helpers/component'
 
@@ -21,11 +22,11 @@ module ProxES
       respond_to do |format|
         format.html do
           haml :"#{view_location}/index",
-            locals: { list: list, title: heading(:list), actions: actions }
+               locals: { list: list, title: heading(:list), actions: actions }
         end
         format.json do
           {
-            'items' => list.map { |entity| entity.values },
+            'items' => list.map(&:values),
             'page' => params[:page],
             'count' => params[:count],
             'total' => list.to_a.size
@@ -79,7 +80,7 @@ module ProxES
       respond_to do |format|
         format.html do
           haml :"#{view_location}/display",
-            locals: { entity: entity, title: heading, actions: actions }
+               locals: { entity: entity, title: heading, actions: actions }
         end
         format.json { entity.values.to_json }
       end

data/lib/proxes/controllers/permissions.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'proxes/controllers/component'
 require 'proxes/models/permission'
 require 'proxes/policies/permission_policy'

data/lib/proxes/controllers/roles.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'proxes/controllers/component'
 require 'proxes/models/role'
 require 'proxes/policies/role_policy'

data/lib/proxes/controllers/users.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'proxes/controllers/component'
 require 'proxes/models/user'
 require 'proxes/policies/user_policy'
@@ -121,7 +122,7 @@ module ProxES
       identity.set values
       if identity.valid? && identity.save
         log_action("#{dehumanized}_update_password".to_sym) if settings.track_actions
-        flash[:success] = "Password Updated"
+        flash[:success] = 'Password Updated'
         redirect '/_proxes/users/profile'
       else
         haml :"#{view_location}/profile", locals: { entity: entity, identity: identity, title: heading }

data/lib/proxes/db.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'sequel'
 require 'proxes/services/logger'
 

data/lib/proxes/forwarder.rb

@@ -6,20 +6,20 @@ module ProxES
   class Forwarder
     attr_reader :backend, :streaming
 
-    def initialize(opts= {})
+    def initialize(opts = {})
       @backend = URI(opts[:backend]) if opts[:backend]
     end
 
     def call(env)
       source_request = Rack::Request.new(env)
-      full_path = source_request.fullpath == "" ? URI.parse(env['REQUEST_URI']).request_uri : source_request.fullpath
+      full_path = source_request.fullpath == '' ? URI.parse(env['REQUEST_URI']).request_uri : source_request.fullpath
       target_request = Net::HTTP.const_get(source_request.request_method.capitalize).new(full_path)
 
       http = Net::HTTP.new(backend.host, backend.port)
       target_response = http.request(target_request)
 
       headers = (target_response.respond_to?(:headers) && target_response.headers) || self.class.normalize_headers(target_response.to_hash)
-      body    = target_response.body || [""]
+      body    = target_response.body || ['']
       body    = [body] unless body.respond_to?(:each)
 
       # Not sure where this is coming from, but it causes timeouts on the client
@@ -31,7 +31,7 @@ module ProxES
     class << self
       def normalize_headers(headers)
         mapped = headers.map do |k, v|
-          [k, if v.is_a? Array then v.join("\n") else v end]
+          [k, v.is_a?(Array) ? v.join("\n") : v]
         end
         Rack::Utils::HeaderHash.new Hash[mapped]
       end

data/lib/proxes/helpers/authentication.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 module ProxES
   module Helpers
     module Authentication
       def current_user
         return nil unless env['rack.session'] && env['rack.session']['user_id']
-        @users ||= Hash.new {|h,k| h[k] = User[k]}
+        @users ||= Hash.new { |h, k| h[k] = User[k] }
         @users[env['rack.session']['user_id']]
       end
 
@@ -17,11 +18,11 @@ module ProxES
       end
 
       def authenticated?
-        !env['rack.session']['user_id'].nil?
+        current_user.nil?
       end
 
       def authenticate!
-        raise NotAuthenticated unless env['rack.session']['user_id']
+        raise NotAuthenticated unless current_user
         true
       end
 

data/lib/proxes/helpers/component.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_support'
 require 'active_support/inflector'
 

data/lib/proxes/helpers/indices.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
+
 module ProxES
   module Helpers
     module Indices
       def filter(asked, against)
-        return against.map { |a| a.gsub(%r{\.\*}, '*') } if asked == ['*'] || asked == []
+        return against.map { |a| a.gsub(/\.\*/, '*') } if asked == ['*'] || asked == []
 
         answer = []
         against.each do |pattern|
-          answer.concat asked.select { |idx| idx =~ %r{#{pattern}} }
+          answer.concat(asked.select { |idx| idx =~ /#{pattern}/ })
         end
         answer
       end

data/lib/proxes/helpers/pundit.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'pundit'
 require 'proxes/request'
 

data/lib/proxes/helpers/views.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ProxES
   module Helpers
     module Views

data/lib/proxes/helpers/wisper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'wisper'
 require 'proxes/request'
 

data/lib/proxes/listener.rb

@@ -6,14 +6,14 @@ module ProxES
       @mutex = Mutex.new
     end
 
-    def method_missing(method, *args, &block)
+    def method_missing(method, *args)
       vals = { action: method }
-      vals[:user] = args[0][:user] if (args[0] && args[0].has_key?(:user))
-      vals[:details] = args[0][:details] if (args[0] && args[0].has_key?(:details))
+      vals[:user] = args[0][:user] if args[0] && args[0].key?(:user)
+      vals[:details] = args[0][:details] if args[0] && args[0].key?(:details)
       @mutex.synchronize { AuditLog.create vals }
     end
 
-    def respond_to_missing?(method, include_private = false)
+    def respond_to_missing?(_method, _include_private = false)
       true
     end
   end

data/lib/proxes/loggers/elasticsearch.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'logger'
 
 module ProxES

data/lib/proxes/models/audit_log.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'proxes/models/base'
 
 module ProxES

data/lib/proxes/models/identity.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'proxes/models/base'
 require 'omniauth-identity'
 require 'active_support'

data/lib/proxes/models/permission.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'proxes/models/base'
 
 module ProxES
@@ -8,7 +9,7 @@ module ProxES
 
     dataset_module do
       def for_user(a_user, action)
-        where(verb: action).where{Sequel.|({role: a_user.roles}, {user_id: a_user.id})}
+        where(verb: action).where { Sequel.|({ role: a_user.roles }, { user_id: a_user.id }) }
       end
     end
 
@@ -20,7 +21,7 @@ module ProxES
     end
 
     def self.verbs
-      ['GET', 'POST', 'PUT', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'INDEX']
+      %w[GET POST PUT DELETE HEAD OPTIONS TRACE INDEX]
     end
   end
 end

data/lib/proxes/models/role.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'proxes/models/base'
 
 module ProxES

data/lib/proxes/models/user.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'proxes/models/base'
 require 'bcrypt'
 require 'digest/md5'

data/lib/proxes/policies/application_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ProxES
   class ApplicationPolicy
     attr_reader :user, :record

data/lib/proxes/policies/audit_log_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'proxes/policies/application_policy'
 
 module ProxES

data/lib/proxes/policies/identity_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'application_policy'
 
 module ProxES

data/lib/proxes/policies/permission_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'proxes/policies/application_policy'
 
 module ProxES

data/lib/proxes/policies/request/root_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ProxES
   class Request
     class RootPolicy < RequestPolicy

data/lib/proxes/policies/request/search_policy.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 module ProxES
   class Request
     class SearchPolicy < RequestPolicy
       class Scope < RequestPolicy::Scope
         def resolve
           patterns = Permission.for_user(user, 'INDEX').map do |permission|
-            permission.pattern.gsub(/\{user.(.*)\}/) { |match| user.send(Regexp.last_match[1].to_sym) }
+            permission.pattern.gsub(/\{user.(.*)\}/) { |_match| user.send(Regexp.last_match[1].to_sym) }
           end
           filter scope.index, patterns
         end

data/lib/proxes/policies/request/snapshot_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ProxES
   class Request
     class SnapshotPolicy < RequestPolicy

data/lib/proxes/policies/request/stats_policy.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 module ProxES
   class Request
     class StatsPolicy < RequestPolicy
       class Scope < RequestPolicy::Scope
         def resolve
           patterns = Permission.for_user(user, 'INDEX').map do |permission|
-            permission.pattern.gsub(/\{user.(.*)\}/) { |match| user.send(Regexp.last_match[1].to_sym) }
+            permission.pattern.gsub(/\{user.(.*)\}/) { |_match| user.send(Regexp.last_match[1].to_sym) }
           end
           filter scope.index, patterns
         end

data/lib/proxes/policies/request_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'proxes/db'
 require 'proxes/models/permission'
 require 'proxes/services/logger'
@@ -16,31 +17,24 @@ module ProxES
     end
 
     def method_missing(method_sym, *arguments, &block)
-      if method_sym.to_s[-1] == '?'
-        return false if user.nil?
+      return super if method_sym.to_s[-1] != '?'
 
-        if record.indices?
-          return true if index_allowed?
-        else
-          return true if action_allowed? method_sym[0..-2].upcase
-        end
-        false
-      else
-        super
-      end
+      return false if user.nil?
+      return true if record.indices? && index_allowed?
+      action_allowed? method_sym[0..-2].upcase
     end
 
     def index_allowed?
       patterns = Permission.for_user(user, 'INDEX').map do |permission|
-        permission.pattern.gsub(/\{user.(.*)\}/) { |match| user.send(Regexp.last_match[1].to_sym) }
+        permission.pattern.gsub(/\{user.(.*)\}/) { |_match| user.send(Regexp.last_match[1].to_sym) }
       end
-      return filter(record.index, patterns).count.positive?
+      filter(record.index, patterns).count.positive?
     end
 
     def action_allowed?(action)
       # Give me all the user's permissions that match the verb
       Permission.for_user(user, action).each do |permission|
-        return true if record.path =~ %r{#{permission.pattern}}
+        return true if record.path =~ /#{permission.pattern}/
       end
       false
     end

data/lib/proxes/policies/role_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'proxes/policies/application_policy'
 
 module ProxES

data/lib/proxes/policies/token_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'application_policy'
 
 module ProxES

data/lib/proxes/policies/user_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'proxes/policies/application_policy'
 
 module ProxES

data/lib/proxes/proxes.rb

@@ -18,23 +18,23 @@ module ProxES
         '/users' => ::ProxES::Users,
         '/roles' => ::ProxES::Roles,
         '/permissions' => ::ProxES::Permissions,
-        '/audit-logs' => ::ProxES::AuditLogs,
+        '/audit-logs' => ::ProxES::AuditLogs
       }
     end
 
     def self.nav_items
       [
-        { order: 0, link:'/users/', text: 'Users', target: User, icon: 'user' },
-        { order: 1, link:'/roles/', text: 'Roles', target: Role, icon: 'group' },
-        { order: 2, link:'/permissions/', text: 'Permissions', target: Permission, icon: 'check-square' },
+        { order: 0, link: '/users/', text: 'Users', target: User, icon: 'user' },
+        { order: 1, link: '/roles/', text: 'Roles', target: Role, icon: 'group' },
+        { order: 2, link: '/permissions/', text: 'Permissions', target: Permission, icon: 'check-square' }
       ]
     end
 
     def self.seeder
-      Proc.new do
+      proc do
         ::ProxES::Role.find_or_create(name: 'user')
         sa = ::ProxES::Role.find_or_create(name: 'super_admin')
-        %w(GET POST PUT DELETE HEAD OPTIONS INDEX).each do |verb|
+        %w[GET POST PUT DELETE HEAD OPTIONS INDEX].each do |verb|
           ::ProxES::Permission.find_or_create(role: sa, verb: verb, pattern: '.*')
         end
       end

data/lib/proxes/rake_tasks.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'rake'
 require 'rake/tasklib'
 
@@ -22,7 +23,7 @@ module ProxES
 
         desc 'Prepare ProxES migrations'
         task :prep do
-          Dir.mkdir 'migrations' unless File.exists?('migrations')
+          Dir.mkdir 'migrations' unless File.exist?('migrations')
           ::ProxES::Container.migrations.each do |path|
             FileUtils.cp_r "#{path}/.", 'migrations'
           end

data/lib/proxes/request.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'rack'
 
 module ProxES
@@ -15,7 +16,7 @@ module ProxES
         require 'proxes/request/' + endpoint.downcase
         Request.const_get(endpoint).new(env)
       rescue LoadError
-        self.new(env)
+        new(env)
       end
     end
 

data/lib/proxes/request/root.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'rack'
 require 'proxes/request'
 

data/lib/proxes/request/search.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'rack'
 require 'proxes/request'
 
@@ -10,9 +11,9 @@ module ProxES
 
       def index=(idx)
         @index = idx
-        self.path_info = '/' + [ index, type, id, endpoint ]
-          .map { |v| v.is_a?(Array) ? v.join(',') : v }
-          .select { |v| !v.nil? && v != '' }.join('/')
+        self.path_info = '/' + [index, type, id, endpoint]
+                         .map { |v| v.is_a?(Array) ? v.join(',') : v }
+                         .select { |v| !v.nil? && v != '' }.join('/')
       end
 
       def endpoint

data/lib/proxes/request/snapshot.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'rack'
 require 'proxes/request'
 

data/lib/proxes/request/stats.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'rack'
 require 'proxes/request'
 
@@ -9,9 +10,9 @@ module ProxES
 
       def index=(idx)
         @index = idx
-        self.path_info = '/' + [ index, endpoint ]
-          .map { |v| v.is_a?(Array) ? v.join(',') : v }
-          .select { |v| !v.nil? && v != '' }.join('/')
+        self.path_info = '/' + [index, endpoint]
+                         .map { |v| v.is_a?(Array) ? v.join(',') : v }
+                         .select { |v| !v.nil? && v != '' }.join('/')
       end
 
       def endpoint

data/lib/proxes/security.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'proxes/services/logger'
 require 'proxes/request'
 require 'proxes/policies/request_policy'

data/lib/proxes/seed.rb

@@ -2,6 +2,4 @@ require 'proxes/db'
 require 'proxes/models/role'
 require 'proxes/models/permission'
 
-::ProxES::Container.seeders.each do |seeder|
-  seeder.call
-end
+::ProxES::Container.seeders.each(&:call)

data/lib/proxes/services/logger.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'logger'
 require 'yaml'
 require 'singleton'
@@ -12,7 +13,7 @@ module ProxES
     class Logger
       include Singleton
 
-      CONFIG = './config/logger.yml'
+      CONFIG = './config/logger.yml'.freeze
       attr_reader :loggers
 
       def initialize
@@ -32,7 +33,7 @@ module ProxES
         loggers.each { |logger| logger.send(method, *args, &block) }
       end
 
-      def respond_to_missing?(method, include_private = false)
+      def respond_to_missing?(method, _include_private = false)
         loggers.any? { |logger| logger.respond_to?(method) }
       end
 

data/lib/proxes/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ProxES
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxes
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler