workbench 0.3 → 0.4

data/lib/workbench.rb

@@ -1,7 +1,36 @@
-require File.expand_path('../workbench/string_helpers', __FILE__)
+require 'workbench/string_helpers'
+
 module Workbench
   COUNTERS = Hash.new(0)
 
+  module InstanceMethods
+    def assign_model_attributes(model, attributes)
+      attributes.each do |k, v|
+        model.send("#{k}=", v)
+      end
+    end
+
+    def save_model(model)
+      if model.respond_to?(:save!) # save should raise if unsuccessful
+        model.save!
+      else
+        model.save
+      end
+    end
+
+    def find_model_by_attributes(klass, attributes)
+      klass.where(attributes).first
+    end
+
+    def new_model(klass)
+      klass.new
+    end
+  end
+
+  def self.extended(klass)
+    klass.send :include, InstanceMethods
+  end
+
   # Declare that the next builder method is to use the said class
   #
   #   module Builders
@@ -77,10 +106,8 @@ private
   def define_builder_methods(name, klass, counter_klass)
     define_method("new_#{name}") do |*args|
       attributes = args[0] || { }
-      klass.new.tap do |model|
-        attributes.each do |k, v|
-          model.send("#{k}=", v)
-        end
+      new_model(klass).tap do |model|
+        assign_model_attributes(model, attributes)
         build_method = method("#{name}_defaults")
         p = [model]
         p << Workbench.counter(counter_klass) if build_method.arity >= 2 || build_method.arity <= -1
@@ -90,18 +117,12 @@ private
     end
 
     define_method("create_#{name}") do |*args|
-      send("new_#{name}", *args).tap do |model|
-        if model.respond_to?(:save!) # save should raise if unsuccessful
-          model.save!
-        else
-          model.save
-        end
-      end
+      send("new_#{name}", *args).tap { |model| save_model(model) }
     end
 
     define_method("find_or_create_#{name}") do |*args|
       attrs = args[0] || { }
-      klass.where(attrs).first || send("create_#{name}", attrs)
+      find_model_by_attributes(klass, attrs) || send("create_#{name}", attrs)
     end
   end
 
@@ -110,5 +131,4 @@ private
       $1.to_sym
     end
   end
-
 end

metadata

@@ -1,82 +1,82 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: workbench
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: '0.4'
   prerelease: 
-  version: "0.3"
 platform: ruby
-authors: 
+authors:
 - Tim Harper
 - Eric Wollesen
 - Ben Mabey
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-19 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70354928164440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.6"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70354928164440
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: &70354928266680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70354928266680
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70354928397240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70354928397240
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70354928523780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: "3.8"
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: '3.8'
   type: :development
-  version_requirements: *id004
-description: |
-  Workbench strikes to reach a better balance between easy-to-read
+  prerelease: false
+  version_requirements: *70354928523780
+description: ! 'Workbench strikes to reach a better balance between easy-to-read
+
   factory builders, ease of use, and robustness.
-  
-  Workbench doesn't use any fancy tricks. It's code is small and the
+
+
+  Workbench doesn''t use any fancy tricks. It''s code is small and the
+
   average rubyist should have no trouble reading it. It exploits what
+
   ruby provides. Instead of operating on a proxy object, builders
-  operate on the actual model. It's also ORM agnostic.
 
-email: 
+  operate on the actual model. It''s also ORM agnostic.
+
+'
+email:
 - tim@leadtune.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - spec/spec_helper.rb
 - spec/workbench/string_helpers_spec.rb
 - spec/workbench_spec.rb
@@ -85,33 +85,30 @@ files:
 - MIT_LICENSE
 - README.rdoc
 - Gemfile
-has_rdoc: true
 homepage: http://github.com/leadtune/workbench
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
-summary: A small, simple ORM agnostic factory library that does the job without any crazy tricks.
+summary: A small, simple ORM agnostic factory library that does the job without any
+  crazy tricks.
 test_files: []
-
+has_rdoc: