fixjour-2 0.0.1 → 0.0.2

data/README

@@ -12,6 +12,11 @@ The builder definitions are more like factory girl now.
       define User do |user|
         user.name = "Pat"
       end
+      
+      define Article do |article|
+        article.user = new_user
+        article.title = "This is a good one"
+      end
     end
 
 The methods generated are the same old Fixjour methods:
@@ -23,8 +28,26 @@ The methods generated are the same old Fixjour methods:
 
 That's it for now.
 
-## TODO
+## What's New
+
+I ripped out a bunch of stuff. Here are some things I don't need:
+
+### Overrides and `process`
+
+The overrides hash in Fixjour was confusing to pretty much everybody I explained
+it to, so it's gone now. PEACE.
+
+### valid_*_attributes
+
+This was useful for controller tests. Controller tests are no longer useful
+though. I like acceptance tests now. Hopefully you do too.
+
+### attr_protected attributes
+
+They just work now. Don't worry about it.
+
+### Fixjour.verify!
 
-* counters (or sequences in Factory girl parlance)
+It's gone now. Write tests for your builders and you're good to go.
 
 (c) Copyright 2011 Pat Nakajima. All Rights Reserved. 

data/lib/fixjour/builder.rb

@@ -1,16 +1,17 @@
 module Fixjour
   class Builder
-    def initialize(model, block)
-      @model, @block = model, block
+    def initialize(model, options, &block)
+      @model, @options, @block = model, options, block
     end
 
     def define
-      model, block = @model, @block
-      Fixjour.module_eval do
-        klass_name = model.model_name.singular
+      block = @block
+      klass = find_class
+      klass_name = klass.model_name.singular
 
+      Fixjour.module_eval do
         define_method("new_" + klass_name) do |*overrides|
-          instance = model.new
+          instance = klass.new
           block.call(instance)
           overrides.first && overrides.first.each do |key, val|
             instance.send("#{key}=", val)
@@ -25,5 +26,13 @@ module Fixjour
         end
       end
     end
+
+    private
+
+    def find_class
+      @options[:class] || @model.is_a?(Symbol) ?
+        @model.to_s.classify.constantize :
+        @model
+    end
   end
 end

data/lib/fixjour/dsl.rb

@@ -1,13 +1,14 @@
 module Fixjour
   class DSL
     include Fixjour
+    include Fixjour::Counter
     
     def initialize(block)
       instance_eval(&block)
     end
 
-    def define(model, &block)
-      Builder.new(model, block).define
+    def define(model, options={}, &block)
+      Builder.new(model, options, &block).define
     end
   end
 end

data/lib/fixjour.rb

@@ -1,7 +1,8 @@
 $LOAD_PATH << File.dirname(__FILE__)
 
-require 'fixjour/dsl'
+require 'fixjour/counter'
 require 'fixjour/builder'
+require 'fixjour/dsl'
 
 module Fixjour
   def self.evaluate(&block)

data/spec/fixjour_spec.rb

@@ -9,9 +9,14 @@ describe "Fixjour Builders" do
         user.name = "Pat"
       end
 
-      define Article do |article|
+      define :article do |article|
         article.user = new_user(:name => "Pat")
       end
+
+      define :comment, :class => Article::Comment do |comment|
+        comment.text = "comment #{counter(:comment)}"
+        comment.article = new_article
+      end
     end
 
     user = new_user
@@ -38,5 +43,13 @@ describe "Fixjour Builders" do
     article = new_article
     article.user.should_not be_nil
     article.user.name.should == "Pat"
+
+    # It works with namespaces
+    comment = new_comment
+
+    # It works with counters
+    first_comment = new_comment
+    second_comment = new_comment
+    first_comment.text.should_not == second_comment.text
   end
 end

data/spec/spec_helper.rb

@@ -9,8 +9,17 @@ build_model :users do
   attr_protected :age
 end
 
-
 build_model :articles do
   integer :user_id
   belongs_to :user
+end
+
+build_model :comments do
+  string :text
+  integer :article_id
+  belongs_to :article
+end
+
+class Article
+  Comment = ::Comment
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fixjour-2
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Pat Nakajima
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Fixjour Again