kaplan 0.2.1 → 0.2.2

data/lib/kaplan.rb

@@ -81,19 +81,25 @@ module Kaplan
   end
 
   class << self
-    def choose_database_adapter
+    attr_reader :database_orm, :web_framework
+
+    def detect_database_orm
       if defined?(::ActiveRecord)
-        Kaplan.extend(Kaplan::DatabaseAdapters::ActiveRecord)
+        @database_orm = :activerecord
+        extend Kaplan::DatabaseAdapters::ActiveRecord
       elsif defined?(::Mongoid)
-        Kaplan.extend(Kaplan::DatabaseAdapters::Mongoid)
+        @database_orm = :mongoid
+        extend Kaplan::DatabaseAdapters::Mongoid
       end
     end
 
-    def choose_web_framework
+    def detect_web_framework
       if defined?(::Rails)
-        Kaplan.extend(Kaplan::WebFrameworks::Rails)
+        @web_framework = :rails
+        extend Kaplan::WebFrameworks::Rails
       elsif defined?(::Padrino)
-        Kaplan.extend(Kaplan::WebFrameworks::Padrino)
+        @web_framework = :padrino
+        extend Kaplan::WebFrameworks::Padrino
       end
     end
 
@@ -108,14 +114,21 @@ module Kaplan
           raise "Error in Kaplan.seeds: Couldn't find the seed files you specified."
         end
       else
-        files = Dir["#{project_root}/seeds/*.{yml,yaml,rb,txt,csv}"] + Dir["#{project_root}/seeds/#{env}/*.{yml,yaml,rb,txt,csv}"]
+        files = [
+          "#{project_root}/db/seeds.rb",
+          Dir["#{project_root}/seeds/*.{yml,yaml,rb,txt,csv}"],
+          Dir["#{project_root}/seeds/#{env}/*.{yml,yaml,rb,txt,csv}"]
+        ].flatten
       end
-      files.map do |filename|
+      files.enum_for(:each_with_index).map do |filename, i|
         basename = ::File.basename(filename)
         basename =~ /^(.+?)\.([^.]+)$/
-        collection_name = $1
         extension = $2.downcase
-        model = collection_name.classify.constantize
+        # collection_name and model only applies to files within seeds/
+        if i > 0
+          collection_name = $1
+          model = collection_name.classify.constantize
+        end
         [filename, extension, collection_name, model]
       end
     end
@@ -129,18 +142,20 @@ module Kaplan
       establish_database(options[:env])
       seeds = seeds(options[:env], :only => options[:only])
       seeds.each do |filename, ext, collection_name, model|
-        if ext == "rb"
-          puts " - Adding data for #{collection_name}..." if level > 1
-          load filename
-        elsif ext == "yml" || ext == "yaml"
-          data = ::YAML.load_file(filename)
-          records = (Hash === data) ? data[data.keys.first] : data
-          puts " - Adding data for #{collection_name}..." if level > 1
-          insert_rows(records, model)
-        else
-          lines = ::File.read(filename).split(/\n/)
-          puts " - Adding data for #{collection_name}..." if level > 1
-          insert_rows_from_csv(lines, model)
+        seed_database_for(filename, ext, collection_name, model) do
+          puts " - Adding data for #{collection_name}..." if level > 1 && collection_name
+        end
+
+        # If the seed file sets an explicit id for a record, the next time you
+        # attempt to create a record, Postgres will bomb because it still thinks
+        # the sequence for the id starts at 1. So this will set the next value for
+        # the sequence to the last id + 1.
+        #
+        # See: <http://stackoverflow.com/questions/1709705/postgresql-nextval-generating-existing-values>
+        #
+        if @database_orm == :activerecord && model && model.connection.adapter_name == "PostgreSQL"
+          puts " - Resetting primary key sequence for #{collection_name}..."
+          ActiveRecord::Base.connection.reset_pk_sequence!(collection_name)
         end
       end
     end
@@ -159,10 +174,27 @@ module Kaplan
 
     def seedable_collections(env, options={})
       # Remove collections that don't exist
-      seeds(env, options).map {|filename, ext, collection_name, model| collection_name } & all_collections
+      seeds(env, options).map {|filename, ext, collection_name, model| collection_name }.compact & all_collections
     end
 
   private
+    def seed_database_for(filename, ext, collection_name, model)
+      case ext
+      when "rb"
+        yield
+        load filename
+      when "yml", "yaml"
+        data = ::YAML.load_file(filename)
+        records = (Hash === data) ? data[data.keys.first] : data
+        yield
+        insert_rows(records, model)
+      else
+        lines = ::File.read(filename).split(/\n/)
+        yield
+        insert_rows_from_csv(lines, model)
+      end
+    end
+
     def insert_rows(rows, model)
       rows.each do |row|
         record = model.new
@@ -173,6 +205,7 @@ module Kaplan
       end
     end
 
+    # TODO: Replace this with a real CSV parser
     def insert_rows_from_csv(lines, model)
       columns = lines.shift.sub(/^#[ ]*/, "").split(/,[ ]*/)
       rows = lines.map do |line|
@@ -185,5 +218,5 @@ module Kaplan
   end
 end
 
-Kaplan.choose_database_adapter
-Kaplan.choose_web_framework
+Kaplan.detect_database_orm
+Kaplan.detect_web_framework

data/lib/kaplan/tasks/kaplan.rake

@@ -12,7 +12,7 @@ namespace :kaplan do
     desc "Seeds a database of your choice (default: development) with bootstrap data.\nThe relevant tables are truncated first so you don't have to."
     task :seed, [:env, :only] => :environment do |t, args|
       env = args[:env] || ENV["RAILS_ENV"] || "development"
-      if only = args[:only] || ENV["ONLY"]
+      if only = args[:only] || ENV["ONLY"] || ENV["SEED"]
         only = only.split(",") unless Array === only
       end
       Rake::Task['kaplan:db:plow'].invoke(env, only)

data/lib/kaplan/version.rb

@@ -1,3 +1,3 @@
 module Kaplan
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaplan
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Elliot Winkler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 -07:00
+date: 2011-02-05 00:00:00 -07:00
 default_executable: 
 dependencies: []