strong_actions 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1012764428766d50f9c26c61ec9a92a2f3eeaf9
-  data.tar.gz: 0da862ab3795a2e426dd8b7058285cbc1f5f57e2
+  metadata.gz: ca614b9e39bb1d36354f7acb67d35bbed3dce7c4
+  data.tar.gz: 58544302bc297db77b1ffc6240186b50a084f0de
 SHA512:
-  metadata.gz: b0b8b1ebdbb1ff44ad641b52cfb098b15d4a1b7e44cfcbb04f4824c4a665cccc578c020b80b157ad3148466bc56c632504fa505dcf6096f0aeb0d026782b61a3
-  data.tar.gz: 8301726f828161f264501e15548747dc3d255a3841dddea79d72ccb15b53268892aac272610d1aaa11a84e527438f4eaf4b5b55fc546660c092f36c6a744863e
+  metadata.gz: af45a6a6bd12d2087a2d8b5006029857b89ba03f87abc99046b5c147a80fefebac11a15c5c3cef6020ff823646484643cd911f4a0443d3bf7b64d37c1ceaaac3
+  data.tar.gz: 41ae17c38389bb6f2942274bf27ade8559090a6d1e58b09a36ae60257f1f9d010222f3d50056ff09f8ecc750a655a2ed682330da39e1a59f12dbc663cb93037e

data/.gitignore

@@ -34,4 +34,5 @@ build/
 .rvmrc
 
 # Eclipse
+/.buildpath
 /.project

data/.travis.yml

@@ -0,0 +1,9 @@
+sudo: false
+language: ruby
+cache: bundler
+rvm:
+  - 2.3.3
+  - 2.2.6
+  - 2.1.9
+script:
+  - bundle exec rake test

data/Gemfile.lock

@@ -1,28 +1,28 @@
 PATH
   remote: .
   specs:
-    strong_actions (0.0.6)
-      actionpack (>= 3.2.0, < 5.0.0)
-      activesupport (>= 3.2.0, < 5.0.0)
-      railties (>= 3.2.0, < 5.0.0)
+    strong_actions (0.0.7)
+      actionpack (>= 4.0.0, < 5.0.0)
+      activesupport (>= 4.0.0, < 5.0.0)
+      railties (>= 4.0.0, < 5.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.2.1)
-      actionview (= 4.2.1)
-      activesupport (= 4.2.1)
+    actionpack (4.2.7.1)
+      actionview (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activesupport (4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -31,31 +31,31 @@ GEM
     builder (3.2.2)
     erubis (2.7.0)
     i18n (0.7.0)
-    json (1.8.2)
-    loofah (2.0.1)
+    json (1.8.3)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mini_portile (0.6.2)
-    minitest (5.6.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    rack (1.6.0)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    nokogiri (1.7.0.1)
+      mini_portile2 (~> 2.1.0)
+    rack (1.6.5)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.1)
-      actionpack (= 4.2.1)
-      activesupport (= 4.2.1)
+    railties (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    thor (0.19.1)
+    rake (10.5.0)
+    thor (0.19.4)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -64,7 +64,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.6)
+  bundler (~> 1.7)
   minitest
-  rake
+  rake (~> 10.0)
   strong_actions!
+
+BUNDLED WITH
+   1.13.7

data/HISTORY.md

@@ -1,5 +1,9 @@
 # History
 
+## 0.0.7
+* drop support for ruby-2.0
+* drop support for rails-3.2
+
 ## 0.0.6
 * supprts controller_path
 

data/README.md

@@ -37,6 +37,23 @@ then prepare config/acl.yml
 
 In above case, when a non-admin user try to access new_user_path, StrongActions::ForbiddenAction is thrown.
 
+if all actions are restricted in the same way, you can make a definition on controller level.
+
+    current_user:
+      users: admin?
+
+controller definition can be namespaced.
+
+    current_user:
+      admin/users: admin?
+
+if you have multiple controllers under a namespace, namespace can be used.
+ending with '/' indicates that is for namespace 'admin' and not controller 'admin'.
+
+    current_user:
+      admin/: admin?
+
+
 ### Handling error in controller
 
 In application_controller.rb, the error should be rescued like

data/config/acl.yml

@@ -4,7 +4,12 @@ current_user:
     destroy: false
   books: true
   end_of_services: false
+  sessions:
+    index: false
   stores:
     new: admin?
-  sessions:
-    index: false
+  sys_admin/: sys_admin?   
+  sys_admin/sys_config:
+    show: true
+    edit: sys_admin?
+ 

data/lib/strong_actions/controller.rb

@@ -19,7 +19,7 @@ module StrongActions
     def authorize_roles!
       StrongActions.config.roles.each do |role|
         unless judge(role, controller_path, action_name, params)
-          message = "#{controller_path.capitalize}Controller##{action_name} is not permitted for role #{role}"
+          message = "#{controller_path.classify}Controller##{action_name} is not permitted for role #{role}"
           raise StrongActions::ForbiddenAction.new(message)
         end
       end

data/lib/strong_actions/decision.rb

@@ -6,27 +6,31 @@ module StrongActions
     end
 
     def call(role, controller_path, action_name = nil, params = {})
+      action_name ||= 'index'
       role_definition = StrongActions.config.role_definition(role)
       return true unless role_definition
 
-      controller_value = role_definition[controller_path]
-      return true if controller_value.nil?
+      controller_names_for(controller_path).each do |controller_name|
+        controller_value = role_definition[controller_name]
+        next if controller_value.nil?
 
-      if controller_value.is_a?(Hash)
-        action_name ||= 'index'
-        action_value = controller_value[action_name]
-      else
-        action_value = controller_value
-      end
-      return true if action_value.nil?
+        if controller_value.is_a?(Hash)
+          action_value = controller_value[action_name]
+        else
+          action_value = controller_value
+        end
+        next if action_value.nil?
 
-      action_value = [action_value] unless action_value.is_a?(Array)
-      action_value.each do |definition|
-        next if definition === true
-        return false unless definition
+        action_values = Array(action_value)
+        action_values.each do |definition|
+          next if definition === true
+          return false if definition === false
 
-        role_object = role_object_for(role)
-        return false unless role_object.instance_eval(definition)
+          role_object = role_object_for(role)
+          return false unless role_object.instance_eval(definition)
+        end
+
+        break
       end
 
       true
@@ -40,5 +44,21 @@ module StrongActions
       end
     end
 
+    def controller_names_for(controller_path)
+      ret = []
+
+      path_elements = controller_path.split('/')
+      if path_elements.size == 1
+        ret = path_elements
+      else
+        path_elements.each_with_index do |path_element, i|
+          ret << ret.last.to_s + path_element + (i < path_elements.size - 1 ? '/' : '')
+        end
+        ret.reverse!
+      end
+
+      ret
+    end
+    
   end
 end

data/lib/strong_actions/version.rb

@@ -1,3 +1,3 @@
 module StrongActions
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/strong_actions.gemspec

@@ -17,11 +17,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", '>= 3.2.0', '< 5.0.0'
-  spec.add_dependency "actionpack", '>= 3.2.0', '< 5.0.0'
-  spec.add_dependency "railties", '>= 3.2.0', '< 5.0.0'
+  spec.required_ruby_version = '~> 2.1'
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_dependency "activesupport", '>= 4.0.0', '< 5.0.0'
+  spec.add_dependency "actionpack", '>= 4.0.0', '< 5.0.0'
+  spec.add_dependency "railties", '>= 4.0.0', '< 5.0.0'
+
+  spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "minitest"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", "~> 10.0"
 end

data/test/namespace_test.rb

@@ -0,0 +1,54 @@
+require 'test_helper'
+
+module SysAdmin
+  class SysAdmin::SysConfigController < ActionController::Base
+    include StrongActions::Controller
+
+    def show
+      head :ok
+    end
+
+    def edit
+      head :ok
+    end
+
+    def update
+      head :ok
+    end
+
+    private
+
+    def current_user
+      unless @current_user
+        @current_user = Object.new
+        @current_user.instance_eval do
+           def sys_admin?
+             false
+           end
+        end
+      end
+
+      @current_user
+    end
+
+  end
+end
+
+class NamespaceTest < ActionController::TestCase
+  tests SysAdmin::SysConfigController
+
+  def test_allowed
+    get :show
+    assert_response :ok
+  end
+
+  def test_forbidden
+    assert_raise StrongActions::ForbiddenAction do
+      get :edit
+    end
+    assert_raise StrongActions::ForbiddenAction do
+      patch :update
+    end
+  end
+
+end

data/test/test_helper.rb

@@ -4,6 +4,8 @@ ENV["RAILS_ENV"] = "test"
 require 'minitest/autorun'
 require 'rails'
 
+ActiveSupport.test_order = :sorted
+
 class FakeApplication < Rails::Application
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strong_actions
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -56,7 +56,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -76,14 +76,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -102,16 +102,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 description: access control for rails controller/action
 email:
 - ichylinux@gmail.com
@@ -120,6 +120,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - HISTORY.md
@@ -138,6 +139,7 @@ files:
 - strong_actions.gemspec
 - test/controller_test.rb
 - test/decision_test.rb
+- test/namespace_test.rb
 - test/test_helper.rb
 homepage: https://github.com/hybitz/strong_actions
 licenses:
@@ -149,9 +151,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -159,11 +161,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: access control for rails controller/action
 test_files:
 - test/controller_test.rb
 - test/decision_test.rb
+- test/namespace_test.rb
 - test/test_helper.rb