rails3-generators 0.10.3 → 0.11.0

data/.bundle/config

@@ -0,0 +1,2 @@
+--- 
+BUNDLE_WITHOUT: ""

data/CHANGELOG.rdoc

@@ -1,8 +1,24 @@
 == TODO
 * Grow Mustache up.(fix the TODOs and move the source to a mustache-rails like gem)
 * Write some documentation. (In both the github wiki and the source code)
-* Datamapper Tests
-* Mongomapper Tests
+
+== 0.11.0
+* enhancements
+  * Added new mongo_mapper generator for mongo mapper 0.8 with lots of extra features [Kristian Mandrup]
+  * Added mongoid generator for mongoid 2.0.beta with features similar to new mongo_mapper [Kristian Mandrup]
+  
+* optimize
+  * renamed datamapper to data_mapper
+  * renamed mongomapper to mongo_mapper.
+  
+* fix
+  * added DataMapper Tests
+  * added MongoMapper Tests
+
+== 0.10.4
+* optimize
+  * Update jquery install by removing unneeded initializer file
+  * Update mustache_rails to user autoload_paths instead of load_paths
 
 == 0.10.3
 * optimize

data/README.rdoc

@@ -38,7 +38,11 @@ Factory Girl: Paul Barry
 
 Authlogic: Jeff Tucker
 
-MongoMapper: Jai-Gouk Kim
+Mongomapper: Jai-Gouk Kim
+
+MongoMapper: Kristian Mandrup (for 0.8) - needs testing
+
+Mongoid: Kristian Mandrup (for 2.0.beta) - needs testing
 
 Machinist: Darcy Laycock
 

data/Rakefile

@@ -9,16 +9,19 @@ begin
       
     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, Shoulda, Formtastic and SimpleForm}
+    gem.description = %Q{Rails 3 compatible generators for DataMapper, Haml, Factory-girl, Authlogic, Mongomapper, Mongoid, Shoulda, Formtastic and SimpleForm}
     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", "Peter Haza", "Peter Gumeson"]
+    gem.authors = ["Jose Valim", "Anuj Dutta", "Paul Berry", "Jeff Tucker", "Louis T.", "Jai-Gouk Kim", "Darcy Laycock", "Peter Haza", "Peter Gumeson", "Kristian Mandrup"]
     # gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.post_install_message =
 %Q{
 rails3-generators-#{version}
 Be sure to check out the wiki, http://wiki.github.com/indirect/rails3-generators/,
 for information about recent changes to this project.
+  
+note: ORM :datamapper has been renamed to :data_mapper
+note: ORM :mongomapper has been renamed to :mongo_mapper
 
 note: if you use erb templates add the follow to your generators block to take full advantage of this gem.
 g.template_engine :erubis

data/VERSION

@@ -1 +1 @@
-0.10.3
+0.11.0

data/lib/generators/{datamapper.rb → data_mapper.rb}

@@ -2,14 +2,17 @@ require 'rails/generators/named_base'
 require 'rails/generators/migration'
 require 'rails/generators/active_model'
 
-module Datamapper
+require 'generators/helpers/migration_helper'
+
+module DataMapper
   module Generators
     class Base < Rails::Generators::NamedBase #:nodoc:
-      include Rails::Generators::Migration
+      include Rails3Generators::MigrationHelper
+      # include Rails::Generators::Migration
 
       def self.source_root
         @_datamapper_source_root ||= File.expand_path(File.join(File.dirname(__FILE__),
-                                                      'datamapper', generator_name, 'templates'))
+                                                      'data_mapper', generator_name, 'templates'))
       end
 
       protected

data/lib/generators/{datamapper → data_mapper}/migration/migration_generator.rb

@@ -1,6 +1,6 @@
-require 'generators/datamapper'
+require 'generators/data_mapper'
 
-module Datamapper
+module DataMapper
   module Generators
     class MigrationGenerator < Base
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"

data/lib/generators/{datamapper → data_mapper}/model/model_generator.rb

@@ -1,6 +1,6 @@
-require 'generators/datamapper'
+require 'generators/data_mapper'
 
-module Datamapper
+module DataMapper
   module Generators
     class ModelGenerator < Base
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
@@ -13,7 +13,7 @@ module Datamapper
       class_option :parent,     :type => :string, :desc => "The parent class for the generated model"
 
       def create_migration_file
-        if options[:migration] && options[:parent].nil?
+        if migration? && parent?
           file_name = "create_#{file_path.gsub(/\//, '_').pluralize}"
           migration_template "migration.rb", "db/migrate/#{file_name}.rb"
         end
@@ -23,6 +23,30 @@ module Datamapper
         template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
       end
 
+      protected
+
+      def migration?
+        options[:migration]
+      end        
+      
+      def timestamps?
+        options[:timestamps]
+      end
+
+      def parent?
+        options[:parent]
+      end
+      
+      def timestamp_statements
+        %q{
+  property :created_at, DateTime
+  # property :created_on, Date
+ 
+  property :updated_at, DateTime
+  # property :updated_on, Date
+}            
+      end
+      
       hook_for :test_framework
     end
   end

data/lib/generators/{datamapper → data_mapper}/model/templates/model.rb

@@ -1,5 +1,5 @@
-class <%= class_name %><%= "< #{options[:parent].classify}" if options[:parent] %>
-<% unless options[:parent] -%>
+class <%= class_name %><%= "< #{options[:parent].classify}" if parent? %>
+<% unless parent? -%>
   include DataMapper::Resource
 
   property :id, Serial
@@ -7,4 +7,6 @@ class <%= class_name %><%= "< #{options[:parent].classify}" if options[:parent]
 <% attributes.each do |attribute| -%>
   property :<%= attribute.name %>, <%= attribute.type_class %>
 <% end -%>
+
+<%= timestamp_statements if timestamps? %>
 end

data/lib/generators/{datamapper → data_mapper}/observer/observer_generator.rb

@@ -1,6 +1,6 @@
-require 'generators/datamapper'
+require 'generators/data_mapper'
 
-module Datamapper
+module DataMapper
   module Generators
     class ObserverGenerator < Base
       check_class_collision :suffix => "Observer"

data/lib/generators/{datamapper → data_mapper}/observer/templates/observer.rb

@@ -1,5 +1,5 @@
 class <%= class_name %>Observer
   include DataMapper::Observer
 
-  observe <%= class_name >
+  observe <%= class_name %>
 end

data/lib/generators/helpers/migration_helper.rb

@@ -0,0 +1,53 @@
+require 'rails/generators/migration'
+
+module Rails3Generators
+  module MigrationHelper
+    include Rails::Generators::Migration
+
+    attr_accessor :migration_number
+
+    module ClassMethods          
+      def migration_lookup_at(dirname) #:nodoc:
+        Dir.glob("#{dirname}/[0-9]*_*.rb")
+      end
+
+      def migration_exists?(dirname, file_name) #:nodoc:
+        migration_lookup_at(dirname).grep(/\d+_#{file_name}.rb$/).first
+      end
+
+      def current_migration_number(dirname) #:nodoc:
+        migration_lookup_at(dirname).collect do |file|
+          File.basename(file).split("_").first.to_i
+        end.max.to_i
+      end
+
+      def next_migration_number(dirname) #:nodoc:
+        orm = Rails.configuration.generators.options[:rails][:orm]
+        require "rails/generators/#{orm}"
+        "#{orm.to_s.camelize}::Generators::Base".constantize.next_migration_number(dirname)         
+      rescue
+        raise NotImplementedError
+      end
+    end         
+
+    def self.included(base) #:nodoc: 
+      base.extend ClassMethods      
+    end
+       
+   
+    def run_migration(options)
+      run "rails g migration #{options}"
+    end
+
+    protected
+    
+      def model_exists?(name)
+        File.exists?(File.join(Rails.root, "app/models/#{name}.rb"))
+      end
+    
+      def model_file(name)                          
+        File.join(Rails.root, "app/models/#{name}.rb")        
+      end    
+  end
+end
+

data/lib/generators/helpers/model_helper.rb

@@ -0,0 +1,75 @@
+module Rails3Generators
+  module Helpers
+    module Model 
+
+      attr_accessor :model_attributes, :model_indexes
+
+      def parse_model_attributes(with_indexes = true)
+        @model_attributes = []        
+        @model_indexes = {}
+        # 
+        # attributes.each do |arg|
+        #   if with_indexes
+        #     # extract index markers
+        #     if arg.include?('#')  
+        #       arg.gsub! /#.*$/, ''            
+        #       model_indexes[arg_name(arg).to_sym] = true
+        #     end
+        #   end
+        # 
+        #   if arg.include?(':')
+        #     model_attributes << Rails::Generators::GeneratedAttribute.new(*arg.split(':'))
+        #   else
+        #     model_attributes << Rails::Generators::GeneratedAttribute.new(arg, "string")            
+        #   end
+        # 
+        #   model_attributes.uniq!
+        # 
+        #   if model_attributes.empty?
+        #     if model_exists?
+        #       model_columns_for_attributes.each do |column|
+        #         model_attributes << Rails::Generators::GeneratedAttribute.new(column.name.to_s, column.type.to_s)
+        #       end
+        #     else
+        #       model_attributes << Rails::Generators::GeneratedAttribute.new('name', 'string')
+        #     end
+        #   end
+        # end 
+      end      
+
+      def arg_name(arg)
+        arg.split(':').first        
+      end
+
+      def arg_type(arg)
+        arg.split(':')[1] || 'string'
+      end
+      
+      def model_name
+        name
+      end      
+      
+      def model_exists?
+        File.exist? destination_path("app/models/#{singular_name}.rb")
+      end
+
+      def singular_name
+        model_name.underscore
+      end
+
+      def plural_name
+        model_name.underscore.pluralize
+      end
+
+      def class_name
+        model_name.camelize
+      end
+
+      def plural_class_name
+        plural_name.camelize
+      end
+    end
+  end
+end
+            
+    

data/lib/generators/jquery/install/install_generator.rb

@@ -5,13 +5,9 @@ module Jquery
     class InstallGenerator < Rails::Generators::Base
       extend TemplatePath
 
-      def copy_initializer_files
-        template "config/initializers/jquery.rb.tt", "config/initializers/jquery.rb"
-      end
-
       def download_jquery_files
-        %w(controls.js dragdrop.js effects.js prototype.js rails.js).each do |prototype|
-          remove_file "public/javascripts/#{prototype}"
+        %w(controls.js dragdrop.js effects.js prototype.js rails.js).each do |js|
+          remove_file "public/javascripts/#{js}"
         end
 
         # Downloading latest jQuery.min
@@ -20,6 +16,10 @@ module Jquery
         # Downloading latest jQuery drivers
         get "http://github.com/rails/jquery-ujs/raw/master/src/rails.js", "public/javascripts/rails.js"
       end
+      
+      def show_readme
+        readme "README"
+      end
     end
   end
 end

data/lib/generators/jquery/install/templates/README

@@ -0,0 +1,10 @@
+
+===============================================================================
+
+Some manual steps you have to do
+
+  1. Uncomment or add the following to you application.rb file:
+  
+      config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
+
+===============================================================================

data/lib/generators/{mongomapper.rb → mongo_mapper.rb}

@@ -1,35 +1,14 @@
 require 'rails/generators/named_base'
-# require 'rails/generators/migration'
 require 'rails/generators/active_model'
 
-module Mongomapper
+module MongoMapper
   module Generators
     class Base < Rails::Generators::NamedBase #:nodoc:
-      # include Rails::Generators::Migration
 
       def self.source_root
         @_mongomapper_source_root ||= File.expand_path(File.join(File.dirname(__FILE__),
-                                                      'mongomapper', generator_name, 'templates'))
+                                                                 'mongo_mapper', generator_name, 'templates'))
       end
-
-      protected
-
-        # # mongomapper does not care if migrations have the same name as long as
-        # # they have different ids. 
-        # #
-        # def migration_exists?(dirname, file_name) #:nodoc:
-        #   false
-        # end
-        # 
-        # # Implement the required interface for Rails::Generators::Migration.
-        # #
-        # def next_migration_number(dirname) #:nodoc:
-        #   if options[:id]
-        #     "%.3d" % options[:id]
-        #   else
-        #     "%.3d" % (current_migration_number(dirname) + 1)
-        #   end
-        # end    
     end
 
     class ActiveModel < Rails::Generators::ActiveModel #:nodoc:
@@ -54,7 +33,7 @@ module Mongomapper
       end
 
       def update_attributes(params=nil)
-        "#{name}.update(#{params})"  
+        "#{name}.update(#{params})"
       end
 
       def errors

data/lib/generators/mongo_mapper/install/install_generator.rb

@@ -0,0 +1,30 @@
+require 'generators/mongo_mapper'
+
+module MongoMapper
+  module Generators
+    class InstallGenerator < Base
+      class_option  :host,      :type => :string, :default => 'localhost',        :desc => "Name of the Mongo host use"
+
+      def create_files
+        template "mongo_mapper.rb" , "config/initializers/mongo_mapper.rb"
+        template "database.mongo.yml" , "config/database.mongo.yml"
+        say "Please ensure Gemfile contains: gem '#{orm_gem_name}', '>=0.8.2'"
+        say "For production enviroment DB configuration, set environment variables as indicated in config/database.mongo.yml"
+      end
+
+      protected
+
+        def database
+          name
+        end
+
+        def orm_gem_name
+          "mongo_mapper"
+        end
+
+        def host
+          options[:host] || 'localhost'
+        end
+    end
+  end
+end

data/lib/generators/mongo_mapper/install/templates/database.mongo.yml

@@ -0,0 +1,25 @@
+defaults: &defaults
+  adapter: mongodb
+  host: <%= host %>
+  # slaves:
+  #   - host: slave1.local
+  #     port: 27018
+  #   - host: slave2.local
+  #     port: 27019
+
+development:
+  <<: *defaults
+  database: <%= database %>_development
+
+test:
+  <<: *defaults
+  database: <%= database %>_test
+
+# set these environment variables on your prod server
+production:
+  <<: *defaults
+  host: <%= ENV['MONGOID_HOST'] %>
+  port: <%= ENV['MONGOID_PORT'] %>
+  username: <%= ENV['MONGOID_USERNAME'] %>
+  password: <%= ENV['MONGOID_PASSWORD'] %>
+  database: <%= ENV['MONGOID_DATABASE'] %>