fix_to_chix 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,12 @@
+=== 0.0.3 2009-10-31
+
+* Accepting arguments for matching names of fixtures to parse.
+
+  For example,
+
+		$ fixtochix -m user		# => will only parse fixtures that match /user/
+		$ fixtochix -m posts	# => will only parse fixtures that match /posts/
+
 === 0.0.2 2009-10-30
 
 * 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.

data/README.rdoc

@@ -6,10 +6,14 @@ http://github.com/caike/fix_to_chix
 
 convert existing yaml fixtures to {factory_girl}[http://github.com/thoughtbot/factory_girl] factories
 
-== FEATURES/PROBLEMS:
+== FEATURES:
 
 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
 
+== PROBLEMS/TODO:
+
+Check for namespaced modules, i.e. admin_posts.yml fixtures and Admin::Post model.
+
 == SYNOPSIS:
 
 Two simple steps to run fix_to_chix:

data/Rakefile

@@ -1,14 +1,13 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
+%w[rubygems rake rake/clean fileutils hoe newgem rubigen].each { |f| require f }
 require File.dirname(__FILE__) + '/lib/fix_to_chix'
-require 'hoe'
+
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('fix_to_chix', FixToChix::VERSION) do |p|
+$hoe = Hoe.spec('fix_to_chix') do |p|
   p.developer('Caike Souza', 'caikesouza@caikesouza.com')
   p.summary =  'convert existing yaml fixtures to factory_girl factories'
   p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
-  p.rubyforge_name       = p.name # TODO this is default value
+  p.rubyforge_name       = p.name
   # p.extra_deps         = [
   #   ['activesupport','>= 2.0.2'],
   # ]

data/bin/fixtochix

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 require 'fix_to_chix'
-FixToChix.execute
+FixToChix.execute(ARGV)

data/lib/fix_to_chix.rb

@@ -7,7 +7,7 @@ require 'fix_to_chix/controller'
 
 module FixToChix
 
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
   APP_ROOT = "." # need to call fixtochix command from your app base
 
@@ -20,8 +20,16 @@ module FixToChix
   SPEC_TARGET_FILE = "#{SPEC_TARGET}/factories.rb"
   TEST_TARGET_FILE = "#{TEST_TARGET}/factories.rb"
 
-  def self.execute
-    FixToChix::Controller.parse_it_all!
+  def self.execute(args=nil)
+    FixToChix::Controller.parse_it_all!(parse_arguments(args))
+  end
+
+  def self.parse_arguments(args)
+    if args && args.index("-m")
+      { :matching => (args[args.index("-m") + 1]) }
+    else
+      {}
+    end
   end
 
 end

data/lib/fix_to_chix/controller.rb

@@ -4,8 +4,9 @@ require 'fix_to_chix/fixture_parser'
 
 module FixToChix
   class Controller
-    def self.parse_it_all!
-      selector = FixtureSelector.new
+    def self.parse_it_all!(options={})
+      matching_option = options[:matching] ? { :matching => Regexp.new(options[:matching]) } : {}
+      selector = FixtureSelector.new(matching_option)
       %w[spec test].each do |type| 
         selector.send("#{type}_fixtures").each do |fixture_file_name|
           parser = FixtureParser.new(fixture_file_name)

data/lib/fix_to_chix/fixture_selector.rb

@@ -1,22 +1,23 @@
 module FixToChix
 
   class FixtureSelector
-    
+
     attr_reader :test_fixtures_dir, :spec_fixtures_dir
 
     def initialize(options={})
       @test_fixtures_dir = options[:test_fixtures_dir] || TEST_FIXTURES
       @spec_fixtures_dir = options[:spec_fixtures_dir] || SPEC_FIXTURES
+      @matching = options[:matching]
     end
 
-    def spec_fixtures(options={})
+    def spec_fixtures
       all_fixtures = fetch_fixtures.select {|f| f =~ /spec/ }
-      filter(all_fixtures, options)
+      filter(all_fixtures)
     end
 
-    def test_fixtures(options={})
+    def test_fixtures
       all_fixtures = fetch_fixtures.select {|f| f =~ /test/ }
-      filter(all_fixtures, options)
+      filter(all_fixtures)
     end
 
     private
@@ -26,13 +27,13 @@ module FixToChix
       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?
+    def filter(all_fixtures)
+      return all_fixtures.select {|f| f =~ @matching } if @matching
       all_fixtures
     end
 

data/spec/controller_spec.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe FixToChix::Controller do 
-  
-  it "should parse spec fixtures" do
+describe FixToChix::Controller do
+
+  it "parses 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"))
@@ -10,12 +10,22 @@ describe FixToChix::Controller do
     FixToChix::Controller.parse_it_all!
   end
 
-  it "should parse test fixtures" do
+  it "parses 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
-  
+
+  it "accepts matching file options for selector" do
+    FixToChix::FixtureSelector.should_receive(:new).with(:matching => /anakin/).and_return(mock('Selector', :spec_fixtures => [], :test_fixtures => []))
+    FixToChix::Controller.parse_it_all!(:matching => "anakin")
+  end
+
+  it "receives empty hash if no arg" do
+    FixToChix::FixtureSelector.should_receive(:new).with({}).and_return(mock('Selector', :spec_fixtures => [], :test_fixtures => []))
+    FixToChix::Controller.parse_it_all!
+  end
+
 end

data/spec/fix_to_chix_spec.rb

@@ -1,10 +1,20 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe FixToChix do
-  
-  it "should parse it all" do
+
+  it "parses it all" do
     FixToChix::Controller.should_receive(:parse_it_all!)
     FixToChix.execute
   end
-  
-end
+
+  it "accepts arguments if given" do
+    FixToChix::Controller.should_receive(:parse_it_all!).with(:matching => "chewbacca")
+    FixToChix.execute(["-m", "chewbacca"])
+  end
+
+  it "accepts passes empty hash if no argument" do
+    FixToChix::Controller.should_receive(:parse_it_all!).with({})
+    FixToChix.execute()
+  end
+
+end

data/spec/fixture_selector_spec.rb

@@ -3,33 +3,50 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 describe FixToChix::FixtureSelector do
 
   describe "selecting fixtures" do
-    
-    before do
+
+    it "selects all spec fixtures by default" 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"])
+      @selector.stub!(:fetch_fixtures).and_return(["spec/fixtures/users.yml","spec/fixtures/user_items.yml", "test/fixtures/posts.yml"])
+      @selector.spec_fixtures.should == ["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"]
+    it "selects all test fixtures by default" do
+      @selector = FixToChix::FixtureSelector.new
+      @selector.stub!(:fetch_fixtures).and_return(["spec/fixtures/users.yml","spec/fixtures/user_items.yml", "test/fixtures/posts.yml"])
+      @selector.test_fixtures.should == ["test/fixtures/posts.yml"]
+    end
+
+    it "selects matching spec fixtures with regexp" do
+      @selector = FixToChix::FixtureSelector.new(:matching => /item/)
+      @selector.stub!(:fetch_fixtures).and_return(["spec/fixtures/users.yml","spec/fixtures/user_items.yml", "test/fixtures/posts.yml"])
+      @selector.spec_fixtures.should == ["spec/fixtures/user_items.yml"]
+    end
+
+    it "selected matching test fixtures with regexp" do
+      @selector = FixToChix::FixtureSelector.new(:matching => /space/)
+      @selector.stub!(:fetch_fixtures).and_return(["spec/fixtures/users.yml","spec/fixtures/user_items.yml", "test/fixtures/posts.yml", "test/fixtures/space_guns.yml"])
+      @selector.test_fixtures.should == ["test/fixtures/space_guns.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
+
+  describe "fetching fixtures" do
+
+    it "gets from default dirs" do
+      @selector = FixToChix::FixtureSelector.new
+      Dir.stub!(:[]).with(FixToChix::TEST_FIXTURES).and_return(["test/fixtures/space_guns.yml"])
+      Dir.stub!(:[]).with(FixToChix::SPEC_FIXTURES).and_return(["spec/fixtures/user_items.yml"])
+      @selector.send(:fetch_fixtures).to_set.should == Set.new(["spec/fixtures/user_items.yml","test/fixtures/space_guns.yml"]) 
     end
 
   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"

data/tasks/rspec.rake

@@ -14,18 +14,6 @@ rescue LoadError
   exit(0)
 end
 
-desc "Run the specs under spec/models"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-namespace :fix_to_chix do
-  desc "Convert your fixtures to factory"
-  task :convert => :environment do
-  end
-end
-
 require 'spec/rake/spectask'
 require "rcov/rcovtask"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fix_to_chix
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Caike Souza
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-30 00:00:00 -04:00
+date: 2009-10-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,7 +83,7 @@ has_rdoc: true
 homepage: 
 licenses: []
 
-post_install_message: PostInstall.txt
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt