surrounded 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 349c77c09cbb18c43dff15df5fcb3ce444f6aee1
-  data.tar.gz: 61b1e9fb3ce7e7865a624425fbb4fc746644d674
+  metadata.gz: c237237d5cefc3b8d15c8c93e1b1835f53b16aa3
+  data.tar.gz: ffc1902273df1fad262c481b65a804e2eb1b8753
 SHA512:
-  metadata.gz: 166ecba24f2037b1a57c80a163f1a2a75506af524d88552af1caa3d6d72ea79cd0693a97df446acbfd7ac903e57b4d8a8c524b21d5f087dbf21fd0ad00c5c4ab
-  data.tar.gz: 04b781c0db8fc068de9af65f4fda3f58b3b8d1e4f859c6dfa67800e89be032cc696a5690b6c7adf7661663dea61dd2eea6dbabb74ad915517e04be0faa9d86a1
+  metadata.gz: 5faa7eae255b50a89451a223d92b0e2988a187c8e5925b6a999d615ac07f1a61ff0b0f6d2ba574e46815e16b291b26121f97adaad01417a018c7f766b0c83d8b
+  data.tar.gz: deb7040f3cb066916086750e32dfe62584759110eba328a242011b5155aba0b070ce7c6533b24729caeb89840950b203b27d51a9f5e3e80c4caf569d5b8cd192

data/README.md

@@ -538,6 +538,17 @@ class ActiviatingAccount
   def disallow_some_trigger_method?
     # whatever conditional code for the instance of the context
   end
+  
+  # Create shortcuts for triggers as class methods
+  # so you can do ActiviatingAccount.some_trigger_method(activator, account)
+  # This will make all triggers shortcuts.
+  shortcut_triggers
+  # Alterantively, you could implement shortcuts individually:
+  def self.some_trigger_method(activator, account)
+    instance = self.new(activator.account)
+    instance.some_trigger_method
+  end
+  
 end
 ```
 

data/lib/surrounded/access_control.rb

@@ -30,12 +30,11 @@ module Surrounded
             remove_roles if __apply_role_policy == :trigger
           end
         end
-      }
+      }, __FILE__, __LINE__
     end
     
     def define_access_method(name, &block)
       class_eval {
-        meth = AccessMethods.instance_method(:with_roles)
         define_method "disallow_#{name}?" do
           begin
             apply_roles if __apply_role_policy == :trigger
@@ -58,15 +57,6 @@ module Surrounded
           !self.respond_to?(method_restrictor, true) || !self.send(method_restrictor)
         }.to_set
       end
-      
-      def with_roles(policy = :trigger)
-        begin
-          apply_roles if __apply_role_policy == policy
-          yield
-        ensure
-          remove_roles if __apply_role_policy == policy
-        end
-      end
     end
   end
 end

data/lib/surrounded/context.rb

@@ -1,6 +1,7 @@
 require 'set'
 require 'surrounded/context/role_map'
 require 'surrounded/access_control'
+require 'surrounded/shortcuts'
 
 # Some features are only available in versions of Ruby
 # where this method is true
@@ -21,19 +22,6 @@ module Surrounded
         @triggers = Set.new
         include InstanceMethods
       }
-      base.singleton_class.send(:alias_method, :setup, :initialize)
-    end
-
-    def self.default_role_type
-      @default_role_type ||= :module
-    end
-
-    class << self
-      attr_writer :default_role_type
-    end
-    
-    def protect_triggers
-      self.extend(::Surrounded::AccessControl)
     end
 
     def new(*args, &block)
@@ -50,6 +38,18 @@ module Surrounded
 
     private
 
+    def self.default_role_type
+      @default_role_type ||= :module
+    end
+
+    class << self
+      attr_writer :default_role_type
+    end
+    
+    # Additional Features
+    def protect_triggers;  self.extend(::Surrounded::AccessControl); end
+    def shortcut_triggers; self.extend(::Surrounded::Shortcuts);     end
+
     def private_const_set(name, const)
       const = const_set(name, const)
       private_constant name.to_sym
@@ -115,10 +115,11 @@ module Surrounded
         def initialize(#{setup_args.join(',')})
           preinitialize
           arguments = method(__method__).parameters.map{|arg| eval(arg[1].to_s) }
+          @role_map = RoleMap.new
           map_roles(#{setup_args}.zip(arguments))
           postinitialize
         end
-      "
+      ", __FILE__, __LINE__
     end
 
     def private_attr_reader(*method_names)
@@ -129,13 +130,7 @@ module Surrounded
     def trigger(*names, &block)
       if block.nil?
         names.each do |name|
-          unless triggers.include?(name) || name.nil?
-            alias_method :"__trigger_#{name}", :"#{name}"
-            private :"__trigger_#{name}"
-            remove_method :"#{name}"
-            redo_method(name)
-            store_trigger(name)
-          end
+          define_trigger_method(name, &block)
         end
       else
         name = names.first
@@ -158,6 +153,16 @@ module Surrounded
         const_get(name)
       end
     end
+    
+    def define_trigger_method(name, &block)
+      unless triggers.include?(name) || name.nil?
+        alias_method :"__trigger_#{name}", :"#{name}"
+        private :"__trigger_#{name}"
+        remove_method :"#{name}"
+        redo_method(name)
+        store_trigger(name)
+      end
+    end
 
     def redo_method(name)
       class_eval %{
@@ -171,7 +176,7 @@ module Surrounded
             remove_roles if __apply_role_policy == :trigger
           end
         end
-      }
+      }, __FILE__, __LINE__
     end
 
     module InstanceMethods

data/lib/surrounded/shortcuts.rb

@@ -0,0 +1,19 @@
+module Surrounded
+  module Shortcuts
+    private
+    
+    def define_shortcut(name)
+      singleton_class.send(:define_method, name) do |*args|
+        instance = self.new(*args)
+        instance.public_send(name)
+      end
+    end
+    
+    def store_trigger(*names)
+      names.each do |name|
+        define_shortcut(name)
+      end
+      @triggers.merge(names)
+    end
+  end
+end

data/lib/surrounded/version.rb

@@ -1,3 +1,3 @@
 module Surrounded
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/test/context_shortcuts_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+class ShortcutContext
+  extend Surrounded::Context
+  shortcut_triggers
+  
+  initialize :user, :other
+  
+  trigger :shorty do
+    user.speak
+  end
+  
+  role :user do
+    def speak
+      'it works, shorty!'
+    end
+  end
+end
+
+describe Surrounded::Context, 'shortcuts' do
+  let(:user){ User.new("Jim") }
+  let(:other){ User.new("Guille") }
+  it 'creates shortcut class methods for triggers' do
+    assert_equal 'it works, shorty!', ShortcutContext.shorty(user, other)
+  end
+end

data/test/surrounded_context_test.rb

@@ -124,7 +124,7 @@ class RoleAssignmentContext
   end
 end
 
-describe Surrounded::Context, '.setup' do
+describe Surrounded::Context, '.initialize' do
   it 'defines an initialize method accepting the same arguments' do
     assert_equal 2, RoleAssignmentContext.instance_method(:initialize).arity
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: surrounded
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - '''Jim Gay'''
@@ -73,9 +73,11 @@ files:
 - lib/surrounded/context/negotiator.rb
 - lib/surrounded/context/role_map.rb
 - lib/surrounded/context_errors.rb
+- lib/surrounded/shortcuts.rb
 - lib/surrounded/version.rb
 - surrounded.gemspec
 - test/context_access_test.rb
+- test/context_shortcuts_test.rb
 - test/example_proxy_test.rb
 - test/example_threaded_test.rb
 - test/example_wrapper_test.rb
@@ -109,6 +111,7 @@ specification_version: 4
 summary: Create encapsulated environments for your objects.
 test_files:
 - test/context_access_test.rb
+- test/context_shortcuts_test.rb
 - test/example_proxy_test.rb
 - test/example_threaded_test.rb
 - test/example_wrapper_test.rb