fixture_overlord 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27e8614d61ffca649fdc210a4ff480440c425bea
-  data.tar.gz: a28aa2db56b52305aac52532f9f2e49a63e01f73
+  metadata.gz: 686a4769f0b7cd7f9d5d731b008aaa713c5b47db
+  data.tar.gz: d19dbdae7bfe0a8fe613cc22ec0e6538e7a155c8
 SHA512:
-  metadata.gz: df52947dd10901e8acd31734415cb701622da273a33a769b9ba0915d302760851c02e6027f68f85932048cdaa3526a6455c547936e620a330d6295a34a1db8d5
-  data.tar.gz: 785e3d129597496325755add81309b1981bcfd1c5ca1cd1e9d914704014c264e467c5ae20fa348af729667f8312fe55d852a80bc4ac9dffe5e742c5fe363b844
+  metadata.gz: b3a89974ad400f9cdd6ee2253fd200c1bb6796ddfb5b12925425845cb3a552d7d63ab92aa816c756179d140c7ed97f68fac28693e8480c7534193be6015a8536
+  data.tar.gz: a368e343c48aa7750f08c8745b36b2851e84269920cd50ec5f9f65f9e1ad1fe6ddea71ce3744beb87656d9d0d9eb4ad2fcca6d75e78a15d4c64aac5a7de7b805

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.1.0
 before_install:
   - gem install bundler
 notifications:

data/lib/fixture_overlord/hashish.rb

@@ -33,6 +33,11 @@ module FixtureOverlord
       Model.init(self, yaml_file)
     end
 
+    def associate(hash)
+      self.merge!(hash)
+      self
+    end
+
     def symbolize_keys(hash = self)
       results = case hash
       when Array

data/lib/fixture_overlord/mock.rb

@@ -87,6 +87,7 @@ module FixtureOverlord
       self
     end
     alias :add :change
+    alias :merge :change
 
 
     # remove an attribute from the class

data/lib/fixture_overlord/version.rb

@@ -6,5 +6,5 @@ module FixtureOverlord
 
   MAJOR = 0
   MINOR = 1
-  PATCH = 8
+  PATCH = 9
 end

data/test/hashish_test.rb

@@ -32,6 +32,11 @@ module FixtureOverlord
       @bob ||= person(:bob)
     end
 
+    def test_merge
+      bob_extended = bob.merge(occupation: 'Secret Agent').mock
+      assert_equal 'Secret Agent', bob_extended.occupation
+    end
+
     def test_mock
       mock = bob.mock
       assert_equal "Bob", mock.name
@@ -52,5 +57,12 @@ module FixtureOverlord
       assert bob.build
     end
 
+    def test_associate
+      bob.associate(account_id: 1)
+      mock = bob.mock
+
+      assert_equal 1, mock.account_id
+    end
+
   end
 end

data/test/mock_test.rb

@@ -31,6 +31,11 @@ module FixtureOverlord
       assert_equal "123 Street", mock.address
     end
 
+    def test_merge
+      mock.merge(address: '123 Street')
+      assert_equal "123 Street", mock.address
+    end
+
     def test_remove
       mock.add(address: '123 Street')
       mock.add(city: 'Carlsbad')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixture_overlord
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Robert Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Handling Fixtures the right way, within a Rails application.