flextures 0.9.0 → 0.9.1

data/README.rdoc

@@ -19,9 +19,12 @@ Rails標準のfixtureの不満点を解消するために作成しました
 
 == インストール方法
 
-RailsのPlug-inとして実装されていますので
-ダウンロードしたファイルを
-vendor/plugin 以下に設置してください
+RailsのPlug-inとして使われることを想定しています
+gem化されているので、bundlerで次のように記述して、普通にbundle install してください
+
+ gem "flextures"
+
+ちなみに開発環境はruby1.9.2、rails3環境を想定しています
 
 == 使い方
 
@@ -47,12 +50,12 @@ Usersモデルのfixture(users.csvか　users.yml)をロードする
 その他オプションは以下のとおりな感じです:
 
  TABLE : テーブル名を指定してロード。テーブル名はカンマ切りで複数指定が可能
- T : TABLEのエイリアス
  MODEL : モデル名を指定してロード。モデル名はカンマ区切りで複数指定が可能
- M : モデル名指定のエイリアス
  DIR : フィクスチャをロード＆ダンプするディレクトリを指定する
- D : ディレクトリ指定のエイリアス
  FILE : ロード、ダンプをするファイル名をRails標準以外のもので直接指定(Userモデルのusers.csv以外を指定)
+ T : TABLEのエイリアス
+ M : モデル名指定のエイリアス
+ D : ディレクトリ指定のエイリアス
  F : ファイル名指定のエイリアス
 
 yamlのファイルはロードしたいけどcsvはロードをしたくない

data/Rakefile

@@ -53,4 +53,3 @@ Rake::RDocTask.new do |rdoc|
   rdoc.options = ["--charset", "utf-8", "--line-numbers"] 
 end
 
-

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/flextures.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flextures}
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["baban"]
-  s.date = %q{2011-11-03}
+  s.date = %q{2011-11-06}
   s.description = %q{load and dump fixtures}
   s.email = %q{babanba.n@gmail.com}
   s.extra_rdoc_files = [
@@ -27,13 +27,14 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "flextures.gemspec",
-    "init.rb",
     "lib/flextures.rb",
-    "lib/flextures_base_config.rb",
-    "lib/flextures_extension_modules.rb",
-    "lib/flextures_factory.rb",
-    "lib/rspec_flextures_support.rb",
-    "lib/tasks/flextures.rake",
+    "lib/flextures/flextures.rake",
+    "lib/flextures/flextures.rb",
+    "lib/flextures/flextures_base_config.rb",
+    "lib/flextures/flextures_extension_modules.rb",
+    "lib/flextures/flextures_factory.rb",
+    "lib/flextures/flextures_railtie.rb",
+    "lib/flextures/rspec_flextures_support.rb",
     "test/helper.rb",
     "test/test_flextures.rb"
   ]

data/lib/flextures.rb

@@ -1,209 +1,8 @@
-# encoding: utf-8
-
-module Flextures
-  LOAD_DIR = Config.fixture_load_directory
-  DUMP_DIR = Config.fixture_dump_directory
-  # �������
-  module ARGS
-    # �����o���E�ǂݍ��� ���ׂ��t�@�C���ƃI�v�V��������������
-    def self.parse option={}
-      table_names = ""
-      table_names = ENV["TABLE"].split(",") if ENV["TABLE"]
-      table_names = ENV["T"].split(",") if ENV["T"]
-      table_names = ENV["MODEL"].constantize.table_name.split(",") if ENV["MODEL"]
-      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 } }
-      table_names = table_names.map{ |option| option.merge dir: ENV["DIR"] } if ENV["DIR"]
-      table_names.first[:file]= ENV["FILE"] if ENV["FILE"] # �t�@�C�����͍ŏ��̂��̂����w��ł��Ȃ�
-      table_names.first[:file]= ENV["F"] if ENV["F"]
-      # read mode ����csv��yaml���݂��Ȃ��t�@�C���͕Ԃ��Ȃ�
-      table_names.select! &exist if option[:mode] && option[:mode].to_sym == :read 
-      table_names
-    end
-
-    # ���݂��Ă���t�@�C���ōi�荞�ށ@    
-    def self.exist
-      return->(name){ File.exists?("#{LOAD_DIR}#{name}.csv") or File.exists?("#{LOAD_DIR}#{name}.yml") }
-    end
-  end
-  
-  # �e�[�u�����f���̍쐬
-  def self.create_model table_name
-    klass = Class.new ActiveRecord::Base
-    klass.table_name=table_name
-    klass
-  end
-  
-  module Dumper
-    PARENT = Flextures
-
-    # �K�؂Ȍ^�ɕϊ�
-    def self.trans v
-      case v
-        when true;  1
-        when false; 0
-        else; v
-      end
-    end
-
-    # csv �� fixtures �� dump 
-    def self.csv format
-      table_name = format[:table]
-      file_name = format[:file] || table_name
-      dir_name = format[:dir] || DUMP_DIR
-      outfile = "#{dir_name}#{file_name}.csv"
-      klass = PARENT.create_model(table_name)
-      attributes = klass.columns.map { |colum| colum.name }
-
-      CSV.open(outfile,'w') do |csv|
-        csv<< attributes
-        klass.all.each do |row|
-          csv<< attributes.map { |column| trans(row.send(column))}
-        end
-      end
-    end
-
-    # yaml �� fixtures �� dump 
-    def self.yml format
-      table_name = format[:table]
-      file_name = format[:file] || table_name
-      dir_name = format[:dir] || DUMP_DIR
-      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| 
-          f<< "#{table_name}_#{idx}:\n" +
-            attributes.map { |column|
-              v = trans row.send(column)
-              "  #{column}: #{v}\n"
-            }.join
-        end
-      end
-    end
-  end
-
-  module Loader 
-    PARENT = Flextures
-
-    # �^�ɉ����ď����default�l��ݒ肷��
-    COMPLETER = {
-      binary:->{ 0 },
-      boolean:->{ false },
-      date:->{ DateTime.now },
-      datetime:->{ DateTime.now },
-      decimal:->{ 0 },
-      float:->{ 0.0 },
-      integer:->{ 0 },
-      string:->{ "" },
-      text:->{ "" },
-      time:->{ DateTime.now },
-      timestamp:->{ DateTime.now },
-    }
-    # �^�̕ϊ����s��
-    TRANSLATER = {
-      binary:->(d){ d.to_i },
-      boolean:->(d){ (0==d || ""==d || !d) ? false : true },
-      date:->(d){ Date.parse(d.to_s) },
-      datetime:->(d){ DateTime.parse(d.to_s) },
-      decimal:->(d){ d.to_i },
-      float:->(d){ d.to_f },
-      integer:->(d){ d.to_i },
-      string:->(d){ d.to_s },
-      text:->(d){ d.to_s },
-      time:->(d){ DateTime.parse(d.to_s) },
-      timestamp:->(d){ DateTime.parse(d.to_s) },
-    }
-
-    # csv �D��ő��݂��Ă��� fixtures �����[�h
-    def self.load format
-      file_name = format[:file] || format[:table]
-      dir_name = format[:dir] || LOAD_DIR
-      method = nil
-      method = :csv if File.exist? "#{dir_name}#{file_name}.csv"
-      method = :yml if File.exist? "#{dir_name}#{file_name}.yml"
-      self::send(method, format) if method
-    end
-
-    # fixtures���܂Ƃ߂ă��[�h�A��Ƀe�X�gtest/unit, rspec �Ŏg�p����    
-    def self.flextures *fixtures
-       # :all�ł��ׂĂ�fixture�𔽉f
-      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 # �n�b�V�����o��
-      fixtures.each{ |table_name| Flextures::Loader::load table: table_name }
-      fixtures_hash.each{ |k,v| Flextures::Loader::load table: k, file: v } if fixtures_hash
-      fixtures
-    end
-
-    # CSV�̃f�[�^�����[�h����
-    def self.csv format
-      table_name = format[:table].to_s
-      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]
-      #filter2 = create_filter2 klass.columns, Factory[table_name]
-      klass.delete_all
-      CSV.open( inpfile ) do |csv|
-        keys = csv.shift # key�̐ݒ�
-        warning "CSV", attributes, keys
-        csv.each do |values|
-          klass.create filter.call values.extend(Extensions::Array).to_hash(keys)
-        end
-      end
-    end
-
-    # YAML�`���Ńf�[�^�����[�h����
-    def self.yml format
-      table_name = format[:table].to_s
-      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]
-      klass.delete_all
-      YAML.load(File.open(inpfile)).each do |k,h|
-        warning "YAML", attributes, h.keys
-        klass.create filter.call h
-      end
-    end
-    
-    # �������J���������m����b�Z�[�W���o������
-    def self.warning format, attributes, keys
-      (attributes-keys).each { |name| print "Warning: #{format} colum is missing! [#{name}]\n" }
-      (keys-attributes).each { |name| print "Warning: #{format} colum is left over! [#{name}]\n" }
-    end
-
-    # �t�B�N�X�`��������o�����l���A���H���ė~�����f�[�^�ɂ���t�B���^���쐬���ĕԂ�
-    def self.create_filter columns, factory=nil
-      # �e�[�u������J�����������o��
-      column_hash = {}
-      columns.each { |col| column_hash[col.name] = col }
-      # �����⊮���K�v�Ȃ͂��̃J����
-      lack_columns = columns.select { |c| !c.null and !c.default }.map &:name
-      # �n�b�V�����󂯎���āA�K�v�Ȓl�ɉ��H���Ă���n�b�V���ŕԂ�
-      ->(h){
-        h.select! { |k,v| column_hash[k] } # �e�[�u���ɑ��݂��Ȃ��L�[����`����Ă���Ƃ��͍폜
-        # �l��nil�łȂ��Ȃ�^��DB�œK�؂Ȃ��̂ɕύX
-        h.each{ |k,v| nil==v || h[k] = TRANSLATER[column_hash[k].type].call(v) }
-        # FactoryFilter�𓮍삳����
-        st = OpenStruct.new(h)
-        factory.call(st) if factory
-        h = st.to_hash
-        # �l��nil�̗�Ƀf�t�H���g�l����
-        lack_columns.each { |k| nil==h[k] && h[k] = COMPLETER[column_hash[k].type].call }
-        h
-      }
-    end
-
-  end
-end
-
+# encoding: utf-8
+
+require 'flextures/flextures_base_config'
+require 'flextures/flextures_extension_modules'
+require 'flextures/flextures'
+require 'flextures/flextures_factory'
+require 'flextures/flextures_railtie' if defined? Rails
+require 'flextures/rspec_flextures_support'

data/lib/flextures/flextures.rake

@@ -0,0 +1,44 @@
+# encoding: utf-8
+
+require 'ostruct'
+require 'csv'
+
+require 'flextures/flextures_base_config'
+require 'flextures/flextures'
+require 'flextures/flextures_extension_modules'
+require 'flextures/flextures_factory'
+#require 'flextures/rspec_flextures_support'
+
+namespace :db do
+  namespace :flextures do
+    desc "Dump data to the test/fixtures/ directory. Use TABLE=table_name"
+    task :dump => :environment do
+      Flextures::ARGS.parse.each { |fmt| Flextures::Dumper::csv(fmt) }
+    end
+
+    desc "Dump data to the test/fixtures/ directory. Use TABLE=table_name"
+    task :csvdump => :environment do
+      #Flextures::ARGS.parse.each { |fmt| Flextures::Dumper::csv(fmt) }
+    end
+
+    desc "Dump data to the test/fixtures/ directory. Use TABLE=table_name"
+    task :ymldump => :environment do
+      #Flextures::ARGS.parse.each { |fmt| Flextures::Dumper::yml(fmt) }
+    end
+
+    desc "Dump data to the test/fixtures/ directory. Use TABLE=table_name"
+    task :load => :environment do
+      #Flextures::ARGS.parse.each { |fmt| Flextures::Loader::load(fmt) }
+    end
+
+    desc "Dump data to the test/fixtures/ directory. Use TABLE=table_name"
+    task :csvload => :environment do
+      #Flextures::ARGS.parse.each { |fmt| Flextures::Loader::csv(fmt) }
+    end
+
+    desc "Dump data to the test/fixtures/ directory. Use TABLE=table_name"
+    task :ymlload => :environment do
+      #Flextures::ARGS::parse.each { |fmt| Flextures::Loader::yml(fmt) }
+    end
+  end
+end

data/lib/flextures/flextures.rb

@@ -0,0 +1,220 @@
+# encoding: utf-8
+
+require 'ostruct'
+require 'csv'
+
+require 'flextures/flextures_base_config'
+require 'flextures/flextures_extension_modules'
+require 'flextures/flextures_factory'
+require 'flextures/rspec_flextures_support.rb' if defined?(RSpec)
+load    "#{Rails.root.to_path}/config/flextures.config.rb"  if defined?(Rails) and Rails.root
+load    "#{Rails.root.to_path}/config/flextures.factory.rb" if defined?(Rails) and Rails.root
+
+module Flextures
+  LOAD_DIR = Config.fixture_load_directory
+  DUMP_DIR = Config.fixture_dump_directory
+
+  # 引数解析
+  module ARGS
+    # 書き出し・読み込み すべきファイルとオプションを書きだす
+    def self.parse option={}
+      table_names = ""
+      table_names = ENV["TABLE"].split(",") if ENV["TABLE"]
+      table_names = ENV["T"].split(",") if ENV["T"]
+      table_names = ENV["MODEL"].constantize.table_name.split(",") if ENV["MODEL"]
+      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 } }
+      table_names = table_names.map{ |option| option.merge dir: ENV["DIR"] } if ENV["DIR"]
+      table_names.first[:file]= ENV["FILE"] if ENV["FILE"] # ファイル名は最初のものしか指定できない
+      table_names.first[:file]= ENV["F"] if ENV["F"]
+      # read mode だとcsvもyaml存在しないファイルは返さない
+      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
+  
+  # テーブルモデルの作成
+  def self.create_model table_name
+    klass = Class.new ActiveRecord::Base
+    klass.table_name=table_name
+    klass
+  end
+  
+  module Dumper
+    PARENT = Flextures
+
+    # 適切な型に変換
+    def self.trans v
+      case v
+        when true;  1
+        when false; 0
+        else; v
+      end
+    end
+
+    # csv で fixtures を dump 
+    def self.csv format
+      table_name = format[:table]
+      file_name = format[:file] || table_name
+      dir_name = format[:dir] || DUMP_DIR
+      outfile = "#{dir_name}#{file_name}.csv"
+      klass = PARENT.create_model(table_name)
+      attributes = klass.columns.map { |colum| colum.name }
+
+      CSV.open(outfile,'w') do |csv|
+        csv<< attributes
+        klass.all.each do |row|
+          csv<< attributes.map { |column| trans(row.send(column))}
+        end
+      end
+    end
+
+    # yaml で fixtures を dump 
+    def self.yml format
+      table_name = format[:table]
+      file_name = format[:file] || table_name
+      dir_name = format[:dir] || DUMP_DIR
+      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| 
+          f<< "#{table_name}_#{idx}:¥n" +
+            attributes.map { |column|
+              v = trans row.send(column)
+              "  #{column}: #{v}¥n"
+            }.join
+        end
+      end
+    end
+  end
+
+  module Loader 
+    PARENT = Flextures
+
+    # 型に応じて勝手にdefault値を設定する
+    COMPLETER = {
+      binary:->{ 0 },
+      boolean:->{ false },
+      date:->{ DateTime.now },
+      datetime:->{ DateTime.now },
+      decimal:->{ 0 },
+      float:->{ 0.0 },
+      integer:->{ 0 },
+      string:->{ "" },
+      text:->{ "" },
+      time:->{ DateTime.now },
+      timestamp:->{ DateTime.now },
+    }
+    # 型の変換を行う
+    TRANSLATER = {
+      binary:->(d){ d.to_i },
+      boolean:->(d){ (0==d || ""==d || !d) ? false : true },
+      date:->(d){ Date.parse(d.to_s) },
+      datetime:->(d){ DateTime.parse(d.to_s) },
+      decimal:->(d){ d.to_i },
+      float:->(d){ d.to_f },
+      integer:->(d){ d.to_i },
+      string:->(d){ d.to_s },
+      text:->(d){ d.to_s },
+      time:->(d){ DateTime.parse(d.to_s) },
+      timestamp:->(d){ DateTime.parse(d.to_s) },
+    }
+
+    # csv 優先で存在している fixtures をロード
+    def self.load format
+      file_name = format[:file] || format[:table]
+      dir_name = format[:dir] || LOAD_DIR
+      method = nil
+      method = :csv if File.exist? "#{dir_name}#{file_name}.csv"
+      method = :yml if File.exist? "#{dir_name}#{file_name}.yml"
+      self::send(method, format) if method
+    end
+
+    # fixturesをまとめてロード、主にテストtest/unit, rspec で使用する    
+    def self.flextures *fixtures
+       # :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| Flextures::Loader::load table: table_name }
+      fixtures_hash.each{ |k,v| Flextures::Loader::load table: k, file: v } if fixtures_hash
+      fixtures
+    end
+
+    # CSVのデータをロードする
+    def self.csv format
+      table_name = format[:table].to_s
+      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]
+      #filter2 = create_filter2 klass.columns, Factory[table_name]
+      klass.delete_all
+      CSV.open( inpfile ) do |csv|
+        keys = csv.shift # keyの設定
+        warning "CSV", attributes, keys
+        csv.each do |values|
+          klass.create filter.call values.extend(Extensions::Array).to_hash(keys)
+        end
+      end
+    end
+
+    # YAML形式でデータをロードする
+    def self.yml format
+      table_name = format[:table].to_s
+      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]
+      klass.delete_all
+      YAML.load(File.open(inpfile)).each do |k,h|
+        warning "YAML", attributes, h.keys
+        klass.create filter.call h
+      end
+    end
+    
+    # 欠けたカラムを検知してメッセージを出しておく
+    def self.warning format, attributes, keys
+      (attributes-keys).each { |name| print "Warning: #{format} colum is missing! [#{name}]¥n" }
+      (keys-attributes).each { |name| print "Warning: #{format} colum is left over! [#{name}]¥n" }
+    end
+
+    # フィクスチャから取り出した値を、加工して欲しいデータにするフィルタを作成して返す
+    def self.create_filter columns, factory=nil
+      # テーブルからカラム情報を取り出し
+      column_hash = {}
+      columns.each { |col| column_hash[col.name] = col }
+      # 自動補完が必要なはずのカラム
+      lack_columns = columns.select { |c| !c.null and !c.default }.map &:name
+      # ハッシュを受け取って、必要な値に加工してからハッシュで返す
+      return->(h){
+        h.select! { |k,v| column_hash[k] } # テーブルに存在しないキーが定義されているときは削除
+        # 値がnilでないなら型をDBで適切なものに変更
+        h.each{ |k,v| nil==v || h[k] = TRANSLATER[column_hash[k].type].call(v) }
+        # FactoryFilterを動作させる
+        st = OpenStruct.new(h)
+        factory.call(st) if factory
+        h = st.to_hash
+        # 値がnilの列にデフォルト値を補間
+        lack_columns.each { |k| nil==h[k] && h[k] = COMPLETER[column_hash[k].type].call }
+        h
+      }
+    end
+
+  end
+end
+

data/lib/{flextures_base_config.rb → flextures/flextures_base_config.rb}

@@ -1,20 +1,20 @@
-# encoding: utf-8
-
-# ��{�ݒ���L�q����
-module Flextures
-  module Config
-    @@configs={
-      fixture_load_directory: "spec/fixtures/",
-      fixture_dump_directory: "spec/fixtures/",
-    }
-    # �n�b�V����setter�Agetter�ɕϊ�
-    class<< self
-      @@configs.each do |setting_key, setting_value|
-        define_method setting_key do @@configs[setting_key] end
-        define_method "#{setting_key}=" do |arg| @@configs[setting_key]=arg end
-      end
-    end
-  end
-end
-
-
+# encoding: utf-8
+
+# 基本設定を記述する
+module Flextures
+  module Config
+    @@configs={
+      fixture_load_directory: "spec/fixtures/",
+      fixture_dump_directory: "spec/fixtures/",
+    }
+    # ハッシュをsetter、getterに変換
+    class<< self
+      @@configs.each do |setting_key, setting_value|
+        define_method setting_key do @@configs[setting_key] end
+        define_method "#{setting_key}=" do |arg| @@configs[setting_key]=arg end
+      end
+    end
+  end
+end
+
+

data/lib/{flextures_extension_modules.rb → flextures/flextures_extension_modules.rb}

@@ -1,28 +1,31 @@
-# encoding: utf-8
-
-module Flextures
-  # Plug-in �����g��
-  class OpenStruct < ::OpenStruct
-    # hash�ɕω�������
-    def to_hash
-      h={}
-      (self.methods - OpenStruct.new.methods)
-        .select{ |name| name.match(/\w+=/) }
-        .map{ |name| name.to_s.gsub(/=/,'').to_sym }
-        .each{ |k| h[k]=self.send(k) }
-        h
-    end
-  end
-
-  module Extensions
-    module Array
-      def to_hash keys
-        h = {}
-        [keys,self].transpose.each{ |k,v| h[k]=v }
-        h
-      end
-    end
-  end
-end
-
-
+# encoding: utf-8
+
+require 'ostruct'
+require 'csv'
+
+module Flextures
+  # Plug-in 内部拡張
+  class OpenStruct < ::OpenStruct
+    # hashに変化させる
+    def to_hash
+      h={}
+      (self.methods - OpenStruct.new.methods)
+        .select{ |name| name.match(/¥w+=/) }
+        .map{ |name| name.to_s.gsub(/=/,'').to_sym }
+        .each{ |k| h[k]=self.send(k) }
+        h
+    end
+  end
+
+  module Extensions
+    module Array
+      def to_hash keys
+        h = {}
+        [keys,self].transpose.each{ |k,v| h[k]=v }
+        h
+      end
+    end
+  end
+end
+
+

data/lib/flextures/flextures_factory.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+require 'ostruct'
+require 'csv'
+
+require 'flextures/flextures_base_config'
+require 'flextures/flextures_extension_modules'
+require 'flextures/flextures'
+require 'flextures/flextures_factory'
+
+module Flextures
+  # ロードするデータを必要に応じて加工する
+  class Factory
+    FACTORIES={}
+    # Factory を定義
+    def self.define table_name, &block
+      FACTORIES[table_name.to_sym]=block
+    end
+
+    # Factoryを取得
+    def self.get table_name
+      FACTORIES[table_name.to_sym]
+    end
+    def self.[](table_name); self.get(table_name); end
+  end
+end
+

data/lib/flextures/flextures_railtie.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+module Flextures
+  class Railtie < Rails::Railtie
+    rake_tasks do
+      load "flextures/flextures.rake"
+    end
+  end
+end

data/lib/flextures/rspec_flextures_support.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+
+# Rspecの内部でflextures関数を使える様にする
+module RSpec
+  module Core
+    module Hooks
+      def flextures *args
+        Flextures::Loader::flextures *args
+      end
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-03 00:00:00.000000000 +09:00
+date: 2011-11-06 00:00:00.000000000 +09:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &77603060 !ruby/object:Gem::Requirement
+  requirement: &87123700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77603060
+  version_requirements: *87123700
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &77602820 !ruby/object:Gem::Requirement
+  requirement: &87123460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *77602820
+  version_requirements: *87123460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &77602580 !ruby/object:Gem::Requirement
+  requirement: &87123220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *77602580
+  version_requirements: *87123220
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &77602340 !ruby/object:Gem::Requirement
+  requirement: &87122980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77602340
+  version_requirements: *87122980
 description: load and dump fixtures
 email: babanba.n@gmail.com
 executables: []
@@ -74,13 +74,14 @@ files:
 - Rakefile
 - VERSION
 - flextures.gemspec
-- init.rb
 - lib/flextures.rb
-- lib/flextures_base_config.rb
-- lib/flextures_extension_modules.rb
-- lib/flextures_factory.rb
-- lib/rspec_flextures_support.rb
-- lib/tasks/flextures.rake
+- lib/flextures/flextures.rake
+- lib/flextures/flextures.rb
+- lib/flextures/flextures_base_config.rb
+- lib/flextures/flextures_extension_modules.rb
+- lib/flextures/flextures_factory.rb
+- lib/flextures/flextures_railtie.rb
+- lib/flextures/rspec_flextures_support.rb
 - test/helper.rb
 - test/test_flextures.rb
 has_rdoc: true
@@ -99,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 804855759
+      hash: -599778417
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/init.rb

@@ -1,16 +0,0 @@
-# encoding: utf-8
-
-require 'ostruct'
-require 'csv'
-
-# ��������
-require 'flextures_base_config'
-# �������ե�������ɤ߽Ф�
-require "#{Rails.root.to_path}/config/flextures.config.rb" if File.exist? "#{Rails.root.to_path}/config/flextures.config.rb" 
-require 'flextures'
-require 'flextures_extension_modules'
-require 'flextures_factory'
-require 'rspec_flextures_support.rb'
-# factory����
-require "#{Rails.root.to_path}/config/flextures.factory.rb" if File.exist? "#{Rails.root.to_path}/config/flextures.factory.rb" 
-

data/lib/flextures_factory.rb

@@ -1,19 +0,0 @@
-# encoding: utf-8
-
-module Flextures
-  # �����ɤ���ǡ�����ɬ�פ˱����Ʋù�����
-  class Factory
-    FACTORIES={}
-    # Factory �����
-    def self.define table_name, &block
-      FACTORIES[table_name.to_sym]=block
-    end
-
-    # Factory�����
-    def self.get table_name
-      FACTORIES[table_name.to_sym]
-    end
-    def self.[](table_name); self.get(table_name); end
-  end
-end
-

data/lib/rspec_flextures_support.rb

@@ -1,9 +0,0 @@
-# encoding: utf-8
-
-# Rspec��������flextures�ؿ���Ȥ����ͤˤ���
-module RSpec::Core::Hooks
-  def flextures *args
-    Flextures::Loader::flextures *args
-  end
-end
-

data/lib/tasks/flextures.rake

@@ -1,32 +0,0 @@
-# encoding: utf-8
-
-namespace :db do
-  namespace :flextures do
-    #desc "Dump data to the test/fixtures/ directory. Use TABLE=table_name"
-    task :dump => :environment do
-      Flextures::ARGS.parse.each { |fmt| Flextures::Dumper::csv(fmt) }
-    end
-
-    #desc "Dump data to the test/fixtures/ directory. Use TABLE=table_name"
-    task :csvdump => :environment do
-      Flextures::ARGS.parse.each { |fmt| Flextures::Dumper::csv(fmt) }
-    end
-
-    #desc "Dump data to the test/fixtures/ directory. Use TABLE=table_name"
-    task :ymldump => :environment do
-      Flextures::ARGS.parse.each { |fmt| Flextures::Dumper::yml(fmt) }
-    end
-
-    task :load => :environment do
-      Flextures::ARGS.parse.each { |fmt| Flextures::Loader::load(fmt) }
-    end
-
-    task :csvload => :environment do
-      Flextures::ARGS.parse.each { |fmt| Flextures::Loader::csv(fmt) }
-    end
-
-    task :ymlload => :environment do
-      Flextures::ARGS::parse.each { |fmt| Flextures::Loader::yml(fmt) }
-    end
-  end
-end