databasion 0.0.8 → 0.0.9

data/README.md

@@ -2,11 +2,9 @@
 
 ## Google Spreadsheet/Excel -> YAML -> Ruby Migration -> Database Management Tool
 
-If we were all part of a hive mind, we wouldn't need management anything.  Databases would get built, the correct columns would get used, programmers would align their ORMs, and keeping it all together wouldn't be some kind of management nightmare.
+A database management tool.  The theory is that a designer/planner can edit application data, a programmer can setup the database and it's fields, all in one happy little place.  As tables are added, and data is changed, if the script is run once again it will update the target database.
 
-Fortunately we aren't a hive mind*.  Still, even though my coworkers can't read my mind, we've come up with a tool that allows top end planners to describe system data in a spreadsheet, programmers to fudge in the column types, sizes, and database relationships, and everyone to export it out into YAML and Ruby migration scripts which update your infrastructure.  Ideally the fully automated suite is used in your test environment so your planner can quickly test changes, and a step by step process used if you are updating production machines.
-
-* If we were I would be just as confused as I am any other day, our office's main language is Japanese.  Although I've been studying it for 9 years...
+TODO: While this system uses Rails Migrations, it isn't taking full advantage of them (i.e. tracking changes, allowing for rollbacks, etc.).  This was also created under a high pressure timeline, so it was unfortunate that I could not create a fully working test suite.
 
 ## Requirements
 
@@ -136,7 +134,7 @@ __0.1.0__
 
 ## Testing
 
-Currently Databasion uses the cucumber test suite.  Any patches or pull requests must have a corresponding Feature, and all tests must pass.  Feature branches get bonus points.
+Currently Databasion uses the cucumber test suite.  The tests aren't complete, unfortunately.
 
 ## Author
 

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.8"
+  gem.version     = "0.0.9"
 
   gem.add_dependency('activerecord', '>= 2.3.5')
   gem.add_dependency('activesupport', '>= 2.3.5')

data/databasion.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{databasion}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Jones", "Istpika"]
-  s.date = %q{2010-07-05}
+  s.date = %q{2010-10-12}
   s.default_executable = %q{databasion}
   s.email = %q{mojobojo@gmail.com}
   s.executables = ["databasion"]
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
      "lib/databasion/csvilize.rb",
      "lib/databasion/datacize.rb",
      "lib/databasion/excelize.rb",
-     "lib/databasion/gititlize.rb",
+     "lib/databasion/gitilize.rb",
      "lib/databasion/googlize.rb",
      "lib/databasion/loadlize.rb",
      "lib/databasion/migitize.rb",

data/lib/databasion/googlize.rb

@@ -59,7 +59,8 @@ module Databasion
         spreadsheet.worksheets.each do |worksheet|
           next unless master_list.collect { |row| row['spreadsheet'] }.include?(worksheet.title)
           data_hash = parse(worksheet)
-          data_hash['connection'] = master_list.collect { |row| row if row['spreadsheet'] == data_hash['name'] }.reject { |d| d.nil? }[0]
+          data_hash['connection'] = master_list.collect { |row| row if row['spreadsheet'] == worksheet.title }.reject { |d| d.nil? }[0]
+          puts data_hash.inspect
           Databasion::Yamalize.yamlbate(data_hash, @@config['output']['yaml_path'])
         end
       end
@@ -103,11 +104,13 @@ module Databasion
 
         case row[0]
         when "table"
-          if d = row[1].split(",")
-            name = d[0]
-            plural = false if d[1] == 'false'
-          else
+          begin
+            d = row[1].split(",")
+            name = d[0].strip
+            plural = false if d[1].strip == 'false'
+          rescue
             name = row[1]
+            plural = true
           end
         when "field"
           row.each do |field|

data/lib/databasion/migitize.rb

@@ -58,7 +58,7 @@ module Databasion
     
     def self.set_table_name(meta)
       return meta['name'].pluralize if meta['plural']
-      meta['name'].pluralize
+      meta['name']
     end
     
     def self.ruby_model(meta)
@@ -76,7 +76,7 @@ module Databasion
     end
     
     def self.ruby_model_name(meta)
-      meta['plural'] ? meta['name'].camelize.pluralize : meta['name'].camelize
+      meta['name'].camelize
     end
     
     def self.ruby_model_table_name(meta)

data/lib/databasion/templates/model.erb

@@ -1,5 +1,5 @@
 class <%= class_name %> < ActiveRecord::Base
-  <%= 'set_table_name %s' % table_name unless table_name.nil? %><%= "\n" %>
+  <%= 'set_table_name "%s"' % table_name unless table_name.nil? %><%= "\n" %>
 end
 <%= class_name %>.establish_connection(
   <% count = 0 %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: databasion
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Brian Jones
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-05 00:00:00 +09:00
+date: 2010-10-12 00:00:00 +09:00
 default_executable: databasion
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,7 +115,7 @@ files:
 - lib/databasion/csvilize.rb
 - lib/databasion/datacize.rb
 - lib/databasion/excelize.rb
-- lib/databasion/gititlize.rb
+- lib/databasion/gitilize.rb
 - lib/databasion/googlize.rb
 - lib/databasion/loadlize.rb
 - lib/databasion/migitize.rb