merbful_authentication 0.1.0 → 0.1.1

data/README

@@ -22,7 +22,7 @@ the controller that handles the actual login/logout function on the
 site.
 
 The third parameter (--include-activation) generates the code for a 
-ActionMailer and its respective Activation Code through email.
+Mailer and the required support code.  Don't forget to setup your mailer for this.
 
 ===  Currently supported ORMs
 Active Record

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "merbful_authentication"
 NAME = "merbful_authentication"
-VERSION = "0.1.0"
+VERSION = "0.1.1"
 AUTHOR = "Daniel Neighman"
 EMAIL = "has.sox@gmail.com"
 HOMEPAGE = "http://rubyforge.org/projects/merbful-auth/"
@@ -20,10 +20,11 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb', '>= 0.4.0')
+  s.add_dependency('merb', '>= 0.5.0')
   s.require_path = 'lib'
   s.autorequire = PLUGIN
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,merb_generators,datamapper_generators,activerecord_generators,rspec_generators,test_unit_generators}/**/*")
+  s.files = %w(LICENSE README Rakefile TODO) +
+          Dir.glob("{lib,specs,merb_generators,datamapper_generators,activerecord_generators,merb_default_generators,sequel_generators,rspec_generators,test_unit_generators}/**/*")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/merb_default_generators/merbful_authentication_model/merbful_authentication_model_generator.rb

@@ -0,0 +1,55 @@
+class MerbfulAuthenticationModelGenerator < RubiGen::Base
+  
+  default_options :author => nil
+  
+  attr_reader :name
+  
+  def initialize(runtime_args, runtime_options = {})
+    super
+    usage if args.empty?
+    @name = args.shift
+    extract_options
+  end
+
+  def manifest
+    record do |m|
+      # Exit out because there should be an orm present
+      puts "\n"
+      puts "-" * 70
+      puts "\nThere is no ORM selected.  merbful_authentication requires there to be an ORM present."
+      puts "\nSelect and ORM in config/dependencies.rb"
+      puts "\ne.g."
+      puts "use_orm :datamapper"
+      puts "\n"
+      puts "-" * 70
+      exit    
+    end
+  end
+
+  protected
+    def banner
+      <<-EOS
+Creates a ...
+
+USAGE: #{$0} #{spec.name} name"
+EOS
+    end
+
+    def add_options!(opts)
+      # opts.separator ''
+      # opts.separator 'Options:'
+      # For each option below, place the default
+      # at the top of the file next to "default_options"
+      # opts.on("-a", "--author=\"Your Name\"", String,
+      #         "Some comment about this option",
+      #         "Default: none") { |options[:author]| }
+      # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
+    end
+    
+    def extract_options
+      # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
+      # Templates can access these value via the attr_reader-generated methods, but not the
+      # raw instance variable value.
+      # @author = options[:author]
+    end
+end

data/merb_generators/{authentication/authentication_generator.rb → authenticated/authenticated_generator.rb}

@@ -1,5 +1,5 @@
 require 'merb'
-class AuthenticationGenerator < RubiGen::Base
+class AuthenticatedGenerator < RubiGen::Base
   
   default_options :author => nil
   
@@ -75,6 +75,20 @@ class AuthenticationGenerator < RubiGen::Base
       m.class_collisions class_path,                  "#{class_name}", "#{class_name}Mailer"# , "#{class_name}MailerTest", "#{class_name}Observer"
       m.class_collisions [], 'AuthenticatedSystem::Controller', 'AuthenticatedSystem::Model'
 
+      # Generate the model first.  These can then throw an error when generating if there is no ORM present
+      model_attributes = { 
+        :class_name           => class_name,
+        :class_path           => class_path, 
+        :file_name            => file_name, 
+        :class_nesting        => class_nesting, 
+        :class_nesting_depth  => class_nesting_depth, 
+        :plural_name          => plural_name, 
+        :singular_name        => singular_name,
+        :include_activation   => options[:include_activation]     
+      }
+      m.dependency "merbful_authentication_model", [name], model_attributes
+
+
       # Controller, helper, views, and test directories.
       
       m.directory File.join('app/controllers', controller_class_path)
@@ -106,19 +120,6 @@ class AuthenticationGenerator < RubiGen::Base
         end
       end
       
-      # Generate the model
-      model_attributes = { 
-        :class_name           => class_name,
-        :class_path           => class_path, 
-        :file_name            => file_name, 
-        :class_nesting        => class_nesting, 
-        :class_nesting_depth  => class_nesting_depth, 
-        :plural_name          => plural_name, 
-        :singular_name        => singular_name,
-        :include_activation   => options[:include_activation]     
-      }
-      m.dependency "merbful_authentication_model", [name], model_attributes 
-
       # Generate the sessions controller
       m.template "session_controller.rb", File.join('app/controllers', 
                                                     controller_class_path, 

data/sequel_generators/merbful_authentication_model/merbful_authentication_model_generator.rb

@@ -0,0 +1,53 @@
+class MerbfulAuthenticationModelGenerator < RubiGen::Base
+  
+  default_options :author => nil
+  
+  attr_reader :name
+  
+  def initialize(runtime_args, runtime_options = {})
+    super
+    usage if args.empty?
+    @name = args.shift
+    extract_options
+  end
+
+  def manifest
+    record do |m|
+      # Exit out because sequel is not yet supported.  
+      # For anyone who want to implement sequel, the model, and ORM map lib are the only files that should
+      # need to be updated.  Some of the specs may need to change sytnax to pass though.
+      puts "\n"
+      puts "-" * 70
+      puts "\nThe sequel ORM is not yet supported in merbful_authentication.  Please select another ORM.\n"
+      puts "-" * 70
+      exit
+    end
+  end
+
+  protected
+    def banner
+      <<-EOS
+Creates a ...
+
+USAGE: #{$0} #{spec.name} name"
+EOS
+    end
+
+    def add_options!(opts)
+      # opts.separator ''
+      # opts.separator 'Options:'
+      # For each option below, place the default
+      # at the top of the file next to "default_options"
+      # opts.on("-a", "--author=\"Your Name\"", String,
+      #         "Some comment about this option",
+      #         "Default: none") { |options[:author]| }
+      # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
+    end
+    
+    def extract_options
+      # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
+      # Templates can access these value via the attr_reader-generated methods, but not the
+      # raw instance variable value.
+      # @author = options[:author]
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merbful_authentication
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire: merbful_authentication
 bindir: bin
 cert_chain: []
 
-date: 2008-01-05 00:00:00 +11:00
+date: 2008-01-07 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: 0.5.0
     version: 
 description: A Merb plugin that is essentially a port of Rick Olsons restful_authentication plugin for rails
 email: has.sox@gmail.com
@@ -39,21 +39,21 @@ files:
 - lib/merbful_authentication
 - lib/merbful_authentication/merbtasks.rb
 - lib/merbful_authentication.rb
-- merb_generators/authentication
-- merb_generators/authentication/authentication_generator.rb
-- merb_generators/authentication/templates
-- merb_generators/authentication/templates/activation.html.erb
-- merb_generators/authentication/templates/activation.text.erb
-- merb_generators/authentication/templates/authenticated_system_controller.rb
-- merb_generators/authentication/templates/authenticated_system_model.rb
-- merb_generators/authentication/templates/login.html.erb
-- merb_generators/authentication/templates/mail_controller.rb
-- merb_generators/authentication/templates/model_controller.rb
-- merb_generators/authentication/templates/new_model.html.erb
-- merb_generators/authentication/templates/session_controller.rb
-- merb_generators/authentication/templates/signup.html.erb
-- merb_generators/authentication/templates/signup.text.erb
-- merb_generators/authentication/USAGE
+- merb_generators/authenticated
+- merb_generators/authenticated/authenticated_generator.rb
+- merb_generators/authenticated/templates
+- merb_generators/authenticated/templates/activation.html.erb
+- merb_generators/authenticated/templates/activation.text.erb
+- merb_generators/authenticated/templates/authenticated_system_controller.rb
+- merb_generators/authenticated/templates/authenticated_system_model.rb
+- merb_generators/authenticated/templates/login.html.erb
+- merb_generators/authenticated/templates/mail_controller.rb
+- merb_generators/authenticated/templates/model_controller.rb
+- merb_generators/authenticated/templates/new_model.html.erb
+- merb_generators/authenticated/templates/session_controller.rb
+- merb_generators/authenticated/templates/signup.html.erb
+- merb_generators/authenticated/templates/signup.text.erb
+- merb_generators/authenticated/USAGE
 - datamapper_generators/merbful_authentication_model
 - datamapper_generators/merbful_authentication_model/merbful_authentication_model_generator.rb
 - datamapper_generators/merbful_authentication_model/templates
@@ -65,6 +65,12 @@ files:
 - activerecord_generators/merbful_authentication_model/templates/authenticated_system_orm_map.rb
 - activerecord_generators/merbful_authentication_model/templates/migration.rb
 - activerecord_generators/merbful_authentication_model/templates/model.rb
+- merb_default_generators/merbful_authentication_model
+- merb_default_generators/merbful_authentication_model/merbful_authentication_model_generator.rb
+- merb_default_generators/merbful_authentication_model/templates
+- sequel_generators/merbful_authentication_model
+- sequel_generators/merbful_authentication_model/merbful_authentication_model_generator.rb
+- sequel_generators/merbful_authentication_model/templates
 - rspec_generators/merbful_authentication_tests
 - rspec_generators/merbful_authentication_tests/merbful_authentication_tests_generator.rb
 - rspec_generators/merbful_authentication_tests/templates
@@ -83,7 +89,6 @@ files:
 - test_unit_generators/merbful_authentication_tests/templates/model_functional_test.rb
 - test_unit_generators/merbful_authentication_tests/templates/model_test_helper.rb
 - test_unit_generators/merbful_authentication_tests/templates/unit_test.rb
-- test_unit_generators/merbful_authentication_tests/USAGE
 has_rdoc: true
 homepage: http://rubyforge.org/projects/merbful-auth/
 post_install_message: 

data/test_unit_generators/merbful_authentication_tests/USAGE

@@ -1,5 +0,0 @@
-Description:
-  
-  
-Usage:
-