cancan-permits 0.2.3 → 0.2.5

data/README.markdown

@@ -2,14 +2,17 @@
 
 Role specific Permits for use with [CanCan](http://github.com/ryanb/cancan) permission system.
 
-## Update Oct 13
+## Update Oct 14
 
-Now updated to support multiple ownership startegies so that alternative ORMs can be supported. 
+Now updated to support multiple ownership startegies so that alternative ORMs can be supported.  
 This gem now includes specs that demonstrate how to configure it for use with Active Record, Data Mapper, Mongoid, Mongo Mapper 
 Special thanks to Sam (yoda) for the initial inspiration and work to ensure support for Mongoid  :)
 
-The generator has also been updated slightly to support this new strategy option as of version 0.2.1. 
-In general, the new Permits API now uses an options hash to replace the old optional request parameter. 
+The built in ownership strategies are :default and :string. The default strategy can be used for generic models and Active Record, where there is no need of 
+type conversion. For some ORMs, like fx Mongoid, there is a need to convert the key (BSON Identifier) to a string for the "comparison" to work, hence the strategy is named :string. 
+
+The Permits generator has also been updated slightly to support this new strategy option as of version 0.2.1. 
+In general, the new Permits API now uses an options hash to replace the previous optional request parameter. 
 This design allows for better extensibility in the future if needed. 
 
 ## Install
@@ -84,6 +87,63 @@ You can be enable this simply by setting the following class instance variable:
 
 <code>Permits::Configuration.localhost_manager = true</code>
 
+### Licenses
+
+Permits also supports creation more fine-grained permits through the use of Licenses.  
+Licenses are a way to group logical fragments of permission statements to be reused across multiple permits.
+The generator will create a licenses.rb file in the permits folder where you can put your licenses. For more complex scenarios, you might want to have a separate
+licenses subfolder where you put your license files.
+
+License example:
+<pre>
+  class BloggingLicense < License::Base
+    def initialize name
+      super
+    end
+
+    def enforce!
+      can(:read, Blog)
+      can(:create, Post)
+      owns(user, Post)
+    end
+  end  
+</pre>
+
+Usage example:
+
+<pre>
+  class GuestPermit < Permit::Base
+    def initialize(ability, options = {})
+      super
+    end
+
+    def permit?(user, options = {}) 
+      super    
+      return if !role_match? user
+
+      licenses :user_admin, :blogging
+    end
+  end
+end
+</pre>
+
+By convention the permits system will try to find a license named UserAdminLicense and BloggingLicense in this example and call enforce! on each license.
+
+## ORMs
+
+The easiest option is to directly set the orm as a class variable. An appropriate ownership strategy will be selected accordingly for the ORM. 
+
+<pre>
+  Permits::Ability.orm = :data_mapper
+</pre>
+
+Alternatively set it for the Ability instance for more fine grained control
+<pre>
+  ability = Permits::Ability.new(@editor, :strategy => :string)  
+</pre>
+
+The ORMs currently supported (and tested) are :active_record, :data_mapper, :mongoid, :mongo_mapper
+
 ## Permits Generator
 
 Options

data/Rakefile

@@ -7,7 +7,7 @@ begin
     gem.email = "kmandrup@gmail.com"
     gem.homepage = "http://github.com/kristianmandrup/cancan-permits"
     gem.authors = ["Kristian Mandrup"]
-    gem.add_development_dependency "rspec",           "~> 2.0.0.beta.22"
+    gem.add_development_dependency "rspec",           "~> 2.0.0"
     gem.add_development_dependency 'code-spec',       "~> 0.2.5"
     gem.add_development_dependency 'rails-app-spec',  "~> 0.2.14"
 

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.5

data/cancan-permits.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cancan-permits}
-  s.version = "0.2.3"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-10-14}
+  s.date = %q{2010-10-17}
   s.description = %q{Role specific Permits for use with CanCan permission system}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -55,13 +55,14 @@ Gem::Specification.new do |s|
      "spec/data_mapper/owner_permits_spec.rb",
      "spec/data_mapper/permits_spec.rb",
      "spec/data_mapper/spec_helper.rb",
+     "spec/fixtures/permits/admin_permit.rb",
+     "spec/fixtures/permits/editor_permit.rb",
+     "spec/fixtures/permits/guest_permit.rb",
      "spec/generators/permit_generator_spec.rb",
-     "spec/generic/fixtures/permits/admin_permit.rb",
-     "spec/generic/fixtures/permits/editor_permit.rb",
-     "spec/generic/fixtures/permits/guest_permit.rb",
-     "spec/generic/permits/fixtures/models.rb",
-     "spec/generic/permits/owner_permits_spec.rb",
-     "spec/generic/permits/permits_spec.rb",
+     "spec/generic/models/all_models.rb",
+     "spec/generic/owner_permits_spec.rb",
+     "spec/generic/permits_spec.rb",
+     "spec/generic/spec_helper.rb",
      "spec/mongo_mapper/models/all_models.rb",
      "spec/mongo_mapper/owner_permits_spec.rb",
      "spec/mongo_mapper/permits_spec.rb",
@@ -90,13 +91,14 @@ Gem::Specification.new do |s|
      "spec/data_mapper/owner_permits_spec.rb",
      "spec/data_mapper/permits_spec.rb",
      "spec/data_mapper/spec_helper.rb",
+     "spec/fixtures/permits/admin_permit.rb",
+     "spec/fixtures/permits/editor_permit.rb",
+     "spec/fixtures/permits/guest_permit.rb",
      "spec/generators/permit_generator_spec.rb",
-     "spec/generic/fixtures/permits/admin_permit.rb",
-     "spec/generic/fixtures/permits/editor_permit.rb",
-     "spec/generic/fixtures/permits/guest_permit.rb",
-     "spec/generic/permits/fixtures/models.rb",
-     "spec/generic/permits/owner_permits_spec.rb",
-     "spec/generic/permits/permits_spec.rb",
+     "spec/generic/models/all_models.rb",
+     "spec/generic/owner_permits_spec.rb",
+     "spec/generic/permits_spec.rb",
+     "spec/generic/spec_helper.rb",
      "spec/mongo_mapper/models/all_models.rb",
      "spec/mongo_mapper/owner_permits_spec.rb",
      "spec/mongo_mapper/permits_spec.rb",
@@ -113,14 +115,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
       s.add_development_dependency(%q<code-spec>, ["~> 0.2.5"])
       s.add_development_dependency(%q<rails-app-spec>, ["~> 0.2.14"])
       s.add_runtime_dependency(%q<cancan>, ["~> 1.4.0"])
       s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.10"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+      s.add_dependency(%q<rspec>, ["~> 2.0.0"])
       s.add_dependency(%q<code-spec>, ["~> 0.2.5"])
       s.add_dependency(%q<rails-app-spec>, ["~> 0.2.14"])
       s.add_dependency(%q<cancan>, ["~> 1.4.0"])
@@ -128,7 +130,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+    s.add_dependency(%q<rspec>, ["~> 2.0.0"])
     s.add_dependency(%q<code-spec>, ["~> 0.2.5"])
     s.add_dependency(%q<rails-app-spec>, ["~> 0.2.14"])
     s.add_dependency(%q<cancan>, ["~> 1.4.0"])

data/lib/cancan-permits/permit/base_permit.rb

@@ -10,14 +10,14 @@ module Permit
           clazz = module_name.constantize
           clazz.new(self).enforce!
         rescue
-          # puts "License #{module_name} not found"
+          raise "License #{module_name} not found"
         end
       end
     end
        
     def initialize ability, options = {}
       @ability  = ability
-      @strategy = options[:strategy] || :default      
+      @strategy = options[:strategy] || Permits::Ability.strategy || :default      
     end
 
     def permit?(user, options = {}) 

data/lib/cancan-permits/permits/ability.rb

@@ -2,45 +2,47 @@ module Permits
   class Ability
     include CanCan::Ability
 
+     class << self
+       attr_accessor :orm, :strategy
+       
+       def orm= orm
+         @orm = orm 
+         case orm
+         when :active_record, :generic
+           @strategy = :default
+         else
+           @strategy = :string
+         end
+       end
+     end
+
     # set up each Permit instance to share this same Ability 
     # so that the can and cannot operations work on the same permission collection!
     def self.permits ability, options = {}
       special_permits = []
       special_permits << [:system, :any].map{|role| make_permit(role, ability, options)}
-      # puts "Available roles: #{Permits::Roles.available}"
       role_permits = Permits::Roles.available.inject([]) do |permits, role|
         permit = make_permit(role, ability, options)
-        # puts "made permit: #{permit}"
         permits << permit if permit
       end
-      # puts "role_permits: #{role_permits.inspect}"      
       (special_permits + role_permits).flatten.compact
     end
 
     def initialize user, options = {}
       # put ability logic here!
-      user ||= Guest.new   
-
+      user ||= Guest.new
       all_permits = Permits::Ability.permits(self, options)
-      # puts "Trying permits: #{all_permits.inspect}"
       all_permits.each do |permit|
         # get role name of permit 
         permit_role = permit.class.demodulize.gsub(/Permit$/, '').underscore.to_sym
-
-        # puts "Permit role: #{permit_role.inspect}"
         if permit_role == :system
           # always execute system permit
           result = permit.permit?(user, options)
           break if result == :break
         else
           # only execute the permit if the user has the role of the permit or is for any role
-          # puts "does user have_role? #{user.has_role?(permit_role)}, #{user.inspect}"
           if user.has_role?(permit_role) || permit_role == :any
-            # puts "user: #{user} of #{permit_role} has permit?"
-            # puts "permit: #{permit.inspect}"
             permit.permit?(user, options) 
-            # else
-            # puts "Permit #{permit} not used for role #{permit_role}"
           end
         end
       end
@@ -51,12 +53,10 @@ module Permits
     def self.make_permit role, ability, options = {}
       begin            
         clazz_name = "#{role.to_s.camelize}Permit"
-        # puts "Attempting to load #{clazz_name} permition class"
         permit_clazz = clazz_name.constantize
         permit_clazz.new(ability, options) if permit_clazz && permit_clazz.kind_of?(Class)
       rescue
-        # puts "permit class not found: #{clazz_name}"
-        nil
+        raise "Permit #{clazz_name} not found"
       end
     end          
   end

data/lib/generators/permits/permits_generator.rb

@@ -1,5 +1,7 @@
 require 'sugar-high/array'
 require 'active_support/inflector'
+require 'rails3_artifactor'
+require 'logging_assist'
 
 class PermitsGenerator < Rails::Generators::Base
   desc "Creates a Permit for each role in 'app/permits' and ensures that the permit folder is added to Rails load path."
@@ -20,16 +22,32 @@ class PermitsGenerator < Rails::Generators::Base
       template_permit role if !role == :admin     
     end    
     template "licenses.rb", "app/permits/licenses.rb"        
+    permits_initializer
   end
   
   protected
 
+  include Rails3::Assist::BasicLogger
+  extend Rails3::Assist::UseMacro
+  
+  use_helpers :app, :file, :special
+
   attr_accessor :permit_name, :permit_logic
 
   # TODO: merge with any registered roles in application
   def roles
     options[:roles].uniq.to_symbols
   end
+  
+  def orm
+    options[:orm]
+  end
+
+  def permits_initializer
+    create_initializer :permits do 
+      "Permits::Ability.orm = :#{orm}"
+    end
+  end 
 
   def template_permit name, template_name=nil
     permit_logic = send "#{name}_logic" if [:admin, :system, :any].include?(name)

data/spec/active_record/owner_permits_spec.rb

@@ -1,5 +1,7 @@
 require 'active_record/spec_helper'
 
+Permits::Ability.orm = :active_record
+
 describe Permits::Ability do
   context "Editor user" do
     context "using default :user_id relation - foreign key to User.id" do   

data/spec/active_record/permits_spec.rb

@@ -1,5 +1,7 @@
 require 'active_record/spec_helper'
 
+Permits::Ability.orm = :active_record
+
 describe Permits::Ability do
   context "Guest user" do
     before :each do

data/spec/active_record/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'rspec/core'
+require 'spec_helper'
 
 require 'rails'
 require 'active_record'
@@ -8,10 +8,6 @@ require 'yaml'
 require 'logger'
 require 'database_cleaner'
 
-require 'cancan/matchers'
-require 'cancan-permits'
-require 'cancan-permits/rspec'
-
 module Rails
   def self.config_root_dir
     File.dirname(__FILE__)
@@ -60,7 +56,6 @@ RSpec.configure do |config|
   end  
 end
 
-require_all File.dirname(__FILE__) + '/../generic/fixtures/permits'
 require_all File.dirname(__FILE__) + '/models/all_models'
 
 module Permits::Roles

data/spec/data_mapper/owner_permits_spec.rb

@@ -1,5 +1,7 @@
 require 'data_mapper/spec_helper'
 
+Permits::Ability.orm = :data_mapper
+
 describe Permits::Ability do
   context "Editor user" do
     context "using default :user_id relation - foreign key to User.id" do   
@@ -7,7 +9,7 @@ describe Permits::Ability do
         @editor         = User.create(:name => "Kristian", :role => "editor")
         @other_guy      = User.create(:name => "Random dude", :role => "admin")
 
-        @ability        = Permits::Ability.new(@editor, :strategy => :string)
+        @ability        = Permits::Ability.new(@editor)
 
         @own_comment    = Comment.create(:user_id => @editor.id)
         @other_comment  = Comment.create(:user_id => @other_guy.id)      

data/spec/data_mapper/permits_spec.rb

@@ -1,11 +1,12 @@
 require 'data_mapper/spec_helper'
 
+Permits::Ability.orm = :data_mapper
+
 describe Permits::Ability do
   context "Guest user" do
     before :each do
       @guest    = User.create(:name => "Kristian", :role => "guest")
-
-      @ability  = Permits::Ability.new(@guest, :strategy => :string)
+      @ability  = Permits::Ability.new(@guest)
 
       @comment  = Comment.create(:user_id => @guest.id)
 

data/spec/data_mapper/spec_helper.rb

@@ -1,17 +1,9 @@
-require 'rspec/core' 
+require 'spec_helper'
 
 require 'dm-core'
 require 'dm-types'
 require 'dm-migrations'
 
-require 'cancan/matchers'
-require 'cancan-permits'
-require 'cancan-permits/rspec'
-
-# gem install dm-core dm-sqlite-adapter 
-# gem install dm-types dm-validations dm-timestamps dm-aggregates dm-adjust dm-is-list dm-is-tree dm-is-versioned dm-is-nested_set 
-# gem install rails_datamapper dm-migrations dm-observer
-
 DataMapper::Logger.new($stdout, :debug)                 
 DataMapper.setup(:default, 'sqlite::memory:')
 
@@ -19,8 +11,6 @@ RSpec.configure do |config|
   config.mock_with :mocha
 end
 
-
-require_all File.dirname(__FILE__) + '/../generic/fixtures/permits'
 require_all File.dirname(__FILE__) + '/models/all_models'
 
 RSpec.configure do |config|

data/spec/generators/permit_generator_spec.rb

@@ -12,7 +12,9 @@ RSpec::Generator.configure do |config|
 end
 
 
-describe 'Permits generator' do
+describe 'Permits generator' do   
+  use_helpers :controller, :special, :file
+    
   setup_generator :permits do
     tests PermitsGenerator
   end
@@ -20,20 +22,29 @@ describe 'Permits generator' do
   describe 'result of running generator with default profile' do
     before :each do
       @generator = with_generator do |g|    
-        g.run_generator
+        arguments = "--orm mongoid".args
+        g.run_generator arguments
       end
     end
-
-    it "should create Admin permit" do
-      @generator.should generate_permit :admin
+    
+    describe 'result of running Permits generator' do
+      it "should create Admin permit" do
+        @generator.should generate_permit :admin
+      end    
+    
+      it "should generate a permits initializer file with orm set to mongoid" do      
+        File.read(initializer_file(:permits)).should match /Permits::Application.orm = mongoid/
+      end      
     end
   end
 
+  # TODO
+
   # describe 'result of running generator with option to create permit for each registered role' do
   #   context "Registered roles :guest, :admin"
   #     before :each do
   #       with_generator do |g|    
-  #         g.run_generator "--roles admin guest"
+  #         g.run_generator "--roles admin editor"
   #       end
   #     end
   # 

data/spec/generic/{permits/owner_permits_spec.rb → owner_permits_spec.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'generic/spec_helper'
 
 describe Permits::Ability do
   context "Editor user" do

data/spec/generic/{permits/permits_spec.rb → permits_spec.rb}

@@ -1,17 +1,4 @@
-require 'spec_helper'
-
-class Comment
-  attr_accessor :owner
-end
-
-class Post
-  attr_accessor :writer  
-end
-
-class Article
-  attr_accessor :author
-end
-
+require 'generic/spec_helper'
 
 describe Permits::Ability do
   context "Guest user" do

data/spec/generic/spec_helper.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+require_all File.dirname(__FILE__) + '/models/all_models'
+
+RSpec.configure do |config|
+  config.mock_with :mocha
+end
+
+module Permits::Roles
+  def self.available
+    User.roles
+  end
+end
+
+class User
+  attr_accessor :id, :role, :name
+
+  def self.roles
+    [:guest, :admin, :editor]
+  end    
+
+  def initialize id, role, name = nil
+    self.id = id    
+    raise ArgumentError, "Role #{role} is not in list of available roles: #{self.class.roles}" if !self.class.roles.include? role
+    self.role = role
+    self.name = name || role.to_s
+  end
+  
+  def has_role? role
+    self.role == role
+  end     
+end

data/spec/mongo_mapper/owner_permits_spec.rb

@@ -1,5 +1,7 @@
 require 'mongo_mapper/spec_helper'
 
+Permits::Ability.orm = :mongo_mapper
+
 describe Permits::Ability do
   context "Editor user" do
     context "using default :user_id relation - foreign key to User.id" do   
@@ -7,7 +9,7 @@ describe Permits::Ability do
         @editor         = User.create(:name => "Kristian", :role => "editor")
         @other_guy      = User.create(:name => "Random dude", :role => "admin")
 
-        @ability        = Permits::Ability.new(@editor, :strategy => :string)
+        @ability        = Permits::Ability.new(@editor)
 
         @own_comment    = Comment.create(:user_id => @editor.id)
         @other_comment  = Comment.create(:user_id => @other_guy.id)      
@@ -42,7 +44,7 @@ describe Permits::Ability do
         @editor         = User.create(:name => "Kristian", :role => "editor")
         @other_guy      = User.create(:name => "Random dude", :role => "admin")
     
-        @ability        = Permits::Ability.new(@editor, :strategy => :string)
+        @ability        = Permits::Ability.new(@editor)
     
         @own_post       = Post.create(:writer => @editor.id)
         @other_post     = Post.create(:writer => @other_guy.id)      

data/spec/mongo_mapper/permits_spec.rb

@@ -1,11 +1,13 @@
 require 'mongo_mapper/spec_helper'
 
+Permits::Ability.orm = :mongo_mapper
+
 describe Permits::Ability do
   context "Guest user" do
     before :each do
       @guest    = User.create(:name => "Kristian", :role => "guest")
 
-      @ability  = Permits::Ability.new(@guest, :strategy => :string)
+      @ability  = Permits::Ability.new(@guest)
 
       @comment  = Comment.create(:user_id => @guest.id)
 

data/spec/mongo_mapper/spec_helper.rb

@@ -1,10 +1,6 @@
-require 'rspec/core' 
+require 'spec_helper' 
 require 'mongo_mapper'
-require 'cancan/matchers'
-require 'cancan-permits'
-require 'cancan-permits/rspec'
 
-require_all File.dirname(__FILE__) + '/../generic/fixtures/permits'
 require_all File.dirname(__FILE__) + '/models/all_models'
 
 RSpec.configure do |config|

data/spec/mongoid/owner_permits_spec.rb

@@ -1,5 +1,7 @@
 require 'mongoid/spec_helper'
 
+Permits::Ability.orm = :mongoid
+
 describe Permits::Ability do
   context "Editor user" do
     context "using default :user_id relation - foreign key to User.id" do   
@@ -7,7 +9,7 @@ describe Permits::Ability do
         @editor         = User.create(:name => "Kristian", :role => "editor")
         @other_guy      = User.create(:name => "Random dude", :role => "admin")
 
-        @ability        = Permits::Ability.new(@editor, :strategy => :string)
+        @ability        = Permits::Ability.new(@editor)
 
         @own_comment    = Comment.create(:user_id => @editor.id)
         @other_comment  = Comment.create(:user_id => @other_guy.id)      
@@ -42,7 +44,7 @@ describe Permits::Ability do
         @editor         = User.create(:name => "Kristian", :role => "editor")
         @other_guy      = User.create(:name => "Random dude", :role => "admin")
 
-        @ability        = Permits::Ability.new(@editor, :strategy => :string)
+        @ability        = Permits::Ability.new(@editor)
 
         @own_post       = Post.create(:writer => @editor.id)
         @other_post     = Post.create(:writer => @other_guy.id)      

data/spec/mongoid/permits_spec.rb

@@ -1,5 +1,7 @@
 require 'mongoid/spec_helper'
 
+Permits::Ability.orm = :mongoid
+
 describe Permits::Ability do
   context "Guest user" do
     before :each do

data/spec/mongoid/spec_helper.rb

@@ -1,10 +1,6 @@
-require 'rspec/core' 
+require 'spec_helper' 
 require 'mongoid'
-require 'cancan/matchers'
-require 'cancan-permits'
-require 'cancan-permits/rspec'
 
-require_all File.dirname(__FILE__) + '/../generic/fixtures/permits'
 require_all File.dirname(__FILE__) + '/models/all_models'
 
 RSpec.configure do |config|

data/spec/spec_helper.rb

@@ -3,35 +3,4 @@ require 'cancan/matchers'
 require 'cancan-permits'
 require 'cancan-permits/rspec'
 
-require_all File.dirname(__FILE__) + '/generic/fixtures/permits'
-
-require_all File.dirname(__FILE__) + '/generic/permits/fixtures'
-
-RSpec.configure do |config|
-  config.mock_with :mocha
-end
-
-module Permits::Roles
-  def self.available
-    User.roles
-  end
-end
-
-class User
-  attr_accessor :id, :role, :name
-
-  def self.roles
-    [:guest, :admin, :editor]
-  end    
-
-  def initialize id, role, name = nil
-    self.id = id    
-    raise ArgumentError, "Role #{role} is not in list of available roles: #{self.class.roles}" if !self.class.roles.include? role
-    self.role = role
-    self.name = name || role.to_s
-  end
-  
-  def has_role? role
-    self.role == role
-  end     
-end
+require_all File.dirname(__FILE__) + '/fixtures/permits'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 +02:00
+date: 2010-10-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,9 +29,7 @@ dependencies:
         - 2
         - 0
         - 0
-        - beta
-        - 22
-        version: 2.0.0.beta.22
+        version: 2.0.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -157,13 +155,14 @@ files:
 - spec/data_mapper/owner_permits_spec.rb
 - spec/data_mapper/permits_spec.rb
 - spec/data_mapper/spec_helper.rb
+- spec/fixtures/permits/admin_permit.rb
+- spec/fixtures/permits/editor_permit.rb
+- spec/fixtures/permits/guest_permit.rb
 - spec/generators/permit_generator_spec.rb
-- spec/generic/fixtures/permits/admin_permit.rb
-- spec/generic/fixtures/permits/editor_permit.rb
-- spec/generic/fixtures/permits/guest_permit.rb
-- spec/generic/permits/fixtures/models.rb
-- spec/generic/permits/owner_permits_spec.rb
-- spec/generic/permits/permits_spec.rb
+- spec/generic/models/all_models.rb
+- spec/generic/owner_permits_spec.rb
+- spec/generic/permits_spec.rb
+- spec/generic/spec_helper.rb
 - spec/mongo_mapper/models/all_models.rb
 - spec/mongo_mapper/owner_permits_spec.rb
 - spec/mongo_mapper/permits_spec.rb
@@ -218,13 +217,14 @@ test_files:
 - spec/data_mapper/owner_permits_spec.rb
 - spec/data_mapper/permits_spec.rb
 - spec/data_mapper/spec_helper.rb
+- spec/fixtures/permits/admin_permit.rb
+- spec/fixtures/permits/editor_permit.rb
+- spec/fixtures/permits/guest_permit.rb
 - spec/generators/permit_generator_spec.rb
-- spec/generic/fixtures/permits/admin_permit.rb
-- spec/generic/fixtures/permits/editor_permit.rb
-- spec/generic/fixtures/permits/guest_permit.rb
-- spec/generic/permits/fixtures/models.rb
-- spec/generic/permits/owner_permits_spec.rb
-- spec/generic/permits/permits_spec.rb
+- spec/generic/models/all_models.rb
+- spec/generic/owner_permits_spec.rb
+- spec/generic/permits_spec.rb
+- spec/generic/spec_helper.rb
 - spec/mongo_mapper/models/all_models.rb
 - spec/mongo_mapper/owner_permits_spec.rb
 - spec/mongo_mapper/permits_spec.rb