genesis 1.1.0 → 1.2.0

data/History.txt

@@ -1,3 +1,8 @@
+== 1.2.0 2010-09-19
+
+* Make create_or_update_by_* methods able to convert AR objects to IDs if the attribute name includes '_id'.
+
+
 == 1.1.0 2010-07-27
 
 * Fixed issue with version attribute colliding with ActiveRecord's magic attribute name.

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/genesis.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{genesis}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["C. Jason Harrelson (midas)"]
-  s.date = %q{2010-07-27}
+  s.date = %q{2010-09-19}
   s.description = %q{A data seeding solution for Ruby on Rails providing seeding facilities far more advanced than the current built in Ruby on Rails solution.}
   s.email = %q{jason@lookforwardenterprises.com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "genesis.gemspec",
      "lib/generators/genesis/genesis_generator.rb",
      "lib/generators/genesis/templates/migration.erb",
+     "lib/generators/genesis_contexts/genesis_contexts_generator.rb",
      "lib/generators/prepare_genesis/prepare_genesis_generator.rb",
      "lib/generators/prepare_genesis/templates/genesis.rake",
      "lib/generators/prepare_genesis/templates/genesis_callbacks.rb",
@@ -39,6 +40,8 @@ Gem::Specification.new do |s|
      "rails_generators/genesis/genesis_generator.rb",
      "rails_generators/genesis/templates/genesis_override.rake",
      "rails_generators/genesis/templates/migration.rb",
+     "rails_generators/genesis_contexts/USAGE",
+     "rails_generators/genesis_contexts/genesis_contexts_generator.rb",
      "rails_generators/prepare_seeding/USAGE",
      "rails_generators/prepare_seeding/prepare_seeding_generator.rb",
      "rails_generators/prepare_seeding/templates/genesis.rake",
@@ -50,7 +53,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/midas/genesis}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A data seeding solution for Ruby on Rails.}
   s.test_files = [
     "spec/generators/genesis_generator_spec.rb",
@@ -62,7 +65,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 2.0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else

data/lib/generators/genesis_contexts/genesis_contexts_generator.rb

@@ -0,0 +1,13 @@
+require 'rails/generators'
+
+class GenesisContextsGenerator < Rails::Generators::Base
+  argument :contexts, :type => :string, :default => []
+
+  def self.source_root
+    File.join( File.dirname(__FILE__), 'templates' )
+  end
+
+  def install_contexts
+    @contexts.each { |context| empty_directory "#{Genesis::SEEDS_ROOT}/contexts/#{context}" }
+  end
+end

data/lib/generators/prepare_genesis/templates/genesis.rake

@@ -2,9 +2,18 @@ namespace :db do
   desc "Loads seed data for the current environment."
   task :genesis => :environment do
     Genesis::Seeder.verify_or_create_version_table
-    ignores = %w()
-    seeds = Dir[File.join( RAILS_ROOT, 'db', 'seeds', '*.rb' )] +
-            Dir[File.join( RAILS_ROOT, 'db', 'seeds', RAILS_ENV, '*.rb') ]
+    ignores = %w(genesis_common.rb)
+    seeds = Dir[File.join( Rails.root, 'db', 'seeds', '*.rb' )] +
+            Dir[File.join( Rails.root, 'db', 'seeds', Rails.env, '*.rb') ]
+
+    contexts = ENV['CONTEXTS']
+    unless contexts.nil? || contexts.empty?
+      contexts = expand_contexts if contexts == 'all'
+      contexts.split( ',' ).each do |context|
+        seeds += Dir[File.join( Rails.root, 'db', 'seeds', 'contexts', context, '*.rb' )]
+      end
+    end
+
     Genesis::Seeder.run( seeds, ENV['VERSION'] || nil, ignores )
   end
 
@@ -14,6 +23,35 @@ namespace :db do
     Rake::Task['db:genesis'].invoke
   end
 
+  desc "An alias for the db:genesis task"
+  task :seed => :environment do
+    Rake::Task['db:genesis'].invoke
+  end
+
+  desc "An alias for the db:regenesis task"
+  task :reseed => :environment do
+    Rake::Task['db:regenesis'].invoke
+  end
+
+  desc "Removes all data, runs migrations and then seeds the database"
+  task :regenesis => :environment do
+    ActiveRecord::Base.connection.tables.select { |t| !['schema_migrations', 'schema_seeds', 'versions', 'sessions'].include?( t ) }.each do |table|
+      puts "Emptying the #{table} table"
+      klass = table.classify.to_s.constantize
+      klass.delete_all
+    end
+
+    puts ''
+
+    Genesis::SchemaSeed.delete_all
+    ActiveRecord::Base.connection.execute( 'DELETE FROM `versions`' )
+    ActiveRecord::Base.connection.execute( 'DELETE FROM `sessions`' )
+
+    Rake::Task['db:migrate'].invoke
+    Rake::Task['db:test:prepare'].invoke
+    Rake::Task['db:genesis'].invoke
+  end
+
   namespace :genesis do
     desc "Returns the current seed version from teh schema_seeds table"
     task :version => :environment do
@@ -21,3 +59,15 @@ namespace :db do
     end
   end
 end
+
+def seeds_root
+  File.join( Rails.root, 'db', 'seeds' )
+end
+
+def contexts_root
+  File.join( seeds_root, 'contexts' )
+end
+
+def expand_contexts
+  Dir[File.join( contexts_root, '*'  )].map { |d| d.split( '/' ).last }.join ','
+end

data/lib/genesis.rb

@@ -6,7 +6,8 @@ require 'genesis/seeder'
 require 'genesis/schema_seed'
 
 module Genesis
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
+  SEEDS_ROOT = 'db/seeds'
 end
 
 ActiveRecord::Base.send :include, Genesis::ActiveRecordExtensions if defined? ActiveRecord::Base

data/lib/genesis/active_record_extensions.rb

@@ -6,10 +6,11 @@ module Genesis
     end
 
     module ClassMethods
-      # Use all attributes to try and find a record.  If found returns the record.  Otherwise creates 
+      # Use all attributes to try and find a record.  If found returns the record.  Otherwise creates
       # and returns the record.
       #
       def create_or_update_by_all( attrs={} )
+        attrs = extract_ar_object_ids( attrs )
         conditions = attrs
         record = find( :first, :conditions => conditions ) || self.new
         record.attributes = attrs
@@ -17,11 +18,12 @@ module Genesis
         record
       end
 
-      # Use some attributes (the ones passed in as the find_by hash) to try and find a record.  If found 
-      # returns the record.  Otherwise creates and returns the record with all of the attributes (including 
+      # Use some attributes (the ones passed in as the find_by hash) to try and find a record.  If found
+      # returns the record.  Otherwise creates and returns the record with all of the attributes (including
       # the ones in the find_by hash.)
       #
       def create_or_update_by_some( attrs={} )
+        attrs = extract_ar_object_ids( attrs )
         conditions = attrs.delete( :find_by )
         raise 'You must provide a :find_by hash of attributes to search with, ie. :find_by => {:id => 1}' unless conditions
         attrs.merge!( conditions )
@@ -36,6 +38,7 @@ module Genesis
       end
 
       def create_or_update_by( field, attrs={} )
+        attrs = extract_ar_object_ids( attrs )
         find_value = attrs[field]
         conditions = {field => find_value}
         record = find( :first, :conditions => conditions) || self.new
@@ -56,7 +59,23 @@ module Genesis
         end
       end
 
-      #alias_method_chain :method_missing, :create_or_update
+      private
+
+      def extract_ar_object_ids( attrs )
+        # TODO: Fix this technique.  It current flattens any *_attributes => [...] effectively destroying it.
+        # attrs = attrs.map do |attr,val|
+        #   debugger if attr == :citations_attributes
+        #   (attr.to_s.include?('_id') && val.is_a?( ActiveRecord::Base )) ? [attr,val.id] : [attr,val]
+        # end
+        #
+        # Hash[*attrs.flatten]
+
+        attrs.each do |attr,val|
+          if attr.to_s.include?('_id') && val.is_a?( ActiveRecord::Base )
+            attrs[attr] = val.id
+          end
+        end
+      end
     end
   end
 end

data/lib/genesis/seeder.rb

@@ -107,7 +107,7 @@ module Genesis
     end
 
     def self.run_seeds
-      callbacks = File.join( RAILS_ROOT, 'db', 'seeds', 'genesis_callbacks.rb' )
+      callbacks = File.join( Rails.root, 'db', 'seeds', 'genesis_callbacks.rb' )
       if File.exists?( callbacks )
         load( callbacks )
         should_run_callbacks = true

data/rails_generators/genesis_contexts/genesis_contexts_generator.rb

@@ -0,0 +1,44 @@
+class GenesisContextsGenerator < Rails::Generator::Base
+  attr_accessor :opts
+  attr_accessor :environments
+
+  def initialize( runtime_args, runtime_options={} )
+    super
+    @opts = {}
+    @contexts = []
+    parse_args( args )
+  end
+
+  def manifest
+    record do |m|
+      m.directory Genesis::SEEDS_ROOT
+      @contexts.each { |context| m.directory "#{Genesis::SEEDS_ROOT}/contexts/#{context}" }
+    end
+  end
+
+  private
+
+  def parse_args( arguments )
+    arguments.each do |arg|
+      arg_parts = arg.split( ':' )
+      if arg_parts[0] == 'contexts'
+        handle_env_arg( arg_parts[1] )
+      else
+        opts[arg_parts[0].to_sym] = arg_parts[1]
+      end
+    end
+  end
+
+  def handle_contexts_arg( val )
+    if val.include?( '[' ) && val.include?( ']')
+      val.gsub!( /\[/, '' ).gsub!( /\]/, '' )
+      val.split( ',' ).each { |v| @contexts << v.trim.gsub( /,/, '' ) }
+    elsif val.include?( '[' ) || val.include?( ']' )
+      raise 'Error The contexts option must be formatted without any spaces in the array. ie. contexts:[accounts,users]'
+    elsif val.include?( ',' )
+      raise 'Error The contexts option must be formatted with braces at the beginning and end of the list. ie. contexts:[accounts,users]'
+    else
+      @contexts << val
+    end
+  end
+end

data/rails_generators/prepare_seeding/prepare_seeding_generator.rb

@@ -1,7 +1,7 @@
 class PrepareSeedingGenerator < Rails::Generator::Base
   attr_accessor :opts
   attr_accessor :environments
-  
+
   def initialize( runtime_args, runtime_options = {} )
     super
     @opts = {}
@@ -17,9 +17,9 @@ class PrepareSeedingGenerator < Rails::Generator::Base
       m.file 'genesis_callbacks.rb', 'db/seeds/genesis_callbacks.rb'
     end
   end
-  
+
   private
-  
+
   def parse_args( arguments )
     arguments.each do |arg|
       arg_parts = arg.split( ':' )
@@ -29,10 +29,10 @@ class PrepareSeedingGenerator < Rails::Generator::Base
         opts[arg_parts[0].to_sym] = arg_parts[1]
       end
     end
-    
+
     validate_env_args
   end
-  
+
   def handle_env_arg( val )
     if val.include?( '[' ) && val.include?( ']')
       val.gsub!( /\[/, '' ).gsub!( /\]/, '' )
@@ -45,7 +45,7 @@ class PrepareSeedingGenerator < Rails::Generator::Base
       @environments << val
     end
   end
-  
+
   def validate_env_args
     @environments += %w(development production) if @environments.empty?
   end

data/rails_generators/prepare_seeding/templates/genesis.rake

@@ -2,9 +2,18 @@ namespace :db do
   desc "Loads seed data for the current environment."
   task :genesis => :environment do
     Genesis::Seeder.verify_or_create_version_table
-    ignores = %w()
-    seeds = Dir[File.join( RAILS_ROOT, 'db', 'seeds', '*.rb' )] +
-            Dir[File.join( RAILS_ROOT, 'db', 'seeds', RAILS_ENV, '*.rb') ]
+    ignores = %w(genesis_common.rb)
+    seeds = Dir[File.join( Rails.root, 'db', 'seeds', '*.rb' )] +
+            Dir[File.join( Rails.root, 'db', 'seeds', Rails.env, '*.rb') ]
+
+    contexts = ENV['CONTEXTS']
+    unless contexts.nil? || contexts.empty?
+      contexts = expand_contexts if contexts == 'all'
+      contexts.split( ',' ).each do |context|
+        seeds += Dir[File.join( Rails.root, 'db', 'seeds', 'contexts', context, '*.rb' )]
+      end
+    end
+
     Genesis::Seeder.run( seeds, ENV['VERSION'] || nil, ignores )
   end
 
@@ -14,6 +23,35 @@ namespace :db do
     Rake::Task['db:genesis'].invoke
   end
 
+  desc "An alias for the db:genesis task"
+  task :seed => :environment do
+    Rake::Task['db:genesis'].invoke
+  end
+
+  desc "An alias for the db:regenesis task"
+  task :reseed => :environment do
+    Rake::Task['db:regenesis'].invoke
+  end
+
+  desc "Removes all data, runs migrations and then seeds the database"
+  task :regenesis => :environment do
+    ActiveRecord::Base.connection.tables.select { |t| !['schema_migrations', 'schema_seeds', 'versions', 'sessions'].include?( t ) }.each do |table|
+      puts "Emptying the #{table} table"
+      klass = table.classify.to_s.constantize
+      klass.delete_all
+    end
+
+    puts ''
+
+    Genesis::SchemaSeed.delete_all
+    ActiveRecord::Base.connection.execute( 'DELETE FROM `versions`' )
+    ActiveRecord::Base.connection.execute( 'DELETE FROM `sessions`' )
+
+    Rake::Task['db:migrate'].invoke
+    Rake::Task['db:test:prepare'].invoke
+    Rake::Task['db:genesis'].invoke
+  end
+
   namespace :genesis do
     desc "Returns the current seed version from teh schema_seeds table"
     task :version => :environment do
@@ -21,3 +59,15 @@ namespace :db do
     end
   end
 end
+
+def seeds_root
+  File.join( Rails.root, 'db', 'seeds' )
+end
+
+def contexts_root
+  File.join( seeds_root, 'contexts' )
+end
+
+def expand_contexts
+  Dir[File.join( contexts_root, '*'  )].map { |d| d.split( '/' ).last }.join ','
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: genesis
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - C. Jason Harrelson (midas)
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 -05:00
+date: 2010-09-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 0
@@ -34,9 +37,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -62,6 +67,7 @@ files:
 - genesis.gemspec
 - lib/generators/genesis/genesis_generator.rb
 - lib/generators/genesis/templates/migration.erb
+- lib/generators/genesis_contexts/genesis_contexts_generator.rb
 - lib/generators/prepare_genesis/prepare_genesis_generator.rb
 - lib/generators/prepare_genesis/templates/genesis.rake
 - lib/generators/prepare_genesis/templates/genesis_callbacks.rb
@@ -74,6 +80,8 @@ files:
 - rails_generators/genesis/genesis_generator.rb
 - rails_generators/genesis/templates/genesis_override.rake
 - rails_generators/genesis/templates/migration.rb
+- rails_generators/genesis_contexts/USAGE
+- rails_generators/genesis_contexts/genesis_contexts_generator.rb
 - rails_generators/prepare_seeding/USAGE
 - rails_generators/prepare_seeding/prepare_seeding_generator.rb
 - rails_generators/prepare_seeding/templates/genesis.rake
@@ -91,23 +99,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A data seeding solution for Ruby on Rails.