mongoid-fixture_set 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f8d0e4ca3845297cbc4d603eb34e7498f6472c5
-  data.tar.gz: 2cbc44d1a2aac525c1d6741f03edcece4f9dceca
+  metadata.gz: 0c3af72edf54ab925487f291330a4bc18c2448ca
+  data.tar.gz: 1ba02a5102274cca576ac9bd985a40fce5156f0f
 SHA512:
-  metadata.gz: c8faf0c64f4475fcabb706e78b45dbafd36c933281ea8b693e6b853fbbc0a92d04958d09f4b5e00fdc5884fb03f68e69b2052350e63ab47b95f0c4345272ffcd
-  data.tar.gz: 4536e3e4d4597db95ab88e3c77dad7cebdcb82d6d2c8be16ed49458b073e5866f1984b6240f769f9fa1e80bfb5d589eeeb12bd407286d76c9357920f52f3bdeb
+  metadata.gz: 733c4120fdbe665b8d592e8f6935758244ad447af60e53dfddecf937bbcb462168d3dd2d238655db17044e287daf72b84b87cdd5fb7211ce3d595c69d86e80ae
+  data.tar.gz: 1ac9ec6b4d9f5ec0e7b8ae163308eef668e26e69984a64ccc2bc7775b4f92ea3e6af7ddb6f6763660c8084127436604ad88dd6fd8ce64f4dfbb76474db8177d6

data/lib/mongoid/fixture_set/test_helper.rb

@@ -19,9 +19,11 @@ module Mongoid
         class_attribute :fixture_path, :instance_writer => false
         class_attribute :fixture_set_names
         class_attribute :load_fixtures_once
+        class_attribute :cached_fixtures
 
         self.fixture_set_names = []
         self.load_fixtures_once = false
+        self.cached_fixtures = nil
       end
 
       module ClassMethods
@@ -65,21 +67,19 @@ module Mongoid
 
       def setup_fixtures
         @fixture_cache = {}
-        @@fixtures_loaded ||= false
 
-        if @@fixtures_loaded && self.class.load_fixtures_once && !Mongoid::FixtureSet.cache_empty?
+        if self.class.cached_fixtures && self.class.load_fixtures_once
           self.class.fixtures(:all)
-          self.loaded_fixtures = Mongoid::FixtureSet.cached_fixtures
+          @loaded_fixtures = self.class.cached_fixtures
         else
           Mongoid::FixtureSet.reset_cache
           self.loaded_fixtures = load_fixtures
-          @@fixtures_loaded = true
-          @loaded_fixtures
+          self.class.cached_fixtures = @loaded_fixtures
         end
       end
 
       def teardown_fixtures
-        Mongoid::FixtureSet.reset_cache unless self.class.load_fixtures_once
+        Mongoid::FixtureSet.reset_cache
       end
 
       private
@@ -93,7 +93,7 @@ module Mongoid
       end
 
       def loaded_fixtures=(fixtures)
-        @loaded_fixtures = Hash[fixtures.map { |f| [f.name, f] }]
+        @loaded_fixtures = Hash[fixtures.dup.map { |f| [f.name, f] }]
       end
     end
   end

data/lib/mongoid/fixture_set/version.rb

@@ -1,6 +1,6 @@
 module Mongoid
   class FixtureSet
-    VERSION = '1.3.0'
+    VERSION = '1.3.1'
   end
 end
 

data/test/fixtures/groups.yml

@@ -5,6 +5,7 @@ print:
   name: Print
   users:
     - user1
+    - user 2é
 group1:
   name: Margot
   main_users:

data/test/fixtures/users.yml

@@ -18,7 +18,7 @@ user1:
       address:
         city: Strasbourg
         real: true
-user2:
+user 2é:
   firstname: user2
   main_group:
       name: Win?

data/test/mongoid/fixture_set_test.rb

@@ -67,7 +67,7 @@ module Mongoid
 
       assert_equal 1, user1.homes.count
       assert_equal geoffroy, f_geoffroy.find
-      assert_equal 2, print.users.count
+      assert_equal 3, print.users.count
       assert print.users.include?(geoffroy)
       assert print.users.include?(user1)
       assert sudoers.main_users.include?(geoffroy)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-fixture_set
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Geoffroy Planquart
@@ -61,9 +61,9 @@ extra_rdoc_files: []
 files:
 - lib/mongoid/fixture_set/errors.rb
 - lib/mongoid/fixture_set/file.rb
-- lib/mongoid/fixture_set/class_cache.rb
-- lib/mongoid/fixture_set/test_helper.rb
 - lib/mongoid/fixture_set/fixture.rb
+- lib/mongoid/fixture_set/test_helper.rb
+- lib/mongoid/fixture_set/class_cache.rb
 - lib/mongoid/fixture_set/version.rb
 - lib/mongoid/fixture_set.rb
 - lib/mongoid-fixture_set.rb
@@ -81,12 +81,12 @@ files:
 - test/models/user.rb
 - test/models/item.rb
 - test/mongoid.yml
-- test/fixtures/groups.yml
 - test/fixtures/schools.yml
 - test/fixtures/organisations.yml
 - test/fixtures/users/family.yml
 - test/fixtures/not_models.yml
 - test/fixtures/users.yml
+- test/fixtures/groups.yml
 - test/test_helper.rb
 - test/load_once_fixtures/tests.yml
 - test/nested_polymorphic_relation_fixtures/groups.yml
@@ -127,12 +127,12 @@ test_files:
 - test/models/user.rb
 - test/models/item.rb
 - test/mongoid.yml
-- test/fixtures/groups.yml
 - test/fixtures/schools.yml
 - test/fixtures/organisations.yml
 - test/fixtures/users/family.yml
 - test/fixtures/not_models.yml
 - test/fixtures/users.yml
+- test/fixtures/groups.yml
 - test/test_helper.rb
 - test/load_once_fixtures/tests.yml
 - test/nested_polymorphic_relation_fixtures/groups.yml