dynamic-fields 0.0.4 → 0.0.10

data/lib/dynamic_fields/field.rb

@@ -36,6 +36,6 @@ module DynamicFields
       end
       args.join(', ').gsub('\\', '')
     end
-
+  
   end
 end

data/lib/dynamic_fields/fields.rb

@@ -50,7 +50,7 @@ module DynamicFields
       
       # Any fields which have not been add to the table
       def new_fields
-        fields.reject {|f| real_field_names.include?(f.name.to_s) }
+        (self.fields ||= []).reject {|f| real_field_names.include?(f.name.to_s) }
       end
       
       # Any fields in the table, but not in the model
@@ -101,7 +101,7 @@ module DynamicFields
       
       # Any indicies which have not been add to the table
       def new_indices
-        indices.reject { |idx| real_index_ids.include?(idx.id) }
+        (self.indices ||= []).reject { |idx| real_index_ids.include?(idx.id) }
       end
       
       # Any indices in the table, but not in the model

data/lib/dynamic_fields/index.rb

@@ -14,7 +14,7 @@ module DynamicFields
     end
     
     def to_s
-      name
+      name.to_s
     end
     
     def unique?
@@ -26,11 +26,10 @@ module DynamicFields
       case action = action.to_sym
       when :add
         args << (fields.is_a?(Array) ? fields : fields.to_sym).inspect
-        args << ":name => #{name.inspect}" if fields.is_a?(Array)
+        args << ":name => #{to_s.inspect}"
         args << ":unique => true" if unique?
       when :remove
-        args << fields.to_sym.inspect unless fields.is_a?(Array)
-        args << ":name => #{name.to_sym.inspect}" if fields.is_a?(Array)
+        args << ":name => #{to_s.inspect}"
       end
       args.join(', ').gsub('\\', '')
     end

data/lib/generators/dynamic_fields/migration/templates/update_table.rb

@@ -1,15 +1,25 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
-  def self.up<% attributes.each do |action, attrs| %><% attrs.each do |attribute| %>
-    <%= action %>_column :<%= table_name %>, <%= attribute.migration_string_for :update, action %><% end -%>
-  <% end %><% indices.each do |action, idxs| %><% idxs.each do |index| %>
-    <%= action %>_index :<%= table_name %>, <%= index.migration_string_for :update, action %><% end -%>
-  <% end %>
+  def self.up
+<%- attributes[:add].each do |attribute| -%>
+    add_column :<%= table_name %>, <%= attribute.migration_string_for :update, :add %>
+<%- end -%><%- indices[:add].each do |index| -%>
+    add_index :<%= table_name %>, <%= index.migration_string_for :update, :add %>
+<%- end -%><%- indices[:remove].each do |index| -%>
+    remove_index :<%= table_name %>, <%= index.migration_string_for :update, :remove %>
+<%- end -%><%- attributes[:remove].each do |attribute| -%>
+    remove_column :<%= table_name %>, <%= attribute.migration_string_for :update, :remove %>
+<%- end -%>
   end
 
-  def self.down<% indices.each do |action, idxs| %><% idxs.each do |index| %>
-    <%= action == :add ? 'remove' : 'add' %>_index :<%= table_name %>, <%= index.migration_string_for(:update, action == :add ? :remove : :add ) %><% end -%>
-  <% end %><% attributes.each do |action, attrs| %><% attrs.reverse.each do |attribute| %>
-    <%= action == :add ? 'remove' : 'add' %>_column :<%= table_name %>, <%= attribute.migration_string_for(:update, action == :add ? :remove : :add ) %><% end -%>
-  <% end %>
+  def self.down
+<%- indices[:add].reverse.each do |index| -%>
+    remove_index :<%= table_name %>, <%= index.migration_string_for :update, :remove %>
+<%- end -%><%- attributes[:add].reverse.each do |attribute| -%>
+    remove_column :<%= table_name %>, <%= attribute.migration_string_for :update, :remove %>
+<%- end -%><%- attributes[:remove].reverse.each do |attribute| -%>
+    add_column :<%= table_name %>, <%= attribute.migration_string_for :update, :add %>
+<%- end -%><%- indices[:remove].reverse.each do |index| -%>
+    add_index :<%= table_name %>, <%= index.migration_string_for :update, :add %>
+<%- end -%>
   end
 end

data/lib/tasks/dynamic_fields.rake

@@ -1,3 +1,4 @@
+require 'dynamic_fields'
 require 'dynamic_fields/migration_generator'
 
 namespace :dynamic_fields do
@@ -42,7 +43,7 @@ def generate_migration_for(klass)
   return unless klass.name.present? # no annoymous classes
   if klass.requires_migration?
     puts "Generating a migration for #{klass.name}"
-    DynamicFields::MigrationGenerator.start klass.name
+    DynamicFields::MigrationGenerator.start [klass.name]
   else
     puts "#{klass.name} is up to date!"
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynamic-fields
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Alex Neill
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 +01:00
+date: 2011-06-21 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -43,28 +44,32 @@ homepage: http://github.com/ajn/dynamic-fields
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Auto-migrate ActiveRecord models