refinerycms-generators 0.9.9.4 → 0.9.9.5

data/lib/gemspec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-version = '0.9.9.4'
+version = '0.9.9.5'
 raise "Could not get version so gemspec can not be built" if version.nil?
 files = Dir.glob("**/*").flatten.reject do |file|
   file =~ /\.gem$/

data/lib/generators/refinery_engine/refinery_engine_generator.rb

@@ -86,24 +86,11 @@ class RefineryEngineGenerator < Rails::Generators::NamedBase
           l =~ %r{refinerycms-#{plural_name}}
         }.join("\n"))
 
-        migration_files = Dir.glob(File.expand_path('../templates/db/migrate/*.rb', __FILE__)).sort.collect{|m|
-          m.gsub('plural_name', plural_name).gsub('singular_name', singular_name).split(File::SEPARATOR).last.split('_')[1..-1].join('_')
-        }
-        if (migration_paths = Dir[Rails.root.join('db', 'migrate', "*#{migration_files.join(',')}")]).any?
-          puts ""
-          puts "I found #{'a ' unless migration_paths.many?}migration#{'s' if migration_paths.many?} at:"
-          puts migration_paths.join("\n")
-          puts ""
-          puts "Please ensure that you roll back these migrations if you used them (using rake db:rollback) and then run:"
-          puts "------------------------"
-          puts "rm #{migration_paths.join("\n rm ")}"
-          puts "rm #{Rails.root.join('db', 'seeds', "#{plural_name}.rb")}"
-          puts "------------------------"
-          puts "This will ensure that nothing gets left behind from this engine in your database."
-          puts "Note - be careful about rolling back if you have any migrations created after this one."
-          puts "This is because Rails rolls back only the last migration used each time you invoke rake db:rollback"
-          puts ""
-        end
+        ::Refinery::Generators::Migrations.revoke({
+          :pattern => File.expand_path('../templates/db/migrate/*.rb', __FILE__),
+          :plural_name => plural_name,
+          :singular_name => singular_name
+        })
       end
     else
       puts "You must specify at least one field. For help: rails generate refinery_engine"

data/lib/generators/refinery_engine/templates/app/models/singular_name.rb

@@ -1,8 +1,8 @@
 class <%= class_name %> < ActiveRecord::Base
+<% if (string_attributes = attributes.map{ |attribute| attribute.name.to_sym if attribute.type.to_s =~ /string|text/ }.compact.uniq).any? %>
+  acts_as_indexed :fields => <%= string_attributes.inspect %>
 
-  acts_as_indexed :fields => [:<%= attributes.collect{ |attribute| attribute.name if attribute.type.to_s =~ /string|text/ }.compact.uniq.join(", :") %>]
-  <% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>
-  validates :<%= title.name %>, :presence => true, :uniqueness => true
+  validates <%= string_attributes.first.inspect %>, :presence => true, :uniqueness => true
   <% else %>
   # def title was created automatically because you didn't specify a string field
   # when you ran the refinery_engine generator. Love, Refinery CMS.

data/lib/refinery/generators/engine_installer.rb

@@ -0,0 +1,69 @@
+require File.expand_path('../../generators', __FILE__)
+require 'rails/generators'
+require 'rails/generators/named_base'
+require 'rails/generators/migration'
+
+module Refinery
+  module Generators
+    # The core engine installer streamlines the installation of custom generated
+    # engines. It takes the migrations and seeds in your engine and moves them
+    # into the rails app db directory, ready to migrate.
+    class EngineInstaller < Rails::Generators::Base
+
+      include Rails::Generators::Migration
+
+      attr_accessor :silence_puts
+      def silence_puts
+        !!@silence_puts
+      end
+
+      class << self
+
+        def engine_name(name = nil)
+          @engine_name = name.to_s unless name.nil?
+          @engine_name
+        end
+
+        def source_root(root = nil)
+          Pathname.new(super.to_s)
+        end
+
+        # Implement the required interface for Rails::Generators::Migration.
+        # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
+        # can be removed once this issue is fixed:
+        # # https://rails.lighthouseapp.com/projects/8994/tickets/3820-make-railsgeneratorsmigrationnext_migration_number-method-a-class-method-so-it-possible-to-use-it-in-custom-generators
+        def next_migration_number(dirname)
+          ::ActiveRecord::Generators::Base.next_migration_number(dirname)
+        end
+      end
+
+      def generate
+        Pathname.glob(self.class.source_root.join('db', '**', '*.rb')).sort.each do |path|
+          case path.to_s
+          when %r{.*/migrate/.*}
+            # unless the migration has already been generated.
+            migration_name = "#{path.split.last.to_s.split(/^\d+_/).last}"
+            unless Dir[Rails.root.join('db', 'migrate', "*#{migration_name}")].any?
+              migration_template path, Rails.root.join('db', 'migrate', migration_name)
+            else
+              puts "You already have a migration called #{migration_name.split('.rb').first}" unless self.silence_puts || self.behavior == :revoke
+            end
+          when %r{.*/seeds/.*}
+            template path, Rails.root.join('db', 'seeds', path.to_s.split('/seeds/').last)
+          end
+        end
+
+        if !self.silence_puts && self.behavior != :revoke
+          puts "------------------------"
+          puts "Now run:"
+          puts "rake db:migrate"
+          puts "------------------------"
+        elsif self.behavior == :revoke
+          ::Refinery::Generators::Migrations.revoke({
+            :pattern => self.class.source_root.join('db', 'migrate', '*.rb')
+          })
+        end
+      end
+    end
+  end
+end

data/lib/refinery/generators/migrations.rb

@@ -0,0 +1,35 @@
+module Refinery
+  module Generators
+    module Migrations
+      class << self
+        def revoke(options = {})
+          options = {:pattern => 'db/*.rb', :plural_name => nil, :singular_name => nil}.merge(options)
+          migration_files = Pathname.glob(options[:pattern]).sort.map { |m|
+            if options[:plural_name]
+              m = m.to_s.gsub('plural_name', options[:plural_name])
+            end
+            if options[:singular_name]
+              m = m.to_s.gsub('singular_name', options[:singular_name])
+            end
+            Pathname.new(m).basename.to_s.split(/^\d+_/).last
+          }.reject{|m| m.blank?}
+
+          if migration_files.any? and (migration_paths = Dir[Rails.root.join('db', 'migrate', "*#{migration_files.join(',')}")]).any?
+            message = [""]
+            message << "I found #{'a ' unless migration_paths.many?}migration#{'s' if migration_paths.many?} at:"
+            message << migration_paths.join("\n")
+            message << ""
+            message << "Please ensure that you roll back these migrations if you used them (using rake db:rollback) and then run:"
+            message << "\nrm #{migration_paths.join("\nrm ")}"
+            message << "rm #{Rails.root.join('db', 'seeds', "#{options[:plural_name]}.rb")}" if options[:plural_name]
+            message << "\nThis will ensure that nothing gets left behind in your database."
+            message << "Note - be careful about rolling back if you have any migrations created after this one."
+            message << "This is because Rails rolls back from the last migration backwards when rake db:rollback is invoked"
+            message << "\n"
+            puts message.join("\n")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/refinery/generators.rb

@@ -1,62 +1,9 @@
 require 'refinery'
+require 'pathname'
 
 module Refinery
   module Generators
-    # The core engine installer streamlines the installation of custom generated
-    # engines. It takes the migrations and seeds in your engine and moves them
-    # into the rails app db directory, ready to migrate.
-    class EngineInstaller < Rails::Generators::Base
-
-      include Rails::Generators::Migration
-
-      attr_accessor :silence_puts
-      def silence_puts
-        !!@silence_puts
-      end
-
-      class << self
-
-        def engine_name(name = nil)
-          @engine_name = name.to_s unless name.nil?
-          @engine_name
-        end
-
-        def source_root(root = nil)
-          Pathname.new(super.to_s)
-        end
-
-        # Implement the required interface for Rails::Generators::Migration.
-        # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
-        # can be removed once this issue is fixed:
-        # # https://rails.lighthouseapp.com/projects/8994/tickets/3820-make-railsgeneratorsmigrationnext_migration_number-method-a-class-method-so-it-possible-to-use-it-in-custom-generators
-        def next_migration_number(dirname)
-          ::ActiveRecord::Generators::Base.next_migration_number(dirname)
-        end
-      end
-
-      def generate
-        Pathname.glob(self.class.source_root.join('db', '**', '*.rb')).sort.each do |path|
-          case path.to_s
-          when %r{.*/migrate/.*}
-            # unless the migration has already been generated.
-            migration_name = "#{path.split.last.to_s.split(/\d+_/).last}"
-            unless Dir[Rails.root.join('db', 'migrate', "*#{migration_name}")].any?
-              migration_template path, Rails.root.join('db', 'migrate', path.to_s.split('/migrate/').last.split(/^\d*_/).last)
-            else
-              puts "You already have a migration called #{migration_name.split('.rb').first}" unless self.silence_puts || self.behavior == :revoke
-            end
-          when %r{.*/seeds/.*}
-            template path, Rails.root.join('db', 'seeds', path.to_s.split('/seeds/').last)
-          end
-        end
-
-        unless self.silence_puts || self.behavior == :revoke
-          puts "------------------------"
-          puts "Now run:"
-          puts "rake db:migrate"
-          puts "------------------------"
-        end
-      end
-    end
+    autoload :EngineInstaller, File.expand_path('../generators/engine_installer', __FILE__)
+    autoload :Migrations, File.expand_path('../generators/migrations', __FILE__)
   end
 end

data/lib/refinerycms-generators.rb

@@ -1,9 +1,8 @@
 require 'refinery'
+require File.expand_path('../refinery/generators', __FILE__)
 
 module Refinery
   module Generators
-    autoload :EngineInstaller, File.expand_path('../refinery/generators', __FILE__)
-
     class Engine < Rails::Engine
       config.after_initialize do
         ::Refinery::Plugin.register do |plugin|

data/refinerycms-generators.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-generators}
-  s.version           = %q{0.9.9.4}
-  s.date              = %q{2011-02-17}
+  s.version           = %q{0.9.9.5}
+  s.date              = %q{2011-02-21}
   s.summary           = %q{Core generators for the Refinery CMS project.}
   s.description       = %q{Core generators for Refinery CMS including refinery_engine.}
   s.homepage          = %q{http://refinerycms.com}
@@ -77,6 +77,9 @@ Gem::Specification.new do |s|
     'lib/generators/refinery_engine/templates/spec/models/singular_name_spec.rb',
     'lib/generators/refinery_engine/USAGE',
     'lib/refinery',
+    'lib/refinery/generators',
+    'lib/refinery/generators/engine_installer.rb',
+    'lib/refinery/generators/migrations.rb',
     'lib/refinery/generators.rb',
     'lib/refinerycms-generators.rb',
     'readme.md',

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-generators
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.4
+  version: 0.9.9.5
 platform: ruby
 authors: 
 - Resolve Digital
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 +13:00
+date: 2011-02-21 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -58,6 +58,8 @@ files:
 - lib/generators/refinery_engine/templates/refinerycms-plural_name.gemspec
 - lib/generators/refinery_engine/templates/spec/models/singular_name_spec.rb
 - lib/generators/refinery_engine/USAGE
+- lib/refinery/generators/engine_installer.rb
+- lib/refinery/generators/migrations.rb
 - lib/refinery/generators.rb
 - lib/refinerycms-generators.rb
 - readme.md