sample_models 1.2.4 → 1.2.5

data/Gemfile.lock

@@ -1,24 +1,24 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activerecord (2.3.5)
-      activesupport (= 2.3.5)
-    activesupport (2.3.5)
+    activerecord (2.3.10)
+      activesupport (= 2.3.10)
+    activesupport (2.3.10)
     git (1.2.5)
     jeweler (1.6.0)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
     rake (0.8.7)
-    sqlite3 (1.3.3)
+    sqlite3 (1.3.4)
     validates_email_format_of (1.4.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 2.3.5)
-  activesupport (= 2.3.5)
+  activerecord (= 2.3.10)
+  activesupport (= 2.3.10)
   bundler (~> 1.0.0)
   jeweler (~> 1.6.0)
   sqlite3

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rubygems'
 
-ActiveRecordVersions = %w(3.0.1 2.3.10 2.3.5)
+ActiveRecordVersions = %w(3.1.1 3.0.1 2.3.10)
 
 desc "Run all tests"
 task :test do

data/VERSION

@@ -1 +1 @@
-1.2.4
+1.2.5

data/lib/sample_models/creation.rb

@@ -21,7 +21,7 @@ module SampleModels
     end
     
     def run
-      @instance = @sampler.model_class.new @attrs
+      @instance = @sampler.model_class.new @attrs.to_hash
       save!
       update_associations
       @instance
@@ -72,7 +72,12 @@ module SampleModels
           fill_based_on_string_column_type(column)
         when :integer
           unless model.belongs_to_associations.any? { |assoc|
-            assoc.primary_key_name == column.name
+            foreign_key = if assoc.respond_to?(:foreign_key)
+              assoc.foreign_key
+            else
+              assoc.primary_key_name
+            end
+            foreign_key == column.name
           }
             self[column.name] = 1
           end

data/lib/sample_models/finder.rb

@@ -31,8 +31,13 @@ module SampleModels
     
     def attach_belongs_to_associations_to_query
       @model.belongs_to_associations.each do |assoc|
+        foreign_key = if assoc.respond_to?(:foreign_key)
+          assoc.foreign_key
+        else
+          assoc.primary_key_name
+        end
         if @attrs.keys.include?(assoc.name.to_s)
-          @ar_query.conditions[assoc.primary_key_name] = if @attrs[assoc.name]
+          @ar_query.conditions[foreign_key] = if @attrs[assoc.name]
             @attrs[assoc.name].id
           else
             @attrs[assoc.name]

data/lib/sample_models/sampler.rb

@@ -49,8 +49,12 @@ module SampleModels
     def fix_deleted_associations(instance, orig_attrs)
       needs_save = false
       model.belongs_to_associations.each do |assoc|
-        if instance.send(assoc.primary_key_name) && 
-           !instance.send(assoc.name)
+        foreign_key = if assoc.respond_to?(:foreign_key)
+          assoc.foreign_key
+        else
+          assoc.primary_key_name
+        end
+        if instance.send(foreign_key) && !instance.send(assoc.name)
          instance.send("#{assoc.name}=", assoc.klass.sample)
          needs_save = true
         end

data/sample_models.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sample_models}
-  s.version = "1.2.4"
+  s.version = "1.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francis Hwang"]
-  s.date = %q{2011-07-16}
+  s.date = %q{2011-11-16}
   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:
 
@@ -58,11 +58,10 @@ A library for making it extremely fast for Rails developers to set up and save A
   s.homepage = %q{http://github.com/fhwang/sample_models}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  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}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sample_models
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 1
   - 2
-  - 4
-  version: 1.2.4
+  - 5
+  version: 1.2.5
 platform: ruby
 authors: 
 - Francis Hwang
@@ -15,11 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-16 00:00:00 -04:00
+date: 2011-11-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: activerecord
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -28,12 +29,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  name: activerecord
   prerelease: false
-  version_requirements: *id001
+  type: :runtime
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: activesupport
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -42,12 +43,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  name: activesupport
   prerelease: false
-  version_requirements: *id002
+  type: :runtime
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: bundler
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -58,12 +59,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :development
-  name: bundler
   prerelease: false
-  version_requirements: *id003
+  type: :development
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: jeweler
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -74,10 +75,9 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  type: :development
-  name: jeweler
   prerelease: false
-  version_requirements: *id004
+  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:
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 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