padrino-admin 0.9.6 → 0.9.7

data/README.rdoc

@@ -12,7 +12,7 @@ Access Control:: Supports authentication and role permissions for your applicati
 
 === Admin Dashboard Usage
 
-For a complete look at usage of the Admin dashboard functionality, be sure to check out the 
+For a complete look at usage of the Admin dashboard functionality, be sure to check out the
 {Padrino Admin}[http://wiki.github.com/padrino/padrino-framework/padrino-admin] guide.
 
 Create a new project:
@@ -38,7 +38,7 @@ To create a new "scaffold" you need to provide only a Model name to the command:
   demo$ padrino-gen rake dm:auto:migrate
   demo$ padrino-gen admin_page post
   demo$ padrino start # and go to http://localhost:3000/admin
-  
+
 That's all!!
 
 === Admin Access Control
@@ -62,7 +62,7 @@ by the admin access control features:
 In this example +if+ we visit urls that start with /+customer+/+orders+ or /+cart/checkout+ we will be redirected
 to our :+login_page+ "/login". Once we are correctly logged in we can visit these pages.
 
-For a more complete look at using the Admin panel functionality and access features, be sure to check out the 
+For a more complete look at using the Admin panel functionality and access features, be sure to check out the
 {Padrino Admin}[http://wiki.github.com/padrino/padrino-framework/padrino-admin] guide.
 
 == Copyright

data/Rakefile

@@ -33,7 +33,7 @@ end
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'test'
-  
+
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
@@ -67,7 +67,7 @@ Rake::RDocTask.new do |rdoc|
 end
 
 
-spec = Gem::Specification.new do |s| 
+spec = Gem::Specification.new do |s|
   s.name              = "foo"
   s.version           = "1.0.1"
   s.author            = "Davide D'Agostino"

data/VERSION

@@ -1 +1 @@
-0.9.6
+0.9.7

data/lib/padrino-admin.rb

@@ -8,31 +8,31 @@ Dir[File.dirname(__FILE__) + '/padrino-admin/{helpers,utils}/*.rb'].each { |file
 module Padrino
   ##
   # Padrino::Admin is beautiful Ajax Admin, with these fatures:
-  # 
+  #
   # Orm Agnostic:: Adapters for datamapper, activerecord, mongomapper, couchdb (now only: datamapper and activerecord)
   # Authentication:: Support for Account authentication, Account Permission managment
   # Scaffold:: You can simply create a new "admin interface" simply providing a Model
   # Ajax Uploads:: You can upload file, manage them and attach them to any model in a quick and simple way (coming soon)
-  # 
+  #
   module Admin; end
 end
 
 ##
 # We need to apply Padrino::Admin::Utils::Extensions
-# 
+#
 String.send(:include, Padrino::Admin::Utils::Crypt)
 
 ##
 # We need to add to Padrino::Application a +access_control+ class
-# 
+#
 Padrino::Application.extend(Padrino::Admin::AccessControl::ClassMethods)
 
 ##
 # Load our Padrino::Admin locales
-# 
+#
 I18n.load_path += Dir["#{File.dirname(__FILE__)}/padrino-admin/locale/**/*.yml"]
 
 ##
 # Now we need to add admin generators to padrino-gen
-# 
+#
 Padrino::Generators.load_paths << Dir[File.dirname(__FILE__) + '/padrino-admin/generators/{actions,orm,admin_app,admin_page}.rb']

data/lib/padrino-admin/access_control.rb

@@ -8,7 +8,7 @@ module Padrino
     module AccessControl
       ##
       # Method used by Padrino::Application when we register the extension
-      # 
+      #
       def self.registered(app)
         app.set :session_id, "_padrino_#{File.basename(Padrino.root)}_#{app.app_name}".to_sym
         app.helpers Padrino::Admin::Helpers::AuthenticationHelpers
@@ -18,9 +18,17 @@ module Padrino
 
       module ClassMethods #:nodoc:
         def inherited(base)
-          base.send(:cattr_accessor, :access_control)
-          base.send(:access_control=, Padrino::Admin::AccessControl::Base.new)
+          unless base.respond_to?(:access_control)
+            base.send(:cattr_accessor, :access_control)
+            base.send(:access_control=, Padrino::Admin::AccessControl::Base.new)
+          end
           super(base)
+          base.class_eval { class << self; alias_method_chain :reload!, :access_control; end }
+        end
+
+        def reload_with_access_control!
+          self.access_control = Padrino::Admin::AccessControl::Base.new
+          reload_without_access_control!
         end
       end
 
@@ -30,7 +38,7 @@ module Padrino
         end
         ##
         # We map project modules for a given role or roles
-        # 
+        #
         def roles_for(*roles, &block)
           raise Padrino::Admin::AccessControlError, "You must define an Account Model!" unless defined?(Account)
           raise Padrino::Admin::AccessControlError, "Role #{role} must be present and must be a symbol!" if roles.any? { |r| !r.kind_of?(Symbol) } || roles.empty?
@@ -42,14 +50,14 @@ module Padrino
 
         ##
         # Return an array of roles
-        # 
+        #
         def roles
           @roles.uniq.reject { |r| r == :any }
         end
 
         ##
         # Return an array of project_modules
-        # 
+        #
         def project_modules(account)
           role = account.role.to_sym rescue :any
           authorizations = @authorizations.find_all { |auth| auth.roles.include?(role) }
@@ -58,7 +66,7 @@ module Padrino
 
         ##
         # Return true if the given account is allowed to see the given path.
-        # 
+        #
         def allowed?(account=nil, path=nil)
           path = "/" if path.blank?
           role = account.role.to_sym rescue nil
@@ -92,21 +100,21 @@ module Padrino
 
         ##
         # Allow a specified path
-        # 
+        #
         def allow(path)
           @allowed << path unless @allowed.include?(path)
         end
 
         ##
         # Protect access from
-        # 
+        #
         def protect(path)
           @denied << path unless @denied.include?(path)
         end
 
         ##
         # Create a project module
-        # 
+        #
         def project_module(name, path)
           allow(path)
           @project_modules << ProjectModule.new(name, path)
@@ -115,7 +123,7 @@ module Padrino
 
       ##
       # Project Module class
-      # 
+      #
       class ProjectModule
         attr_reader :name
 
@@ -125,21 +133,21 @@ module Padrino
 
         ##
         # Returns the name of the project module. If a symbol it translate/humanize them for you.
-        # 
+        #
         def human_name
           @name.is_a?(Symbol) ? I18n.t("padrino.admin.menu.#{@name}", :default => @name.to_s.humanize) : @name
         end
 
         ##
         # Return the path of the project module. If a prefix given will be prepended.
-        # 
+        #
         # ==== Examples
-        # 
+        #
         #   # => /accounts/new
         #   project_module.path
         #   # => /admin/accounts
         #   project_module.path("/admin")
-        # 
+        #
         def path(prefix=nil)
           prefix ? File.join(prefix, @path) : @path
         end

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

@@ -4,7 +4,7 @@ module Padrino
       module Actions
         ##
         # Tell us which orm we are using
-        # 
+        #
         def orm
           fetch_component_choice(:orm).to_sym rescue :datamapper
         end
@@ -12,26 +12,18 @@ module Padrino
 
         ##
         # Tell us for now wich orm we support
-        # 
+        #
         def supported_orm
           [:datamapper, :activerecord, :mongomapper, :mongoid]
         end
 
         ##
         # Add access_control permission in our app.rb
-        # 
+        #
         def add_project_module(controller)
-          permission = indent(6, "role.project_module :#{controller}, \"/#{controller}\"\n")
+          permission = "      role.project_module :#{controller}, \"/#{controller}\"\n"
           inject_into_file destination_root("/admin/app.rb"),  permission, :after => "access_control.roles_for :admin do |role, account|\n"
         end
-
-        ##
-        # Indent a content/string for the given spaces
-        # 
-        def indent(count, content)
-          indent = ' ' * count
-          content.lines.map { |line| line != "\n" ? indent+line : "\n" }.join
-        end
       end # Actions
     end # Admin
   end # Generators

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

@@ -44,7 +44,6 @@ module Padrino
           say "You are not at the root of a Padrino application! (config/boot.rb not found)" and return unless in_app_root?
         end
       end
-    end
-
-  end
-end
+    end # AdminPage
+  end # Generators
+end # Padrino

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

@@ -17,7 +17,7 @@ class Account < ActiveRecord::Base
 
   ##
   # This method is for authentication purpose
-  # 
+  #
   def self.authenticate(email, password)
     account = first(:conditions => { :email => email }) if email.present?
     account && account.password_clean == password ? account : nil
@@ -25,7 +25,7 @@ class Account < ActiveRecord::Base
 
   ##
   # This method is used for retrive the original password.
-  # 
+  #
   def password_clean
     crypted_password.decrypt(salt)
   end

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

@@ -28,7 +28,7 @@ class Account
 
   ##
   # This method is for authentication purpose
-  # 
+  #
   def self.authenticate(email, password)
     account = first(:conditions => { :email => email }) if email.present?
     account && account.password_clean == password ? account : nil
@@ -43,7 +43,7 @@ class Account
 
   ##
   # This method is used for retrive the original password.
-  # 
+  #
   def password_clean
     crypted_password.decrypt(salt)
   end

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

@@ -26,7 +26,7 @@ class Account
 
   ##
   # This method is for authentication purpose
-  # 
+  #
   def self.authenticate(email, password)
     account = first(:conditions => { :email => email }) if email.present?
     account && account.password_clean == password ? account : nil
@@ -41,7 +41,7 @@ class Account
 
   ##
   # This method is used for retrive the original password.
-  # 
+  #
   def password_clean
     crypted_password.decrypt(salt)
   end

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

@@ -26,7 +26,7 @@ class Account
 
   ##
   # This method is for authentication purpose
-  # 
+  #
   def self.authenticate(email, password)
     account = first(:email => email) if email.present?
     account && account.password_clean == password ? account : nil
@@ -34,7 +34,7 @@ class Account
 
   ##
   # This method is used for retrive the original password.
-  # 
+  #
   def password_clean
     crypted_password.decrypt(salt)
   end

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

@@ -1,10 +1,10 @@
 # Seed add you the ability to populate your db.
 # We provide you a basic shell for interaction with the end user.
 # So try some code like below:
-# 
+#
 #   name = shell.ask("What's your name?")
 #   shell.say name
-# 
+#
 email     = shell.ask "Which email do you want use for loggin into admin?"
 password  = shell.ask "Tell me the password to use:"
 

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

@@ -2,7 +2,7 @@ class Admin < Padrino::Application
   configure do
     ##
     # Application-specific configuration options
-    # 
+    #
     # set :raise_errors, true     # Show exceptions (default for development)
     # set :public, "foo/bar"      # Location for static assets (default root/public)
     # set :sessions, false        # Enabled by default
@@ -14,7 +14,7 @@ class Admin < Padrino::Application
     # disable :flash              # Disables rack-flash (enabled by default)
     # enable  :authentication     # Enable padrino-admin authentication (disabled by default)
     # layout  :my_layout          # Layout can be in views/layouts/foo.ext or views/foo.ext (default :application)
-    # 
+    #
     enable  :authentication
     disable :store_location
     set :login_page, "/admin/sessions/new"

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

@@ -3,5 +3,4 @@ Admin.controllers  :base do
   get :index, :map => "(/)" do
     render "base/index"
   end
-
 end

data/lib/padrino-admin/generators/templates/erb/app/base/index.erb.tt

@@ -1,4 +1,4 @@
-<div class="block" id="block-text">  
+<div class="block" id="block-text">
   <div class="content">
     <h2 class="title">Dashboard</h2>
     <div class="inner">

data/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt

@@ -22,7 +22,7 @@
           <%% end %>
         </ul>
       </div>
-    </div>    
+    </div>
     <div id="wrapper" class="wat-cf">
       <div class="flash">
         <%%= [:error, :warning, :notice].map { |type| flash_tag(type, :class => "message #{type}") }.join %>
@@ -38,7 +38,7 @@
       <div id="sidebar">
         <%%= yield_content :sidebar %>
       </div>
-    </div>    
+    </div>
   </div>
 </body>
 </html>

data/lib/padrino-admin/generators/templates/erb/app/sessions/new.erb.tt

@@ -10,7 +10,7 @@
     <div id="box">
       <h1><%= options[:name] %></h1>
       <div class="block" id="block-login">
-        <h2>Login Box</h2>        
+        <h2>Login Box</h2>
         <div class="content login">
           <div class="flash">
             <%%= [:error, :warning, :notice].map { |type| flash_tag(type, :class => "message #{type}") }.join %>
@@ -22,7 +22,7 @@
               </div>
               <div class="right">
                 <%%= text_field_tag :email, :value => params[:email], :class => 'text_field' %>
-              </div>              
+              </div>
             </div>
             <div class="group wat-cf">
               <div class="left">
@@ -30,13 +30,13 @@
               </div>
               <div class="right">
                 <%%= password_field_tag :password, :value => params[:password], :class => 'text_field' %>
-              </div>              
+              </div>
             </div>
             <div class="group navform wat-cf">
               <div class="right">
                 <%%= submit_tag "Sign in", :class => :button %>
               </div>
-            </div>            
+            </div>
           <%% end %>
         </div>
       </div>

data/lib/padrino-admin/generators/templates/haml/app/base/_sidebar.haml.tt

@@ -2,7 +2,7 @@
   %h3 Simple Block
   .content
     %p
-      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. 
+      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
       Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
 .block
   %h3 Links

data/lib/padrino-admin/generators/templates/haml/app/base/index.haml.tt

@@ -3,8 +3,8 @@
     %h2.title Dashboard
     .inner
       %p.first
-        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. 
-        Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 
+        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+        Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
         Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
         %span.hightlight
           Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
@@ -16,8 +16,8 @@
           Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore
       %hr
       %p
-        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. 
-        Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 
+        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+        Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
         Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
         %span.hightlight
           Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

data/lib/padrino-admin/generators/templates/haml/app/layouts/application.haml.tt

@@ -24,7 +24,7 @@
           #footer
             .block
               %p
-                Copyright © 
+                Copyright ©
                 =Time.now.year
                 Your Site - Powered by
                 =link_to "Padrino v.#{Padrino.version}", "http://padrino.github.com", :target => :_blank

data/lib/padrino-admin/generators/templates/haml/page/index.haml.tt

@@ -20,7 +20,7 @@
             %td<%= ".first" if i==0 %>=<%= @orm.name_singular %>.<%= column.name %>
             <%- end -%>
             %td.last
-              =button_to pat(:edit), url(:<%= @orm.name_plural %>, :edit, :id => <%= @orm.name_singular %>.id), :method => :get, :class => :button_to 
+              =button_to pat(:edit), url(:<%= @orm.name_plural %>, :edit, :id => <%= @orm.name_singular %>.id), :method => :get, :class => :button_to
               ="|"
               =button_to pat(:delete), url(:<%= @orm.name_plural %>, :destroy, :id => <%= @orm.name_singular %>.id), :method => :delete, :class => :button_to
       .actions-bar.wat-cf

data/lib/padrino-admin/helpers/authentication_helpers.rb

@@ -4,25 +4,25 @@ module Padrino
       module AuthenticationHelpers
         ##
         # Returns true if +current_account+ is logged and active.
-        # 
+        #
         def logged_in?
           !current_account.nil?
         end
 
         ##
         # Returns the current_account, it's an instance of <tt>Account</tt> model
-        # 
+        #
         def current_account
           @current_account ||= login_from_session
         end
 
         ##
         # Override the current_account, you must provide an instance of Account Model
-        # 
+        #
         # ==== Examples:
-        # 
+        #
         #     set_current_account(Account.authenticate(params[:email], params[:password])
-        # 
+        #
         def set_current_account(account=nil)
           session[options.session_id] = account ? account.id : nil
           @current_account = account
@@ -30,16 +30,16 @@ module Padrino
 
         ##
         # Returns true if the +current_account+ is allowed to see the requested path
-        # 
+        #
         # For configure this role please refer to: +Padrino::Admin::AccessControl::Base+
-        # 
+        #
         def allowed?
           access_control.allowed?(current_account, request.path_info)
         end
 
         ##
         # Returns project modules for the current account
-        # 
+        #
         def project_modules
           access_control.project_modules(current_account)
         end
@@ -47,9 +47,9 @@ module Padrino
         ##
         # Returns a helper useful in a +before_filter+ for check if
         # an account are: +logged_in?+ and +allowed?+
-        # 
+        #
         # By default this method is used in Admin Apps.
-        # 
+        #
         def login_required
           store_location! if store_location
           return access_denied unless allowed?
@@ -57,7 +57,7 @@ module Padrino
 
         ##
         # Store in session[:return_to] the env['HTTP_REFERER']
-        # 
+        #
         def store_location!
           session[:return_to] = env['HTTP_REFERER']
         end
@@ -65,7 +65,7 @@ module Padrino
         ##
         # Redirect the account to the page that requested an authentication or
         # if the account is not allowed/logged return it to a default page
-        # 
+        #
         def redirect_back_or_default(default)
           return_to = session.delete(:return_to)
           redirect(return_to || default)

data/lib/padrino-admin/helpers/view_helpers.rb

@@ -4,15 +4,15 @@ module Padrino
       module ViewHelpers
         ##
         # Translate a given word for padrino admin
-        # 
+        #
         # ==== Examples
-        # 
+        #
         #   # => t("padrino.admin.profile",  :default => "Profile")
         #   pat(:profile)
-        # 
+        #
         #   # => t("padrino.admin.profile",  :default => "My Profile")
         #   pat(:profile, "My Profile")
-        # 
+        #
         def padrino_admin_translate(word, default=nil)
           t("padrino.admin.#{word}", :default => (default || word.to_s.humanize))
         end
@@ -20,12 +20,12 @@ module Padrino
 
         ##
         # Translate attribute name for the given model
-        # 
+        #
         # ==== Examples
-        # 
+        #
         #   # => t("models.account.email", :default => "Email")
         #   mat(:account, :email)
-        # 
+        #
         def model_attribute_translate(model, attribute)
           t("models.#{model}.attributes.#{attribute}", :default => attribute.to_s.humanize)
         end
@@ -33,12 +33,12 @@ module Padrino
 
         ##
         # Translate model name
-        # 
+        #
         # ==== Examples
-        # 
+        #
         #   # => t("models.account.name", :default => "Account")
         #   mt(:account)
-        # 
+        #
         def model_translate(model)
           t("models.#{model}.name", :default => model.to_s.humanize)
         end

data/lib/padrino-admin/locale/orm/de.yml

@@ -5,7 +5,7 @@ de:
         inclusion: "ist nicht in der Liste enthalten"
         exclusion: "ist reserviert"
         invalid: "ist ung¸ltig"
-        confirmation: "entspricht nicht der Best‰tigung" 
+        confirmation: "entspricht nicht der Best‰tigung"
         accepted: "muss akzeptiert werden"
         empty: "Darf nicht leer sein"
         blank: "Darf nicht nur Leerzeichen sein"

data/lib/padrino-admin/utils/crypt.rb

@@ -3,17 +3,23 @@ require 'openssl'
 module Padrino
   module Admin
     module Utils
+      ##
       # This util it's used for encrypt/decrypt password.
       # We want password decryptable because generally for our sites we have: password_lost.
       # We prefer send original password instead reset them.
+      #
       module Crypt
-        # Decrypts the current string using the current key and algorithm specified
+        ##
+        # Decrypts the current string using the current key specified
+        #
         def decrypt(password)
           cipher = build_cipher(:decrypt, password)
           cipher.update(self.unpack('m')[0]) + cipher.final
         end
 
+        ##
         # Encrypts the current string using the current key and algorithm specified
+        #
         def encrypt(password)
           cipher = build_cipher(:encrypt, password)
           [cipher.update(self) + cipher.final].pack('m').chomp
@@ -25,8 +31,7 @@ module Padrino
           cipher.pkcs5_keyivgen(password)
           cipher
         end
-      end
-
-    end
-  end
-end
+      end # Crypt
+    end # Utils
+  end # Admin
+end # Padrino

data/padrino-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-admin}
-  s.version = "0.9.6"
+  s.version = "0.9.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-03-15}
+  s.date = %q{2010-03-22}
   s.description = %q{Admin View for Padrino applications}
   s.email = %q{padrinorb@gmail.com}
   s.extra_rdoc_files = [
@@ -94,18 +94,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.6"])
-      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.9.6"])
-      s.add_runtime_dependency(%q<padrino-helpers>, ["= 0.9.6"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.7"])
+      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.9.7"])
+      s.add_runtime_dependency(%q<padrino-helpers>, ["= 0.9.7"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
       s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
     else
-      s.add_dependency(%q<padrino-core>, ["= 0.9.6"])
-      s.add_dependency(%q<padrino-gen>, ["= 0.9.6"])
-      s.add_dependency(%q<padrino-helpers>, ["= 0.9.6"])
+      s.add_dependency(%q<padrino-core>, ["= 0.9.7"])
+      s.add_dependency(%q<padrino-gen>, ["= 0.9.7"])
+      s.add_dependency(%q<padrino-helpers>, ["= 0.9.7"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
@@ -113,9 +113,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<webrat>, [">= 0.5.1"])
     end
   else
-    s.add_dependency(%q<padrino-core>, ["= 0.9.6"])
-    s.add_dependency(%q<padrino-gen>, ["= 0.9.6"])
-    s.add_dependency(%q<padrino-helpers>, ["= 0.9.6"])
+    s.add_dependency(%q<padrino-core>, ["= 0.9.7"])
+    s.add_dependency(%q<padrino-gen>, ["= 0.9.7"])
+    s.add_dependency(%q<padrino-helpers>, ["= 0.9.7"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])

data/test/fixtures/data_mapper.rb

@@ -47,7 +47,7 @@ class Account
 
   ##
   # This method it's for authentication purpose
-  # 
+  #
   def self.authenticate(email, password)
     account = first(:conditions => { :email => email }) if email.present?
     account && account.password_clean == password ? account : nil
@@ -62,7 +62,7 @@ class Account
 
   ##
   # This method it's used for retrive the original password.
-  # 
+  #
   def password_clean
     crypted_password.decrypt(salt)
   end
@@ -82,12 +82,12 @@ end
 DataMapper.auto_migrate!
 
 # We build some fake accounts
-admin  = Account.create(:name => "DAddYE", :role => "admin",  :email => "d.dagostino@lipsiasoft.com", 
+admin  = Account.create(:name => "DAddYE", :role => "admin",  :email => "d.dagostino@lipsiasoft.com",
                         :password => "some", :password_confirmation => "some")
 editor = Account.create(:name => "Dexter", :role => "editor", :email => "editor@lipsiasoft.com",
                         :password => "some", :password_confirmation => "some")
 
-%w(News Press HowTo).each do |c| 
+%w(News Press HowTo).each do |c|
   admin.categories.create(:name => c)
   editor.categories.create(:name => c)
 end

data/test/generators/test_admin_app_generator.rb

@@ -5,7 +5,7 @@ require 'padrino-gen/generators/actions'
 Dir[File.dirname(__FILE__) + '/generators/{components}/**/*.rb'].each { |lib| require lib }
 
 class TestAdminAppGenerator < Test::Unit::TestCase
-  
+
   def setup
     `rm -rf /tmp/sample_project`
     @project = Padrino::Generators::Project.dup

data/test/generators/test_admin_page_generator.rb

@@ -21,7 +21,7 @@ class TestAdminPageGenerator < Test::Unit::TestCase
   end
 
   context 'the admin page generator' do
-    
+
     should 'fail outside app root' do
       output = silence_logger { @page.start(['foo', '-r=/tmp/sample_project']) }
       assert_match(/not at the root/, output)

data/test/helper.rb

@@ -9,13 +9,12 @@ require 'shoulda'
 require 'thor/group'
 
 # We try to load the vendored padrino-core if exist
-%w(core gen helpers).each do |gem|
-  if File.exist?(File.dirname(__FILE__) + "/../../padrino-#{gem}/lib")
-    $:.unshift File.dirname(__FILE__) + "/../../padrino-#{gem}/lib"
+%w(core gen helpers).each do |lib|
+  if File.exist?(File.dirname(__FILE__) + "/../../padrino-#{lib}/lib")
+    $:.unshift File.dirname(__FILE__) + "/../../padrino-#{lib}/lib"
   end
 end
 
-
 require 'padrino-core/support_lite'
 require 'padrino-admin'
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - Padrino Team
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 -07:00
+date: 2010-03-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,8 +30,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 6
-        version: 0.9.6
+        - 7
+        version: 0.9.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,8 +44,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 6
-        version: 0.9.6
+        - 7
+        version: 0.9.7
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,8 +58,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 6
-        version: 0.9.6
+        - 7
+        version: 0.9.7
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency