padrino-admin 0.9.25 → 0.9.26

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

@@ -43,7 +43,9 @@ module Padrino
             say "<= Your are using '#{tmp_ext}' and for admin we only support '#{supported_ext.join(', ')}'. Please use -e haml or -e erb or -e slim", :yellow
             raise SystemExit
           end
+
           store_component_choice(:admin_renderer, tmp_ext)
+          @session_secret = fetch_component_choice(:session_secret)
 
           self.behavior = :revoke if options[:destroy]
 

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

@@ -16,7 +16,7 @@ class Admin < Padrino::Application
   # disable :flash              # Disables rack-flash (enabled by default if sessions)
   # layout  :my_layout          # Layout can be in views/layouts/foo.ext or views/foo.ext (default :application)
   #
-  set :session_secret, "<%= '%x' % rand(2**255) %>"
+  set :session_secret, "<%= @session_secret %>"
   set :login_page, "/admin/sessions/new"
   disable :store_location
 

data/padrino-admin.gemspec

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
 
 Gem::Specification.new do |s|
@@ -11,10 +12,14 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.version = Padrino.version
   s.date = Time.now.strftime("%Y-%m-%d")
+
   s.extra_rdoc_files = Dir["*.rdoc"]
-  s.files = %w(.document .gitignore LICENSE README.rdoc Rakefile padrino-admin.gemspec) + Dir.glob("{bin,lib,test}/**/*")
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_path = "lib"
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.rdoc_options  = ["--charset=UTF-8"]
+
   s.add_dependency("padrino-core", Padrino.version)
   s.add_dependency("padrino-helpers", Padrino.version)
 end

data/test/generators/test_admin_page_generator.rb

@@ -56,6 +56,16 @@ class TestAdminPageGenerator < Test::Unit::TestCase
       assert_match_in_file "check_box_tag :bypass", "#{@apptmp}/sample_project/admin/views/sessions/new.haml"
     end
 
+    should "store and apply session_secret" do
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
+      silence_logger { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      assert_match_in_file(/session_secret:.+/, "#{@apptmp}/sample_project/.components")
+      session_secret = YAML.load_file("#{@apptmp}/sample_project/.components")[:session_secret]
+      assert_not_equal "", session_secret
+      assert_match_in_file(/#{session_secret}/, "#{@apptmp}/sample_project/app/app.rb")
+      assert_match_in_file(/#{session_secret}/, "#{@apptmp}/sample_project/admin/app.rb")
+    end
+
     should 'correctly generate a new padrino admin application with erb renderer' do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper', '-e=erb') }
       silence_logger { generate(:admin_app, "--root=#{@apptmp}/sample_project") }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-admin
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 9
-  - 25
-  version: 0.9.25
+  - 26
+  version: 0.9.26
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,8 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 +02:00
-default_executable: 
+date: 2011-04-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: padrino-core
@@ -29,12 +28,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15
         segments: 
         - 0
         - 9
-        - 25
-        version: 0.9.25
+        - 26
+        version: 0.9.26
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,12 +44,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15
         segments: 
         - 0
         - 9
-        - 25
-        version: 0.9.25
+        - 26
+        version: 0.9.26
   type: :runtime
   version_requirements: *id002
 description: Admin View for Padrino applications
@@ -67,7 +66,7 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- padrino-admin.gemspec
+- lib/padrino-admin.rb
 - lib/padrino-admin/access_control.rb
 - lib/padrino-admin/generators/actions.rb
 - lib/padrino-admin/generators/admin_app.rb
@@ -80,13 +79,13 @@ files:
 - lib/padrino-admin/generators/templates/account/mongomapper.rb.tt
 - lib/padrino-admin/generators/templates/account/seeds.rb.tt
 - lib/padrino-admin/generators/templates/account/sequel.rb.tt
+- lib/padrino-admin/generators/templates/app.rb.tt
 - lib/padrino-admin/generators/templates/app/controllers/base.rb
 - lib/padrino-admin/generators/templates/app/controllers/sessions.rb
-- lib/padrino-admin/generators/templates/app.rb.tt
 - lib/padrino-admin/generators/templates/assets/stylesheets/base.css
 - lib/padrino-admin/generators/templates/assets/stylesheets/themes/amro/style.css
-- lib/padrino-admin/generators/templates/assets/stylesheets/themes/bec/style.css
 - lib/padrino-admin/generators/templates/assets/stylesheets/themes/bec-green/style.css
+- lib/padrino-admin/generators/templates/assets/stylesheets/themes/bec/style.css
 - lib/padrino-admin/generators/templates/assets/stylesheets/themes/blue/style.css
 - lib/padrino-admin/generators/templates/assets/stylesheets/themes/default/style.css
 - lib/padrino-admin/generators/templates/assets/stylesheets/themes/djime-cerulean/style.css
@@ -158,13 +157,12 @@ files:
 - lib/padrino-admin/locale/orm/zh_cn.yml
 - lib/padrino-admin/locale/orm/zh_tw.yml
 - lib/padrino-admin/utils/crypt.rb
-- lib/padrino-admin.rb
+- padrino-admin.gemspec
 - test/fixtures/data_mapper.rb
 - test/generators/test_admin_app_generator.rb
 - test/generators/test_admin_page_generator.rb
 - test/helper.rb
 - test/test_admin_application.rb
-has_rdoc: true
 homepage: http://www.padrinorb.com
 licenses: []
 
@@ -196,9 +194,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: padrino-admin
-rubygems_version: 1.5.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Admin Dashboard for Padrino
-test_files: []
-
+test_files: 
+- test/fixtures/data_mapper.rb
+- test/generators/test_admin_app_generator.rb
+- test/generators/test_admin_page_generator.rb
+- test/helper.rb
+- test/test_admin_application.rb