@@ -13,14 +13,14 @@ module Machinist raise "No blueprint for class #{object.class}" if blueprint.nil? - returning self.new(adapter, object, attributes) do |lathe| - lathe.instance_eval(&named_blueprint) if named_blueprint - klass = object.class - while klass - lathe.instance_eval(&klass.blueprint) if klass.respond_to?(:blueprint) && klass.blueprint - klass = klass.superclass - end + lathe = self.new(adapter, object, attributes) + lathe.instance_eval(&named_blueprint) if named_blueprint + klass = object.class + while klass + lathe.instance_eval(&klass.blueprint) if klass.respond_to?(:blueprint) && klass.blueprint + klass = klass.superclass end + lathe end def initialize(adapter, object, attributes = {}) lib/machinist.rb @@ -58,9 +58,9 @@ module Machinist end def make_unsaved(*args) - returning(Machinist.with_save_nerfed { make(*args) }) do |object| - yield object if block_given? - end + object = Machinist.with_save_nerfed { make(*args) } + yield object if block_given? + object end def plan(*args) lib/machinist/active_record.rb @@ -66,9 +66,9 @@ module Machinist end def make_unsaved(*args) - returning(Machinist.with_save_nerfed { make(*args) }) do |object| - yield object if block_given? - end + object = Machinist.with_save_nerfed { make(*args) } + yield object if block_given? + object end def plan(*args) lib/machinist/data_mapper.rb @@ -1,5 +1,3 @@ -require 'active_support' - class Sham @@shams = {} @@ -56,9 +54,9 @@ class Sham generate_values(2 * @values.length) raise "Can't generate more unique values for Sham.#{@name}" if @offset >= @values.length end - returning @values[@offset] do - @offset += 1 - end + result = @values[@offset] + @offset += 1 + result end private lib/sham.rb @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "machinist" - s.version = "1.0.3" + s.version = "1.0.4" s.author = "Pete Yandell" s.email = "pete@nothat.com" s.homepage = "http://github.com/notahat/machinist" machinist.gemspec 2b7562f4bddb403857e29d7c96230cf1c2d13953 64675882109ce9e8e61835a4d8452a7e555e8bf4 Pavel Kunc pavel.kunc@gmail.com http://github.com/notahat/machinist/commit/e5d8dafe3c0d60080e1ad5ad0b7d3c33a5b2924f e5d8dafe3c0d60080e1ad5ad0b7d3c33a5b2924f 2009-10-13T09:40:58-07:00 2009-10-13T09:40:58-07:00 Merge branch 'master' of git://github.com/notahat/machinist 57cfdc4dac46a731ed595b852477015c0abfb718 Pavel Kunc pavel.kunc@gmail.com