databasion 0.0.3 → 0.0.4

data/Rakefile

@@ -8,7 +8,7 @@ Jeweler::Tasks.new do |gem|
   gem.email       = "mojobojo@gmail.com"
   gem.homepage    = "http://github.com/boj/databasion"
   gem.authors     = ["Brian Jones", "Istpika"]
-  gem.version     = "0.0.3"
+  gem.version     = "0.0.4"
 
   gem.add_dependency('activerecord', '>= 2.3.5')
   gem.add_dependency('activesupport', '>= 2.3.5')

data/databasion.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{databasion}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Jones", "Istpika"]
@@ -43,6 +43,8 @@ Gem::Specification.new do |s|
      "lib/databasion/loadlize.rb",
      "lib/databasion/migitize.rb",
      "lib/databasion/svnilize.rb",
+     "lib/databasion/templates/migration.erb",
+     "lib/databasion/templates/model.erb",
      "lib/databasion/yamalize.rb",
      "lib/migration_helpers/MIT-LICENSE",
      "lib/migration_helpers/README.markdown",

data/lib/databasion.rb

@@ -34,6 +34,7 @@ module Databasion
     end
   end
   
+  private
   def self.googlize
     Databasion::Googlize.config = @@config
     Databasion::Googlize.googlebate
@@ -43,12 +44,12 @@ module Databasion
     Databasion::Excelize.excelbate
   end
   
-  def datacize
+  def self.datacize
     Databasion::Datacize.config = @@config
-    Databasion::Datacize.loadalize
+    Databasion::Datacize.datacize
   end
   
-  def loadalize
+  def self.loadalize
     Databasion::Loadlize.config = @@config
     Databasion::Loadlize.loadalize
   end
@@ -57,8 +58,7 @@ module Databasion
     Databasion::Svnilize.config = @@config
     Databasion::Svnilize.commit
   end
-  
-  private
+
   def self.set_ar_logger
     ActiveRecord::Base.logger = Databasion::LOGGER
   end

data/lib/databasion/applcize.rb

@@ -1,4 +1,5 @@
 require 'trollop'
+require 'fileutils'
 
 module Databasion
   

data/lib/databasion/migitize.rb

@@ -1,4 +1,6 @@
 require 'active_support'
+require 'erb'
+require 'fileutils'
 
 module Databasion
   
@@ -42,43 +44,14 @@ module Databasion
     end
     
     def self.migration_class(meta)
-      migration = "class %sMigration < ActiveRecord::Migration\n" % meta['name'].camelize
-      migration += migration_up(meta)
-      migration += migration_down(meta)
-      migration += "end\n"
-    end
-    
-    def self.migration_up(meta)
-      migration = "  def self.up\n"
-      if meta['fields'].collect {|f| f['field']}.include?('id')
-        migration += "    create_table :%s, :id => false do |t|\n" % set_table_name(meta)
-      else
-        migration += "    create_table :%s do |t|\n" % set_table_name(meta)
-      end
-      migration += migration_up_fields(meta)
-      migration += "    end\n"
-      migration += "  end\n"
-    end
-    
-    def self.migration_up_fields(meta)
-      migration = ''
-      meta['fields'].each do |field|
-        if field['field'] == 'id'
-          migration += '      t.integer :id, :options => "PRIMARY KEY"' + "\n"
-        else
-          migration += "      t.%s :%s" % [field['type'], field['field']]
-          migration += ", :limit => %s" % field['size'] if field['size']
-          migration += ", :default => %s" % field['default'] if field['default']
-          migration += "\n"
-        end
-      end
-      migration
-    end
-    
-    def self.migration_down(meta)
-      migration = "  def self.down\n"
-      migration += "    drop_table :%s\n" % meta['name'].pluralize
-      migration += "  end\n"
+      template = ''
+      File.open(File.expand_path(File.dirname(__FILE__)) + '/templates/migration.erb', 'r') { |f| template = f.read }
+      class_name = meta['name'].camelize
+      table_name = meta['name']
+      fields = meta['fields']
+
+      migration = ERB.new(template, nil, ">")
+      migration.result(binding)
     end
     
     def self.set_table_name(meta)
@@ -87,10 +60,17 @@ module Databasion
     end
     
     def self.ruby_model(meta)
-      model = "class %s < ActiveRecord::Base\n" % ruby_model_name(meta)
-      model += ruby_model_table_name(meta)
-      model += "end\n"
-      model += ruby_model_connection(meta)
+      template = ''
+      File.open(File.expand_path(File.dirname(__FILE__)) + '/templates/model.erb', 'r') { |f| template = f.read }
+      class_name = ruby_model_name(meta)
+      table_name = ruby_model_table_name(meta)
+      fields = meta['connection'].clone
+      fields.delete('spreadsheet')
+      fields.delete('options')
+      fields.delete('dbname')
+
+      model = ERB.new(template, nil, ">")
+      model.result(binding)
     end
     
     def self.ruby_model_name(meta)
@@ -98,25 +78,12 @@ module Databasion
     end
     
     def self.ruby_model_table_name(meta)
-      return "set_table_name %s\n" % meta['name'] unless meta['plural']
-      ''
-    end
-    
-    def self.ruby_model_connection(meta)
-      model = "%s.establish_connection(\n" % ruby_model_name(meta)
-      count = 0
-      meta['connection'].each do |key, value|
-        count += 1
-        next if value.nil?
-        next if ['spreadsheet', 'options', 'dbname'].include?(key)
-        model += "  :" + key + " => " + '"' + value + '"'
-        model += "," unless meta['connection'].size == count
-        model += "\n"
-      end
-      model += ")\n"
+      return meta['name'] unless meta['plural']
+      nil
     end
     
     def self.write_migration(migration, file_name, sub_path)
+      puts sub_path
       path = @@config['output']['migrations']['path'] + "/" + sub_path
       check_output_path(path)
       unless migration_exists?(file_name)

data/lib/databasion/templates/migration.erb

@@ -0,0 +1,12 @@
+class <%= class_name %>Migration < ActiveRecord::Migration
+  def self.up
+    create_table :<%= table_name %><%= ', :id => false' if fields.collect {|f| f['field']}.include?('id') %> do |t|
+    <% for field in fields %>
+      t.<%= field['type'] %> :<%= field['field'] %><%= ', :limit => %s' % field['size'] if field['size'] %><%= ', :default => %s' % field['default'] if field['default'] %><%= "\n" %>
+    <% end %>
+    end
+  end
+  def self.down
+    drop_table :<%= table_name %><%= "\n" %>
+  end
+end

data/lib/databasion/templates/model.erb

@@ -0,0 +1,11 @@
+class <%= class_name %> < ActiveRecord::Base
+  <%= 'set_table_name %s' % table_name unless table_name.nil? %><%= "\n" %>
+end
+<%= class_name %>.establish_connection(
+  <% count = 0 %>
+  <% for key, value in fields %>
+  <% count += 1 %>
+  <% next if value.nil? %>
+  :<%= key %> => "<%= value %>"<%= ',' unless count == fields.size %><%= "\n" %>
+  <% end %>
+)

data/lib/databasion/yamalize.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Databasion
   
   class YamalizeError < StandardError; end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: databasion
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Brian Jones
@@ -119,6 +119,8 @@ files:
 - lib/databasion/loadlize.rb
 - lib/databasion/migitize.rb
 - lib/databasion/svnilize.rb
+- lib/databasion/templates/migration.erb
+- lib/databasion/templates/model.erb
 - lib/databasion/yamalize.rb
 - lib/migration_helpers/MIT-LICENSE
 - lib/migration_helpers/README.markdown