rails3-generators 0.6.0 → 0.7.0

data/README.rdoc

@@ -1,6 +1,6 @@
 = rails3-generators
 
-Rails 3 compatible generators for DataMapper, Haml, Factory-girl, Authlogic, Mongomapper, and Mongoid
+Rails 3 compatible generators for DataMapper, Haml, Factory-girl, Authlogic, Mongomapper, and Shoulda
 
 == Note on Patches/Pull Requests
 
@@ -20,4 +20,4 @@ MongoMapper: Jai-Gouk Kim
 
 Machinist: Darcy Laycock
 
-Mongoid: Guillaume Belleguic
+Shoulda: Peter Haza

data/Rakefile

@@ -6,10 +6,10 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "rails3-generators"
     gem.summary = %Q{Rails 3 compatible generators}
-    gem.description = %Q{Rails 3 compatible generators for DataMapper, Haml, Factory-girl, Authlogic, Mongomapper, and Mongoid}
+    gem.description = %Q{Rails 3 compatible generators for DataMapper, Haml, Factory-girl, Authlogic, Mongomapper, and Shoulda}
     gem.email = "andre@arko.net"
     gem.homepage = "http://github.com/indirect/rails3-generators"
-    gem.authors = ["Jose Valim", "Anuj Dutta", "Paul Berry", "Jeff Tucker", "Louis T.", "Jai-Gouk Kim", "Darcy Laycock", "Guillaume Belleguic"]
+    gem.authors = ["Jose Valim", "Anuj Dutta", "Paul Berry", "Jeff Tucker", "Louis T.", "Jai-Gouk Kim", "Darcy Laycock", "Peter Haza"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/lib/generators/haml/scaffold/templates/_form.haml.erb

@@ -1,5 +1,4 @@
 - form_for @<%= singular_name %> do |f|
-  = f.error_messages
 
 <% for attribute in attributes -%>
   .field
@@ -7,4 +6,4 @@
     = f.<%= attribute.field_type %> :<%= attribute.name %>
 <% end -%>
   .actions
-    = f.submit 'Save'
+    = f.submit 'Save'

data/lib/generators/shoulda/controller/controller_generator.rb

@@ -0,0 +1,16 @@
+require 'generators/shoulda'
+
+module Shoulda
+  module Generators
+    class ControllerGenerator < Base
+      argument :actions, :type => :array, :default => [], :banner => "action action"
+      class_option :dir, :type => :string, :default => "test/functional", :desc => "The directory where the controller tests should go"
+      
+      check_class_collision :suffix => 'ControllerTest'
+
+      def create_controller_file
+        template 'controller.rb', File.join(options[:dir], "#{file_name}_controller_test.rb")
+      end
+    end
+  end
+end

data/lib/generators/shoulda/controller/templates/controller.rb

@@ -0,0 +1,84 @@
+require 'test_helper'
+
+class <%= plural_name %>ControllerTest < ActionController::TestCase
+  <% if actions.include?('index') %>
+  
+  context "index action" do
+    should "render index template" do
+      get :index
+      assert_template 'index'
+    end
+  end
+  <% end %>
+  <% if actions.include?('show') %>
+  
+  context "show action" do
+    should "render show template" do
+      get :show, :id => <%= class_name %>.first
+      assert_template 'show'
+    end
+  end    
+  <% end %>
+  <% if actions.include?('new') %>
+  
+  context "new action" do
+    should "render new template" do
+      get :new
+      assert_template 'new'
+    end
+  end
+  <% end %>
+  <% if actions.include?('create') %>
+
+  context "create action" do
+    should "render new template when model is invalid" do
+      <%= class_name %>.any_instance.stubs(:valid?).returns(false)
+      post :create
+      assert_template 'new'
+    end
+    
+    should "redirect when model is valid" do
+      <%= class_name %>.any_instance.stubs(:valid?).returns(true)
+      post :create
+      assert_redirected_to
+    end
+  end
+  <% end %>
+  <% if actions.include?('edit') %>
+
+  context "edit action" do
+    should "render edit template" do
+      get :edit, :id => <%= class_name %>.first
+      assert_template 'edit'
+    end
+  end
+  <% end %>
+  <% if actions.include?('update') %>
+
+  context "update action" do
+    should "render edit template when model is invalid" do
+      <%= class_name %>.any_instance.stubs(:valid?).returns(false)
+      put :update, :id => <%= class_name %>.first
+      assert_template 'edit'
+    end
+  
+    should "redirect when model is valid" do
+      <%= class_name %>.any_instance.stubs(:valid?).returns(true)
+      put :update, :id => <%= class_name %>.first
+      assert_redirected_to
+    end
+  end
+  <% end %>
+  <% if actions.include?('destroy') %>
+
+  context "destroy action" do
+    should "destroy model and redirect to index action" do
+      <%= singular_name %> = <%= class_name %>.first
+      delete :destroy, :id => <%= singular_name %>
+      assert_redirected_to
+      assert !<%= class_name %>.exists?(<%= singular_name %>.id)
+    end
+  end
+  <% end %>
+  
+end

data/lib/generators/shoulda/model/model_generator.rb

@@ -0,0 +1,16 @@
+require 'generators/shoulda'
+
+module Shoulda
+  module Generators
+    class ModelGenerator < Base
+      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      class_option :dir, :type => :string, :default => "test/unit", :desc => "The directory where the model tests should go"
+      
+      def create_model_test_file
+        template 'model.rb', File.join(options[:dir], "#{singular_name}_test.rb")
+      end
+      
+      hook_for :fixture_replacement
+    end
+  end
+end

data/lib/generators/shoulda/model/templates/model.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class <%= class_name %>Test < ActiveSupport::TestCase
+  should "be valid" do
+    assert <%= class_name %>.new.valid?
+  end
+end

data/lib/generators/shoulda.rb

@@ -0,0 +1,11 @@
+require 'rails/generators/named_base'
+
+module Shoulda
+  module Generators
+    class Base < Rails::Generators::NamedBase #:nodoc:
+      def self.source_root
+        @_shoulda_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'shoulda', generator_name, 'templates'))
+      end
+    end
+  end
+end

data/rails3-generators.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails3-generators}
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jose Valim", "Anuj Dutta", "Paul Berry", "Jeff Tucker", "Louis T.", "Jai-Gouk Kim", "Darcy Laycock", "Guillaume Belleguic"]
-  s.date = %q{2010-04-12}
-  s.description = %q{Rails 3 compatible generators for DataMapper, Haml, Factory-girl, Authlogic, Mongomapper, and Mongoid}
+  s.authors = ["Jose Valim", "Anuj Dutta", "Paul Berry", "Jeff Tucker", "Louis T.", "Jai-Gouk Kim", "Darcy Laycock", "Peter Haza"]
+  s.date = %q{2010-05-01}
+  s.description = %q{Rails 3 compatible generators for DataMapper, Haml, Factory-girl, Authlogic, Mongomapper, and Shoulda}
   s.email = %q{andre@arko.net}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -70,13 +70,15 @@ Gem::Specification.new do |s|
      "lib/generators/machinist/model/model_generator.rb",
      "lib/generators/machinist/model/templates/blueprint.rb",
      "lib/generators/machinist/model/templates/machinist_initializer.rb",
-     "lib/generators/mongoid.rb",
-     "lib/generators/mongoid/model/model_generator.rb",
-     "lib/generators/mongoid/model/templates/model.rb",
      "lib/generators/mongomapper.rb",
      "lib/generators/mongomapper/model/model_generator.rb",
      "lib/generators/mongomapper/model/templates/model.rb",
      "lib/generators/mongomapper/observer/observer_generator.rb",
+     "lib/generators/shoulda.rb",
+     "lib/generators/shoulda/controller/controller_generator.rb",
+     "lib/generators/shoulda/controller/templates/controller.rb",
+     "lib/generators/shoulda/model/model_generator.rb",
+     "lib/generators/shoulda/model/templates/model.rb",
      "lib/rails3-generators.rb",
      "rails3-generators.gemspec"
   ]

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Jose Valim
@@ -16,12 +16,12 @@ authors:
 - Louis T.
 - Jai-Gouk Kim
 - Darcy Laycock
-- Guillaume Belleguic
+- Peter Haza
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 -07:00
+date: 2010-05-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,7 +38,7 @@ dependencies:
         version: 1.2.9
   type: :development
   version_requirements: *id001
-description: Rails 3 compatible generators for DataMapper, Haml, Factory-girl, Authlogic, Mongomapper, and Mongoid
+description: Rails 3 compatible generators for DataMapper, Haml, Factory-girl, Authlogic, Mongomapper, and Shoulda
 email: andre@arko.net
 executables: []
 
@@ -101,13 +101,15 @@ files:
 - lib/generators/machinist/model/model_generator.rb
 - lib/generators/machinist/model/templates/blueprint.rb
 - lib/generators/machinist/model/templates/machinist_initializer.rb
-- lib/generators/mongoid.rb
-- lib/generators/mongoid/model/model_generator.rb
-- lib/generators/mongoid/model/templates/model.rb
 - lib/generators/mongomapper.rb
 - lib/generators/mongomapper/model/model_generator.rb
 - lib/generators/mongomapper/model/templates/model.rb
 - lib/generators/mongomapper/observer/observer_generator.rb
+- lib/generators/shoulda.rb
+- lib/generators/shoulda/controller/controller_generator.rb
+- lib/generators/shoulda/controller/templates/controller.rb
+- lib/generators/shoulda/model/model_generator.rb
+- lib/generators/shoulda/model/templates/model.rb
 - lib/rails3-generators.rb
 - rails3-generators.gemspec
 has_rdoc: true

data/lib/generators/mongoid/model/model_generator.rb

@@ -1,21 +0,0 @@
-require 'generators/mongoid'
-
-module Mongoid
-  module Generators
-    class ModelGenerator < Base
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-
-      check_class_collision
-
-      class_option :timestamps, :type => :boolean, :default => true
-      class_option :parent,     :type => :string, :desc => "The parent class for the generated model" 
-      class_option :versioning, :type => :boolean, :default => false, :desc => "Enable mongoid versioning"
-      
-      def create_model_file
-        template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
-      end
-
-      hook_for :test_framework
-    end
-  end
-end

data/lib/generators/mongoid/model/templates/model.rb

@@ -1,14 +0,0 @@
-class <%= class_name %><%= "< #{options[:parent].classify}" if options[:parent] %>
-<% unless options[:parent] -%>
-  include Mongoid::Document
-  <% if options[:timestamps] %> 
-  include Mongoid::Timestamps
-  <% end %>
-  <% if options[:versioning] %>
-  include Mongoid::Versioning
-  <% end %>
-<% end -%>
-<% attributes.each do |attribute| -%>
-  field :<%= attribute.name %>, :type => <%= attribute.type_class %>
-<% end -%>
-end

data/lib/generators/mongoid.rb

@@ -1,61 +0,0 @@
-require 'rails/generators/named_base'
-# require 'rails/generators/migration'
-require 'rails/generators/active_model'
-
-module Mongoid
-  module Generators
-    class Base < Rails::Generators::NamedBase #:nodoc:
-
-      def self.source_root
-        @_mongoid_source_root ||= File.expand_path(File.join(File.dirname(__FILE__),
-                                                      'mongoid', generator_name, 'templates'))
-      end
-   
-    end
-
-    class ActiveModel < Rails::Generators::ActiveModel #:nodoc:
-      def self.all(klass)
-        "#{klass}.all"
-      end
-
-      def self.find(klass, params=nil)
-        "#{klass}.first(#{params})"
-      end
-
-      def self.build(klass, params=nil)
-        if params
-          "#{klass}.new(#{params})"
-        else
-          "#{klass}.new"
-        end
-      end
-
-      def save
-        "#{name}.save"
-      end
-
-      def update_attributes(params=nil)
-        "#{name}.update(#{params})"  
-      end
-
-      def errors
-        "#{name}.errors"
-      end
-
-      def destroy
-        "#{name}.destroy"
-      end
-    end
-  end
-end
-
-module Rails
-  module Generators
-    class GeneratedAttribute #:nodoc:
-      def type_class
-        return 'DateTime' if type.to_s == 'datetime'
-        return type.to_s.camelcase
-      end
-    end
-  end
-end