surveyor 0.9.4 → 0.9.5

data/README.md

@@ -27,6 +27,10 @@ Try out the "kitchen sink" survey:
 
     rake surveyor FILE=surveys/kitchen_sink_survey.rb
 
+The rake surveyor task overwrites previous surveys by default, but can append instead:
+
+    rake surveyor FILE=surveys/kitchen_sink_survey.rb APPEND=true
+
 # Configuration
 
 The surveyor generator creates config/initializers/surveyor.rb. There, you can specify:

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

data/app/models/dependency_condition.rb

@@ -6,6 +6,7 @@ class DependencyCondition < ActiveRecord::Base
   belongs_to :answer
   belongs_to :dependency
   belongs_to :dependent_question, :foreign_key => :question_id, :class_name => :question
+  belongs_to :question
 
   # Validations
   validates_numericality_of :dependency_id, :question_id, :answer_id

data/generators/surveyor/templates/README

@@ -6,5 +6,5 @@ Surveyor installed. Next, run the migrations:
 Try out the "kitchen sink" survey:
 
     rake surveyor FILE=surveys/kitchen_sink_survey.rb
-    
+
 Or see README.md for configuration and customization details

data/lib/fixtures_extensions.rb

@@ -0,0 +1,6 @@
+class Fixtures
+  def delete_existing_fixtures
+    # @connection.delete "DELETE FROM #{@connection.quote_table_name(table_name)}", 'Fixture Delete'
+    puts "Appending, skipping delete..."
+  end
+end

data/lib/tasks/surveyor_tasks.rake

@@ -17,8 +17,8 @@ namespace :surveyor do
   desc "load survey fixtures"
   task :load_fixtures => :environment do
     require 'active_record/fixtures'
-    
-    ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
+    require 'fixtures_extensions' unless ENV["APPEND"].blank?
+    ActiveRecord::Base.establish_connection(Rails.env)
 
     fixture_dir = File.join(RAILS_ROOT, "surveys", "fixtures")
     fixtures = Dir.glob("#{fixture_dir}/*.yml")

data/script/surveyor/base.rb

@@ -46,13 +46,20 @@ module SurveyParser
     
     # Filter out attributes that shouldn't be in fixtures, including children, parser, placeholders
     def yml_attrs
-      instance_variables.sort - self.class.children.map{|model| "@#{model.to_s}"} - %w(@parser @dependency @validation @question_reference @answer_reference)
+      instance_variables.sort - self.class.children.map{|model| "@#{model.to_s}"} - %w(@id @parser @dependency @validation @question_reference @answer_reference)
     end
     def to_yml
-      out = [ %(#{@data_export_identifier}_#{@id}:) ]
-      yml_attrs.each{|a| out << "  #{a[1..-1]}: #{instance_variable_get(a).is_a?(String) ? "\"#{instance_variable_get(a)}\"" : instance_variable_get(a) }"}
+      out = [ %(#{self.parser.salt}_#{self.class.name.demodulize.underscore}_#{@id}:) ]
+      yml_attrs.each{|a| out << associate_and_format(a)}
       (out << nil ).join("\r\n")
     end
+    def associate_and_format(a)
+      if a =~ /_id$/ # a foreign key, e.g. survey_id
+        "  #{a[1..-4]}: " + (instance_variable_get(a).nil? ? "" : "#{self.parser.salt}_#{a[1..-4]}_#{instance_variable_get(a)}")
+      else # quote strings
+        "  #{a[1..-1]}: #{instance_variable_get(a).is_a?(String) ? "\"#{instance_variable_get(a)}\"" : instance_variable_get(a) }"
+      end
+    end
     def to_file
       File.open(self.parser.send("#{self.class.name.demodulize.underscore.pluralize}_yml"), File::CREAT|File::APPEND|File::WRONLY) {|f| f << to_yml}
       self.class.children.each{|model| self.send(model).compact.map(&:to_file)}

data/script/surveyor/parser.rb

@@ -7,7 +7,7 @@ module SurveyParser
     (%w(base) + @@models).each{|m| require File.dirname(__FILE__) + "/#{m}"}
 
     # Attributes
-    attr_accessor :surveys, :grid_answers
+    attr_accessor :salt, :surveys, :grid_answers
     @@models.each{|m| attr_accessor "#{m.pluralize}_yml".to_sym } # for fixtures
     (@@models - %w(dependency_condition validation_condition)).each {|m| attr_accessor "current_#{m}".to_sym} # for current_model caches
   
@@ -32,12 +32,13 @@ module SurveyParser
   
     # Instance methods
     def initialize
+      self.salt = Time.now.strftime("%Y%m%d%H%M%S")
       self.surveys = []
       self.grid_answers = []
       initialize_counters(@@models)
       initialize_fixtures(@@models.map(&:pluralize), File.join(RAILS_ROOT, "surveys", "fixtures"))
     end
-  
+    
     # @last_survey_id, @last_survey_section_id, etc.
     def initialize_counters(names)
       names.each{|name| instance_variable_set("@last_#{name}_id", 0)}

data/surveyor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{surveyor}
-  s.version = "0.9.4"
+  s.version = "0.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Chamberlain", "Mark Yoon"]
-  s.date = %q{2009-11-10}
+  s.date = %q{2009-11-12}
   s.email = %q{yoon@northwestern.edu}
   s.extra_rdoc_files = [
     "README.md"
@@ -128,6 +128,7 @@ Gem::Specification.new do |s|
      "generators/test_surveyor/test_surveyor_generator.rb",
      "init.rb",
      "install.rb",
+     "lib/fixtures_extensions.rb",
      "lib/surveyor.rb",
      "lib/surveyor/acts_as_response.rb",
      "lib/surveyor/config.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: surveyor
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Brian Chamberlain
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-10 00:00:00 -06:00
+date: 2009-11-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -145,6 +145,7 @@ files:
 - generators/test_surveyor/test_surveyor_generator.rb
 - init.rb
 - install.rb
+- lib/fixtures_extensions.rb
 - lib/surveyor.rb
 - lib/surveyor/acts_as_response.rb
 - lib/surveyor/config.rb