fix_to_chix 0.0.1 → 0.0.2

data/History.txt

@@ -1,4 +1,7 @@
-== 0.0.1 2009-10-29
+=== 0.0.2 2009-10-30
 
-* 1 major enhancement:
-  * Initial release
+* Parsing fixtures with the default names (:one and :two) to factory names <model_name>_one and <model_name>_two so you don't end up with factories with the same name.
+
+=== 0.0.1 2009-10-29
+
+* initial release

data/Manifest.txt

@@ -14,6 +14,7 @@ script/destroy
 script/generate
 spec/controller_spec.rb
 spec/factory_writer_spec.rb
+spec/fix_to_chix_spec.rb
 spec/fixture_parser_spec.rb
 spec/fixture_selector_spec.rb
 spec/fixtures/authors.yml

data/README.rdoc

@@ -10,18 +10,6 @@ convert existing yaml fixtures to {factory_girl}[http://github.com/thoughtbot/fa
 
 It currently looks for yml files in your test and spec folders and translates them to factory_girl factory definitions written to test/factories.rb or spec/factories.rb
 
-It does not differ fixtures with the same name in different files. For example, a fixture named *one* in authors.yml will have the same factory name as *one* in posts.yml:
-
-Factory.define :one, :class_name => Author do |a|
-...
-end
-
-Factory.define :one, :class_name => Post do |p|
-...
-end
-
-I may solve that by using a name like :author_one and :post_one, but I'm still thinking about it.
-
 == SYNOPSIS:
 
 Two simple steps to run fix_to_chix:

data/Rakefile

@@ -26,4 +26,4 @@ require 'newgem/tasks' # load /tasks/*.rake
 Dir['tasks/**/*.rake'].each { |t| load t }
 
 # TODO - want other tests/tasks run by default? Add them to the list
-# task :default => [:spec, :features]
+task :default => [:package, :spec]

data/lib/fix_to_chix/controller.rb

@@ -5,21 +5,14 @@ require 'fix_to_chix/fixture_parser'
 module FixToChix
   class Controller
     def self.parse_it_all!
-      
       selector = FixtureSelector.new
-      
-      selector.spec_fixtures.each do |fixture_file_name|
-        parser = FixtureParser.new(fixture_file_name)
-        parser.parse_fixture
-        FactoryWriter.write(parser.output_buffer, SPEC_TARGET_FILE)
+      %w[spec test].each do |type| 
+        selector.send("#{type}_fixtures").each do |fixture_file_name|
+          parser = FixtureParser.new(fixture_file_name)
+          parser.parse_fixture
+          FactoryWriter.write(parser.output_buffer, FixToChix.class_eval("#{type.upcase}_TARGET_FILE"))
+        end
       end
-      
-      selector.test_fixtures.each do |fixture_file_name|
-        parser = FixtureParser.new(fixture_file_name)
-        parser.parse_fixture
-        FactoryWriter.write(parser.output_buffer, TEST_TARGET_FILE)
-      end
-      
     end
   end
 end

data/lib/fix_to_chix/factory_writer.rb

@@ -7,7 +7,7 @@ module FixToChix
         output_buffer.each { |output| f.puts output }
       end
     end
-    
+
   end
 
 end

data/lib/fix_to_chix/fixture_parser.rb

@@ -1,12 +1,16 @@
+class FileNotFoundError < IOError; end;
+
 module FixToChix
 
   class FixtureParser
 
+    DEFAULT_NAMES = ["one", "two"]
+
     attr_reader :output_buffer, :factory_names, :factory_writer
 
     def initialize(fixture_file)
       raise ArgumentError if fixture_file.nil?
-      raise StandardError unless File.exists?(fixture_file)
+      raise FileNotFoundError unless File.exists?(fixture_file)
       @fixture_file = fixture_file
     end
 
@@ -28,7 +32,7 @@ module FixToChix
     def define_factories
       factory_definition = []
       @factory_names.each do |name|
-        factory_definition << "Factory.define :#{name}, :class => #{model_name.camelize} do |#{model_name[0].chr}|"
+        factory_definition << "Factory.define :#{self.factory_name(name)}, :class => #{model_name.camelize} do |#{model_name[0].chr}|"
         define_attributes_for(name).each do |attrib|
           factory_definition << attrib
         end
@@ -48,5 +52,9 @@ module FixToChix
       attr_value = attr_value.to_i == 0 ? "'#{attr_value}'" : "#{attr_value}"
       "  #{model_name[0].chr}.#{attribute} #{attr_value}"
     end
+
+    def factory_name(node_name)
+      DEFAULT_NAMES.include?(node_name) ? "#{self.model_name}_#{node_name}" : node_name
+    end
   end
 end

data/lib/fix_to_chix/fixture_selector.rb

@@ -1,27 +1,35 @@
 module FixToChix
 
   class FixtureSelector
+    
+    attr_reader :test_fixtures_dir, :spec_fixtures_dir
 
-    def initialize
+    def initialize(options={})
+      @test_fixtures_dir = options[:test_fixtures_dir] || TEST_FIXTURES
+      @spec_fixtures_dir = options[:spec_fixtures_dir] || SPEC_FIXTURES
     end
 
     def spec_fixtures(options={})
-      all_fixtures = fetch_fixtures(options).select {|f| f =~ /spec/ }
+      all_fixtures = fetch_fixtures.select {|f| f =~ /spec/ }
       filter(all_fixtures, options)
     end
 
     def test_fixtures(options={})
-      all_fixtures = fetch_fixtures(options).select {|f| f =~ /test/ }
+      all_fixtures = fetch_fixtures.select {|f| f =~ /test/ }
       filter(all_fixtures, options)
     end
 
     private
-    def fetch_fixtures(options)
+    def fetch_fixtures
       project_fixtures = []
-      project_fixtures.concat(Dir[TEST_FIXTURES]) unless Dir[TEST_FIXTURES].empty?
-      project_fixtures.concat(Dir[SPEC_FIXTURES]) unless Dir[SPEC_FIXTURES].empty?
+      project_fixtures.concat(fetch_dir_files(self.test_fixtures_dir))
+      project_fixtures.concat(fetch_dir_files(self.spec_fixtures_dir))
       project_fixtures
     end
+    
+    def fetch_dir_files(dir)
+      Dir[dir] unless Dir[dir].empty?
+    end
 
     def filter(all_fixtures, options)
       return all_fixtures.select {|f| f =~ options[:matching] } unless options[:matching].nil?

data/lib/fix_to_chix.rb

@@ -7,16 +7,16 @@ require 'fix_to_chix/controller'
 
 module FixToChix
 
-  VERSION = '0.0.1'
-  
-  APP_ROOT = "." # have to call fixtochix from the app base
+  VERSION = '0.0.2'
+
+  APP_ROOT = "." # need to call fixtochix command from your app base
 
   TEST_FIXTURES = "#{APP_ROOT}/test/fixtures/*"
   SPEC_FIXTURES = "#{APP_ROOT}/spec/fixtures/*"
 
   SPEC_TARGET = "#{APP_ROOT}/spec"
   TEST_TARGET = "#{APP_ROOT}/test"
-  
+
   SPEC_TARGET_FILE = "#{SPEC_TARGET}/factories.rb"
   TEST_TARGET_FILE = "#{TEST_TARGET}/factories.rb"
 

data/spec/controller_spec.rb

@@ -2,10 +2,20 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe FixToChix::Controller do 
   
-  it "should parse it all" do
-    selector = mock('FixtureSelector', :spec_fixtures => [], :test_fixtures => [])
-    FixToChix::FixtureSelector.should_receive(:new).and_return(selector)
+  it "should parse spec fixtures" do
+    selector = mock('FixtureSelector', :spec_fixtures => ["spec_fix"], :test_fixtures => [])
+    FixToChix::FixtureSelector.stub!(:new).and_return(selector)
+    FixToChix::FixtureParser.should_receive(:new).with("spec_fix").and_return(mock('selector', :parse_fixture => "", :output_buffer => "buff"))
+    FixToChix::FactoryWriter.should_receive(:write).with("buff", FixToChix::SPEC_TARGET_FILE)
     FixToChix::Controller.parse_it_all!
   end
 
+  it "should parse test fixtures" do
+    selector = mock('FixtureSelector', :spec_fixtures => [], :test_fixtures => ["test_fix"])
+    FixToChix::FixtureSelector.stub!(:new).and_return(selector)
+    FixToChix::FixtureParser.should_receive(:new).with("test_fix").and_return(mock('selector', :parse_fixture => "", :output_buffer => "buff"))
+    FixToChix::FactoryWriter.should_receive(:write).with("buff", FixToChix::TEST_TARGET_FILE)
+    FixToChix::Controller.parse_it_all!
+  end
+  
 end

data/spec/factory_writer_spec.rb

@@ -2,4 +2,10 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe FixToChix::FactoryWriter, "writing factories" do
 
+  it "should write the output buffer" do
+    File.should_receive(:open).with("factories_file", 'a').and_yield(mock("file handler", :puts => ""))
+    buffer = mock("output buffer", :each => "bla")
+    FixToChix::FactoryWriter.write(buffer, "factories_file")
+  end
+
 end

data/spec/fix_to_chix_spec.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe FixToChix do
+  
+  it "should parse it all" do
+    FixToChix::Controller.should_receive(:parse_it_all!)
+    FixToChix.execute
+  end
+  
+end

data/spec/fixture_parser_spec.rb

@@ -3,11 +3,11 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 describe FixToChix::FixtureParser do
 
   it "raises error if no fixture file passed as argument" do
-    lambda { FixToChix::FixtureParser.new }.should raise_error
+    lambda { FixToChix::FixtureParser.new }.should raise_error(ArgumentError)
   end
 
   it "raises error if file not found" do
-    lambda { FixToChix::FixtureParser.new("bla/bla/bla") }.should raise_error
+    lambda { FixToChix::FixtureParser.new("bla/bla/bla") }.should raise_error(FileNotFoundError)
   end
 
   describe "reading file" do
@@ -72,7 +72,12 @@ describe FixToChix::FixtureParser do
       @parser.output_buffer.join.should match(/a.blog 'I write a blog'/)
       @parser.output_buffer.join.should match(/a.age 900/)
     end
-
+    
+    it "generates compound file if fixture name is :one or :two" do
+      @parser.factory_name("one").should == "author_one"
+      @parser.factory_name("anakin").should == "anakin"
+    end
+    
   end
 
 end

data/spec/fixture_selector_spec.rb

@@ -1,20 +1,38 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe FixToChix::FixtureSelector, "selecting fixtures" do
-  
-  before do
-    @ftc_fixture_selector = FixToChix::FixtureSelector.new
-    @ftc_fixture_selector.stub!(:fetch_fixtures).and_return(["spec/fixtures/users.yml","spec/fixtures/user_items.yml", "test/posts.yml"])
-  end
+describe FixToChix::FixtureSelector do
 
-  it "selects all fixtures by default" do
-    @ftc_fixture_selector.spec_fixtures.should == ["spec/fixtures/users.yml","spec/fixtures/user_items.yml"]
-    @ftc_fixture_selector.test_fixtures.should == ["test/posts.yml"]
-  end
+  describe "selecting fixtures" do
+    
+    before do
+      @selector = FixToChix::FixtureSelector.new
+      @selector.stub!(:test_fixtures_dir).and_return("test")
+      @selector.stub!(:spec_fixtures_dir).and_return("spec")
+      @selector.stub!(:fetch_dir_files).with("test").and_return(["test/posts.yml"])
+      @selector.stub!(:fetch_dir_files).with("spec").and_return(["spec/fixtures/users.yml","spec/fixtures/user_items.yml"])
+    end
+
+    it "selects all fixtures by default" do
+      @selector.spec_fixtures.should == ["spec/fixtures/users.yml","spec/fixtures/user_items.yml"]
+      @selector.test_fixtures.should == ["test/posts.yml"]
+    end
+
+    it "selects matching with regexp" do
+      @selector.spec_fixtures(:matching => /item/).should == ["spec/fixtures/user_items.yml"]
+      @selector.test_fixtures(:matching => /user/).should == []
+    end
 
-  it "selects matching with regexp" do
-    @ftc_fixture_selector.spec_fixtures(:matching => /item/).should == ["spec/fixtures/user_items.yml"]
-    @ftc_fixture_selector.test_fixtures(:matching => /user/).should == []
   end
   
+  describe "overriding default values" do
+    it "changes test fixture dir" do
+      @selector = FixToChix::FixtureSelector.new(:test_fixtures_dir => "/some/other")
+      @selector.test_fixtures_dir.should == "/some/other"
+    end
+    
+    it "changes spec fixture dir" do
+      @selector = FixToChix::FixtureSelector.new(:spec_fixtures_dir => "/some/other")
+      @selector.spec_fixtures_dir.should == "/some/other"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fix_to_chix
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Caike Souza
@@ -70,6 +70,7 @@ files:
 - script/generate
 - spec/controller_spec.rb
 - spec/factory_writer_spec.rb
+- spec/fix_to_chix_spec.rb
 - spec/fixture_parser_spec.rb
 - spec/fixture_selector_spec.rb
 - spec/fixtures/authors.yml