strong_actions 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f33bd237fe0db5884816fedd3d3d8be5c61bc65
-  data.tar.gz: d61a5a34fde02ded12c2943e5d22ed0c7382b4f8
+  metadata.gz: 31fc4f5e9191a56ec48d3f35fdb424deaa0371ae
+  data.tar.gz: 8a4e24d7bb75c0930820a4856b87bfc1f56a6fc2
 SHA512:
-  metadata.gz: ea2429d1c839a9b318f7bca17dea13be8cc60448856165c2d996e3baf2913e31aa17d5f4608e0f724bb3b43ecad811d33f3d2ae8f230da2a700ac324190eab2c
-  data.tar.gz: 7cf82ccdebb20b21bb570372144f46edd20aa30c71c828f8396ab7c205e7aec92089c56c67ebf576cb20bab605d9d5059834c2df361d8bc72258220fa6a3d431
+  metadata.gz: d71a0a3d851fdd2b8e7b95706e4a4040849cf4fca180f1fb11d673bcee0f7c04f88a1072a1391b0a2d77ddf39c7a1003107e5cd87fcb5cce7f88ae7bf1d84615
+  data.tar.gz: de3ee53a2db2ee226297b46a1e7dc1b9f54c6117e6992fb69a0d5266d1b13f8d52b3ba8935b657a69e61077cba2d73db55fdc6f38f5993b3800798f305bef44f

data/Gemfile

@@ -2,6 +2,3 @@ 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

@@ -9,62 +9,45 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-      builder (~> 3.0.0)
+    actionpack (4.1.6)
+      actionview (= 4.1.6)
+      activesupport (= 4.1.6)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.6)
+      activesupport (= 4.1.6)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      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)
+    activesupport (4.1.6)
+      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)
     erubis (2.7.0)
-    hike (1.2.3)
     i18n (0.6.11)
-    journey (1.0.4)
     json (1.8.1)
-    minitest (5.4.1)
-    multi_json (1.10.1)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.4)
-      rack
+    minitest (5.4.2)
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    railties (3.2.19)
-      actionpack (= 3.2.19)
-      activesupport (= 3.2.19)
-      rack-ssl (~> 1.3.2)
+    railties (4.1.6)
+      actionpack (= 4.1.6)
+      activesupport (= 4.1.6)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+      thor (>= 0.18.1, < 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)
-    tilt (1.4.1)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 3.2.0)
   bundler (~> 1.6)
   minitest
-  railties (~> 3.2.0)
   rake
   strong_actions!

data/HISTORY.md

@@ -1,5 +1,8 @@
 # History
 
+## 0.0.5
+* do not raise error when role is undefined but not needed.
+
 ## 0.0.4
 * test
 

data/lib/strong_actions/config.rb

@@ -1,4 +1,5 @@
 require 'singleton'
+require 'yaml'
 
 module StrongActions
   class Config

data/lib/strong_actions/decision.rb

@@ -9,12 +9,6 @@ module StrongActions
       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?
 
@@ -30,11 +24,21 @@ module StrongActions
       action_value.each do |definition|
         next if definition === true
         return false unless definition
+
+        role_object = role_object_for(role)
         return false unless role_object.instance_eval(definition)
       end
 
       true
     end
-    
+
+    def role_object_for(role)
+      begin
+         return @target.instance_eval(role)
+      rescue NameError
+        raise "role #{role} is not defined in controller"
+      end
+    end
+
   end
 end

data/lib/strong_actions/version.rb

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

data/test/decision_test.rb

@@ -45,6 +45,11 @@ class DecisionTest < Minitest::Test
     assert decision.call('current_user', 'stores', 'new')
   end
 
+  def test_role_undefined_and_not_needed
+    assert decision.call('current_user', 'some_actions')
+    assert decision.call('undefined', 'some_actions')
+  end
+
 end
 
 class User

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strong_actions
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: access control for rails controller/action
@@ -165,3 +165,4 @@ test_files:
 - test/config/acl.yml
 - test/decision_test.rb
 - test/test_helper.rb
+has_rdoc: