diff --git a/.gitignore b/.gitignore index bfd750037..5e4cc583e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -.bundle Gemfile.lock +.bundle .rvmrc .yardoc *.rbc diff --git a/README.rdoc b/README.rdoc index 347614f06..bedc81364 100644 --- a/README.rdoc +++ b/README.rdoc @@ -81,4 +81,4 @@ The individual Padrino sub-gems also contain README's which outlines their funct == Copyright -Copyright (c) 2011 Padrino. See LICENSE for details. \ No newline at end of file +Copyright (c) 2011 Padrino. See LICENSE for details. diff --git a/load_paths.rb b/load_paths.rb index 38a8af2fe..e02cead5c 100644 --- a/load_paths.rb +++ b/load_paths.rb @@ -3,4 +3,4 @@ else require 'rubygems' end -require 'bundler/setup' \ No newline at end of file +require 'bundler/setup' diff --git a/padrino-admin/README.rdoc b/padrino-admin/README.rdoc index b7be5a7d2..d8491f9b2 100644 --- a/padrino-admin/README.rdoc +++ b/padrino-admin/README.rdoc @@ -67,4 +67,4 @@ For a more complete look at using the Admin panel functionality and access featu == Copyright -Copyright (c) 2011 Padrino. See LICENSE for details. \ No newline at end of file +Copyright (c) 2011 Padrino. See LICENSE for details. diff --git a/padrino-admin/lib/padrino-admin/access_control.rb b/padrino-admin/lib/padrino-admin/access_control.rb index f27dab770..bf20902c7 100644 --- a/padrino-admin/lib/padrino-admin/access_control.rb +++ b/padrino-admin/lib/padrino-admin/access_control.rb @@ -1,6 +1,6 @@ module Padrino module Admin - class AccessControlError < StandardError ## @private + class AccessControlError < StandardError # @private end ## # This module give to a padrino application an access control functionality @@ -22,7 +22,7 @@ def registered(app) end class Base - def initialize ## @private + def initialize # @private @roles, @authorizations, @project_modules = [], [], [] end @@ -80,7 +80,7 @@ def allowed?(account=nil, path=nil) class Authorization attr_reader :allowed, :denied, :project_modules, :roles - def initialize(*roles, &block) ## @private + def initialize(*roles, &block) # @private @roles = roles @allowed = [] @denied = [] @@ -117,7 +117,7 @@ def project_module(name, path) class ProjectModule attr_reader :name - def initialize(name, path) ## @private + def initialize(name, path) # @private @name, @path = name, path end @@ -146,4 +146,4 @@ def path(prefix=nil) end # ProjectModule end # AccessControl end # Admin -end # Padrino \ No newline at end of file +end # Padrino diff --git a/padrino-admin/lib/padrino-admin/generators/templates/account/activerecord.rb.tt b/padrino-admin/lib/padrino-admin/generators/templates/account/activerecord.rb.tt index 9e5fccee7..f8597c739 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/account/activerecord.rb.tt +++ b/padrino-admin/lib/padrino-admin/generators/templates/account/activerecord.rb.tt @@ -35,4 +35,4 @@ class Account < ActiveRecord::Base def password_required crypted_password.blank? || password.present? end -end \ No newline at end of file +end diff --git a/padrino-admin/lib/padrino-admin/generators/templates/account/couchrest.rb.tt b/padrino-admin/lib/padrino-admin/generators/templates/account/couchrest.rb.tt index a2e275adc..62eda8e8c 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/account/couchrest.rb.tt +++ b/padrino-admin/lib/padrino-admin/generators/templates/account/couchrest.rb.tt @@ -63,4 +63,4 @@ class Account < CouchRest::Model::Base errors.add(:email, "is not unique") end -end \ No newline at end of file +end diff --git a/padrino-admin/lib/padrino-admin/generators/templates/account/datamapper.rb.tt b/padrino-admin/lib/padrino-admin/generators/templates/account/datamapper.rb.tt index 7af690205..8ba1ffd98 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/account/datamapper.rb.tt +++ b/padrino-admin/lib/padrino-admin/generators/templates/account/datamapper.rb.tt @@ -52,4 +52,4 @@ class Account def encrypt_password self.crypted_password = ::BCrypt::Password.create(password) if password.present? end -end \ No newline at end of file +end diff --git a/padrino-admin/lib/padrino-admin/generators/templates/account/mongoid.rb.tt b/padrino-admin/lib/padrino-admin/generators/templates/account/mongoid.rb.tt index 4fa7d9fa6..f5ea6fecb 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/account/mongoid.rb.tt +++ b/padrino-admin/lib/padrino-admin/generators/templates/account/mongoid.rb.tt @@ -50,4 +50,4 @@ class Account def password_required crypted_password.blank? || self.password.present? end -end \ No newline at end of file +end diff --git a/padrino-admin/lib/padrino-admin/generators/templates/account/mongomapper.rb.tt b/padrino-admin/lib/padrino-admin/generators/templates/account/mongomapper.rb.tt index 330e4e8bb..3a5bbb681 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/account/mongomapper.rb.tt +++ b/padrino-admin/lib/padrino-admin/generators/templates/account/mongomapper.rb.tt @@ -43,4 +43,4 @@ class Account def password_required crypted_password.blank? || password.present? end -end \ No newline at end of file +end diff --git a/padrino-admin/lib/padrino-admin/generators/templates/account/seeds.rb.tt b/padrino-admin/lib/padrino-admin/generators/templates/account/seeds.rb.tt index 237cef4d2..b230f549c 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/account/seeds.rb.tt +++ b/padrino-admin/lib/padrino-admin/generators/templates/account/seeds.rb.tt @@ -25,4 +25,4 @@ else account.errors.full_messages.each { |m| shell.say " - #{m}" } end -shell.say "" \ No newline at end of file +shell.say "" diff --git a/padrino-admin/lib/padrino-admin/generators/templates/account/sequel.rb.tt b/padrino-admin/lib/padrino-admin/generators/templates/account/sequel.rb.tt index c9b3e3cd8..b5dc84ceb 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/account/sequel.rb.tt +++ b/padrino-admin/lib/padrino-admin/generators/templates/account/sequel.rb.tt @@ -49,4 +49,4 @@ class Account < ::Sequel::Model def password_required crypted_password.blank? || password.present? end -end \ No newline at end of file +end diff --git a/padrino-admin/lib/padrino-admin/generators/templates/app/controllers/base.rb b/padrino-admin/lib/padrino-admin/generators/templates/app/controllers/base.rb index d98538e77..73a00ee73 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/app/controllers/base.rb +++ b/padrino-admin/lib/padrino-admin/generators/templates/app/controllers/base.rb @@ -3,4 +3,4 @@ get :index, :map => "/" do render "base/index" end -end \ No newline at end of file +end diff --git a/padrino-admin/lib/padrino-admin/generators/templates/app/controllers/sessions.rb b/padrino-admin/lib/padrino-admin/generators/templates/app/controllers/sessions.rb index 1557faecf..cf500efe2 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/app/controllers/sessions.rb +++ b/padrino-admin/lib/padrino-admin/generators/templates/app/controllers/sessions.rb @@ -22,4 +22,4 @@ set_current_account(nil) redirect url(:sessions, :new) end -end \ No newline at end of file +end diff --git a/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/base.css b/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/base.css index f2fa5f761..321b59ef0 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/base.css +++ b/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/base.css @@ -92,4 +92,4 @@ ul.list li .item .avatar{float:left;margin:0 5px 5px 0;width:30px;height:30px;} #box .block h2{padding:10px 15px;margin:0;} #box .block .content{padding:10px 20px;} /* custom */ -.code{font-family: Courier, 'Courier New', monospace;color:#36393D;} \ No newline at end of file +.code{font-family: Courier, 'Courier New', monospace;color:#36393D;} diff --git a/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/amro/style.css b/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/amro/style.css index fc8b388ad..d7ddddd43 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/amro/style.css +++ b/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/amro/style.css @@ -361,4 +361,4 @@ ul.list li .item .avatar { -webkit-border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -} \ No newline at end of file +} diff --git a/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/blue/style.css b/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/blue/style.css index 0767a09e1..ba0d00988 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/blue/style.css +++ b/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/blue/style.css @@ -284,4 +284,4 @@ ul.list li .item .avatar { -webkit-border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -} \ No newline at end of file +} diff --git a/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/djime-cerulean/style.css b/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/djime-cerulean/style.css index f466bfa19..119abe6b0 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/djime-cerulean/style.css +++ b/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/djime-cerulean/style.css @@ -302,4 +302,4 @@ ul.list li .item .avatar { -webkit-border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -} \ No newline at end of file +} diff --git a/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/olive/style.css b/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/olive/style.css index aa6685fa3..d08e838d8 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/olive/style.css +++ b/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/olive/style.css @@ -342,4 +342,4 @@ ul.list li .item .avatar { -webkit-border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -} \ No newline at end of file +} diff --git a/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/orange/style.css b/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/orange/style.css index 0291bfe90..db54805f1 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/orange/style.css +++ b/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/orange/style.css @@ -266,4 +266,4 @@ ul.list li .item .avatar { -webkit-border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -} \ No newline at end of file +} diff --git a/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/reidb-greenish/style.css b/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/reidb-greenish/style.css index de81f9ea7..18c239ab2 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/reidb-greenish/style.css +++ b/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/reidb-greenish/style.css @@ -299,4 +299,4 @@ ul.list li .item .avatar { -webkit-border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -} \ No newline at end of file +} diff --git a/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/ruby/style.css b/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/ruby/style.css index 17959e1cb..4826d8773 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/ruby/style.css +++ b/padrino-admin/lib/padrino-admin/generators/templates/assets/stylesheets/themes/ruby/style.css @@ -278,4 +278,4 @@ ul.list li .item .avatar { -webkit-border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -} \ No newline at end of file +} diff --git a/padrino-admin/lib/padrino-admin/generators/templates/erb/app/base/_sidebar.erb.tt b/padrino-admin/lib/padrino-admin/generators/templates/erb/app/base/_sidebar.erb.tt index b6f348242..a9b2256f2 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/erb/app/base/_sidebar.erb.tt +++ b/padrino-admin/lib/padrino-admin/generators/templates/erb/app/base/_sidebar.erb.tt @@ -10,4 +10,4 @@