fluent_fixtures 0.6.1 → 0.7.0.pre.20180612160111

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e58777cdbc9ae0d2c57ad7a7a74a328fd7976c80
-  data.tar.gz: 8cef3ad69ad97b9c336e6c05021558ad0c63c9f6
+SHA256:
+  metadata.gz: 3e4679ff0187eb29f8abb0adc3f9b5fc8cb635c0512204e52e6b29b2c8e5c22b
+  data.tar.gz: 7909c015b6d80d9997aa291c62923e8afb78e23207dee2c68b5f377ead3e201a
 SHA512:
-  metadata.gz: 4fafc83c1b7bd3f26225f44dfef26fd4b928c5456359d47687c80dcaa0f6f8ba5564aad5e4a189982bbc31f15f454feecce1f7c0d9b11e9584c2e3737f0592d9
-  data.tar.gz: 03bf45cfd2e0f8749eab7f6624e992408bf87cc0c701636814efcfb0d4e025030b453733fc6757d78fc9217fbc2af6dd9969b354d450eb1bb83827104cf8b556
+  metadata.gz: 1728e0a96edbbacf2d121903607d29c2ba5bf89effdff549c42fbc651c473eaaacffe028caf55065a69973a4abbae7ddb0a3b87458fe66ee2b72da1f79cd0ec6
+  data.tar.gz: 783a9d8e793464912ef399ef34fff7949bb44c02597eb91c4ba05f56dc0072e551a58813b7abacf11111750c3f21ca77a509f8e71e421479185628bc3c698132

data/ChangeLog

@@ -1,9 +1,69 @@
+2018-06-12  Michael Granger  <ged@FaerieMUD.org>
+
+	* .ruby-version, examples/nodb/lib/acme/fixtures/users.rb,
+	lib/fluent_fixtures/dsl.rb, lib/fluent_fixtures/factory.rb,
+	spec/fluent_fixtures/dsl_spec.rb,
+	spec/fluent_fixtures/factory_spec.rb:
+	Add composed decorators
+	[5a9635f0e734] [github/master, tip]
+
+2017-10-30  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.md:
+	Remove the (now retired) project link
+	[145d33914658]
+
+	* .ruby-version:
+	Bump ruby version to 2.4
+	[7aba5ecd78b7]
+
+	* .hgtags:
+	Added tag v0.6.1 for changeset 26a51ed462e4
+	[91ab791a3775]
+
+	* .hgsigs:
+	Added signature for changeset a7a6e88dd27a
+	[26a51ed462e4] [v0.6.1]
+
+	* History.md, lib/fluent_fixtures.rb:
+	Bump the patch version, update history.
+	[a7a6e88dd27a]
+
+	* lib/fluent_fixtures/dsl.rb, spec/fluent_fixtures/dsl_spec.rb:
+	Fix a bug with decorator aliasing
+	[660937258342]
+
+	* lib/fluent_fixtures/dsl.rb:
+	Style consistency fixes
+	[834df1ab36a0]
+
+	* certs/ged.pem:
+	Update my gem-signing cert
+	[49ee3a922275]
+
 2017-06-26  Michael Granger  <ged@FaerieMUD.org>
 
+	* .hgtags:
+	Added tag v0.6.0 for changeset 3a609403c94a
+	[3d4cf477828e] [github/@]
+
+	* .hgsigs:
+	Added signature for changeset 3d6408efbde6
+	[3a609403c94a] [v0.6.0]
+
+	* History.md, lib/fluent_fixtures.rb:
+	Bump the minor version, update history.
+	[3d6408efbde6]
+
+	* lib/fluent_fixtures/factory.rb,
+	spec/fluent_fixtures/factory_spec.rb:
+	Add support for mutator blocks to factory generators.
+	[068568028a13]
+
 	* README.md, lib/fluent_fixtures.rb,
 	lib/fluent_fixtures/collection.rb:
 	Start work on better docs
-	[9f00baf84bb2] [tip]
+	[9f00baf84bb2]
 
 2017-05-15  Michael Granger  <ged@FaerieMUD.org>
 
@@ -27,7 +87,7 @@
 	spec/fluent_fixtures/dsl_spec.rb,
 	spec/fluent_fixtures/factory_spec.rb:
 	Add a `presave` option for decorators that need a saved instance.
-	[d4160c6c04e0] [github/master]
+	[d4160c6c04e0]
 
 2016-12-13  Michael Granger  <ged@FaerieMUD.org>
 

data/README.md

@@ -1,9 +1,6 @@
 # fluent_fixtures
 
 home
-: http://deveiate.org/projects/FluentFixtures
-
-code
 : http://bitbucket.org/ged/fluent_fixtures
 
 github

data/lib/fluent_fixtures.rb

@@ -24,7 +24,7 @@ module FluentFixtures
 
 
 	# Package version
-	VERSION = '0.6.1'
+	VERSION = '0.7.0'
 
 	# Version control revision
 	REVISION = %q$Revision: a7a6e88dd27a $

data/lib/fluent_fixtures/dsl.rb

@@ -67,6 +67,33 @@ module FluentFixtures::DSL
 	end
 
 
+	### Declare a decorator that is composed out of other decorators and an optional
+	### +block+. The first +hash+ pair should be the name of the declared decorator
+	### and the names of the decorator/s it is composed of.
+	###
+	### Example:
+	###
+	###    decorator :foo { ... }
+	###    decorator :bar { ... }
+	###    compose( :simple => :foo ) { ... }
+	###    compose( :complex => [:foo, :bar] ) { ... }
+	###    compose( :complex_with_args => {foo: [1,2], bar: "Something"} ) { ... }
+	def compose( **hash, &block )
+		name, components = hash.first
+
+		raise ArgumentError, "expected a name and one or more component decorators" unless name
+		unless [Symbol, Array, Hash].include?( components.class )
+			raise ArgumentError, "invalid compose values: expected symbol, array, or hash; got %p" %
+				[ components.class ]
+		end
+
+		options = hash.reject {|k,_| k == name }.merge( prelude: components )
+		block ||= Proc.new {}
+
+		self.decorator( name, options, &block )
+	end
+
+
 	### Returns +true+ if there is a decorator with the specified +name+.
 	def decorator?( name )
 		return self.decorators.key?( name.to_sym )

data/lib/fluent_fixtures/factory.rb

@@ -186,6 +186,8 @@ class FluentFixtures::Factory
 		self.log.debug "Applying decorator %p (%p - %p) to a %p with args: %p" %
 			[ decorator_name, decorator_block, decorator_options, instance.class, args ]
 
+		self.apply_prelude( instance, decorator_options[:prelude] ) if decorator_options[:prelude]
+
 		instance = self.try_to_save( instance ) if decorator_options[:presave]
 		instance.instance_exec( *args, &decorator_block )
 
@@ -206,6 +208,28 @@ class FluentFixtures::Factory
 	end
 
 
+	### Apply a decorator +prelude+ to the current instance.
+	def apply_prelude( instance, prelude, args=[] )
+		case prelude
+		when Symbol
+			self.log.debug "Applying single prelude decorator: %p" % [ prelude ]
+			self.apply_named_decorator( instance, args, prelude )
+		when Array
+			self.log.debug "Applying multiple prelude decorators: %p" % [ prelude ]
+			prelude.each do |sublude|
+				self.apply_prelude( instance, sublude, args )
+			end
+		when Hash
+			self.log.debug "Applying one or more prelude decorators with args: %p" % [ prelude ]
+			prelude.each do |sublude, args|
+				self.apply_prelude( instance, sublude, args )
+			end
+		else
+			raise ArgumentError, "unhandled prelude type %p" % [ prelude.class ]
+		end
+	end
+
+
 	### Look for common transaction mechanisms on the fixtured class, and wrap one of
 	### them around the +block+ if one exists. If no transaction mechanism can be found,
 	### just yield to the block.

data/spec/fluent_fixtures/dsl_spec.rb

@@ -14,11 +14,12 @@ describe FluentFixtures::DSL do
 		Class.new do
 			def initialize( params={} )
 				@saved = false
+				@friends = []
 				params.each do |name, value|
 					self.send( "#{name}=", value )
 				end
 			end
-			attr_accessor :name, :login, :email
+			attr_accessor :name, :login, :email, :friends
 			def save; @saved = true; end
 			def saved?; @saved; end
 			def bizarroify
@@ -142,5 +143,20 @@ describe FluentFixtures::DSL do
 	end
 
 
+	it "can declare composed decorators" do
+		fixture_module.decorator( :with_first_name ) { self.first_name = 'Mark' }
+		fixture_module.decorator( :with_last_name ) { self.last_name = 'Walberg' }
+		fixture_module.decorator( :with_friends ) do
+			self.friends = [ 'Scott Ross', 'Hector Barros', 'Terry Yancey', 'Anothony Thomas' ]
+		end
+
+		fixture_module.compose( :marky_mark => [:with_first_name, :with_last_name, :with_friends] )
+
+		expect( fixture_module ).to have_decorator( :marky_mark )
+		expect( fixture_module.decorator_options[:marky_mark] ).
+			to include( prelude: [:with_first_name, :with_last_name, :with_friends] )
+	end
+
+
 end
 

data/spec/fluent_fixtures/factory_spec.rb

@@ -403,5 +403,54 @@ describe FluentFixtures::Factory do
 
 	end
 
+
+	describe "composed decorators" do
+
+		it "applies a single-decorator prelude before running" do
+			fixture_module.decorator( :with_anonymized_email ) { self.email = 'xxx@xxx.xxx' }
+			fixture_module.decorator( :with_anonymized_login ) { self.login = 'xxxxxxx' }
+			fixture_module.compose( :anonymized => :with_anonymized_email ) do
+				self.name = 'Xxxx Xxxxxxxxx'
+			end
+
+			object = factory.anonymized.instance
+
+			expect( object.name ).to eq( 'Xxxx Xxxxxxxxx' )
+			expect( object.email ).to eq( 'xxx@xxx.xxx' )
+			expect( object.login ).to_not eq( 'xxxxxxx' )
+		end
+
+
+		it "applies a multi-decorator prelude before running" do
+			fixture_module.decorator( :with_anonymized_email ) { self.email = 'xxx@xxx.xxx' }
+			fixture_module.decorator( :with_anonymized_login ) { self.login = 'xxxxxxx' }
+			fixture_module.compose( :anonymized => [:with_anonymized_email, :with_anonymized_login] ) do
+				self.name = 'Xxxx Xxxxxxxxx'
+			end
+
+			object = factory.anonymized.instance
+
+			expect( object.name ).to eq( 'Xxxx Xxxxxxxxx' )
+			expect( object.email ).to eq( 'xxx@xxx.xxx' )
+			expect( object.login ).to eq( 'xxxxxxx' )
+		end
+
+
+		it "applies a decorator prelude with arguments before running" do
+			fixture_module.decorator( :with_anonymized_email ) do |base_email='xxx@xxxx.com'|
+				self.email = base_email.gsub(/\w/, 'x')
+			end
+			fixture_module.compose( :anonymized => {with_anonymized_email: 'thomas.dalton@example.com'} ) do
+				self.name = 'Xxxx Xxxxxxxxx'
+			end
+
+			object = factory.anonymized.instance
+
+			expect( object.name ).to eq( 'Xxxx Xxxxxxxxx' )
+			expect( object.email ).to eq( 'xxxxxx.xxxxxx@xxxxxxx.xxx' )
+		end
+
+	end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent_fixtures
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0.pre.20180612160111
 platform: ruby
 authors:
 - Michael Granger
@@ -35,7 +35,7 @@ cert_chain:
   X0qdrKi+2aZZ0NGuFj9AItBsVmAvkBGIpX4TEKQp5haEbPpmaqO5nIIhV26PXmyT
   OMKv6pWsoS81vw5KAGBmfX8nht/Py90DQrbRvakATGI=
   -----END CERTIFICATE-----
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -232,12 +232,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.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: FluentFixtures is a toolkit for building testing objects with a fluent interface