flextures 1.0.3 → 1.0.4

data/README.rdoc

@@ -104,3 +104,5 @@ Configuration file can change load and dump directory
    Config.fixture_dump_directory = "test/fixtures/"
  end
 
+
+

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/flextures.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flextures}
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["baban"]
-  s.date = %q{2011-11-27}
+  s.date = %q{2011-12-04}
   s.description = %q{load and dump fixtures}
   s.email = %q{babanba.n@gmail.com}
   s.extra_rdoc_files = [

data/lib/flextures/flextures.rb

@@ -40,21 +40,28 @@ module Flextures
       table_names = ENV["M"].constantize.table_name.split(",") if ENV["M"]
       table_names = ActiveRecord::Base.connection.tables if ""==table_names
       table_names = table_names.map{ |name| { table: name } }
+      # ENV["FIXTURES"]の中身を解析
+      fixtures_args_parser =->(s){
+        names = s.split(',')
+        ( names.size==1 and ENV.values_at("M", "MODEL", "T", "TABLE").first ) ?
+          [ table_names.first.merge( file: names.first ) ] :
+          names.map{ |name| { table: name, file: name } }
+      }
+      table_names = fixtures_args_parser.call ENV["FIXTURES"] if ENV["FIXTURES"]
+      table_names = fixtures_args_parser.call ENV["F"] if ENV["F"]
       table_names = table_names.map{ |option| option.merge dir: ENV["DIR"] } if ENV["DIR"]
-      table_names = ENV["FIXTURES"].split(',').map{ |name| { table: name }  } if ENV["FIXTURES"] 
-      table_names = ENV["F"].split(',').map{ |name| { table: name } } if ENV["F"]
       # read mode だとcsvもyaml存在しないファイルは返さない
-      table_names.select! &exist if option[:mode] && option[:mode].to_sym == :read 
+      table_names.select! &exist if option[:mode] && option[:mode].to_sym == :read
       table_names
     end
 
-    # 存在しているファイルで絞り込む　    
+    # 存在しているファイルで絞り込む
     def self.exist
       return->(name){ File.exists?("#{LOAD_DIR}#{name}.csv") or File.exists?("#{LOAD_DIR}#{name}.yml") }
     end
   end
   
-  # データを吐き出す処理をまとめる  
+  # データを吐き出す処理をまとめる
   module Dumper
     PARENT = Flextures
 
@@ -67,7 +74,7 @@ module Flextures
       end
     end
 
-    # csv で fixtures を dump 
+    # csv で fixtures を dump
     def self.csv format
       table_name = format[:table]
       file_name = format[:file] || table_name
@@ -84,7 +91,7 @@ module Flextures
       end
     end
 
-    # yaml で fixtures を dump 
+    # yaml で fixtures を dump
     def self.yml format
       table_name = format[:table]
       file_name = format[:file] || table_name
@@ -92,14 +99,13 @@ module Flextures
       outfile = "#{dir_name}#{file_name}.yml"
       klass = PARENT::create_model(table_name)
       attributes = klass.columns.map { |colum| colum.name }
-
       File.open(outfile,"w") do |f|
-        klass.all.each_with_index do |row,idx| 
+        klass.all.each_with_index do |row,idx|
           f<< "#{table_name}_#{idx}:\n" +
             attributes.map { |column|
               v = trans row.send(column)
               "  #{column}: #{v}\n"
-            }.*
+            }.join
         end
       end
     end
@@ -149,12 +155,12 @@ module Flextures
       self::send(method, format) if method
     end
 
-    # fixturesをまとめてロード、主にテストtest/unit, rspec で使用する    
+    # fixturesをまとめてロード、主にテストtest/unit, rspec で使用する
     def self.flextures *fixtures
       PARENT::init_load
       # :allですべてのfixtureを反映
       fixtures = ActiveRecord::Base.connection.tables if fixtures.size== 1 and :all == fixtures.first
-      
+
       fixtures_hash = fixtures.pop if fixtures.last and fixtures.last.is_a? Hash # ハッシュ取り出し
       fixtures.each{ |table_name| Loader::load table: table_name }
       fixtures_hash.each{ |k,v| Loader::load table: k, file: v } if fixtures_hash
@@ -167,7 +173,6 @@ module Flextures
       file_name = format[:file] || table_name
       dir_name = format[:dir] || LOAD_DIR
       inpfile = "#{dir_name}#{file_name}.csv"
-
       klass = PARENT::create_model table_name
       attributes = klass.columns.map &:name
       filter = create_filter klass.columns, Factory[table_name]
@@ -191,7 +196,6 @@ module Flextures
       file_name = format[:file] || table_name
       dir_name = format[:dir] || LOAD_DIR
       inpfile = "#{dir_name}#{file_name}.yml"
-
       klass = PARENT::create_model table_name
       attributes = klass.columns.map &:name
       filter = create_filter klass.columns, Factory[table_name]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-27 00:00:00.000000000 +09:00
+date: 2011-12-04 00:00:00.000000000 +09:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &78827590 !ruby/object:Gem::Requirement
+  requirement: &75392980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78827590
+  version_requirements: *75392980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &78827320 !ruby/object:Gem::Requirement
+  requirement: &75392680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *78827320
+  version_requirements: *75392680
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &78827080 !ruby/object:Gem::Requirement
+  requirement: &75392380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *78827080
+  version_requirements: *75392380
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &78826840 !ruby/object:Gem::Requirement
+  requirement: &75392080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78826840
+  version_requirements: *75392080
 description: load and dump fixtures
 email: babanba.n@gmail.com
 executables: []
@@ -101,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 250641213
+      hash: 876332047
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: