bricks 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/bricks.gemspec

@@ -4,13 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{bricks}
-  s.version = "0.5.0"
+  s.name = "bricks"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Leal"]
-  s.date = %q{2011-06-29}
-  s.email = %q{david@mojotech.com}
+  s.date = "2011-11-24"
+  s.email = "david@mojotech.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -37,11 +37,11 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/support/active_record.rb"
   ]
-  s.homepage = %q{http://github.com/mojotech/bricks}
+  s.homepage = "http://github.com/mojotech/bricks"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Hybrid object builder/factory.}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Hybrid object builder/factory."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/bricks/adapters/active_record.rb

@@ -10,8 +10,8 @@ module Bricks
         def initialize(klass, kind)
           @class = klass
           @type  = case kind
-                   when :belongs_to;                         :one
-                   when :has_many, :has_and_belongs_to_many; :many
+                   when :belongs_to;                         :parent
+                   when :has_many, :has_and_belongs_to_many; :children
                    else "Unknown AR association type: #{kind}."
                    end
         end

data/lib/bricks/builder.rb

@@ -30,13 +30,12 @@ module Bricks
     end
 
     def derive(args = {})
-      build_attrs
-
       klass  = args[:class] || @class
       save   = args.has_key?(:save) ? args[:save] : @save
       search = args.has_key?(:search) ? args[:search] : @search
 
-      Builder.new(klass, @attrs, @traits, save, search).tap { |b|
+      Builder.new(klass, @attrs, @traits, save, search, &@block).tap { |b|
+        b.send :build_attrs
         b.run_hook :after, :clone if ! args[:class]
       }
     end
@@ -197,9 +196,9 @@ module Bricks
         pair[-1] = val
 
         self
-      elsif adapter.association?(@class, nsym, :one)
+      elsif adapter.association?(@class, nsym, :parent)
         pair[-1] = builder(adapter.association(@class, nsym).klass, @save)
-      elsif adapter.association?(@class, nsym, :many)
+      elsif adapter.association?(@class, nsym, :children)
         pair[-1] ||= BuilderSet.new(adapter.association(@class, nsym).klass)
       else
         raise Bricks::BadSyntax,

data/spec/support/active_record.rb

@@ -40,6 +40,8 @@ class Article < ActiveRecord::Base
   belongs_to :newspaper
   has_many   :readers
 
+  validates_presence_of :newspaper_id
+
   def saved?
     ! new_record?
   end

metadata

@@ -1,72 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bricks
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.1
   prerelease: 
-  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - David Leal
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-29 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-24 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &82543630 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *82543630
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &82543330 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *82543330
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &82526310 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *82526310
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &82525860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *82525860
 description: 
 email: david@mojotech.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -87,36 +83,32 @@ files:
 - spec/bricks_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
-has_rdoc: true
 homepage: http://github.com/mojotech/bricks
-licenses: 
+licenses:
 - MIT
 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 
-      hash: -614702947
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -651750993
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Hybrid object builder/factory.
 test_files: []
-