proxes 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d84d569f0a5650fb34b6bd9aede6d9737540323
-  data.tar.gz: ac93f76be8bf7ccd7fdfac033e2affe8f9442999
+  metadata.gz: 701cef47d840b7a98b029c49b0669549df8d24fe
+  data.tar.gz: beefb8e479b990c177976245a03d2f401d10861a
 SHA512:
-  metadata.gz: 725746109ead14f455a36006863ad9bff880d8685b2511d4ddec6cf7c882b85b04e4250f9154e1eb71c12a523c14ef11399430200082fca0bdc85fd6e48565dc
-  data.tar.gz: ab5eb8ba0e65a9adf781cd6f2ff977323ae514388f206d4ef7a5e8a0748bc8c4e1241239dfa1acc5117eefc188fa397c5aea561c7fd9d7a8b7df03f475236a8d
+  metadata.gz: d95b0bf8b05afe16014fdeb90c88c8860462d5c240f0e5f0c0483f869403430e81e8724b9d6fa031dd5777cb466a0992dbbd93192fb45f5b799968cf3ee219e9
+  data.tar.gz: aa3fffe5fe4deb819ecaa8e2f13562da5e881dca04e4c2e0ea449c239d1d16d27fc1e2b6b06dc6e05a8f28ec5bdd8f8474fcad11c20be981fcc83d1d8102764d

data/.gitignore

@@ -11,3 +11,4 @@
 /node_modules
 .vagrant
 *.db
+/Gemfile.dev.lock

data/lib/proxes/container.rb

@@ -96,13 +96,19 @@ module ProxES
           def navigation
             Plugins.plugins.map do |_key, plugin|
               plugin.nav_items if plugin.respond_to?(:nav_items)
-            end.flatten.sort_by { |h| h[:order] }
+            end.compact.flatten.sort_by { |h| h[:order] }
           end
 
           def migrations
             Plugins.plugins.map do |_key, plugin|
               plugin.migration_folder if plugin.respond_to?(:migration_folder)
-            end
+            end.compact
+          end
+
+          def seeders
+            Plugins.plugins.map do |_key, plugin|
+              plugin.seeder if plugin.respond_to?(:seeder)
+            end.compact
           end
         end
 

data/lib/proxes/helpers/authentication.rb

@@ -4,7 +4,8 @@ module ProxES
     module Authentication
       def current_user
         return nil unless env['rack.session'] && env['rack.session']['user_id']
-        @user ||= User[env['rack.session']['user_id']]
+        @users ||= Hash.new {|h,k| h[k] = User[k]}
+        @users[env['rack.session']['user_id']]
       end
 
       def current_user=(user)

data/lib/proxes/listener.rb

@@ -2,11 +2,15 @@ require 'wisper'
 
 module ProxES
   class Listener
+    def initialize
+      @mutex = Mutex.new
+    end
+
     def method_missing(method, *args, &block)
       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))
-      AuditLog.create vals
+      @mutex.synchronize { AuditLog.create vals }
     end
 
     def respond_to_missing?(method, include_private = false)

data/lib/proxes/proxes.rb

@@ -29,6 +29,16 @@ module ProxES
         { order: 2, link:'/permissions/', text: 'Permissions', target: Permission, icon: 'check-square' },
       ]
     end
+
+    def self.seeder
+      Proc.new 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|
+          ::ProxES::Permission.find_or_create(role: sa, verb: verb, pattern: '.*')
+        end
+      end
+    end
   end
 end
 

data/lib/proxes/security.rb

@@ -38,9 +38,9 @@ module ProxES
       begin
         check_basic
         authorize request
-      rescue StandardError => e
+      rescue StandardError
         log_action(:es_request_denied, details: "#{request.request_method.upcase} #{request.fullpath} (#{request.class.name})")
-        logger.debug "Access denied by security layer: #{e.message}"
+        logger.debug "Access denied for #{current_user ? current_user.email : 'Anonymous User'} by security layer: #{request.request_method.upcase} #{request.fullpath} (#{request.class.name})"
         return error 'Forbidden', 403
       end
       request.index = policy_scope(request) if request.indices?

data/lib/proxes/seed.rb

@@ -2,8 +2,6 @@ require 'proxes/db'
 require 'proxes/models/role'
 require 'proxes/models/permission'
 
-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|
-  ProxES::Permission.find_or_create(role: sa, verb: verb, pattern: '.*')
+::ProxES::Container.seeders.each do |seeder|
+  seeder.call
 end

data/lib/proxes/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ProxES
-  VERSION = '0.3.6'
+  VERSION = '0.4.0'
 end

data/proxes.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport'
   spec.add_dependency 'rake', '~> 10.0'
   spec.add_dependency 'rack-contrib'
-  spec.add_dependency 'sinatra'
+  spec.add_dependency 'sinatra', '~> 1.0'
   spec.add_dependency 'sinatra-flash'
   spec.add_dependency 'sinatra-contrib'
   spec.add_dependency 'elasticsearch'
@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'bcrypt'
   spec.add_dependency 'omniauth'
   spec.add_dependency 'omniauth-identity'
-  spec.add_dependency 'haml'
+  spec.add_dependency 'haml', '~> 4.0'
   spec.add_dependency 'wisper'
   spec.add_dependency 'tilt', '>= 2'
 end

data/views/audit_logs/index.haml

@@ -22,3 +22,5 @@
                 = entity.details
               %td
                 = entity.created_at.strftime('%Y-%m-%d %H:%M:%S')
+
+=pagination(list, base_path)

data/views/identity/register.haml

@@ -1,6 +1,3 @@
-.row
-  .col-md-12
-    %h1 ProxES Registration
 .row
   .col-md-2
   .col-md-8

data/views/partials/form_control.haml

@@ -13,8 +13,7 @@
           - options.each do |k,v| k ||= v;  v ||= k;
             %option{ value: k, selected: (k.to_s == model[field].to_s)}= v
     - elsif type == 'textarea'
-      %textarea{attributes}
-        = model[field]
+      %textarea{attributes}= preserve(model[field])
     - else
       %input{attributes, type: type, value: model[field]}
     - if model.errors[field]

data/views/partials/pager.haml

@@ -1,19 +1,12 @@
-<nav aria-label="Page navigation">
-  <p class="text-center">
-    Showing <%= list.current_page_record_range %> of <%= list.pagination_record_count %> records
-  </p>
-  <ul class="pager">
-    <li>
-      <a href="<%= base_path %>?page=1&count=<%= list.page_size %>">First</a>
-    </li>
-    <li<% if list.first_page? %> class="disabled"<% end %>>
-      <a href="<%= prev_link %>">Previous</a>
-    </li>
-    <li<% if list.last_page? %> class="disabled"<% end %>>
-      <a href="<%= next_link %>">Next</a>
-    </li>
-    <li>
-      <a href="<%= base_path %>?page=<%= list.page_count %>&count=<%= list.page_size %>">Last</a>
-    </li>
-  </ul>
-</nav>
+%nav{"aria-label" => "Page navigation"}
+  %p.text-center
+    Showing #{list.current_page_record_range} of #{list.pagination_record_count} records
+  %ul.pager
+    %li
+      %a{href: "#{base_path}?page=1&count=#{list.page_size}"} First
+    %li{class: ("disabled" if list.first_page?)}
+      %a{href: prev_link} Previous
+    %li{class: ("disabled" if list.last_page?)}
+      %a{href: next_link} Next
+    %li
+      %a{href: "#{base_path}?page=#{list.page_count}&count=#{list.page_size}"} Last

data/views/permissions/index.haml

@@ -12,3 +12,5 @@
                   = entity.pattern
       .panel-body.text-right
         %a.btn.btn-primary{ href: '/_proxes/permissions/new' } New Permission
+
+=pagination(list, base_path)

data/views/roles/index.haml

@@ -15,3 +15,5 @@
                 = entity.permissions_dataset.count
       .panel-body.text-right
         %a.btn.btn-primary{ href: '/_proxes/roles/new' } New Role
+
+=pagination(list, base_path)

data/views/users/index.haml

@@ -17,4 +17,6 @@
               %td= entity.surname
               %td= entity.roles_dataset.map(:name).map(&:titlecase).join(', ')
       .panel-body.text-right
-        %a.btn.btn-primary{ href: '/_proxes/users/new' } New User
+        %a.btn.btn-primary{ href: '/_proxes/users/new' } New User
+
+=pagination(list, base_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxes
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-16 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,16 +140,16 @@ dependencies:
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sinatra-flash
   requirement: !ruby/object:Gem::Requirement
@@ -280,16 +280,16 @@ dependencies:
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: wisper
   requirement: !ruby/object:Gem::Requirement
@@ -336,7 +336,6 @@ files:
 - Gemfile
 - Gemfile.ci
 - Gemfile.dev
-- Gemfile.dev.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -396,8 +395,8 @@ files:
 - lib/proxes/seed.rb
 - lib/proxes/services/logger.rb
 - lib/proxes/version.rb
-- migrate/20170207_01_base_tables.rb
-- migrate/20170207_02_audit_log.rb
+- migrate/20170207_base_tables.rb
+- migrate/20170208_audit_log.rb
 - migrate/20170416_audit_log_details.rb
 - migrate/20170416_user_specific_permissions.rb
 - package.json

data/Gemfile.dev.lock

@@ -1,164 +0,0 @@
-GIT
-  remote: https://github.com/alexch/rerun.git
-  revision: 3e4c486304be406cb86180ef70ec24e9ae055ce4
-  branch: master
-  specs:
-    rerun (0.11.0)
-      listen (~> 3.0)
-
-PATH
-  remote: .
-  specs:
-    proxes (0.3.5)
-      activesupport
-      bcrypt
-      elasticsearch
-      haml
-      logger
-      omniauth
-      omniauth-identity
-      pundit
-      rack-contrib
-      rake (~> 10.0)
-      sequel
-      sinatra
-      sinatra-contrib
-      sinatra-flash
-      tilt (>= 2)
-      wisper
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (5.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    backports (3.7.0)
-    bcrypt (3.1.11)
-    bcrypt-ruby (3.1.5)
-      bcrypt (>= 3.1.3)
-    byebug (9.0.6)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.4)
-    database_cleaner (1.5.3)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    elasticsearch (5.0.4)
-      elasticsearch-api (= 5.0.4)
-      elasticsearch-transport (= 5.0.4)
-    elasticsearch-api (5.0.4)
-      multi_json
-    elasticsearch-transport (5.0.4)
-      faraday
-      multi_json
-    factory_girl (4.8.0)
-      activesupport (>= 3.0.0)
-    faraday (0.12.0.1)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.9.14)
-    git-version-bump (0.15.1)
-    haml (4.0.7)
-      tilt
-    hashie (3.5.5)
-    i18n (0.7.0)
-    json (2.0.2)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    logger (1.2.8)
-    method_source (0.8.2)
-    minitest (5.10.1)
-    multi_json (1.12.1)
-    multipart-post (2.0.0)
-    omniauth (1.6.1)
-      hashie (>= 3.4.6, < 3.6.0)
-      rack (>= 1.6.2, < 3)
-    omniauth-identity (1.1.1)
-      bcrypt-ruby (~> 3.0)
-      omniauth (~> 1.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
-      pry (~> 0.10)
-    pundit (1.1.0)
-      activesupport (>= 3.0.0)
-    rack (1.6.5)
-    rack-contrib (1.4.0)
-      git-version-bump (~> 0.15)
-      rack (~> 1.4)
-    rack-protection (1.5.3)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    racksh (1.0.0)
-      rack (>= 1.0)
-      rack-test (>= 0.5)
-    rake (10.5.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    ruby_dep (1.5.0)
-    sequel (4.45.0)
-    simplecov (0.12.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-contrib (1.4.7)
-      backports (>= 2.0)
-      multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (>= 1.3, < 3)
-    sinatra-flash (0.3.0)
-      sinatra (>= 1.0.0)
-    slop (3.6.0)
-    sqlite3 (1.3.12)
-    thread_safe (0.3.5)
-    tilt (2.0.7)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    wisper (2.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.12)
-  database_cleaner
-  factory_girl
-  proxes!
-  pry-byebug
-  rack-test
-  racksh
-  rerun!
-  rspec (~> 3.0)
-  simplecov
-  sqlite3
-
-BUNDLED WITH
-   1.14.6