padrino-admin 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c7b4aeb0ecf5580414ca88d95d7258d72328762
-  data.tar.gz: a6618a7e7a657783f753f7576fdbe1fbb692d020
+  metadata.gz: 1cd122df97a418952e33fc80320f6dd0371200d5
+  data.tar.gz: 31ad46248b46636ffad8d5153c9a9cceaa09df2d
 SHA512:
-  metadata.gz: abefef201e4f889d2cda36a6adba3ec6e2b5a92c4f678e14fe08eb72e5cfe52d7ab39a56acbba80504e321575eb0b9c5284a29aff79fa7a0db8ba5205f0796eb
-  data.tar.gz: da782d5502ad38427a099d256d79d9e1138c9a3fd7001e9021f76c51b3063a407a9d5f343d40e64ad626442d3c84c472b408e48265aa7354aadbb81c47e3e5be
+  metadata.gz: d94c406691ca33465ae8a05e806ed7a33136f6235fcf0eaf3fe89b535995758039087c7564a76ec6e70fb691d43ced205ff8818b3c91c3313ed4add6b28b82f6
+  data.tar.gz: 4d9f3107020b865b41874a8206ace887db9a8acd9bd212be221eca73cb399078ee3395de77a91ec17e118b774214d422c96ad0b14fa548a29e326eb7584d92ad

data/lib/padrino-admin/access_control.rb

@@ -20,16 +20,14 @@ module Padrino
           app.helpers Padrino::Admin::Helpers::ViewHelpers
           app.before { login_required }
           app.class_eval do
-            def access_control
-              @@access_control
-            end
-            def self.access_control
-              @@access_control
+            class << self
+              attr_accessor :access_control
             end
-            def self.access_control=(control)
-              @@access_control = control
+            def access_control
+              self.class.access_control
             end
           end
+
           app.send(:access_control=, Padrino::Admin::AccessControl::Base.new)
         end
         alias :included :registered

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

@@ -39,7 +39,7 @@ module Padrino
         #   pat(:profile, "My Profile")
         #
         def padrino_admin_translate(word, *args)
-          options = args.extract_options!
+          options = args.last.is_a?(Hash) ? args.pop : {}
           options[:default] ||= word.to_s.humanize
           t("padrino.admin.#{word}", options)
         end

data/test/test_admin_application.rb

@@ -268,4 +268,21 @@ describe "AdminApplication" do
     get "/modules"
     assert_equal "admin => /admin", body
   end
+
+  it 'should use different access control for different apps' do
+    app1 = Sinatra.new Padrino::Application do
+      register Padrino::Admin::AccessControl
+      access_control.roles_for :any do |role|
+        role.project_module :foo, "/foo"
+      end
+    end
+    app2 = Sinatra.new Padrino::Application do
+      register Padrino::Admin::AccessControl
+      access_control.roles_for :any do |role|
+        role.project_module :bar, "/bar"
+      end
+    end
+    assert_equal '/foo', app1.access_control.project_modules(:any).first.path
+    assert_equal '/bar', app2.access_control.project_modules(:any).first.path
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-admin
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-08-17 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.13.2
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
@@ -291,16 +291,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: padrino-admin
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Admin Dashboard for Padrino
-test_files:
-- test/fixtures/sequel.rb
-- test/generators/test_account_model_generator.rb
-- test/generators/test_admin_app_generator.rb
-- test/generators/test_admin_page_generator.rb
-- test/helper.rb
-- test/test_admin_application.rb
-- test/test_locale.rb
-has_rdoc: 
+test_files: []