strong_actions 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33b2e12b49fba4ce6ffdc958dcffb10f3488e7eb
-  data.tar.gz: 5ae09785037dff9dae2907cb6f35ac0af28ff100
+  metadata.gz: 8f33bd237fe0db5884816fedd3d3d8be5c61bc65
+  data.tar.gz: d61a5a34fde02ded12c2943e5d22ed0c7382b4f8
 SHA512:
-  metadata.gz: d7abda3d916eb50633e65d1a7a66f3bc86332f53e766ae125ec17bdcb2d621e1e2c7456c814b13b54a4024428498e63c1792dd5c60b1559e361b732453631d28
-  data.tar.gz: 05396c0b7f028c12168adfbb6748294ae129d82db55388b4ec518f86c7b8711babe249922135b25afaad347c2e2e621e9cb9700e14397aae0676959d30dddb5d
+  metadata.gz: ea2429d1c839a9b318f7bca17dea13be8cc60448856165c2d996e3baf2913e31aa17d5f4608e0f724bb3b43ecad811d33f3d2ae8f230da2a700ac324190eab2c
+  data.tar.gz: 7cf82ccdebb20b21bb570372144f46edd20aa30c71c828f8396ab7c205e7aec92089c56c67ebf576cb20bab605d9d5059834c2df361d8bc72258220fa6a3d431

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in strong_actions.gemspec
 gemspec
+
+gem "actionpack", "~> 3.2.0"
+gem "railties", "~> 3.2.0"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    strong_actions (0.0.3)
+    strong_actions (0.0.4)
       actionpack (>= 3.2.0, < 5.0.0)
       activesupport (>= 3.2.0, < 5.0.0)
       railties (>= 3.2.0, < 5.0.0)
@@ -9,44 +9,62 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.1.5)
-      actionview (= 4.1.5)
-      activesupport (= 4.1.5)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.5)
-      activesupport (= 4.1.5)
-      builder (~> 3.1)
+    actionpack (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
+      builder (~> 3.0.0)
       erubis (~> 2.7.0)
-    activesupport (4.1.5)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    builder (3.2.2)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.19)
+      activesupport (= 3.2.19)
+      builder (~> 3.0.0)
+    activesupport (3.2.19)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    builder (3.0.4)
     erubis (2.7.0)
+    hike (1.2.3)
     i18n (0.6.11)
+    journey (1.0.4)
     json (1.8.1)
     minitest (5.4.1)
-    rack (1.5.2)
+    multi_json (1.10.1)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.4)
+      rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    railties (4.1.5)
-      actionpack (= 4.1.5)
-      activesupport (= 4.1.5)
+    railties (3.2.19)
+      actionpack (= 3.2.19)
+      activesupport (= 3.2.19)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
     rake (10.3.2)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
+    tilt (1.4.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  actionpack (~> 3.2.0)
   bundler (~> 1.6)
+  minitest
+  railties (~> 3.2.0)
   rake
   strong_actions!

data/HISTORY.md

@@ -1,10 +1,14 @@
 # History
 
-## 0.0.2
+## 0.0.4
+* test
+
+## 0.0.3
+* refactoring
 
+## 0.0.2
 * support explicit true value
 * support rails-3.2
 
 ## 0.0.1
-
 * First release

data/Rakefile

@@ -1,2 +1,12 @@
 require "bundler/gem_tasks"
 
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+task :default => :test

data/lib/strong_actions.rb

@@ -1,3 +1,4 @@
+require 'action_controller'
 require "strong_actions/version"
 require "strong_actions/config"
 require "strong_actions/forbidden_action"

data/lib/strong_actions/config.rb

@@ -5,8 +5,7 @@ module StrongActions
     include Singleton
 
     def initialize
-      @config_files = ['config/acl.yml']
-      load_config_files
+      @config_files ||= ['config/acl.yml']
     end
 
     def config_files
@@ -14,31 +13,31 @@ module StrongActions
     end
 
     def config_files=(files)
-      config_files = files
-      load_config_files
+      @config_files = ([] << files).flatten
     end
 
     def roles
-      load_config_files if Rails.env.development?
-      @acl.keys
+      definitions.keys
     end
 
     def role_definition(role)
-      load_config_files if Rails.env.development?
-      @acl[role]
+      definitions[role]
     end
 
     private
 
-    def load_config_files
-      @acl = {}
-      config_files.each do |config_file|
-        yml = YAML.load_file(config_file)
-        yml.each do |role, values|
-          raise "role #{role} is already defined." if @acl.has_key?(role)
-          @acl[role] = values
+    def definitions
+      if @acl.nil? or Rails.env.development?
+        @acl = {}
+        config_files.each do |config_file|
+          yml = YAML.load_file(config_file)
+          yml.each do |role, values|
+            raise "role #{role} is already defined." if @acl.has_key?(role)
+            @acl[role] = values
+          end
         end
       end
+      @acl
     end
 
   end

data/lib/strong_actions/controller_extensions.rb

@@ -1,3 +1,5 @@
+require 'strong_actions/decision'
+
 module StrongActions
   module ControllerExtensions
     extend ActiveSupport::Concern
@@ -24,8 +26,6 @@ module StrongActions
     end
 
     def available?(controller_name, action_name = nil, params = {})
-      action_name ||= 'index'
-
       StrongActions.config.roles.each do |role|
         return false unless judge(role, controller_name, action_name, params)
       end
@@ -33,34 +33,9 @@ module StrongActions
       true
     end
 
-    def judge(role, controller_name, action_name, params)
-      role_definition = StrongActions.config.role_definition(role)
-      return true unless role_definition
-
-      begin
-        role_object = eval(role)
-      rescue NameError
-        raise "role #{role} is not defined in controller"
-      end
-
-      controller_value = role_definition[controller_name]
-      return true if controller_value.nil?
-
-      if controller_value.is_a?(Hash)
-        action_value = controller_value[action_name]
-      else
-        action_value = controller_value
-      end
-      return true 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
-        return false unless role_object.instance_eval(definition)
-      end
-
-      true
+    def judge(role, controller_name, action_name = nil, params = {})
+      @decision ||= StrongActions::Decision.new(self)
+      @decision.call(role, controller_name, action_name, params)
     end
 
   end

data/lib/strong_actions/decision.rb

@@ -0,0 +1,40 @@
+module StrongActions
+  class Decision
+
+    def initialize(target)
+      @target = target
+    end
+
+    def call(role, controller_name, action_name = nil, params = {})
+      role_definition = StrongActions.config.role_definition(role)
+      return true unless role_definition
+
+      begin
+        role_object = @target.instance_eval(role)
+      rescue NameError
+        raise "role #{role} is not defined in controller"
+      end
+
+      controller_value = role_definition[controller_name]
+      return true 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?
+
+      action_value = [action_value] unless action_value.is_a?(Array)
+      action_value.each do |definition|
+        next if definition === true
+        return false unless definition
+        return false unless role_object.instance_eval(definition)
+      end
+
+      true
+    end
+    
+  end
+end

data/lib/strong_actions/version.rb

@@ -1,3 +1,3 @@
 module StrongActions
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/strong_actions.gemspec

@@ -22,5 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "railties", '>= 3.2.0', '< 5.0.0'
 
   spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake"
 end

data/test/config/acl.yml

@@ -0,0 +1,10 @@
+current_user:
+  welcome:
+    index: true
+    destroy: false
+  books: true
+  end_of_services: false
+  stores:
+    new: admin?
+  sessions:
+    index: false

data/test/decision_test.rb

@@ -0,0 +1,56 @@
+require 'test_helper'
+
+class DecisionTest < Minitest::Test
+
+  def setup
+    StrongActions.config.config_files = File.join(File.dirname(__FILE__), 'config', 'acl.yml')
+  end
+
+  def decision
+    @decision ||= StrongActions::Decision.new(self)
+  end
+
+  def current_user
+    @user ||= User.new
+  end
+
+  def test_controller_true
+    assert decision.call('current_user', 'books')
+  end
+
+  def test_controller_false
+    assert ! decision.call('current_user', 'end_of_services')
+  end
+
+  def test_action_true
+    assert decision.call('current_user', 'welcome', 'index')
+  end
+
+  def test_action_false
+    assert ! decision.call('current_user', 'welcome', 'destroy')
+  end
+
+  def test_action_default_to_index
+    assert decision.call('current_user', 'welcome')
+    assert ! decision.call('current_user', 'sessions')
+  end
+
+  def test_admin_for_new
+    current_user.admin = false
+    assert decision.call('current_user', 'stores')
+    assert ! decision.call('current_user', 'stores', 'new')
+
+    current_user.admin = true
+    assert decision.call('current_user', 'stores')
+    assert decision.call('current_user', 'stores', 'new')
+  end
+
+end
+
+class User
+  attr_accessor :admin
+  
+  def admin?
+    admin
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,6 @@
+# Configure Rails Environment
+ENV["RAILS_ENV"] = "test"
+
+require 'minitest/autorun'
+require 'rails'
+require 'strong_actions'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strong_actions
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-06 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -84,6 +84,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -115,10 +129,14 @@ files:
 - lib/strong_actions.rb
 - lib/strong_actions/config.rb
 - lib/strong_actions/controller_extensions.rb
+- lib/strong_actions/decision.rb
 - lib/strong_actions/forbidden_action.rb
 - lib/strong_actions/railtie.rb
 - lib/strong_actions/version.rb
 - strong_actions.gemspec
+- test/config/acl.yml
+- test/decision_test.rb
+- test/test_helper.rb
 homepage: https://github.com/hybitz/strong_actions
 licenses:
 - MIT
@@ -143,4 +161,7 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: access control for rails controller/action
-test_files: []
+test_files:
+- test/config/acl.yml
+- test/decision_test.rb
+- test/test_helper.rb