datum 0.8.7 → 0.9.0

data/lib/datum/db_tasks.rb

@@ -9,7 +9,7 @@ module Datum
     def prepare
       create
       migrate
-      load
+      load_when_empty
     end
 
     def create
@@ -27,22 +27,15 @@ module Datum
 
       #Rake::Task['db:drop'].invoke()
       ActiveRecord::Base.connection.drop_database database rescue nil
-      
     end
     
+    def load_when_empty
+      load_fixtures true
+    end
+
     # get into the datum fixtures directory, walk the yml, load into db
     def load
-      Dir.glob("#{@@local_path}/fixtures/*.yml").entries.each do |entry|
-        file_name = entry.to_s.split('/').last.to_s.split('.')[0]
-        target_model = file_name.classify.constantize
-        data_hash = YAML.load(File.read(entry))
-        data_hash.each_value {|value|
-          value.delete "id"
-          value.delete "created_at"
-          value.delete "updated_at"
-          target_model.create value
-        }
-      end
+      load_fixtures false
     end
     
     # get into datum db, get relevant tables, produce ymls (for sharing)
@@ -55,8 +48,7 @@ module Datum
       tables = (ActiveRecord::Base.connection.tables - skip_tables)
       tables.each do |table_name|
         i = "000"
-        File.open("#{@@local_path}/fixtures/#{table_name}.yml", 
-        'w') do |file|
+        File.open("#{@@local_path}/fixtures/#{table_name}.yml", 'w') do |file|
           data = ActiveRecord::Base.connection.select_all(sql % table_name)
           file.write data.inject({}) { |hash, record|
             hash["#{table_name}_#{i.succ!}"] = record
@@ -74,23 +66,40 @@ module Datum
         f1.puts "\n\n#\n# data dump for code access of table #{file_name}"
         f1.puts "#\nmodule #{tasked_model.to_s.pluralize}"
         f1.puts "def self.data\nd = ["
-          data.each_with_index {|e, i|
-            hash = e.attributes
-            hash.each_pair {|key, value|
-              new_value = value.to_s
-              hash[key] = new_value
-            }
-            f1.puts "#{hash.to_s},"
+        data.each_with_index {|e, i|
+          hash = e.attributes
+          hash.each_pair {|key, value|
+            new_value = value.to_s
+            hash[key] = new_value
           }
+          f1.puts "#{hash.to_s},"
+        }
         f1.puts "]\nend\nend"
       end
     end
 
     private
+
     @@local_path = "#{Rails.root}/test/lib/datum"
     
     @@datum_environment = "datum"
     
+    def load_fixtures skip_with_data
+      Dir.glob("#{@@local_path}/fixtures/*.yml").entries.each do |entry|
+        file_name = entry.to_s.split('/').last.to_s.split('.')[0]
+        target_model = file_name.classify.constantize
+        if(!skip_with_data || target_model.count == 0)
+          data_hash = YAML.load(File.read(entry))
+          data_hash.each_value {|value|
+            value.delete "id"
+            value.delete "created_at"
+            value.delete "updated_at"
+            target_model.create value
+          }
+        end
+      end
+    end
+
     def context
       return Datum::Context
     end

data/lib/datum/verification_task.rb

@@ -82,7 +82,9 @@ module Datum
         {:version => "0.8.3"},
         {:version => "0.8.4"},
         {:version => "0.8.5"},
-        {:version => "0.8.6"}])
+        {:version => "0.8.6"},
+        {:version => "0.8.7"},
+        {:version => "0.9.0"}])
     end
 
     def exec_test

data/lib/datum/verify_helpers/datum_version.rb

@@ -3,4 +3,6 @@
 class DatumVersion < ActiveRecord::Base
   establish_connection :datum
   
+  attr_accessor :datum_versions
+  
 end

data/lib/datum/version.rb

@@ -1,5 +1,5 @@
 module Datum
-  VERSION = "0.8.7"
+  VERSION = "0.9.0"
 end
 
 ## 0.8.1
@@ -18,4 +18,7 @@ end
 ## Fixed migration not observing schema version (regression)
 ## Updated drop to use connection instead of rake task (unreliable)
 ## 0.8.7
-## Added db:prepare rake task
+## Added db:prepare rake task
+## 0.9.0
+## prepare no longer uses load, instead it uses load_when_empty
+## attr_accessor added to datum_version model

data/lib/tasks/datum.rake

@@ -23,6 +23,9 @@ namespace :datum do
     desc "Dump data as fixtures from datum database"
     task :dump => :environment do invoke "dump" end
     
+    desc "Loads datum fixtures IF table is empty"
+    task :load_when_empty => :environment do invoke "load_when_empty" end
+
     desc "Loads fixtures specific to datum database"
     task :load => :environment do invoke "load" end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datum
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,14 +10,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.1
   type: :runtime
@@ -25,9 +25,25 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.1
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.11
 description: Flexible data-driven test solution for Rails
 email:
 - datum@tyemill.com
@@ -106,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1943143270625711471
+      hash: -3296774884059331308
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1943143270625711471
+      hash: -3296774884059331308
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24