padrino-admin 0.14.0.rc1 → 0.14.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4107303fab4491d4c9b6b224dc1f52a426f3db19
-  data.tar.gz: ef949e5722f436742f71c144ead17f6cdf10be6a
+  metadata.gz: 9f5fe8b0d4121898b6e3408184bde80a47e5ada5
+  data.tar.gz: fe7f50ed5937b673a60c9bcd46dd29c35da11e5c
 SHA512:
-  metadata.gz: 513085a0e8b9c797f80ec9a7f1b4d232221123918e5e5ed5c16dc9b72b2bda45e1cbfe6e51365b00e700c3a9069dbea1884f59ce4eabe8d0080c361b3f7c40ce
-  data.tar.gz: 20ba8c3728e2b79fcd7d3ac5354d63bdca0bf6375c6ba90862fbe9934841990f65140ab913696b54c707db5c1d13a4b54a92a3dde605bb9171a4c12879d89653
+  metadata.gz: d6bdaad9e6d002dbb121d69e33995bf9f715d7aaec4f77ea0690edf9985e38c836d28a4828f69fe29b2b1e0aea27d3d7e084b845f69c302bf026c2357837e3ec
+  data.tar.gz: 6db2c8630a4b078a2f65ca338fc9b1205d4aa53ef2688cc073d1d817b675cae84fe8cee718713b8aa2c275bd81b285a340af0742d49e23d02cd2430ba616b77a

data/lib/padrino-admin/access_control.rb

@@ -12,7 +12,7 @@ module Padrino
         #
         def registered(app)
           app.register Padrino::Admin unless app.extensions.include?(Padrino::Admin)
-          app.set :session_id, "_padrino_#{File.basename(Padrino.root)}_#{app.app_name}".to_sym unless app.respond_to?(:session_id)
+          app.set :session_id, "_padrino_#{Padrino.env}_#{app.app_name}" unless app.respond_to?(:session_id)
           app.set :admin_model, 'Account' unless app.respond_to?(:admin_model)
           app.helpers Padrino::Admin::Helpers::AuthenticationHelpers
           app.helpers Padrino::Admin::Helpers::ViewHelpers

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

@@ -49,7 +49,7 @@ module Padrino
 
           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
+            say "<= You are using '#{tmp_ext}' and for admin we only support '#{supported_ext.join(', ')}'. Please use #{supported_ext.map { |ext| '-e ' + ext.to_s }.join(' or ')}", :yellow
             raise SystemExit
           end
 

data/test/test_admin_application.rb

@@ -9,21 +9,20 @@ describe "AdminApplication" do
   describe "session id setting" do
     it "should provide it if it doesn't exist" do
       mock_app do
+        set :app_name, 'session_id_tester'
         register Padrino::Admin::AccessControl
       end
 
-      assert_equal @app.session_id, "_padrino_#{File.basename(Padrino.root)}_#{@app.app_name}".to_sym
+      assert_equal "_padrino_test_session_id_tester", @app.session_id
     end
 
-    # it "should preserve it if it already existed" do
-    #   Padrino.configure_apps { enable :sessions; set :session_id, "foo" }
-
-    #   mock_app do
-    #     register Padrino::Admin::AccessControl
-    #   end
-
-    #   assert_equal @app.session_id, "foo"
-    # end
+    it "should preserve it if it already existed" do
+      mock_app do
+        set :session_id, "foo"
+        register Padrino::Admin::AccessControl
+      end
+      assert_equal "foo", @app.session_id
+    end
   end
 
   it 'should require correctly login' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-admin
 version: !ruby/object:Gem::Version
-  version: 0.14.0.rc1
+  version: 0.14.0.rc2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.rc1
+        version: 0.14.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.rc1
+        version: 0.14.0.rc2
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.rc1
+        version: 0.14.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.rc1
+        version: 0.14.0.rc2
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement