padrino-admin 0.16.2 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b9ada1e1445197975d4474ddd29280709f9587fa4733daa4f539c9ca735b5dc
-  data.tar.gz: c59747b4b8ea966625bc9b41cac768b40e9afcefe4381943eca24f9fc94fa0f0
+  metadata.gz: c033740234fd9e4af9f6c01e8af2090eed03e89faaaf5ba0a1dd9f49d2b53701
+  data.tar.gz: b94058c0063610c456ca57fbc873074c21ebf5e968a644a63cf8ef2ea1decfd8
 SHA512:
-  metadata.gz: 7aff29502db814e8c6ea8eb29c5c4604d9b7c8699740dabdd69dbe5a74a0a2c66fc73b8a5de11ab30ba2c6f0a917da932eedca7133b14396e1fda832a0edb1db
-  data.tar.gz: b2caaa43c99d3684fd0c6698fb1eca36b98b2198bb54a0785af0080c711f1a1a7efe94b60891a007a02fecf4258e61ad7d676637b5b7befefa1a44108c896f1e
+  metadata.gz: 1fb1835134b7dea8f57e7d575f0e46d9512ebaf167e8305c16143c2c0c072af41c63f61fc154ab359ee3ad32f71860da728e766a6c79cd413027e035a457531b
+  data.tar.gz: 2076c252e57b13dcdfb6a66ee01219114aa1ab6fbf758036fea60b6b3c9e20582072b9c2fe5f298c6acbc6ee979983f4fe1a26d0a37a28a05bd3243f0a9a6f85

data/README.rdoc

@@ -4,7 +4,7 @@
 
 Padrino has a beautiful Admin management dashboard with these features:
 
-Orm Agnostic:: Data Adapters for Datamapper, Activerecord, Sequel, Mongomapper, Mongoid, Couchrest, 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
@@ -27,7 +27,7 @@ Create the admin subapplication:
 Next, follow the admin setup steps:
 
 * configure your <tt>config/database.rb</tt> to connect to the correct data.
-* run <tt>padrino rake dm:migrate</tt> # or ar:migrate if you use activerecord
+* run <tt>padrino rake ar:migrate</tt> # if you use activerecord
 * run <tt>padrino rake seed</tt>
 
 Your admin panel now is ready and you can start your server with <tt>padrino start</tt> and point your browser to <tt>/admin</tt>!
@@ -35,7 +35,7 @@ Your admin panel now is ready and you can start your server with <tt>padrino sta
 To create a new "scaffold" you need to provide only a Model name to the command:
 
   demo$ padrino-gen model post --skip-migration # edit your post.rb model and add some fields
-  demo$ padrino-gen rake dm:auto:migrate
+  demo$ padrino-gen rake ar:migrate
   demo$ padrino-gen admin_page post
   demo$ padrino start # and go to http://localhost:3000/admin
 

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

@@ -44,7 +44,7 @@ module Padrino
         # We map project modules for a given role or roles.
         #
         def roles_for(*roles, &block)
-          raise Padrino::Admin::AccessControlError, "Role #{role} must be present and must be a symbol!" if roles.any? { |r| !r.is_a?(Symbol) } || roles.empty?
+          raise Padrino::Admin::AccessControlError, "Role #{roles.inspect} must be present and must be a symbol!" if roles.any? { |r| !r.is_a?(Symbol) } || roles.empty?
           raise Padrino::Admin::AccessControlError, "You can't merge :any with other roles" if roles.size > 1 && roles.any? { |r| r == :any }
 
           @roles += roles
@@ -104,6 +104,8 @@ module Padrino
         #
         def allowed?(account = nil, path = nil)
           path = '/' if path.nil? || path.empty?
+          # 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
@@ -118,10 +120,21 @@ module Padrino
             denied_paths  += authorizations.map(&:allowed).flatten.uniq # remove paths explicitly allowed for other roles
             denied_paths  += authorizations.map(&:denied).flatten.uniq # remove paths explicitly denied to other roles
           end
-          return true  if allowed_paths.any? { |p| path =~ /^#{p}/ }
-          return false if denied_paths.any?  { |p| path =~ /^#{p}/ }
+          return true  if allowed_paths.any? { |p| path_within?(path, p) }
+          return false if denied_paths.any?  { |p| path.start_with?(p) } # loose on purpose: fails closed
           true
         end
+
+        private
+
+        # An allowed path covers itself, its sub-paths and its formats ('/posts' allows '/posts',
+        # '/posts/1' and '/posts.json'), but not unrelated paths that merely start with it ('/posts_admin').
+        # A Regexp matches at the start of the path, as on the deny side.
+        def path_within?(path, prefix)
+          return path.start_with?(prefix) if prefix.is_a?(Regexp) || prefix.end_with?('/', '.')
+
+          path == prefix || path.start_with?("#{prefix}/", "#{prefix}.")
+        end
       end
 
       ###
@@ -175,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 datamapper activerecord mongomapper mongoid couchrest sequel ohm dynamoid]
+          %i[activerecord mongoid sequel]
         end
 
         ##

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

@@ -34,7 +34,6 @@ module Padrino
       class_option :renderer,       type: :string,  aliases: '-e',                     desc: 'Rendering engine (erb, haml, slim)'
       class_option :admin_model,    type: :string,  aliases: '-m', default: 'Account', desc: 'The name of model for access controlling'
       class_option :admin_name,     type: :string,  aliases: '-a', default: 'admin',   desc: 'The admin application name and path'
-      # class_option :models_path,     desc: 'The models destination path', default: '.', type: :string
 
       # Copies over the Padrino base admin application.
       def create_admin
@@ -42,13 +41,13 @@ module Padrino
         if in_app_root?
           unless supported_orm.include?(orm)
             say "<= At the moment, Padrino only supports #{supported_orm.join(' or ')}. Sorry!", :yellow
-            raise SystemExit
+            exit 1
           end
 
           tmp_ext = options[:renderer] || fetch_component_choice(:renderer)
           unless supported_ext.include?(tmp_ext.to_sym)
             say "<= You are using '#{tmp_ext}' and for admin we only support '#{supported_ext.join(', ')}'. Please use #{supported_ext.map { |ext| "-e #{ext}" }.join(' or ')}", :yellow
-            raise SystemExit
+            exit 1
           end
 
           # Get the app's namespace.
@@ -77,19 +76,19 @@ module Padrino
           RUBY
 
           unless options[:destroy]
-            insert_middleware 'ConnectionPoolManagement', @admin_path if %i[minirecord activerecord].include?(orm)
-            insert_middleware 'IdentityMap', @admin_path if orm == :datamapper
+            insert_middleware 'ConnectionPoolManagement', @admin_path if orm == :activerecord
           end
 
           params = [
             @model_singular, 'name:string', 'surname:string', 'email:string', 'crypted_password:string', 'role:string',
-            "-a=#{options[:models_path]}",
             "-r=#{options[:root]}"
           ]
           params << '-s' if options[:skip_migration]
           params << '-d' if options[:destroy]
 
-          Padrino::Generators::Model.start(params)
+          # An existing model is reused: the model generator would refuse it and exit 1.
+          model_exists = already_exists?(@model_name, fetch_component_choice(:namespace))
+          Padrino::Generators::Model.start(params) if options[:destroy] || !model_exists
           column = Struct.new(:name, :type)
           columns = %i[id name surname email].map { |col| column.new(col) }
           column_fields = [
@@ -102,7 +101,7 @@ module Padrino
           ]
 
           unless options[:destroy]
-            admin_app = Padrino::Generators::AdminPage.new([@model_singular], root: options[:root], destroy: options[:destroy], admin_model: @model_singular, admin_name: @admin_name)
+            admin_app = Padrino::Generators::AdminPage.new([@model_singular], root: options[:root], destroy: options[:destroy], admin_model: @model_singular, admin_name: options[:admin_name])
             admin_app.default_orm = Padrino::Admin::Generators::Orm.new(@model_singular, orm, columns, column_fields)
             admin_app.invoke_all
           end
@@ -147,11 +146,10 @@ module Padrino
 
           instructions = []
           instructions << "Run 'bundle'"
-          if %i[activerecord datamapper sequel].include?(orm)
+          if %i[activerecord sequel].include?(orm)
             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}" }
@@ -164,7 +162,7 @@ module Padrino
           say '=' * 65, :green
           say
         else
-          say 'You are not at the root of a Padrino application! (config/boot.rb not found)'
+          exit_outside_app_root!
         end
       end
     end

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

@@ -41,13 +41,23 @@ 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
+          check_app_existence(@admin_path)
           @admin_model = options[:admin_model]
           models.each do |model|
             @orm = default_orm || Padrino::Admin::Generators::Orm.new(model, adapter)
-            self.behavior = :revoke if options[:destroy]
+            if options[:destroy]
+              self.behavior = :revoke
+            else
+              @orm.check_model_orm
+            end
             empty_directory destination_root("#{@admin_path}/views/#{@orm.name_plural}")
 
             template 'templates/page/controller.rb.tt',       destination_root("#{@admin_path}/controllers/#{@orm.name_plural}.rb")
@@ -59,7 +69,7 @@ module Padrino
             options[:destroy] ? remove_project_module(@orm.name_plural) : add_project_module(@orm.name_plural)
           end
         else
-          say 'You are not at the root of a Padrino application! (config/boot.rb not found)'
+          exit_outside_app_root!
         end
       end
     end

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

@@ -4,12 +4,19 @@ 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',
+          mongoid: 'Mongoid::Document',
+          sequel: 'Sequel::Model'
+        }.freeze
+
         attr_reader :klass_name, :klass, :name_plural, :name_singular, :orm, :name_param
 
         def initialize(name, orm, columns = nil, column_fields = nil)
@@ -22,18 +29,26 @@ 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 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 }
+
+          raise OrmError, "Model '#{klass_name}' is not based on #{base} but the project orm is #{orm}!\nCheck the orm in your .components file."
         end
 
         def activerecord?
-          case orm
-          when :activerecord, :minirecord then true
-          else false
-          end
+          orm == :activerecord
         end
 
         def field_type(type)
-          type = :string if type.nil? # couchrest-Hack to avoid the next line to fail
+          type = :string if type.nil?
           type = type.to_s.demodulize.downcase.to_sym unless type.is_a?(Symbol)
 
           case type
@@ -51,37 +66,12 @@ module Padrino
           @columns ||=
             case orm
             when :activerecord then @klass.columns
-            when :minirecord   then @klass.columns
-            when :datamapper   then @klass.properties.map { |p| dm_column(p) }
-            when :couchrest    then @klass.properties
             when :mongoid      then @klass.fields.values.reject { |col| %w[_id _type].include?(col.name) }
-            when :mongomapper  then @klass.keys.values.reject { |key| key.name == '_id' } # On MongoMapper keys are an hash
             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
 
-        def dm_column(property)
-          case property
-          when DataMapper::Property::Text
-            Column.new(property.name, :text)
-          when DataMapper::Property::Boolean
-            Column.new(property.name, :boolean)
-          when DataMapper::Property::Integer
-            Column.new(property.name, :integer)
-          when DataMapper::Property::Decimal
-            Column.new(property.name, :decimal)
-          when DataMapper::Property::Float
-            Column.new(property.name, :float)
-          when DataMapper::Property::String
-            Column.new(property.name, :string)
-          else # if all fails, lets assume its string-ish
-            Column.new(property.name, :string)
-          end
-        end
-
         def column_fields
           excluded_columns = %w[created_at updated_at] << (orm == :mongoid ? '_id' : 'id')
           column_fields    = columns.dup
@@ -97,9 +87,8 @@ module Padrino
 
         def find(params = nil)
           case orm
-          when :activerecord, :minirecord, :mongomapper, :mongoid, :dynamoid then "#{klass_name}.find(#{params})"
-          when :datamapper, :couchrest then "#{klass_name}.get(#{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
@@ -118,42 +107,36 @@ module Padrino
 
         def update_attributes(params = nil)
           case orm
-          when :mongomapper, :mongoid, :couchrest, :dynamoid then "@#{name_singular}.update_attributes(#{params})"
-          when :activerecord, :minirecord, :datamapper, :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 :datamapper then "#{klass_name}.all(id: #{params})"
           when :sequel then "#{klass_name}.where(id: #{params})"
           when :mongoid then "#{klass_name}.find(#{params})"
-          when :couchrest then "#{klass_name}.all(keys: #{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 :datamapper then "#{params}.destroy"
-          when :couchrest, :mongoid, :mongomapper, :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 :datamapper, :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/seeds.rb.tt

@@ -5,8 +5,13 @@
 #   name = shell.ask("What's your name?")
 #   shell.say name
 #
-email     = shell.ask "Which email do you want use for logging into admin?"
-password  = shell.ask "Tell me the password to use:", echo: false
+if $stdin.tty?
+  email    = shell.ask "Which email do you want use for logging into admin?"
+  password = shell.ask "Tell me the password to use:", echo: false
+else
+  # Piped input (CI, Docker): the email and the password on two lines, not echoed.
+  email, password = 2.times.map { $stdin.gets.to_s.strip }
+end
 
 shell.say ""
 

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

@@ -8,11 +8,7 @@
       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

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

@@ -26,7 +26,10 @@ module <%= @app_name %>
     set :admin_model, '<%= @model_name %>'
     set :login_page,  '/sessions/new'
 
-    enable  :sessions
+    # 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)
     })
   })