roles_data_mapper 0.2.2 → 0.3.0

data/Gemfile

@@ -0,0 +1,21 @@
+source :rubygems
+
+gem "activesupport",     ">= 3.0.1"
+gem "sugar-high",         "~> 0.3.0"
+gem "require_all",        '~> 1.2.0' 
+gem "roles_generic",      '~> 0.3.2'  
+gem 'rails3_artifactor',  '>= 0.3.1'
+gem 'logging_assist',     '>= 0.1.6'
+
+gem "dm-core",            "~> 1.0"
+gem "dm-types",           "~> 1.0"
+gem "dm-migrations",      "~> 1.0"
+gem "dm-validations",     "~> 1.0"
+gem "dm-sqlite-adapter",  "~> 1.0"
+
+group :test do
+  gem "rspec",            ">= 2.0.1" 
+  gem "yaml"
+  gem "logger"
+  gem "generator_spec",   '>= 0.7.0'
+end

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/lib/generators/data_mapper/roles/roles_generator.rb

@@ -14,11 +14,20 @@ module DataMapper
 
       class_option :logfile, :type => :string,   :default => nil,   :desc => "Logfile location"
       class_option :roles, :type => :array, :default => [], :desc => "Valid roles"
+      
+      class_option :role_class,       :type => :string,   :aliases => "-rc", :default => 'Role', :desc => "Role class"
+      class_option :user_class,       :type => :string, :aliases => "-uc", :default => 'User', :desc => "User class"
+      class_option :user_role_class,  :type => :string, :aliases => "-urc", :default => 'UserRole', :desc => "User Role join class"
 
       def apply_role_strategy
         logger.add_logfile :logfile => logfile if logfile
         logger.debug "apply_role_strategy for : #{strategy} in model #{name}"
 
+        if !valid_strategy?
+          say "Strategy '#{strategy}' is not valid, at least not for Data Mapper", :red
+          return 
+        end
+
         if !has_model_file?(user_model_name)
           say "User model #{user_model_name} not found", :red
           return 
@@ -30,9 +39,11 @@ module DataMapper
           end
         rescue Exeption => e
           logger.debug"Error: #{e.message}"
-        end
+        end 
+        
+        copy_role_models if role_class_strategy?        
      end 
-      
+                 
       protected                  
 
       extend Rails3::Assist::UseMacro
@@ -40,6 +51,37 @@ module DataMapper
 
       use_orm :data_mapper
 
+      def valid_strategy?
+        valid_strategies.include? strategy.to_sym
+      end
+
+      def valid_strategies
+        [:admin_flag, :role_string, :one_role, :many_roles, :roles_mask]
+      end        
+
+      def copy_role_models
+        logger.debug 'copy_role_models'
+        case strategy.to_sym  
+        when :one_role
+          copy_one_role_model
+        when :many_roles
+          copy_many_roles_models
+        end
+      end
+
+      def copy_one_role_model
+        logger.debug "copy_one_role_model: #{role_class.underscore}"
+
+        template 'one_role/role.rb', "app/models/#{role_class.underscore}.rb"
+      end
+
+      def copy_many_roles_models        
+        logger.debug "copy_many_roles_models: #{role_class.underscore} and #{user_role_class.underscore}"
+
+        template 'many_roles/role.rb', "app/models/#{role_class.underscore}.rb"        
+        template 'many_roles/user_role.rb', "app/models/#{user_role_class.underscore}.rb"
+      end
+
       def logfile
         options[:logfile]
       end
@@ -55,6 +97,10 @@ module DataMapper
       def default_roles
         [:admin, :guest]        
       end
+
+      def role_class_strategy?
+        [:one_role, :many_roles].include? strategy.to_sym
+      end
   
       def roles_to_add
         @roles_to_add ||= default_roles.concat(options[:roles]).to_symbols.uniq
@@ -65,14 +111,15 @@ module DataMapper
       end
   
       def role_strategy_statement 
-        "strategy :#{strategy}, :default\n#{role_class_stmt}"
+        "strategy :#{strategy} #{strategy_options}"
       end
 
-      def role_class_stmt
-        "  role_class :role" if [:one_role, :many_roles].include? (strategy.to_sym)
+      def strategy_options
+        return ", :role_class => :#{role_class.to_s.underscore}" if role_class_strategy? && role_class.to_s != 'Role'
+        ''
       end
-  
-      def roles_statement
+        
+      def valid_roles_statement
         return '' if has_valid_roles_statement?
         roles ? "valid_roles_are #{roles.join(', ')}" : ''
       end
@@ -84,9 +131,21 @@ module DataMapper
       def insertion_text
         %Q{include Roles::#{orm.to_s.camelize} 
   #{role_strategy_statement}
-  #{roles_statement}}
+  #{valid_roles_statement}}
       end
-  
+
+      def user_class
+        options[:user_class].classify || 'User'
+      end
+
+      def role_class
+        options[:role_class].classify || 'Role'
+      end
+
+      def user_role_class
+        options[:user_role_class].classify || 'UserRole'
+      end
+        
       def strategy
         options[:strategy]                
       end

data/lib/generators/data_mapper/roles/templates/many_roles/role.rb

@@ -0,0 +1,17 @@
+class <%= role_class %>
+  include DataMapper::Resource
+  
+  def self.named role_names 
+    where(:name.in => role_names.flatten)
+  end
+
+  property :id, Serial
+  property :name, String
+
+  validates_uniqueness_of :name
+
+  has n, :<%= user_role_class.to_s.pluralize.underscore %>
+  has n, :<%= user_class.to_s.pluralize.underscore %>, :through => :<%= user_role_class.to_s.pluralize.underscore %>
+
+  extend RoleClass::ClassMethods
+end  

data/lib/generators/data_mapper/roles/templates/many_roles/user_role.rb

@@ -0,0 +1,6 @@
+class <%= user_role_class %>      
+  include DataMapper::Resource
+    
+  belongs_to :<%= user_class.underscore %>, '<%= user_class %>', :key => true
+  belongs_to :<%= role_class.underscore %>, '<%= role_class %>', :key => true
+end  

data/lib/generators/data_mapper/roles/templates/one_role/role.rb

@@ -0,0 +1,14 @@
+class <%= role_class %>
+  include DataMapper::Resource
+  
+  def self.named role_names 
+    where(:name.in => role_names.flatten)
+  end
+
+  property :id, Serial
+  property :name, String
+
+  validates_uniqueness_of :name
+
+  extend RoleClass::ClassMethods
+end  

data/lib/roles_data_mapper/base.rb

@@ -20,13 +20,69 @@ module Roles
         :role_string  => "property :role_string,  String",
         :roles_string => "property :roles_string, String"
       }
+
+      def valid_single_strategies
+        [:admin_flag, :one_role, :role_string]
+      end
+
+      def valid_multi_strategies
+        [:many_roles, :roles_mask]
+      end
+
+      def valid_strategies
+        valid_single_strategies + valid_multi_strategies
+      end
       
-      def strategy name, options=nil
+      def strategy name, options={}
+        strategy_name = name.to_sym
+        raise ArgumentError, "Unknown role strategy #{strategy_name}" if !valid_strategies.include? strategy_name
+
+        use_roles_strategy strategy_name
+
+        set_role_class(strategy_name, options) if strategies_with_role_class.include? strategy_name
+                
         if options == :default && MAP[name]
           instance_eval MAP[name] 
         end
+        
         set_role_strategy name, options
-      end    
+      end 
+
+      private
+
+      def set_role_class strategy_name, options = {}
+        @role_class_name = !options.kind_of?(Symbol) ? get_role_class(strategy_name, options) : default_role_class(strategy_name)
+      end
+
+      def default_options? options = {}
+        return true if options == :default                           
+        if options.kind_of? Hash
+          return true # if options[:config] == :default || options == {} 
+        end
+        false
+      end
+
+      def statement code_str
+        code_str.gsub /Role/, @role_class_name.to_s
+      end
+
+      def default_role_class strategy_name
+        if defined? ::Role
+          require "roles_data_mapper/role_class"
+          return ::Role 
+        end
+        raise "Default Role class not defined"
+      end
+
+      def strategies_with_role_class
+        # :embed_one_role, :embed_many_roles
+        [:one_role, :many_roles]
+      end 
+
+      def get_role_class strategy_name, options
+        options[:role_class] ? options[:role_class].to_s.camelize.constantize : default_role_class(strategy_name)
+      end      
+         
     end
   end
 end

data/lib/roles_data_mapper/role.rb

@@ -13,15 +13,8 @@ module Roles::Base
   end
 end
 
-class Role
-  include DataMapper::Resource
-  
-  property :id, Serial  
-  property :name, String
-
-  validates_uniqueness_of :name
-
-  class << self
+module RoleClass
+  module ClassMethods
     def find_roles(*role_names)
       all(:name => role_names.flatten)
     end
@@ -32,4 +25,5 @@ class Role
       res ? res.first : res
     end
   end
-end  
+end
+

data/lib/roles_data_mapper/role_class.rb

@@ -0,0 +1,14 @@
+class Role
+  include DataMapper::Resource
+  
+  def self.named role_names 
+    where(:name.in => role_names.flatten)
+  end
+
+  property :id, Serial
+  property :name, String
+
+  validates_uniqueness_of :name
+
+  extend RoleClass::ClassMethods
+end  

data/lib/roles_data_mapper/strategy/multi/many_roles.rb

@@ -1,11 +1,8 @@
 require 'roles_data_mapper/strategy/multi'
 
+# TODO: Refactor into strategy method to make generic and not hardcoded names and model linking
 class Role
-  def self.named role_names 
-    where(:name.in => role_names.flatten)
-  end
-
-  property :id, Serial
+  include DataMapper::Resource  
   has n, :user_roles      
   has n, :users, :through => :user_roles
 end  

data/roles_data_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_data_mapper}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-12-20}
+  s.date = %q{2011-01-01}
   s.description = %q{Makes it easy to set a role strategy on your User model in DataMapper}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -20,15 +20,20 @@ Gem::Specification.new do |s|
     ".document",
     ".rspec",
     "Changelog.textile",
+    "Gemfile",
     "LICENSE",
     "README.markdown",
     "Rakefile",
     "VERSION",
     "lib/generators/data_mapper/roles/roles_generator.rb",
+    "lib/generators/data_mapper/roles/templates/many_roles/role.rb",
+    "lib/generators/data_mapper/roles/templates/many_roles/user_role.rb",
+    "lib/generators/data_mapper/roles/templates/one_role/role.rb",
     "lib/roles_data_mapper.rb",
     "lib/roles_data_mapper/base.rb",
     "lib/roles_data_mapper/namespaces.rb",
     "lib/roles_data_mapper/role.rb",
+    "lib/roles_data_mapper/role_class.rb",
     "lib/roles_data_mapper/strategy.rb",
     "lib/roles_data_mapper/strategy/multi.rb",
     "lib/roles_data_mapper/strategy/multi/many_roles.rb",
@@ -73,6 +78,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.1"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.3.0"])
+      s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
+      s.add_runtime_dependency(%q<roles_generic>, ["~> 0.3.2"])
+      s.add_runtime_dependency(%q<rails3_artifactor>, [">= 0.3.1"])
+      s.add_runtime_dependency(%q<logging_assist>, [">= 0.1.6"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<dm-types>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<dm-migrations>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<dm-validations>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<dm-sqlite-adapter>, ["~> 1.0"])
       s.add_development_dependency(%q<rspec>, [">= 2.0.1"])
       s.add_runtime_dependency(%q<dm-core>, ["~> 1.0"])
       s.add_runtime_dependency(%q<dm-types>, ["~> 1.0"])
@@ -85,6 +101,17 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rails3_artifactor>, [">= 0.3.2"])
       s.add_runtime_dependency(%q<logging_assist>, [">= 0.1.6"])
     else
+      s.add_dependency(%q<activesupport>, [">= 3.0.1"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])
+      s.add_dependency(%q<require_all>, ["~> 1.2.0"])
+      s.add_dependency(%q<roles_generic>, ["~> 0.3.2"])
+      s.add_dependency(%q<rails3_artifactor>, [">= 0.3.1"])
+      s.add_dependency(%q<logging_assist>, [">= 0.1.6"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0"])
+      s.add_dependency(%q<dm-types>, ["~> 1.0"])
+      s.add_dependency(%q<dm-migrations>, ["~> 1.0"])
+      s.add_dependency(%q<dm-validations>, ["~> 1.0"])
+      s.add_dependency(%q<dm-sqlite-adapter>, ["~> 1.0"])
       s.add_dependency(%q<rspec>, [">= 2.0.1"])
       s.add_dependency(%q<dm-core>, ["~> 1.0"])
       s.add_dependency(%q<dm-types>, ["~> 1.0"])
@@ -98,6 +125,17 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<logging_assist>, [">= 0.1.6"])
     end
   else
+    s.add_dependency(%q<activesupport>, [">= 3.0.1"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])
+    s.add_dependency(%q<require_all>, ["~> 1.2.0"])
+    s.add_dependency(%q<roles_generic>, ["~> 0.3.2"])
+    s.add_dependency(%q<rails3_artifactor>, [">= 0.3.1"])
+    s.add_dependency(%q<logging_assist>, [">= 0.1.6"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0"])
+    s.add_dependency(%q<dm-types>, ["~> 1.0"])
+    s.add_dependency(%q<dm-migrations>, ["~> 1.0"])
+    s.add_dependency(%q<dm-validations>, ["~> 1.0"])
+    s.add_dependency(%q<dm-sqlite-adapter>, ["~> 1.0"])
     s.add_dependency(%q<rspec>, [">= 2.0.1"])
     s.add_dependency(%q<dm-core>, ["~> 1.0"])
     s.add_dependency(%q<dm-types>, ["~> 1.0"])

data/spec/roles_data_mapper/generators/roles_generator_spec.rb

@@ -1,8 +1,11 @@
 require 'generator_spec_helper'
-require_generator :data_mapper => :roles
+
+# require_generator :data_mapper => :roles
+require 'generators/data_mapper/roles/roles_generator'
 
 # root_dir = Rails3::Assist::Directory.rails_root
-root_dir = File.join(Rails.application.config.root_dir, 'rails')
+# root_dir = File.join(Rails.application.config.root_dir, 'rails')
+root_dir = Rails.root
 
 describe 'role strategy generator: admin_flag' do
   describe 'ORM: data_mapper' do  
@@ -48,7 +51,7 @@ describe 'role strategy generator: admin_flag' do
           clazz.should include_module 'DataMapper::Resource'
           clazz.should include_module 'Roles::DataMapper'
           clazz.should have_call :valid_roles_are, :args => ':admin, :guest, :user'
-          clazz.should have_call :role_class, :args => ":role"        
+          # clazz.should have_call :role_class, :args => ":role"        
           clazz.should have_call :strategy, :args => ":one_role"        
         end
       end

data/spec/roles_data_mapper/strategy/multi/many_roles_spec.rb

@@ -1,12 +1,10 @@
 require 'spec_helper'
-use_roles_strategy :many_roles
 
 class User
   include DataMapper::Resource  
   include Roles::DataMapper 
   
-  strategy :many_roles, :default
-  role_class :role
+  strategy :many_roles
   
   property :id, Serial
   property :name, String   
@@ -17,14 +15,6 @@ DataMapper.auto_migrate!
 
 User.valid_roles_are :admin, :guest, :user
 
-# def api_migrate
-#   migrate('many_roles')
-# end
-# 
-# def api_fixture
-#   load 'fixtures/many_roles_setup.rb'
-# end
-
 def api_name
   :many_roles
 end

data/spec/roles_data_mapper/strategy/single/one_role_spec.rb

@@ -1,12 +1,11 @@
 require 'spec_helper'
-use_roles_strategy :one_role
 
 class User
   include DataMapper::Resource  
   include Roles::DataMapper 
   
-  strategy :one_role, :default 
-  role_class :role
+  strategy :one_role
+
   property :id, Serial
   property :name, String   
 end
@@ -16,10 +15,6 @@ DataMapper.auto_migrate!
 
 User.valid_roles_are :admin, :guest, :user
 
-# def api_migrate
-#   migrate('roles_mask')
-# end
-
 def api_name
   :one_role
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,13 +14,172 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 +01:00
+date: 2011-01-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  name: activesupport
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 1
+        version: 3.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: sugar-high
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 0
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: require_all
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 0
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: roles_generic
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 2
+        version: 0.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rails3_artifactor
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 1
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: logging_assist
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 6
+        version: 0.1.6
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: dm-core
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: dm-types
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: dm-migrations
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: dm-validations
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: dm-sqlite-adapter
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,11 +190,11 @@ dependencies:
         - 1
         version: 2.0.1
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,11 +204,11 @@ dependencies:
         - 0
         version: "1.0"
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: dm-types
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -59,11 +218,11 @@ dependencies:
         - 0
         version: "1.0"
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: dm-migrations
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -73,11 +232,11 @@ dependencies:
         - 0
         version: "1.0"
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: dm-validations
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -87,11 +246,11 @@ dependencies:
         - 0
         version: "1.0"
   type: :runtime
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -102,11 +261,11 @@ dependencies:
         - 1
         version: 3.0.1
   type: :runtime
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: require_all
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -117,11 +276,11 @@ dependencies:
         - 0
         version: 1.2.0
   type: :runtime
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: sugar-high
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -132,11 +291,11 @@ dependencies:
         - 1
         version: 0.3.1
   type: :runtime
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: roles_generic
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -147,11 +306,11 @@ dependencies:
         - 2
         version: 0.3.2
   type: :runtime
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: rails3_artifactor
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -162,11 +321,11 @@ dependencies:
         - 2
         version: 0.3.2
   type: :runtime
-  version_requirements: *id010
+  prerelease: false
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   name: logging_assist
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -177,7 +336,8 @@ dependencies:
         - 6
         version: 0.1.6
   type: :runtime
-  version_requirements: *id011
+  prerelease: false
+  version_requirements: *id022
 description: Makes it easy to set a role strategy on your User model in DataMapper
 email: kmandrup@gmail.com
 executables: []
@@ -191,15 +351,20 @@ files:
 - .document
 - .rspec
 - Changelog.textile
+- Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
 - VERSION
 - lib/generators/data_mapper/roles/roles_generator.rb
+- lib/generators/data_mapper/roles/templates/many_roles/role.rb
+- lib/generators/data_mapper/roles/templates/many_roles/user_role.rb
+- lib/generators/data_mapper/roles/templates/one_role/role.rb
 - lib/roles_data_mapper.rb
 - lib/roles_data_mapper/base.rb
 - lib/roles_data_mapper/namespaces.rb
 - lib/roles_data_mapper/role.rb
+- lib/roles_data_mapper/role_class.rb
 - lib/roles_data_mapper/strategy.rb
 - lib/roles_data_mapper/strategy/multi.rb
 - lib/roles_data_mapper/strategy/multi/many_roles.rb