allowy 0.1.3 → 0.2.0

data/allowy.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
 
   s.add_runtime_dependency "i18n"
-  s.add_runtime_dependency "activesupport"
+  s.add_runtime_dependency "activesupport", "~> 3.2"
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "pry"

data/lib/allowy/access_control.rb

@@ -5,25 +5,23 @@ module Allowy
       attr_reader :context
     end
 
-    module InstanceMethods
-      def initialize(ctx)
-        @context = ctx
-      end
-
-      def can?(action, *args)
-        m = "#{action}?"
-        raise UndefinedAction.new("The #{self.class.name} needs to have #{m} method. Please define it.") unless self.respond_to? m
-        send(m, *args)
-      end
+    def initialize(ctx)
+      @context = ctx
+    end
 
-      def cannot?(*args)
-        not can?(*args)
-      end
+    def can?(action, *args)
+      m = "#{action}?"
+      raise UndefinedAction.new("The #{self.class.name} needs to have #{m} method. Please define it.") unless self.respond_to? m
+      send(m, *args)
+    end
 
-      def authorize!(*args)
-        raise AccessDenied.new("Not authorized", args.first, args[1]) unless can?(*args)
-      end
+    def cannot?(*args)
+      not can?(*args)
     end
 
+    def authorize!(*args)
+      raise AccessDenied.new("Not authorized", args.first, args[1]) unless can?(*args)
+    end
   end
+
 end

data/lib/allowy/context.rb

@@ -21,27 +21,25 @@ module Allowy
   module Context
     extend ActiveSupport::Concern
 
-    module InstanceMethods
 
-      def allowy_context
-        self
-      end
+    def allowy_context
+      self
+    end
 
-      def current_allowy
-        @current_allowy ||= ::Allowy::Registry.new(allowy_context)
-      end
+    def current_allowy
+      @current_allowy ||= ::Allowy::Registry.new(allowy_context)
+    end
 
-      def can?(action, subject, *args)
-        current_allowy.access_control_for!(subject).can?(action, subject, *args)
-      end
+    def can?(action, subject, *args)
+      current_allowy.access_control_for!(subject).can?(action, subject, *args)
+    end
 
-      def cannot?(*args)
-        current_allowy.access_control_for!(subject).cannot?(action, subject, *args)
-      end
+    def cannot?(*args)
+      current_allowy.access_control_for!(subject).cannot?(action, subject, *args)
+    end
 
-      def authorize!(action, subject, *args)
-        current_allowy.access_control_for!(subject).authorize!(action, subject, *args)
-      end
+    def authorize!(action, subject, *args)
+      current_allowy.access_control_for!(subject).authorize!(action, subject, *args)
     end
   end
 

data/lib/allowy/matchers.rb

@@ -7,15 +7,10 @@ module Allowy
       end
 
       def say msg
-        "#{msg} #{@action} #{@subject.inspect}" + if @context
-          ' with ' + @context.inspect
-        else
-          ''
-        end
+        "#{msg} #{@action} #{@subject.inspect}"
       end
 
       def matches?(access_control)
-        @context = access_control.context
         access_control.can?(@action, @subject)
       end
 

data/lib/allowy/version.rb

@@ -1,3 +1,3 @@
 module Allowy
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/spec/context_spec.rb

@@ -1,33 +1,6 @@
 require 'spec_helper'
 
 module Allowy
-  module Context
-    extend ActiveSupport::Concern
-
-    module InstanceMethods
-
-      def allowy_context
-        self
-      end
-
-      def current_allowy
-        @current_allowy ||= ::Allowy::Registry.new(allowy_context)
-      end
-
-      def can?(action, subject, *args)
-        current_allowy.access_control_for!(subject).can?(action, subject, *args)
-      end
-
-      def cannot?(*args)
-        current_allowy.access_control_for!(subject).cannot?(action, subject, *args)
-      end
-
-      def authorize!(action, subject, *args)
-        current_allowy.access_control_for!(subject).authorize!(action, subject, *args)
-      end
-    end
-  end
-
   class SampleContext
     include Context
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: allowy
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000 Z
+date: 2012-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70143292970420 !ruby/object:Gem::Requirement
+  requirement: &70283147409820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143292970420
+  version_requirements: *70283147409820
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70143292969800 !ruby/object:Gem::Requirement
+  requirement: &70283147409320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70143292969800
+  version_requirements: *70283147409320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70143292969140 !ruby/object:Gem::Requirement
+  requirement: &70283147408900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70143292969140
+  version_requirements: *70283147408900
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70143292968580 !ruby/object:Gem::Requirement
+  requirement: &70283147408440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70143292968580
+  version_requirements: *70283147408440
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70143292967960 !ruby/object:Gem::Requirement
+  requirement: &70283147408020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70143292967960
+  version_requirements: *70283147408020
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70143292967200 !ruby/object:Gem::Requirement
+  requirement: &70283147407600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70143292967200
+  version_requirements: *70283147407600
 description: Allowy provides CanCan-like way of checking permission but doesn't enforce
   a tight DSL giving you more control
 email: