fluent_fixtures 0.4.0 → 0.5.0.pre.20170515170202

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 04ae27c7451ece98c029d41e761a6cb221e5c8da
-  data.tar.gz: f380b5322b4c13da8fb5a0f3ab8219002d18d3b9
+SHA256:
+  metadata.gz: ebb817e0b2fc99aa884784742e8bb0deb77befcdaecf5683a08e8d696edb5192
+  data.tar.gz: 30eafd70938cfe9d9677b4f7a7847e8b00d8666eafdbbe9927dac1a568a1c120
 SHA512:
-  metadata.gz: faf29bb484053e605d19134703fdf9e708aadd30ab797ae8cfba1a66307ba1af42ee9b42b8e365b3d5675caa06e11f783d316bf278e47fd698c5782eda01785c
-  data.tar.gz: c37d481e8ab51e49b21147da7889102b8ec82b600619a74ba516615442c65442adfdb291e74541e8317fe145a27af57568555f10a77ebcb5d85d983375c9e000
+  metadata.gz: 87590528c3dfefb068c667397e9edf77df914789147a7e52bd162b0622637c0968d28ec70f43ee0b3a3fdd5baffd197e2d071383c68874197ba9cf1a6a420de1
+  data.tar.gz: 5704dc5782a7a78da0c17c1d35e86d24fc1b0ce0010a28f8771a743ba54c2ae8fda1a7428dca6ef2814afecef929faf99953d1fe36cc6a8195769b02b32613b0

data/History.md

@@ -1,6 +1,13 @@
+##  v0.5.0 [2017-05-12] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+
+- Add a `presave` option for decorators that need a saved instance.
+
+
 ## v0.4.0 [2016-12-13] Michael Granger <ged@FaerieMUD.org>
 
-Enchancements:
+Enhancements:
 
 - Added `depends_on` to the fixture DSL.
 

data/lib/fluent_fixtures/collection.rb

@@ -79,6 +79,7 @@ module FluentFixtures::Collection
 
 		fixture_mod.extend( FluentFixtures::DSL )
 		fixture_mod.instance_variable_set( :@decorators, {} )
+		fixture_mod.instance_variable_set( :@decorator_options, {} )
 		fixture_mod.instance_variable_set( :@fixtured_class, nil )
 		fixture_mod.instance_variable_set( :@base_fixture, nil )
 

data/lib/fluent_fixtures/dsl.rb

@@ -14,6 +14,9 @@ module FluentFixtures::DSL
 	# The Hash of decorators declared for this fixture module
 	attr_reader :decorators
 
+	# The Hash of options hashes for declared decorators
+	attr_reader :decorator_options
+
 	##
 	# The name of the base fixture for the fixture module as a Symbol
 	attr_accessor :base_fixture
@@ -57,8 +60,10 @@ module FluentFixtures::DSL
 
 	### Declare a decorator for the fixture with the specified +name+ that will use the
 	### given +block+.
-	def decorator( name, &block )
-		self.decorators[ name.to_sym ] = block
+	def decorator( name, **options, &block )
+		name = name.to_sym
+		self.decorators[ name ] = block
+		self.decorator_options[ name ] = options
 	end
 
 

data/lib/fluent_fixtures/factory.rb

@@ -75,7 +75,7 @@ class FluentFixtures::Factory
 			if !decorator_name
 				self.apply_inline_decorator( instance, block )
 			elsif self.fixture_module.decorators.key?( decorator_name )
-				self.apply_named_decorator( instance, decorator_args, decorator_name )
+				instance = self.apply_named_decorator( instance, decorator_args, decorator_name )
 			else
 				self.apply_method_decorator( instance, decorator_args, decorator_name, block )
 			end
@@ -105,13 +105,7 @@ class FluentFixtures::Factory
 	def create( args={}, &block )
 		obj = self.with_transaction do
 			obj = self.instance( args, &block )
-			obj = self.fixture_module.call_before_saving( obj ) if
-				self.fixture_module.respond_to?( :call_before_saving )
-
-			self.try_to_save( obj )
-
-			obj = self.fixture_module.call_after_saving( obj ) if
-				self.fixture_module.respond_to?( :call_after_saving )
+			obj = self.try_to_save( obj )
 			obj
 		end
 
@@ -186,9 +180,14 @@ class FluentFixtures::Factory
 	### +decorator_name+ to the specified +instance+.
 	def apply_named_decorator( instance, args, decorator_name )
 		decorator_block = self.fixture_module.decorators[ decorator_name ]
-		self.log.debug "Applying decorator %p (%p) to a %p with args: %p" %
-			[ decorator_name, decorator_block, instance.class, args ]
+		decorator_options = self.fixture_module.decorator_options[ decorator_name ] || {}
+		self.log.debug "Applying decorator %p (%p - %p) to a %p with args: %p" %
+			[ decorator_name, decorator_block, decorator_options, instance.class, args ]
+
+		instance = self.try_to_save( instance ) if decorator_options[:presave]
 		instance.instance_exec( *args, &decorator_block )
+
+		return instance
 	end
 
 
@@ -222,11 +221,23 @@ class FluentFixtures::Factory
 	### Try various methods for saving the given +object+, logging a warning if it doesn't
 	### respond to any of them.
 	def try_to_save( object )
-		CREATE_METHODS.each do |methodname|
-			return object.public_send( methodname ) if object.respond_to?( methodname )
+		object = self.fixture_module.call_before_saving( object ) if
+			self.fixture_module.respond_to?( :call_before_saving )
+
+		save_method = CREATE_METHODS.find do |methodname|
+			object.respond_to?( methodname )
 		end
 
-		self.log.warn "create: don't know how to save %p" % [ object ]
+		if save_method
+			object.public_send( save_method )
+		else
+			self.log.warn "create: don't know how to save %p" % [ object ]
+		end
+
+		object = self.fixture_module.call_after_saving( object ) if
+			self.fixture_module.respond_to?( :call_after_saving )
+
+		return object
 	end
 
 

data/lib/fluent_fixtures.rb

@@ -11,10 +11,10 @@ module FluentFixtures
 
 
 	# Package version
-	VERSION = '0.4.0'
+	VERSION = '0.5.0'
 
 	# Version control revision
-	REVISION = %q$Revision: 08f17f26d0cb $
+	REVISION = %q$Revision: ed67198925b5 $
 
 
 	# Loggability API -- set up a named logger

data/spec/fluent_fixtures/collection_spec.rb

@@ -136,6 +136,7 @@ describe FluentFixtures::Collection do
 
 		it "adds instance data to its fixture modules" do
 			expect( extending_module.decorators ).to be_a( Hash )
+			expect( extending_module.decorator_options ).to be_a( Hash )
 		end
 
 	end

data/spec/fluent_fixtures/dsl_spec.rb

@@ -86,6 +86,17 @@ describe FluentFixtures::DSL do
 	end
 
 
+	it "can indicate that an object needs to be saved before a decorator is applied" do
+		with_associated_object_block = Proc.new  {|obj| self.associated_object = obj }
+		fixture_module.decorator( :with_associated_object, presave: true, &with_associated_object_block )
+
+		expect( fixture_module ).to have_decorator( :with_associated_object )
+
+		expect( fixture_module.decorators[:with_associated_object] ).to be( with_associated_object_block )
+		expect( fixture_module.decorator_options[:with_associated_object] ).to include( presave: true )
+	end
+
+
 	it "can declare an alias for an already-declared decorator" do
 		fixture_module.decorator( :with_no_email ) { self.email = nil }
 		fixture_module.alias_decorator( :emailless, :with_no_email )

data/spec/fluent_fixtures/factory_spec.rb

@@ -15,14 +15,20 @@ describe FluentFixtures::Factory do
 			def initialize( params={} )
 				@saved = false
 				@deleted = false
+				@roles = []
+				@copied = false
 				params.each do |name, value|
 					self.send( "#{name}=", value )
 				end
 				yield if block_given?
 			end
-			attr_accessor :name, :login, :email
+			def initialize_copy( _original )
+				@copied = true
+			end
+			attr_accessor :name, :login, :email, :roles
 			def save; @saved = true; end
 			def saved?; @saved; end
+			def copied?; @copied; end
 			def bizarroify
 				self.name = "Bizarro #{self.name}"
 				self.email = "bizarro+#{self.email}"
@@ -31,6 +37,10 @@ describe FluentFixtures::Factory do
 			end
 			def delete; @deleted = true; end
 			def deleted?; @deleted; end
+			def add_role( role )
+				raise "not saved" unless self.saved?
+				self.roles << role
+			end
 		end
 	end
 
@@ -266,6 +276,39 @@ describe FluentFixtures::Factory do
 	end
 
 
+	it "supports decorators that save the object before running" do
+		fixture_module.decorator( :with_role, presave: true ) do |role|
+			self.add_role( role )
+		end
+
+		object = factory.with_role( 'admin' ).instance
+
+		expect( object ).to be_saved
+		expect( object.roles ).to include( 'admin' )
+	end
+
+
+	it "calls pre- and post-save hooks for decorators with presaving" do
+		fixture_module.decorator( :with_role, presave: true ) do |role|
+			self.add_role( role )
+		end
+		def fixture_module.call_before_saving( instance )
+			instance.dup
+		end
+		def fixture_module.call_after_saving( instance )
+			instance.delete
+			instance
+		end
+
+		object = factory.with_role( 'admin' ).instance
+
+		expect( object ).to be_saved
+		expect( object ).to be_copied
+		expect( object ).to be_deleted
+		expect( object.roles ).to include( 'admin' )
+	end
+
+
 	it "allows ad-hoc decorators declared as inline blocks" do
 		counter = 0
 		result = factory.decorated_with do |obj|

metadata

@@ -1,41 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fluent_fixtures
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0.pre.20170515170202
 platform: ruby
 authors:
 - Michael Granger
 autorequire: 
 bindir: bin
 cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQsFADA+MQwwCgYDVQQDDANnZWQx
-  GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTYwODIwMTgxNzQyWhcNMTcwODIwMTgxNzQyWjA+MQwwCgYDVQQDDANnZWQx
-  GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC/JWGRHO+USzR97vXjkFgt
-  83qeNf2KHkcvrRTSnR64i6um/ziin0I0oX23H7VYrDJC9A/uoUa5nGRJS5Zw/+wW
-  ENcvWVZS4iUzi4dsYJGY6yEOsXh2CcF46+QevV8iE+UmbkU75V7Dy1JCaUOyizEt
-  TH5UHsOtUU7k9TYARt/TgYZKuaoAMZZd5qyVqhF1vV+7/Qzmp89NGflXf2xYP26a
-  4MAX2qqKX/FKXqmFO+AGsbwYTEds1mksBF3fGsFgsQWxftG8GfZQ9+Cyu2+l1eOw
-  cZ+lPcg834G9DrqW2zhqUoLr1MTly4pqxYGb7XoDhoR7dd1kFE2a067+DzWC/ADt
-  +QkcqWUm5oh1fN0eqr7NsZlVJDulFgdiiYPQiIN7UNsii4Wc9aZqBoGcYfBeQNPZ
-  soo/6za/bWajOKUmDhpqvaiRv9EDpVLzuj53uDoukMMwxCMfgb04+ckQ0t2G7wqc
-  /D+K9JW9DDs3Yjgv9k4h7YMhW5gftosd+NkNC/+Y2CkCAwEAAaN1MHMwCQYDVR0T
-  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFHKN/nkRusdqCJEuq3lgB3fJvyTg
-  MBwGA1UdEQQVMBOBEWdlZEBGYWVyaWVNVUQub3JnMBwGA1UdEgQVMBOBEWdlZEBG
-  YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBCwUAA4IBgQAPJzKiT0zBU7kpqe0aS2qb
-  FI0PJ4y5I8buU4IZGUD5NEt/N7pZNfOyBxkrZkXhS44Fp+xwBH5ebLbq/WY78Bqd
-  db0z6ZgW4LMYMpWFfbXsRbd9TU2f52L8oMAhxOvF7Of5qJMVWuFQ8FPagk2iHrdH
-  inYLQagqAF6goWTXgAJCdPd6SNeeSNqA6vlY7CV1Jh5kfNJJ6xu/CVij1GzCLu/5
-  DMOr26DBv+qLJRRC/2h34uX71q5QgeOyxvMg+7V3u/Q06DXyQ2VgeeqiwDFFpEH0
-  PFkdPO6ZqbTRcLfNH7mFgCBJjsfSjJrn0sPBlYyOXgCoByfZnZyrIMH/UY+lgQqS
-  6Von1VDsfQm0eJh5zYZD64ZF86phSR7mUX3mXItwH04HrZwkWpvgd871DZVR3i1n
-  w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
-  p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
-  -----END CERTIFICATE-----
-date: 2016-12-14 00:00:00.000000000 Z
+- certs/ged.pem
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -85,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
@@ -169,14 +143,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
 description: |-
   FluentFixtures is a toolkit for building testing objects with a fluent interface.
 
@@ -232,12 +206,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: FluentFixtures is a toolkit for building testing objects with a fluent interface