happy 0.1.0.pre12 → 0.1.0.pre13

data/lib/happy/context.rb

@@ -23,11 +23,6 @@ module Happy
       old_controller = self.controller
       self.controller = new_controller
 
-      # execute permissions block    SMELL - better integration
-      if controller.class.respond_to?(:permissions_blk)
-        controller.class.permissions_blk.try(:call, permissions, self)
-      end
-
       # execute block
       yield
     ensure

data/lib/happy/ext/permissions.rb

@@ -7,27 +7,21 @@ module Happy
         extend ActiveSupport::Concern
 
         def permissions(&blk)
-          @permissions ||= Allowance.define
+          (@permissions ||= Allowance::Permissions.new).tap do |p|
+            if blk
+              blk.arity == 0 ? p.instance_exec(&blk) : blk.call(p)
+            end
+          end
         end
 
-        def can?(*args)
-          permissions.allowed?(*args)
-        end
+        alias_method :can, :permissions
       end
 
       module ControllerExtensions
         extend ActiveSupport::Concern
 
         included do
-          delegate :can?, :to => :context
-        end
-
-        module ClassMethods
-          attr_accessor :permissions_blk
-
-          def permissions(&blk)
-            self.permissions_blk = blk
-          end
+          delegate :permissions, :can, :to => :context
         end
       end
     end

data/lib/happy/ext/resources.rb

@@ -23,11 +23,11 @@ module Happy
         end
 
         def resource_with_permission_scope(*args)
-          context.permissions.scoped_model(*args, options[:class])
+          permissions.scoped_model(*args, options[:class])
         end
 
         def require_permission!(*args)
-          raise "not allowed" unless can?(*args, options[:class])
+          raise "not allowed" unless permissions.can?(*args, options[:class])
         end
 
         def set_plural_variable(v)

data/lib/happy/version.rb

@@ -1,3 +1,3 @@
 module Happy
-  VERSION = "0.1.0.pre12"
+  VERSION = "0.1.0.pre13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happy
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre12
+  version: 0.1.0.pre13
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70295340567400 !ruby/object:Gem::Requirement
+  requirement: &70218841196860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70295340567400
+  version_requirements: *70218841196860
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70295340555820 !ruby/object:Gem::Requirement
+  requirement: &70218841195560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70295340555820
+  version_requirements: *70218841195560
 - !ruby/object:Gem::Dependency
   name: happy-helpers
-  requirement: &70295340539140 !ruby/object:Gem::Requirement
+  requirement: &70218841194520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.0.pre9
   type: :runtime
   prerelease: false
-  version_requirements: *70295340539140
+  version_requirements: *70218841194520
 - !ruby/object:Gem::Dependency
   name: allowance
-  requirement: &70295340535640 !ruby/object:Gem::Requirement
+  requirement: &70218841193840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70295340535640
+  version_requirements: *70218841193840
 - !ruby/object:Gem::Dependency
   name: happy-cli
-  requirement: &70295340526260 !ruby/object:Gem::Requirement
+  requirement: &70218841193140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.0.pre1
   type: :runtime
   prerelease: false
-  version_requirements: *70295340526260
+  version_requirements: *70218841193140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70295340518680 !ruby/object:Gem::Requirement
+  requirement: &70218841192140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295340518680
+  version_requirements: *70218841192140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70295340505940 !ruby/object:Gem::Requirement
+  requirement: &70218841189600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70295340505940
+  version_requirements: *70218841189600
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
-  requirement: &70295340498580 !ruby/object:Gem::Requirement
+  requirement: &70218841188740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295340498580
+  version_requirements: *70218841188740
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70295340485280 !ruby/object:Gem::Requirement
+  requirement: &70218841187540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295340485280
+  version_requirements: *70218841187540
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70295340465380 !ruby/object:Gem::Requirement
+  requirement: &70218841186200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295340465380
+  version_requirements: *70218841186200
 description: A happy little toolkit for writing web applications.
 email:
 - hendrik@mans.de