sample_models 2.0.0 → 2.0.1

data/Gemfile.lock

@@ -1,40 +1,25 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activesupport (3.1.0)
-      multi_json (~> 1.0)
-    arel (2.2.1)
-    bcrypt-ruby (3.0.1)
-    builder (3.0.0)
+    activerecord (2.3.14)
+      activesupport (= 2.3.14)
+    activesupport (2.3.14)
     git (1.2.5)
-    i18n (0.6.0)
     jeweler (1.6.0)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    multi_json (1.0.3)
     rake (0.8.7)
     sqlite3 (1.3.4)
-    tzinfo (0.3.29)
-    validates_email_format_of (1.5.2)
+    validates_email_format_of (1.4.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 3.1.0)
-  activesupport (= 3.1.0)
+  activerecord (= 2.3.14)
+  activesupport (= 2.3.14)
   bundler (~> 1.0.0)
   jeweler (~> 1.6.0)
   sqlite3
-  validates_email_format_of (~> 1.5.0)
+  validates_email_format_of (~> 1.4.0)

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/lib/sample_models/creation.rb

@@ -32,16 +32,22 @@ module SampleModels
     def run
       attrs = @specified_attrs.clone
       @sampler.defaults.each do |attr, val|
-        attrs[attr] = val unless attrs.member?(attr)
+        unless attrs.member?(attr) ||
+               ((assoc = model.belongs_to_association(attr)) &&
+               (attrs.member?(assoc.name) || attrs.member?(assoc.foreign_key)))
+          attrs[attr] = val
+        end
       end
-      columns_to_fill = model.columns.clone
+      columns_to_fill = model.columns.clone.reject { |c|
+        c.name == 'id' || timestamp?(c.name)
+      }
       model.validated_attr_accessors.each do |attr|
         columns_to_fill << VirtualColumn.new(attr)
       end
       columns_to_fill.each do |column|
         unless attrs.member?(column.name) || 
                specified_association_value?(column.name) ||
-               ((assoc = belongs_to_assoc(column.name)) && attrs.member?(assoc.name)) || timestamp?(column.name)
+               ((assoc = belongs_to_assoc(column.name)) && attrs.member?(assoc.name))
           sequence = @sampler.first_pass_attribute_sequence(column)
           attrs[column.name] = sequence.value
         end

data/lib/sample_models/sampler.rb

@@ -55,8 +55,8 @@ module SampleModels
           Attribute.new(@sampler, meth)
         elsif @sampler.model.belongs_to_association(meth)
           Attribute.new(@sampler, meth)
-        elsif @sampler.model.instance_methods.include?(meth.to_s) && 
-              @sampler.model.instance_methods.include?("#{meth.to_s}=")
+        elsif @sampler.model.instance_methods.map(&:to_sym).include?(meth) && 
+              @sampler.model.instance_methods.map(&:to_sym).include?("#{meth.to_s}=".to_sym)
           Attribute.new(@sampler, meth)
         elsif meth.to_s =~ /(.*)_sample$/
           @sampler.named_samples[$1] = args.first

data/sample_models.gemspec

@@ -4,21 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{sample_models}
-  s.version = "2.0.0"
+  s.name = "sample_models"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francis Hwang"]
-  s.date = %q{2011-11-22}
-  s.description = %q{
-A library for making it extremely fast for Rails developers to set up and save ActiveRecord instances when writing test cases. It aims to:
-
-* meet all your validations automatically
-* only make you specify the attributes you care about
-* give you a rich set of features so you can specify associated values as concisely as possible
-* do this with as little configuration as possible
-}
-  s.email = %q{francis.hwang@profitably.com}
+  s.date = "2012-03-02"
+  s.description = "\nA library for making it extremely fast for Rails developers to set up and save ActiveRecord instances when writing test cases. It aims to:\n\n* meet all your validations automatically\n* only make you specify the attributes you care about\n* give you a rich set of features so you can specify associated values as concisely as possible\n* do this with as little configuration as possible\n"
+  s.email = "francis.hwang@profitably.com"
   s.extra_rdoc_files = [
     "README.markdown"
   ]
@@ -37,6 +30,7 @@ A library for making it extremely fast for Rails developers to set up and save A
     "lib/sample_models/initializer.rb",
     "lib/sample_models/model.rb",
     "lib/sample_models/sampler.rb",
+    "log/.gitkeep",
     "sample_models.gemspec",
     "tasks/sample_models_tasks.rake",
     "test/db/placeholder",
@@ -51,11 +45,11 @@ A library for making it extremely fast for Rails developers to set up and save A
     "test/unit/sample_test.rb",
     "uninstall.rb"
   ]
-  s.homepage = %q{http://github.com/fhwang/sample_models}
+  s.homepage = "http://github.com/fhwang/sample_models"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{A library for making it extremely fast for Rails developers to set up and save ActiveRecord instances when writing test cases}
+  s.rubygems_version = "1.8.17"
+  s.summary = "A library for making it extremely fast for Rails developers to set up and save ActiveRecord instances when writing test cases"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/test_helper.rb

@@ -8,11 +8,11 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
-require 'test/setup/schema'
+require File.expand_path(File.join(File.dirname(__FILE__), 'setup/schema'))
 require 'validates_email_format_of'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'sample_models'
-require 'test/setup/models'
+require File.expand_path(File.join(File.dirname(__FILE__), 'setup/models'))
 require 'test/unit'
 
 class SampleModelsTestCase < Test::Unit::TestCase

data/test/unit/configuration_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../test_helper"
+require File.expand_path(File.join(File.dirname(__FILE__), '/../test_helper'))
 
 class ConfigurationTest < SampleModelsTestCase
   def test_model_with_configured_default

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: sample_models
 version: !ruby/object:Gem::Version 
-  hash: 15
   prerelease: 
-  segments: 
-  - 2
-  - 0
-  - 0
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Francis Hwang
@@ -15,78 +10,58 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-22 00:00:00 -05:00
-default_executable: 
+date: 2012-03-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  prerelease: false
   type: :runtime
-  requirement: *id001
+  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  prerelease: false
   type: :runtime
-  requirement: *id002
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: bundler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
-  prerelease: false
   type: :development
-  requirement: *id003
+  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
         version: 1.6.0
-  prerelease: false
   type: :development
-  requirement: *id004
-description: |
-  
-  A library for making it extremely fast for Rails developers to set up and save ActiveRecord instances when writing test cases. It aims to:
-  
-  * meet all your validations automatically
-  * only make you specify the attributes you care about
-  * give you a rich set of features so you can specify associated values as concisely as possible
-  * do this with as little configuration as possible
-
+  prerelease: false
+  version_requirements: *id004
+description: "\n\
+  A library for making it extremely fast for Rails developers to set up and save ActiveRecord instances when writing test cases. It aims to:\n\n\
+  * meet all your validations automatically\n\
+  * only make you specify the attributes you care about\n\
+  * give you a rich set of features so you can specify associated values as concisely as possible\n\
+  * do this with as little configuration as possible\n"
 email: francis.hwang@profitably.com
 executables: []
 
@@ -109,6 +84,7 @@ files:
 - lib/sample_models/initializer.rb
 - lib/sample_models/model.rb
 - lib/sample_models/sampler.rb
+- log/.gitkeep
 - sample_models.gemspec
 - tasks/sample_models_tasks.rake
 - test/db/placeholder
@@ -122,7 +98,6 @@ files:
 - test/unit/polymorphic_belongs_to_test.rb
 - test/unit/sample_test.rb
 - uninstall.rb
-has_rdoc: true
 homepage: http://github.com/fhwang/sample_models
 licenses: 
 - MIT
@@ -136,23 +111,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   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.6.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A library for making it extremely fast for Rails developers to set up and save ActiveRecord instances when writing test cases