devise_generator.rb in dm-devise-1.2.0.beta

- old
+ new

@@ -1,18 +1,26 @@
 require 'generators/devise/orm_helpers'
 require 'sugar-high/file'
 
+# Reload Active Support's String#blank?, overridden by sugar-high. Active Support's
+# version considers any all-space String blank, behavior that devise expects.
+class String #:nodoc:
+  def blank?
+    self !~ /\S/
+  end
+end
+
 module DataMapper
   module Generators
     class DeviseGenerator < Rails::Generators::NamedBase
       include ::Devise::Generators::OrmHelpers
 
       def generate_model
-        invoke "data_mapper:model", [name] unless model_exists?
+        invoke "data_mapper:model", [name] unless model_exists? && behavior == :invoke
       end
 
       def inject_devise_content
-        inject_into_file model_path, model_contents, :after => "include DataMapper::Resource\n"
+        inject_into_file model_path, model_contents, :after => "include DataMapper::Resource\n" if model_exists?
       end
 
       def replace_default_devise_orm
         devise_init_file = File.join(Rails.root, 'config', 'initializers', 'devise.rb')
         File.replace_content_from devise_init_file, :where => 'orm/active_record', :with => 'orm/data_mapper'