<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>generators/permissable/permissible_generator.rb</filename>
    </added>
    <added>
      <filename>generators/permissable/templates/acts_as_permissible.rb</filename>
    </added>
    <added>
      <filename>generators/permissable/templates/acts_as_permissible_spec.rb</filename>
    </added>
    <added>
      <filename>tasks/acts_as_permissible_tasks.rake</filename>
    </added>
    <added>
      <filename>test/acts_as_permissible_test.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -5,20 +5,20 @@ This plugin enables any activerecord model to have permissions.
 It provides a set of methods for querying the model's permissions.
 In addition, the plugin can generate roles support, which turns in into a full RBAC (Role Based Access Control) solution.
 
-Any model which includes the line &quot;acts_as_permissable&quot; can have permissions, and with roles support it can also have roles which in turn have their own permissions.
+Any model which includes the line &quot;acts_as_permissible&quot; can have permissions, and with roles support it can also have roles which in turn have their own permissions.
 Roles can also belong to roles, which creates a sort of inheritance hierarchy.
 When permissions are calculated, the model's permissions are merged with the model's role permissions (if any), which in turn are merged with the role's roles permissions, until a finite permissions hash is generated.
 In the case of identical keys, a false value overrides a true value. A nil value is false.
 
 Setup
 =====
-script/generate permissable &lt;PermissionModelName&gt; [RoleModelName]
+script/generate permissible &lt;PermissionModelName&gt; [RoleModelName]
 
 The role model name is optional. If you do not want the roles support generated, use the --skip-roles option.
 
-examples: script/generate permissable Permission Role
-		  script/generate permissable Permission Group
-		  script/generate permissable Allowance --skip-roles
+examples: script/generate permissible Permission Role
+		  script/generate permissible Permission Group
+		  script/generate permissible Allowance --skip-roles
 
 use --skip-migration if you don't want a migration created for the permissions model.
 
@@ -31,7 +31,7 @@ Add role-&gt;role relationships in your roles_memberships table.
 
 Important
 =========
-add these lines to any model which acts_as_permissable and has roles:
+add these lines to any model which acts_as_permissible and has roles:
 
 	has_many :role_memberships, :as =&gt; :roleable
 	has_many :roles, :through =&gt; :role_memberships
@@ -46,7 +46,7 @@ Usage
 =====
 
 	class User &lt; Activerecord::Base
-		acts_as_permissable
+		acts_as_permissible
 	end
 
 Now a user will have the following methods:
@@ -76,4 +76,4 @@ Copyright (c) 2008 Noam Ben-Ari, released under the MIT license
 
         
         # TODO:
-		# acts_as_permissable_system that includes controller stuff like before_filters.
+		# acts_as_permissible_system that includes controller stuff like before_filters.</diff>
      <filename>README</filename>
    </modified>
    <modified>
      <diff>@@ -5,17 +5,17 @@ require 'rake/rdoctask'
 desc 'Default: run unit tests.'
 task :default =&gt; :test
 
-desc 'Test the acts_as_permissable plugin.'
+desc 'Test the acts_as_permissible plugin.'
 Rake::TestTask.new(:test) do |t|
   t.libs &lt;&lt; 'lib'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
 
-desc 'Generate documentation for the acts_as_permissable plugin.'
+desc 'Generate documentation for the acts_as_permissible plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ActsAsPermissable'
+  rdoc.title    = 'ActsAsPermissible'
   rdoc.options &lt;&lt; '--line-numbers' &lt;&lt; '--inline-source'
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')</diff>
      <filename>Rakefile</filename>
    </modified>
    <modified>
      <diff>@@ -1 +1 @@
-./script/generate permissable PermissionsModelName
\ No newline at end of file
+./script/generate permissible PermissionsModelName
\ No newline at end of file</diff>
      <filename>generators/permissable/USAGE</filename>
    </modified>
    <modified>
      <diff>@@ -1,48 +1,48 @@
 one:
     id: 1
-    permissable_id: 7
-    permissable_type: &quot;&lt;%= class_name %&gt;&quot;
+    permissible_id: 7
+    permissible_type: &quot;&lt;%= class_name %&gt;&quot;
     action: &quot;view_something&quot;
     granted: 1
 two:
     id: 2
-    permissable_id: 7
-    permissable_type: &quot;&lt;%= class_name %&gt;&quot;
+    permissible_id: 7
+    permissible_type: &quot;&lt;%= class_name %&gt;&quot;
     action: &quot;delete_something&quot;
     granted: 0
 three:
     id: 3
-    permissable_id: 8
-    permissable_type: &quot;&lt;%= class_name %&gt;&quot;
+    permissible_id: 8
+    permissible_type: &quot;&lt;%= class_name %&gt;&quot;
     action: &quot;view_something&quot;
     granted: 1
 four:
     id: 4
-    permissable_id: 8
-    permissable_type: &quot;&lt;%= class_name %&gt;&quot;
+    permissible_id: 8
+    permissible_type: &quot;&lt;%= class_name %&gt;&quot;
     action: &quot;delete_something&quot;
     granted: 1
 five:
     id: 5
-    permissable_id: 8
-    permissable_type: &quot;&lt;%= class_name %&gt;&quot;
+    permissible_id: 8
+    permissible_type: &quot;&lt;%= class_name %&gt;&quot;
     action: &quot;update_something&quot;
     granted: 1
 six:
     id: 6
-    permissable_id: 8
-    permissable_type: &quot;&lt;%= class_name %&gt;&quot;
+    permissible_id: 8
+    permissible_type: &quot;&lt;%= class_name %&gt;&quot;
     action: &quot;create_something&quot;
     granted: 0
 perm:
     id: 7
-    permissable_id: 47
-    permissable_type: &quot;User&quot;
+    permissible_id: 47
+    permissible_type: &quot;User&quot;
     action: &quot;non_important&quot;
     granted: 1
 perm2:
     id: 8
-    permissable_id: 48
-    permissable_type: &quot;User&quot;
+    permissible_id: 48
+    permissible_type: &quot;User&quot;
     action: &quot;non_important&quot;
     granted: 1
\ No newline at end of file</diff>
      <filename>generators/permissable/templates/fixtures.yml</filename>
    </modified>
    <modified>
      <diff>@@ -1,2 +1,2 @@
-require 'lib/acts_as_permissable'
-ActiveRecord::Base.send(:include, NoamBenAri::Acts::Permissable)
\ No newline at end of file
+require 'lib/acts_as_permissible'
+ActiveRecord::Base.send(:include, NoamBenAri::Acts::Permissible)
\ No newline at end of file</diff>
      <filename>generators/permissable/templates/initializer.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,8 +1,8 @@
 class &lt;%= migration_name %&gt; &lt; ActiveRecord::Migration
   def self.up
     create_table &quot;&lt;%= table_name %&gt;&quot;, :force =&gt; true do |t|
-      t.integer :permissable_id
-      t.string :permissable_type
+      t.integer :permissible_id
+      t.string :permissible_type
       t.string :action
       t.boolean :granted
 </diff>
      <filename>generators/permissable/templates/migration.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,14 +1,14 @@
 class &lt;%= class_name %&gt; &lt; ActiveRecord::Base
   # uncomment any of the following lines which is relevant to your application,
-  # or create your own with the name of the model which acts_as_permissable.
+  # or create your own with the name of the model which acts_as_permissible.
   #belongs_to :user
   belongs_to :&lt;%= role_model_file_name %&gt;
-  belongs_to :permissable, :polymorphic =&gt; true
+  belongs_to :permissible, :polymorphic =&gt; true
   
-  validates_presence_of :permissable_id, :permissable_type, :action
+  validates_presence_of :permissible_id, :permissible_type, :action
   validates_format_of :action, :with =&gt; /^[a-z_]+$/
-  validates_numericality_of :permissable_id
-  validates_uniqueness_of :action, :scope =&gt; [:permissable_id,:permissable_type]
+  validates_numericality_of :permissible_id
+  validates_uniqueness_of :action, :scope =&gt; [:permissible_id,:permissible_type]
   
   def to_hash
     self.new_record? ? {} : {self.action =&gt; self.granted}</diff>
      <filename>generators/permissable/templates/model.rb</filename>
    </modified>
    <modified>
      <diff>@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe &lt;%= class_name %&gt;, &quot;to_hash&quot; do
   before(:each) do
-    @permission = &lt;%= class_name %&gt;.new(:permissable_id =&gt; 1, :permissable_type =&gt; &quot;User&quot;, :action =&gt; &quot;some_action&quot;, :granted =&gt; 1)
+    @permission = &lt;%= class_name %&gt;.new(:permissible_id =&gt; 1, :permissible_type =&gt; &quot;User&quot;, :action =&gt; &quot;some_action&quot;, :granted =&gt; 1)
   end
   
   it &quot;to_hash returns {} if new record&quot; do
@@ -18,26 +18,26 @@ end
 
 describe &lt;%= class_name %&gt;, &quot;validations&quot; do
   before(:each) do
-    @permission = &lt;%= class_name %&gt;.new(:permissable_id =&gt; 1, :permissable_type =&gt; &quot;User&quot;, :action =&gt; &quot;some_action&quot;, :granted =&gt; 1)
+    @permission = &lt;%= class_name %&gt;.new(:permissible_id =&gt; 1, :permissible_type =&gt; &quot;User&quot;, :action =&gt; &quot;some_action&quot;, :granted =&gt; 1)
   end
   
   it &quot;should be valid&quot; do
     @permission.should be_valid
   end
 
-  it &quot;action should be unique to a permissable id and type&quot; do
+  it &quot;action should be unique to a permissible id and type&quot; do
     @permission.save
-    @permission2 = &lt;%= class_name %&gt;.new(:permissable_id =&gt; 1, :permissable_type =&gt; &quot;User&quot;, :action =&gt; &quot;some_action&quot;, :granted =&gt; 0)
+    @permission2 = &lt;%= class_name %&gt;.new(:permissible_id =&gt; 1, :permissible_type =&gt; &quot;User&quot;, :action =&gt; &quot;some_action&quot;, :granted =&gt; 0)
     @permission2.should_not be_valid
   end
   
-  it &quot;must have a permissable_id&quot; do
-    @permission.permissable_id = nil
+  it &quot;must have a permissible_id&quot; do
+    @permission.permissible_id = nil
     @permission.should_not be_valid
   end
   
-  it &quot;must have a permissable_type&quot; do
-    @permission.permissable_type = nil
+  it &quot;must have a permissible_type&quot; do
+    @permission.permissible_type = nil
     @permission.should_not be_valid
   end
   </diff>
      <filename>generators/permissable/templates/model_spec.rb</filename>
    </modified>
    <modified>
      <diff>@@ -8,5 +8,5 @@ class &lt;%= role_model_name %&gt; &lt; ActiveRecord::Base
   
   validates_uniqueness_of :name
   
-  acts_as_permissable
+  acts_as_permissible
 end
\ No newline at end of file</diff>
      <filename>generators/permissable/templates/role_model.rb</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>generators/permissable/permissable_generator.rb</filename>
    </removed>
    <removed>
      <filename>generators/permissable/templates/acts_as_permissable.rb</filename>
    </removed>
    <removed>
      <filename>generators/permissable/templates/acts_as_permissable_spec.rb</filename>
    </removed>
    <removed>
      <filename>tasks/acts_as_permissable_tasks.rake</filename>
    </removed>
    <removed>
      <filename>test/acts_as_permissable_test.rb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>b6bc36298b3889fb1929c0264140130ea471e80d</id>
    </parent>
  </parents>
  <author>
    <name>Noam Ben-Ari</name>
    <email>nbenari@gmail.com</email>
  </author>
  <url>http://github.com/NoamB/acts_as_permissible/commit/0b2bee7f27bbe607b6ee398027c3531765b99b72</url>
  <id>0b2bee7f27bbe607b6ee398027c3531765b99b72</id>
  <committed-date>2008-05-09T16:19:35-07:00</committed-date>
  <authored-date>2008-05-09T16:19:35-07:00</authored-date>
  <message>changed spelling error permissable to permissible.</message>
  <tree>513c0c00de72e6c2473552e89c65663ca74dbb01</tree>
  <committer>
    <name>Noam Ben-Ari</name>
    <email>nbenari@gmail.com</email>
  </committer>
</commit>
