roles_mongoid 0.3.4 → 0.3.5

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

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

@@ -18,15 +18,22 @@ module Mongoid
         logger.add_logfile :logfile => logfile if logfile
         logger.debug "apply_role_strategy for : #{strategy} in model #{name}"
 
-        say "User model #{user_model_name} not found", :red if !has_model_file?(user_model_name)
-
-        insert_into_model user_model_name, :after => /include Mongoid::\w+/ do
-          insertion_text
-        end     
-
-        unless read_model(:user) =~ /use_roles_strategy/
-          inject_into_file model_file(:user), "use_roles_strategy :#{strategy}\n\n", :before => "class"
-        end        
+        if !has_model_file?(user_model_name)
+          say "User model #{user_model_name} not found", :red
+          return 
+        end
+
+        begin 
+          insert_into_model user_model_name, :after => /include Mongoid::\w+/ do
+            insertion_text
+          end     
+
+          unless read_model(:user) =~ /use_roles_strategy/
+            inject_into_file model_file(:user), "use_roles_strategy :#{strategy}\n\n", :before => "class"
+          end        
+        rescue Exception => e
+          logger.debug"Error: #{e.message}"
+        end
       end 
       
       protected                  

data/lib/roles_mongoid/role.rb

@@ -2,8 +2,11 @@ module Roles::Base
   def valid_roles_are(*role_list)
     strategy_class.valid_roles = role_list.to_symbols
     if role_class_name
-      role_list.each do |name|
-        role_class_name.create(:name => name.to_s)
+      role_list.each do |name| 
+        begin
+          role_class_name.create(:name => name.to_s)
+        rescue
+        end
       end
     end
   end
@@ -16,6 +19,8 @@ class Role
 
   # references_many :users, :class_name => 'User', :stored_as => :array  
 
+  validates_uniqueness_of :name
+
   class << self
     def find_roles(*role_names)
       where(:name.in => role_names.flatten).to_a

data/roles_mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_mongoid}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-12-01}
+  s.date = %q{2010-12-21}
   s.description = %q{Makes it easy to set a role strategy on your User model in Mongoid}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 +01:00
+date: 2010-12-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency