slim_migrations 3.2.0 → 3.2.1

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2011 Jan Lelis
+Copyright 2011-2012 Jan Lelis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -12,7 +12,7 @@ Turns
     end
   end
 
-into:
+into
 
   migration do
     def up
@@ -31,29 +31,36 @@ into:
 
 === Install
 
+==== Rails 3.2
+
+  # in your Gemfile
+  gem 'slim_migrations', '~> 3.2.1'
+
 ==== Rails 3.1
 
   # as plugin:
   rails plugin install git://github.com/janlelis/slim_migrations.git -r 3.1
-  # or in Gemfile:
-  gem 'slim_migrations', '~> 3.1.0'
+  # or in your Gemfile:
+  gem 'slim_migrations', '~> 3.1.1'
 
 ==== Rails 3.0
 
   # as plugin:
   rails plugin install git://github.com/janlelis/slim_migrations.git -r 3.0
-  # or in Gemfile:
-  gem 'slim_migrations', '~> 3.0.0'
+  # or in your Gemfile:
+  gem 'slim_migrations', '~> 3.0.1'
 
 ==== Rails 2.3
 
   # as plugin:
   script/plugin install git://github.com/janlelis/slim_migrations.git -r 2.3
-  # or in config/environment.rb
-  config.gem 'slim_migrations', :version => '~> 2.3.0'
+  # or in your config/environment.rb
+  config.gem 'slim_migrations', :version => '~> 2.3.1'
 
 === Credits
 
-Blog post: http://rbjl.net
+Blog post: http://rbjl.net/53-three-little-tips-for-slimmer-rails-migrations
+
+Thanks to contributions from: Manuel Meurer
 
-J-_-L
+MIT-LICENSE, J-_-L

data/lib/rails/generators/active_record/migration/migration_generator.rb

@@ -3,11 +3,11 @@ require 'rails/generators/active_record'
 module ActiveRecord
   module Generators
     class MigrationGenerator < Base
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      argument :attributes, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
 
       def create_migration_file
         set_local_assigns!
-        migration_template File.dirname(__FILE__) + "/templates/migration.rb", "db/migrate/#{file_name}.rb"
+        migration_template "migration.rb", "db/migrate/#{file_name}.rb"
       end
 
       protected
@@ -16,7 +16,7 @@ module ActiveRecord
         def set_local_assigns!
           if file_name =~ /^(add|remove)_.*_(?:to|from)_(.*)/
             @migration_action = $1
-            @table_name       = $2.pluralize
+            @table_name = $2.pluralize
           end
         end
 

data/lib/rails/generators/active_record/migration/templates/migration.rb

@@ -2,14 +2,20 @@ migration do
 <%- if migration_action == 'add' -%>
   def change
 <% attributes.each do |attribute| -%>
-    add_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %>
+    add_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
+    <%- if attribute.has_index? -%>
+    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
+    <%- end %>
 <%- end -%>
   end
 <%- else -%>
   def up
 <% attributes.each do |attribute| -%>
   <%- if migration_action -%>
-    <%= migration_action %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'add' %>, :<%= attribute.type %><% end %>
+    <%= migration_action %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'add' %>, :<%= attribute.type %><%= attribute.inject_options %><% end %>
+    <% if attribute.has_index? && migration_action == 'add' %>
+    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
+    <% end -%>
   <%- end -%>
 <%- end -%>
   end
@@ -17,7 +23,7 @@ migration do
   def down
 <% attributes.reverse.each do |attribute| -%>
   <%- if migration_action -%>
-    <%= migration_action == 'add' ? 'remove' : 'add' %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'remove' %>, :<%= attribute.type %><% end %>
+    <%= migration_action == 'add' ? 'remove' : 'add' %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'remove' %>, :<%= attribute.type %><%= attribute.inject_options %><% end %>
   <%- end -%>
 <%- end -%>
   end

data/lib/slim_migrations.rb

@@ -13,7 +13,7 @@ module Kernel
 
   # initialize migrations with <tt>migration do</tt> instead of <tt>class SomeMigration < ActiveRecord::Migration</tt>
   def migration(&block)
-    if caller[0].rindex(/(?:[0-9]+)_([_a-z0-9]*).rb:\d+(?::in `.*')?$/)
+    if caller[0].rindex(/\/(?:[0-9]+)_([_a-z0-9]*).rb:\d+(?::in `.*')?$/)
       m = Object.const_set $1.camelize, Class.new(ActiveRecord::Migration)
       m.class_eval(&block) # 3.1
     else

data/lib/slim_migrations/version.rb

@@ -1,3 +1,3 @@
 module SlimMigrations
-  VERSION = '3.2.0'
+  VERSION = '3.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim_migrations
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-04 00:00:00.000000000Z
+date: 2012-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &25448980 !ruby/object:Gem::Requirement
+  requirement: &8317800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc1
+        version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *25448980
+  version_requirements: *8317800
 description: Let's you write even slimmer migrations.
 email: mail@janlelis.de
 executables: []
@@ -50,7 +50,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3511577405469603588
+      hash: 1305657415440073261
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -59,10 +59,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3511577405469603588
+      hash: 1305657415440073261
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Let's you write even slimmer migrations.