padrino-admin 0.17.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68403b4a1ac0ebf79801d31e20efdf28626df2b7bcdad0a7c4e8de5d797083a4
-  data.tar.gz: 2c54d74ec0ab3894b3e17316a5eef9c6fbb0ab1de7a5d53c7142fd3b8024a9e8
+  metadata.gz: 281388666c8cb872b46f3ce068940e8718006d27375c7a81b5281e09e8a250de
+  data.tar.gz: e3b4d990cc8c9d48954531eeb3234efadc0d46ab2a63fdf34cce3f1e8ce218ac
 SHA512:
-  metadata.gz: 2790f246820f9cc250f9f652af4a70ce6485dd2b9622272cfbeb057ad7fda6e3c54959dca39d3e2751fe1f89c1c917089a62e00d2075c5a8fd239df359d9bbe7
-  data.tar.gz: 5e9fbac977443415c373f2bba7ec3243052974512aadf5c5caa38d32be93399ac5cc65fb8cd586582c2ac6405d10879396e540d37f144d2ac650d8a4fb0f4f47
+  metadata.gz: 7c2b5c039a5c8716aaeb1f4e6a1aad7bf61aeee5994cb567e425a3580050d282e473e033037a603ceb85feeef1a84fcb8d0f3d056e5916d97bd2bcec54398e79
+  data.tar.gz: e58b0d302e3d6ff10a2ae6866e55640819512d6309e06a595138a91ee61e3ff1789abd898dfe233245d97a49dcf366d6014d5d5b8f5ba9d1723c6aa0ebbebb97

data/README.rdoc

@@ -4,7 +4,7 @@
 
 Padrino has a beautiful Admin management dashboard with these features:
 
-Orm Agnostic:: Data Adapters for Activerecord, MiniRecord, Sequel, Mongoid, Ohm, Dynamoid
+Orm Agnostic:: Data Adapters for Activerecord, Sequel, Mongoid
 Template Agnostic:: Erb, Erubis and Haml Renderer
 Authentication:: Support for Account authentication, Account Permission management
 Scaffold:: You can simply create a new "admin interface" by providing a Model

data/Rakefile

@@ -1,22 +1 @@
 require_relative '../gem_rake_helper'
-
-namespace :bootstrap do
-  desc 'Compile bootstrap assets'
-  task :compile do
-    puts 'Implement'
-  end
-
-  desc 'Compile css'
-  task :css do
-    require 'less'
-    src = File.join(__dir__, 'lib', 'padrino-admin', 'bootstrap-less', 'padrino-admin.less')
-    out = File.join(__dir__, 'lib', 'padrino-admin', 'generators', 'templates', 'assets', 'stylesheets', 'bootstrap.css')
-    css = Less::Parser.new(paths: [File.dirname(src)]).parse(File.read(src)).to_css(compress: true)
-    File.open(out, 'w') { |file| file.write css }
-    puts "Generated #{out}"
-  end
-
-  desc 'Compile js'
-  task :js do
-  end
-end

data/lib/padrino-admin/access_control.rb

@@ -104,7 +104,8 @@ module Padrino
         #
         def allowed?(account = nil, path = nil)
           path = '/' if path.nil? || path.empty?
-          path = Rack::Utils.unescape_path(path.b).force_encoding(Encoding::UTF_8) # compare the decoded path
+          # Compare the decoded path; scrub invalid UTF-8 ('/%ff') so Regexp rules can match it.
+          path = Rack::Utils.unescape_path(path.b).force_encoding(Encoding::UTF_8).scrub
           role = account.role.to_sym rescue nil
           authorizations = @authorizations.find_all { |auth| auth.roles.include?(:any) }
           allowed_paths  = authorizations.map(&:allowed).flatten.uniq
@@ -187,7 +188,7 @@ module Padrino
         # Returns the name of the project module humanize them for you.
         #
         def human_name
-          @name.to_s.humanize
+          Padrino::Inflections.humanize(@name)
         end
 
         ##

data/lib/padrino-admin/generators/actions.rb

@@ -27,7 +27,7 @@ module Padrino
         # Tell us for now which orm we support
         #
         def supported_orm
-          %i[minirecord activerecord mongoid sequel ohm dynamoid]
+          %i[activerecord mongoid sequel]
         end
 
         ##

data/lib/padrino-admin/generators/admin_app.rb

@@ -76,7 +76,7 @@ module Padrino
           RUBY
 
           unless options[:destroy]
-            insert_middleware 'ConnectionPoolManagement', @admin_path if %i[minirecord activerecord].include?(orm)
+            insert_middleware 'ConnectionPoolManagement', @admin_path if orm == :activerecord
           end
 
           params = [
@@ -150,7 +150,6 @@ module Padrino
             instructions << "Run 'bundle exec rake db:create' if you have not created a database yet"
             instructions << "Run 'bundle exec rake db:migrate'"
           end
-          instructions << "Now repeat after me... 'ohm mani padme hum', 'ohm mani padme hum'... :)" if orm == :ohm
           instructions << "Run 'bundle exec rake db:seed'"
           instructions << "Visit the admin panel in the browser at '/#{@admin_path}'"
           instructions.map! { |i| "  #{instructions.index(i) + 1}) #{i}" }

data/lib/padrino-admin/generators/admin_page.rb

@@ -41,6 +41,11 @@ module Padrino
       def create_controller
         self.destination_root = options[:root]
         if in_app_root?
+          unless supported_orm.include?(orm)
+            say "<= At the moment, Padrino only supports #{supported_orm.join(' or ')}. Sorry!", :yellow
+            exit 1
+          end
+
           @app_name = fetch_app_name
           @admin_name = options[:admin_name].classify
           @admin_path = options[:admin_name].underscore

data/lib/padrino-admin/generators/orm.rb

@@ -4,19 +4,17 @@ module Padrino
     # Contains all admin related generator functionality.
     #
     module Generators
-      # Defines a generic exception for the admin ORM handler.
-      class OrmError < StandardError; end
+      # Defines a generic exception for the admin ORM handler. A Thor::Error, so the
+      # generators print its message without a backtrace and exit with status 1.
+      class OrmError < Thor::Error; end
 
       ##
       # Defines the generic ORM management functions used to manipulate data for admin.
       class Orm
         MODEL_BASES = {
           activerecord: 'ActiveRecord::Base',
-          minirecord: 'ActiveRecord::Base',
           mongoid: 'Mongoid::Document',
-          sequel: 'Sequel::Model',
-          ohm: 'Ohm::Model',
-          dynamoid: 'Dynamoid::Document'
+          sequel: 'Sequel::Model'
         }.freeze
 
         attr_reader :klass_name, :klass, :name_plural, :name_singular, :orm, :name_param
@@ -31,13 +29,13 @@ module Padrino
           @orm            = orm.to_sym
           @columns        = columns
           @column_fields  = column_fields
-          raise OrmError, "Model '#{klass_name}' could not be found!\nPerhaps you would like to run 'bundle exec padrino g model #{klass_name}' to create it first?" if @columns.nil? && @klass.nil?
         end
 
-        # Raises OrmError when the model does not belong to the project's orm. Only needed when
-        # reading the model's columns to generate a page, so destroying a page skips it.
+        # Raises OrmError when the model is missing or does not belong to the project's orm. Only
+        # needed when reading the model's columns to generate a page, so destroying a page skips it.
         def check_model_orm
           return unless @columns.nil?
+          raise OrmError, "Model '#{klass_name}' could not be found!\nPerhaps you would like to run 'bundle exec padrino g model #{klass_name}' to create it first?" if @klass.nil?
 
           base = MODEL_BASES[orm]
           return if base.nil? || @klass.ancestors.any? { |mod| mod.name == base }
@@ -46,10 +44,7 @@ module Padrino
         end
 
         def activerecord?
-          case orm
-          when :activerecord, :minirecord then true
-          else false
-          end
+          orm == :activerecord
         end
 
         def field_type(type)
@@ -71,11 +66,8 @@ module Padrino
           @columns ||=
             case orm
             when :activerecord then @klass.columns
-            when :minirecord   then @klass.columns
             when :mongoid      then @klass.fields.values.reject { |col| %w[_id _type].include?(col.name) }
             when :sequel       then @klass.db_schema.map { |k, v| v[:type] = :text if v[:db_type] =~ /^text/i; Column.new(k, v[:type]) }
-            when :ohm          then @klass.attributes.map { |a| Column.new(a.to_s, :string) } # ohm has strings
-            when :dynamoid     then @klass.attributes.map { |k, v| Column.new(k.to_s, v[:type]) }
             else raise OrmError, "Adapter #{orm} is not yet supported!"
             end
         end
@@ -95,8 +87,8 @@ module Padrino
 
         def find(params = nil)
           case orm
-          when :activerecord, :minirecord, :mongoid, :dynamoid then "#{klass_name}.find(#{params})"
-          when :sequel, :ohm then "#{klass_name}[#{params}]"
+          when :activerecord, :mongoid then "#{klass_name}.find(#{params})"
+          when :sequel then "#{klass_name}[#{params}]"
           else raise OrmError, "Adapter #{orm} is not yet supported!"
           end
         end
@@ -115,39 +107,36 @@ module Padrino
 
         def update_attributes(params = nil)
           case orm
-          when :mongoid, :dynamoid then "@#{name_singular}.update_attributes(#{params})"
-          when :activerecord, :minirecord, :ohm then "@#{name_singular}.update(#{params})"
+          when :mongoid then "@#{name_singular}.update_attributes(#{params})"
+          when :activerecord then "@#{name_singular}.update(#{params})"
           when :sequel then "@#{name_singular}.modified! && @#{name_singular}.update(#{params})"
           else raise OrmError, "Adapter #{orm} is not yet supported!"
           end
         end
 
         def destroy
-          orm == :ohm ? "#{name_singular}.delete" : "#{name_singular}.destroy"
+          "#{name_singular}.destroy"
         end
 
         def find_by_ids(params = nil)
           case orm
-          when :ohm then "#{klass_name}.fetch(#{params})"
           when :sequel then "#{klass_name}.where(id: #{params})"
           when :mongoid then "#{klass_name}.find(#{params})"
-          when :dynamoid then "#{klass_name}.find(#{params})"
           else find(params)
           end
         end
 
         def multiple_destroy(params = nil)
           case orm
-          when :ohm then "#{params}.each(&:delete)"
           when :sequel then "#{params}.destroy"
-          when :mongoid, :dynamoid then "#{params}.each(&:destroy)"
+          when :mongoid then "#{params}.each(&:destroy)"
           else "#{klass_name}.destroy #{params}"
           end
         end
 
         def has_error(field)
           case orm
-          when :ohm, :sequel then "@#{name_singular}.errors.key?(:#{field}) && @#{name_singular}.errors[:#{field}].count > 0"
+          when :sequel then "@#{name_singular}.errors.key?(:#{field}) && @#{name_singular}.errors[:#{field}].count > 0"
           else "@#{name_singular}.errors.include?(:#{field})"
           end
         end

data/lib/padrino-admin/generators/templates/account/mongoid.rb.tt

@@ -27,7 +27,7 @@ class <%= @model_name %>
   # This method is for authentication purpose.
   #
   def self.authenticate(email, password)
-    account = where(email: /#{Object::Regexp.escape(email)}/i).first if email.present?
+    account = where(email: /\A#{Object::Regexp.escape(email)}\z/i).first if email.present?
     account if account&.has_password?(password)
   end
 

data/lib/padrino-admin/generators/templates/app/controllers/sessions.rb.tt

@@ -7,14 +7,6 @@
     if account = <%= @model_name %>.authenticate(params[:email], params[:password])
       set_current_account(account)
       redirect url(:base, :index)
-    elsif Padrino.env == :development && params[:bypass]
-      <%- if @orm == :ohm -%>
-      account = <%= @model_name %>.all.first
-      <%- else -%>
-      account = <%= @model_name %>.first
-      <%- end -%>
-      set_current_account(account)
-      redirect url(:base, :index)
     else
       params[:email] = h(params[:email])
       flash.now[:error] = pat('login.error')

data/lib/padrino-admin/generators/templates/app.rb.tt

@@ -26,8 +26,10 @@ module <%= @app_name %>
     set :admin_model, '<%= @model_name %>'
     set :login_page,  '/sessions/new'
 
-    set :sessions, same_site: :lax
-    # set :sessions, same_site: :lax, secure: true # Send the session cookie over HTTPS only
+    # The session cookie is Secure (sent over HTTPS only) in production. Over plain HTTP
+    # the app then sends no session cookie, so logins and CSRF-protected forms fail. Behind
+    # a proxy that terminates TLS, have it send X-Forwarded-Proto: https, or set secure: false.
+    set :sessions, same_site: :lax, secure: Padrino.env == :production
     disable :store_location
 
     access_control.roles_for :any do |role|

data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/affix.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: affix.js v3.1.0
- * http://getbootstrap.com/javascript/#affix
+ * Bootstrap: affix.js v3.4.1
+ * https://getbootstrap.com/docs/3.4/javascript/#affix
  * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2019 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
@@ -15,28 +15,56 @@
 
   var Affix = function (element, options) {
     this.options = $.extend({}, Affix.DEFAULTS, options)
-    this.$window = $(window)
+
+    var target = this.options.target === Affix.DEFAULTS.target ? $(this.options.target) : $(document).find(this.options.target)
+
+    this.$target = target
       .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
       .on('click.bs.affix.data-api',  $.proxy(this.checkPositionWithEventLoop, this))
 
     this.$element     = $(element)
-    this.affixed      =
-    this.unpin        =
+    this.affixed      = null
+    this.unpin        = null
     this.pinnedOffset = null
 
     this.checkPosition()
   }
 
-  Affix.RESET = 'affix affix-top affix-bottom'
+  Affix.VERSION  = '3.4.1'
+
+  Affix.RESET    = 'affix affix-top affix-bottom'
 
   Affix.DEFAULTS = {
-    offset: 0
+    offset: 0,
+    target: window
+  }
+
+  Affix.prototype.getState = function (scrollHeight, height, offsetTop, offsetBottom) {
+    var scrollTop    = this.$target.scrollTop()
+    var position     = this.$element.offset()
+    var targetHeight = this.$target.height()
+
+    if (offsetTop != null && this.affixed == 'top') return scrollTop < offsetTop ? 'top' : false
+
+    if (this.affixed == 'bottom') {
+      if (offsetTop != null) return (scrollTop + this.unpin <= position.top) ? false : 'bottom'
+      return (scrollTop + targetHeight <= scrollHeight - offsetBottom) ? false : 'bottom'
+    }
+
+    var initializing   = this.affixed == null
+    var colliderTop    = initializing ? scrollTop : position.top
+    var colliderHeight = initializing ? targetHeight : height
+
+    if (offsetTop != null && scrollTop <= offsetTop) return 'top'
+    if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom'
+
+    return false
   }
 
   Affix.prototype.getPinnedOffset = function () {
     if (this.pinnedOffset) return this.pinnedOffset
     this.$element.removeClass(Affix.RESET).addClass('affix')
-    var scrollTop = this.$window.scrollTop()
+    var scrollTop = this.$target.scrollTop()
     var position  = this.$element.offset()
     return (this.pinnedOffset = position.top - scrollTop)
   }
@@ -48,43 +76,41 @@
   Affix.prototype.checkPosition = function () {
     if (!this.$element.is(':visible')) return
 
-    var scrollHeight = $(document).height()
-    var scrollTop    = this.$window.scrollTop()
-    var position     = this.$element.offset()
+    var height       = this.$element.height()
     var offset       = this.options.offset
     var offsetTop    = offset.top
     var offsetBottom = offset.bottom
-
-    if (this.affixed == 'top') position.top += scrollTop
+    var scrollHeight = Math.max($(document).height(), $(document.body).height())
 
     if (typeof offset != 'object')         offsetBottom = offsetTop = offset
     if (typeof offsetTop == 'function')    offsetTop    = offset.top(this.$element)
     if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
 
-    var affix = this.unpin   != null && (scrollTop + this.unpin <= position.top) ? false :
-                offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' :
-                offsetTop    != null && (scrollTop <= offsetTop) ? 'top' : false
+    var affix = this.getState(scrollHeight, height, offsetTop, offsetBottom)
 
-    if (this.affixed === affix) return
-    if (this.unpin) this.$element.css('top', '')
+    if (this.affixed != affix) {
+      if (this.unpin != null) this.$element.css('top', '')
 
-    var affixType = 'affix' + (affix ? '-' + affix : '')
-    var e         = $.Event(affixType + '.bs.affix')
+      var affixType = 'affix' + (affix ? '-' + affix : '')
+      var e         = $.Event(affixType + '.bs.affix')
 
-    this.$element.trigger(e)
+      this.$element.trigger(e)
 
-    if (e.isDefaultPrevented()) return
+      if (e.isDefaultPrevented()) return
 
-    this.affixed = affix
-    this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
+      this.affixed = affix
+      this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
 
-    this.$element
-      .removeClass(Affix.RESET)
-      .addClass(affixType)
-      .trigger($.Event(affixType.replace('affix', 'affixed')))
+      this.$element
+        .removeClass(Affix.RESET)
+        .addClass(affixType)
+        .trigger(affixType.replace('affix', 'affixed') + '.bs.affix')
+    }
 
     if (affix == 'bottom') {
-      this.$element.offset({ top: scrollHeight - offsetBottom - this.$element.height() })
+      this.$element.offset({
+        top: scrollHeight - height - offsetBottom
+      })
     }
   }
 
@@ -92,9 +118,7 @@
   // AFFIX PLUGIN DEFINITION
   // =======================
 
-  var old = $.fn.affix
-
-  $.fn.affix = function (option) {
+  function Plugin(option) {
     return this.each(function () {
       var $this   = $(this)
       var data    = $this.data('bs.affix')
@@ -105,6 +129,9 @@
     })
   }
 
+  var old = $.fn.affix
+
+  $.fn.affix             = Plugin
   $.fn.affix.Constructor = Affix
 
 
@@ -127,10 +154,10 @@
 
       data.offset = data.offset || {}
 
-      if (data.offsetBottom) data.offset.bottom = data.offsetBottom
-      if (data.offsetTop)    data.offset.top    = data.offsetTop
+      if (data.offsetBottom != null) data.offset.bottom = data.offsetBottom
+      if (data.offsetTop    != null) data.offset.top    = data.offsetTop
 
-      $spy.affix(data)
+      Plugin.call($spy, data)
     })
   })
 

data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/alert.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: alert.js v3.1.0
- * http://getbootstrap.com/javascript/#alerts
+ * Bootstrap: alert.js v3.4.1
+ * https://getbootstrap.com/docs/3.4/javascript/#alerts
  * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2019 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
@@ -18,6 +18,10 @@
     $(el).on('click', dismiss, this.close)
   }
 
+  Alert.VERSION = '3.4.1'
+
+  Alert.TRANSITION_DURATION = 150
+
   Alert.prototype.close = function (e) {
     var $this    = $(this)
     var selector = $this.attr('data-target')
@@ -27,12 +31,13 @@
       selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
     }
 
-    var $parent = $(selector)
+    selector    = selector === '#' ? [] : selector
+    var $parent = $(document).find(selector)
 
     if (e) e.preventDefault()
 
     if (!$parent.length) {
-      $parent = $this.hasClass('alert') ? $this : $this.parent()
+      $parent = $this.closest('.alert')
     }
 
     $parent.trigger(e = $.Event('close.bs.alert'))
@@ -42,13 +47,14 @@
     $parent.removeClass('in')
 
     function removeElement() {
-      $parent.trigger('closed.bs.alert').remove()
+      // detach from parent, fire event then clean up data
+      $parent.detach().trigger('closed.bs.alert').remove()
     }
 
     $.support.transition && $parent.hasClass('fade') ?
       $parent
-        .one($.support.transition.end, removeElement)
-        .emulateTransitionEnd(150) :
+        .one('bsTransitionEnd', removeElement)
+        .emulateTransitionEnd(Alert.TRANSITION_DURATION) :
       removeElement()
   }
 
@@ -56,9 +62,7 @@
   // ALERT PLUGIN DEFINITION
   // =======================
 
-  var old = $.fn.alert
-
-  $.fn.alert = function (option) {
+  function Plugin(option) {
     return this.each(function () {
       var $this = $(this)
       var data  = $this.data('bs.alert')
@@ -68,6 +72,9 @@
     })
   }
 
+  var old = $.fn.alert
+
+  $.fn.alert             = Plugin
   $.fn.alert.Constructor = Alert