databasion 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,7 +1,12 @@
+### 0.2.1
+* [FIXED] Tables without an 'id' field weren't updating via the load command and bailing, a dramatic oversight on my part.  Databasion now includes the composite primary keys gem for ActiveRecord, and correctly drops and loads master data now.
+
 ### 0.2.0
 
 * [FIXED] Fields flagged with an index were not properly referenced.
+* [FIXED] Default field values are now correctly inserted into database.
 * [CHANGE] There is now an Environment spreadsheet to define environments, and each environment replaces the old Database spreadsheet.  Databasion data is also broken down by directory, named after the relevant environment.  Specific environments are called with the new -e switch.
+* [CHANGE] If an id field is assigned as "id, auto" then it will be set as an auto incrementing primary key, and all other primary keys are ignored.
 * [NEW] Version control is now handled in the Environment spreadsheet, and works via the -r switch.  Ideal for near-realtime updates using crontab.
 * [NEW] Multiple primary keys can now be assigned by adding a comma delimited _primary_ to a field.
 * [NEW] The _options_ field in a spreadsheet environment definition now works according to the Rails Migration rules.

data/README.md

@@ -20,6 +20,7 @@ NOTE: The system is currently undergoing major changes, and will not remain back
 * ActiveSupport >= 2.3.5
 * Google Spreadsheet >= 0.1.2
 * Spreadsheet >= 0.6.4.1
+* Composite Primary Keys >= 3.0.9
 
 ## Installation
 
@@ -76,7 +77,7 @@ Next we define the actual table spreadsheets.
 | comment  |             |              |                    |
 | table    | superheroes |              |                    |
 | index    | yes         |              |                    |
-| field    | id          | name         | power              | cape 
+| field    | id, primary | name         | power              | cape 
 | type     | integer     | string, 20   | string, 20, Wimp   | boolean
 |          | 1           | Brian Jones  | Ruby Hacker        | false
 |          | 2           | Superman     | Invincible         | true
@@ -89,7 +90,7 @@ Next we define the actual table spreadsheets.
 * comment - Ideally a description of the field, what the values means, etc.
 * table - The name of the table, and an optional comma delimited 'false' if the table name should not be auto-pluralized.
 * index - This will create an index on the designated field.  If a multi-index is required, indices will be grouped by unique names.  Multiple multi-indices are possible.
-* field - The name of the table column, with an optional comma delimited 'auto' or 'primary' parameter.  Auto is strictly limited to an 'id' field, and enables auto incrementation.
+* field - The name of the table column, with an optional comma delimited 'auto' or 'primary' parameter.  Auto is strictly limited to an 'id' field, and enables auto incrementation.  At least one field _must_ be labeled 'primary' or 'auto', otherwise the system will bail while trying to build that table.
 * type  - A comma delimited list giving the type of the column (using Ruby migration terms), optional size, and optional default value.
 
 __Ruby Migration Types__
@@ -172,7 +173,7 @@ Keywords are also supported in the _ignore_ columns and rows of table definition
  | comment      |             |              |                    |         |                       
  | table        | superheroes |              |                    |         |                       
  | index        | yes         |              |                    |         |                       
- | field        | id          | name         | power              | cape    | mask                  
+ | field        | id, primary | name         | power              | cape    | mask                  
  | type         | integer     | string, 20   | string, 20, Wimp   | boolean | boolean               
  |              | 1           | Brian Jones  | Ruby Hacker        | false   | false                 
  |              | 2           | Superman     | Invincible         | true    | false                 

data/Rakefile

@@ -8,12 +8,13 @@ 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.2.0"
+  gem.version     = "0.2.1"
 
   gem.add_dependency('activerecord', '>= 2.3.5')
   gem.add_dependency('activesupport', '>= 2.3.5')
   gem.add_dependency('google-spreadsheet-ruby', '>= 0.1.2')
   gem.add_dependency('spreadsheet', '>= 0.6.4.1')
+  gem.add_dependency('composite_primary_keys', '>= 3.0.9')
 end
 
 Jeweler::GemcutterTasks.new

data/databasion.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{databasion}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Jones", "Istpika"]
-  s.date = %q{2010-12-03}
+  s.date = %q{2010-12-15}
   s.default_executable = %q{databasion}
   s.email = %q{mojobojo@gmail.com}
   s.executables = ["databasion"]
@@ -71,17 +71,20 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
       s.add_runtime_dependency(%q<google-spreadsheet-ruby>, [">= 0.1.2"])
       s.add_runtime_dependency(%q<spreadsheet>, [">= 0.6.4.1"])
+      s.add_runtime_dependency(%q<composite_primary_keys>, [">= 3.0.9"])
     else
       s.add_dependency(%q<activerecord>, [">= 2.3.5"])
       s.add_dependency(%q<activesupport>, [">= 2.3.5"])
       s.add_dependency(%q<google-spreadsheet-ruby>, [">= 0.1.2"])
       s.add_dependency(%q<spreadsheet>, [">= 0.6.4.1"])
+      s.add_dependency(%q<composite_primary_keys>, [">= 3.0.9"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 2.3.5"])
     s.add_dependency(%q<activesupport>, [">= 2.3.5"])
     s.add_dependency(%q<google-spreadsheet-ruby>, [">= 0.1.2"])
     s.add_dependency(%q<spreadsheet>, [">= 0.6.4.1"])
+    s.add_dependency(%q<composite_primary_keys>, [">= 3.0.9"])
   end
 end
 

data/lib/databasion/build_migration.rb

@@ -73,6 +73,14 @@ module Databasion
       fields.delete('spreadsheet')
       fields.delete('options')
       fields.delete('dbname')
+      
+      keys = []
+      if meta['auto'] == false
+        meta['primaries'].each do |key|
+          keys << key
+        end
+        keys << 'id' if meta['fields'].collect { |field| field['field'] }.include?('id') and !keys.include?('id')
+      end
 
       model = ERB.new(template, nil, ">")
       model.result(binding)

data/lib/databasion/google_loader.rb

@@ -172,6 +172,8 @@ module Databasion
           end
         end
       end
+      
+      raise DatabasionError, "You cannot create a table without at least one 'auto' field, and/or one or more 'primary' fields." if primaries.empty? and !auto
 
       {
         'name'        => name,

data/lib/databasion/load_data.rb

@@ -32,16 +32,16 @@ module Databasion
           yaml_file = YAML.load_file('%s/%s.yml' % [opts[:env] + "/" + @@config['output']['yaml_path'], normal_name])
         end
 
-        for row in yaml_file['data']
-          klass = eval("%s.new" % camel_name)
-          model = camel_name.constantize.find(:first, :conditions => ['id = ?', row['id']])
-          if model
-            camel_name.constantize.update(model.id, row)
-          else
-            klass.id = row['id']
-            klass.update_attributes(row)
+        if yaml_file['data']
+          camel_name.constantize.delete_all
+          yaml_file['data'].each do |row|
+            klass = eval("%s.new" % camel_name)
+            row.each do |key, value|
+              eval("klass.%s = '%s'" % [key, value])
+            end
+            klass.save
           end
-        end if yaml_file['data']
+        end
       end
     end
     

data/lib/databasion/templates/model.erb

@@ -1,4 +1,7 @@
 class <%= class_name %> < ActiveRecord::Base
+  <% if !keys.empty? %>
+  set_primary_keys <%= keys.collect { |key| ":%s, " % key }.to_s.strip.chop %>
+  <% end %>
   <%= 'set_table_name "%s"' % table_name unless table_name.nil? %><%= "\n" %>
 end
 <%= class_name %>.establish_connection(

data/lib/databasion.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'logger'
 require 'active_record'
+require 'composite_primary_keys'
 
 APP_PATH = File.dirname(File.expand_path(__FILE__))
 $: << APP_PATH

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: databasion
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Brian Jones
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-03 00:00:00 +09:00
+date: 2010-12-15 00:00:00 +09:00
 default_executable: databasion
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,6 +84,22 @@ dependencies:
         version: 0.6.4.1
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: composite_primary_keys
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 3
+        - 0
+        - 9
+        version: 3.0.9
+  type: :runtime
+  version_requirements: *id005
 description: 
 email: mojobojo@gmail.com
 executables: