permissive 0.2.4.alpha → 0.2.5.alpha

data/VERSION

@@ -1 +1 @@
-0.2.4.alpha
+0.2.5.alpha

data/lib/permissive/permission_definition.rb

@@ -81,27 +81,24 @@ module Permissive
         eoc
       end
 
-      if model.instance_methods.include?('role=') && !model.respond_to?(:permissive_role_defined?)
-        puts "role= defined but role_defined? is false"
+      if model.column_names.include?('role')
         model.class_eval do
-          def role_with_permissive=(role_name)
-            self.permissions = self.class.permissions[:global].roles[role_name.to_s.downcase.to_sym]
-            self.role_without_permissive = role_name.to_s.downcase
+          def role=(role_name)
+            if role_name
+              self.permissions = self.class.permissions[:global].roles[role_name.to_s.downcase.to_sym]
+              if respond_to?(:write_attribute)
+                write_attribute(:role, role_name.to_s.downcase.strip)
+              end
+            else
+              self.permissions = []
+            end
           end
         end
-        model.alias_method_chain :role=, :permissive
       else
         model.class_eval do
           def role=(role_name)
             self.permissions = self.class.permissions[:global].roles[role_name.to_s.downcase.to_sym]
           end
-
-          class << self
-            def permissive_role_defined?
-              true
-            end
-            protected :permissive_role_defined?
-          end
         end
       end
     end
@@ -138,7 +135,7 @@ module Permissive
         @role = name.to_s.to_sym
         roles[@role] ||= []
         instance_eval(&block) if block_given?
-        if model.instance_methods.include?('role') && !model.instance_methods.include?("is_#{name}?")
+        if model.column_names.include?('role') && !model.instance_methods.include?("is_#{name}?")
           model.class_eval <<-eoc
             def is_#{name}?
               role == #{name.to_s.downcase.inspect}

data/spec/roles_spec.rb

@@ -61,4 +61,26 @@ describe Permissive, "roles" do
       user.can?(:flee).should be_false
     end
   end
+
+  describe "for models that store the role" do
+    before :each do
+      PermissiveSpecHelper.db_up
+    end
+
+    it "should, like, actually store it" do
+      user = UserWithRole.create!(:role => 'hungry_person')
+      UserWithRole.find(user.id).role.should == 'hungry_person'
+    end
+
+    it "should meta-program an 'is_role?' method" do
+      user = UserWithRole.create!(:role => 'hungry_person')
+      user.should respond_to :is_hungry_person?
+    end
+
+    it "should return `true` from 'is_role?' when a user has the correct role" do
+      user = UserWithRole.create!(:role => 'hungry_person')
+      user.is_hungry_person?.should be_true
+      user.is_sleepy_person?.should be_false
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -41,4 +41,5 @@ end
 
 # Setup the logging
 PermissiveSpecHelper.clear_log
-ActiveRecord::Base.logger = Logger.new(PermissiveSpecHelper.log_path)
+ActiveRecord::Base.logger = Logger.new(PermissiveSpecHelper.log_path)
+PermissiveSpecHelper.db_up

data/spec/spec_models.rb

@@ -1,13 +1,23 @@
-# Setup some basic models to test with. We'll set permissions on both,
-# and then test :scope'd permissions through both.
-class Permissive::Organization < ActiveRecord::Base
-  set_table_name :permissive_organizations
-end
-
-class Permissive::User < ActiveRecord::Base
-  set_table_name :permissive_users
-end
-
-class UserWithRole < ActiveRecord::Base
-  set_table_name :permissive_users_with_roles
-end
+if defined?(Permissive)
+  # Setup some basic models to test with. We'll set permissions on both,
+  # and then test :scope'd permissions through both.
+  class Permissive::Organization < ActiveRecord::Base
+    set_table_name :permissive_organizations
+  end
+
+  class Permissive::User < ActiveRecord::Base
+    set_table_name :permissive_users
+  end
+
+  class UserWithRole < ActiveRecord::Base
+    set_table_name :permissive_users_with_roles
+
+    has_permissions do
+      to :eat, 0
+      to :sleep, 1
+
+      role(:hungry_person) { can :eat }
+      role(:sleepy_person) { can :sleep }
+    end
+  end
+end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
+  - 5
   - alpha
-  version: 0.2.4.alpha
+  version: 0.2.5.alpha
 platform: ruby
 authors: 
 - Flip Sasser
@@ -48,10 +48,16 @@ files:
 - lib/permissive/permission.rb
 - lib/permissive/permission_definition.rb
 - rails/init.rb
+- spec/checking_permissions_spec.rb
+- spec/defining_permissions_spec.rb
 - spec/has_permissions_spec.rb
+- spec/metaprogramming_spec.rb
 - spec/rcov.opts
+- spec/roles_spec.rb
+- spec/scoping_permissions_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/spec_models.rb
 has_rdoc: true
 homepage: http://github.com/flipsasser/permissive
 licenses: []