flextures 1.0.8 → 1.9.0

data/Gemfile

@@ -6,7 +6,7 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
+  #gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"

data/Gemfile.lock

@@ -8,7 +8,6 @@ GEM
       rake
     rake (0.9.2)
     rcov (0.9.11)
-    shoulda (2.11.3)
 
 PLATFORMS
   ruby
@@ -17,4 +16,3 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
   rcov
-  shoulda

data/README.ja.rdoc

@@ -53,6 +53,7 @@ Usersモデルのfixture(users.csvか　users.yml)をロードする
  MODEL : モデル名を指定してロード。モデル名はカンマ区切りで複数指定が可能
  DIR : フィクスチャをロード＆ダンプするディレクトリを指定する
  FIXTURES : ロード、ダンプをするファイル名をRails標準以外のもので直接指定(Userモデルのusers.csv以外を指定)
+ FORMAT : yml,yaml 等の文字列を指定するとロード、ダンプをするフォーマットを変更できる(ymlload,ymldumpと同じ)
  T : TABLEのエイリアス
  M : モデル名指定のエイリアス
  D : ディレクトリ指定のエイリアス

data/README.rdoc

@@ -54,6 +54,7 @@ Other options...
  MODEL : set model name
  DIR : set directory name
  FIXTURES : set fixture file name
+ FORMAT : dumping format change csv to yaml (aka. ymlload, ymldump command)
  T : alias TABLE option
  M : alias MODEL option
  D : alias DIR option

data/VERSION

@@ -1,2 +1,2 @@
-1.0.8
+1.9.0
 

data/flextures.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flextures}
-  s.version = "1.0.8"
+  s.version = "1.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["baban"]
-  s.date = %q{2012-01-26}
+  s.date = %q{2012-02-14}
   s.description = %q{load and dump fixtures}
   s.email = %q{babanba.n@gmail.com}
   s.extra_rdoc_files = [
@@ -49,18 +49,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/lib/flextures/flextures.rake

@@ -6,32 +6,57 @@ namespace :db do
   namespace :flextures do
     desc "Dump data to csv format"
     task :dump => :environment do
-      Flextures::ARGS.parse.each { |fmt| Flextures::Dumper::csv(fmt) }
+      table_names = Flextures::ARGS.parse
+      Flextures::init_load
+      puts "dumping..."
+      if ["yml","yaml"].include? ENV["FORMAT"]
+        table_names.each { |fmt| Flextures::Dumper::yml(fmt) }
+      else
+        table_names.each { |fmt| Flextures::Dumper::csv(fmt) }
+      end
     end
 
     desc "Dump data to prefer csv format"
     task :csvdump => :environment do
-      Flextures::ARGS.parse.each { |fmt| Flextures::Dumper::csv(fmt) }
+      table_names = Flextures::ARGS.parse
+      Flextures::init_load
+      table_names.each { |fmt| Flextures::Dumper::csv(fmt) }
     end
 
     desc "Dump data to yaml format"
     task :ymldump => :environment do
-      Flextures::ARGS.parse.each { |fmt| Flextures::Dumper::yml(fmt) }
+      table_names = Flextures::ARGS.parse
+      Flextures::init_load
+      table_names.each { |fmt| Flextures::Dumper::yml(fmt) }
     end
 
     desc "load fixture data csv format"
     task :load => :environment do
-      Flextures::ARGS.parse.each { |fmt| Flextures::Loader::load(fmt) }
+      table_names = Flextures::ARGS.parse
+      Flextures::init_load
+      Flextures::init_tables
+      puts "loading..."
+      if ["yml","yaml"].include? ENV["FORMAT"]
+        table_names.each { |fmt| Flextures::Loader::yml(fmt) }
+      else
+        table_names.each { |fmt| Flextures::Loader::csv(fmt) }
+      end
     end
 
     desc "load fixture data only csv format files"
     task :csvload => :environment do
-      Flextures::ARGS.parse.each { |fmt| Flextures::Loader::csv(fmt) }
+      table_names = Flextures::ARGS.parse
+      Flextures::init_load
+      Flextures::init_tables
+      table_names.each { |fmt| Flextures::Loader::csv(fmt) }
     end
 
     desc "load fixture files only yaml format"
     task :ymlload => :environment do
-      Flextures::ARGS::parse.each { |fmt| Flextures::Loader::yml(fmt) }
+      table_names = Flextures::ARGS::parse
+      Flextures::init_load
+      Flextures::init_tables
+      table_names.each { |fmt| Flextures::Loader::yml(fmt) }
     end
   end
 end

data/lib/flextures/flextures.rb

@@ -36,18 +36,27 @@ module Flextures
     end
   end
 
+  # テーブル情報の初期化
+  def self.init_tables
+    tables = ActiveRecord::Base.connection.tables
+    tables.delete "schema_migrations"
+    tables.each{ |name| Class.new(ActiveRecord::Base){ |o| o.table_name=name }.delete_all }
+  end
+
   # 引数解析
   module ARGS
     # 書き出し 、読み込み すべきファイルとオプションを書きだす
     def self.parse option={}
-      Flextures::init_load
-      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 = []
+      if ENV["T"] or ENV["TABLE"]
+        table_names = (ENV["T"] or ENV["TABLE"]).split(',').map{ |name| { table: name } }
+      end
+      if ENV["M"] or ENV["MODEL"]
+        table_names = (ENV["M"] or ENV["MODEL"]).split(',').map{ |name| { table: name.constantize.table_name } }
+      end
+      if table_names.empty?
+        table_names = ActiveRecord::Base.connection.tables.map{ |name| { table: name } }
+      end
       # ENV["FIXTURES"]の中身を解析
       fixtures_args_parser =->(s){
         names = s.split(',')
@@ -84,27 +93,26 @@ module Flextures
 
     # csv で fixtures を dump
     def self.csv format
-      table_name = format[:table]
-      file_name = format[:file] || table_name
+      file_name = format[:file] || format[:table]
       dir_name = format[:dir] || DUMP_DIR
       outfile = "#{dir_name}#{file_name}.csv"
+      table_name = format[:table]
       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))}
+          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
+      file_name = format[:file] || format[:table]
       dir_name = format[:dir] || DUMP_DIR
       outfile = "#{dir_name}#{file_name}.yml"
+      table_name = format[:table]
       klass = PARENT::create_model(table_name)
       attributes = klass.columns.map { |colum| colum.name }
       File.open(outfile,"w") do |f|
@@ -164,8 +172,14 @@ module Flextures
     end
 
     # fixturesをまとめてロード、主にテストtest/unit, rspec で使用する
+    #
+    # 全テーブルが対象
+    # fixtures :all
+    # テーブル名で一覧する
+    # fixtures :users, :items
+    # ハッシュで指定
+    # fixtures :users => :users2
     def self.flextures *fixtures
-      PARENT::init_load
       # :allですべてのfixtureを反映
       fixtures = ActiveRecord::Base.connection.tables if fixtures.size== 1 and :all == fixtures.first
 
@@ -184,13 +198,13 @@ module Flextures
       klass = PARENT::create_model table_name
       attributes = klass.columns.map &:name
       filter = create_filter klass, Factory[table_name]
-      klass.delete_all
       CSV.open( inpfile ) do |csv|
         keys = csv.shift # keyの設定
         warning "CSV", attributes, keys
         csv.each do |values|
           h = values.extend(Extensions::Array).to_hash(keys)
-          o = filter.call h
+          args = [h, file_name]
+          o = filter.call *args[0,filter.arity]
           o.save
         end
       end
@@ -208,7 +222,8 @@ module Flextures
       klass.delete_all
       YAML.load(File.open(inpfile)).each do |k,h|
         warning "YAML", attributes, h.keys
-        o = filter.call h
+        args = [h, file_name]
+        o = filter.call *args[0,filter.arity]
         o.save
       end
     end

data/lib/flextures/rspec_flextures_support.rb

@@ -4,10 +4,25 @@
 module RSpec
   module Core
     module Hooks
-      def flextures *args
-        Flextures::Loader::flextures *args
+      def flextures *_
+        before { Flextures::Loader::flextures *_ }
       end
     end
   end
+
+  module Rails
+    module FlextureSupport
+      @@configs={ load_count: 0 }
+      def self.included(m)
+        # 一番外側のdescribeにだけ追加
+        m.before { Flextures::init_load } if @@configs[:load_count]==0
+        @@configs[:load_count] += 1
+      end
+    end
+  end
+
+  RSpec.configure do |c|
+    c.include RSpec::Rails::FlextureSupport
+  end
 end
 

data/lib/flextures/testunit_flextures_support.rb

@@ -2,8 +2,8 @@
 
 # shouda等へのfixture拡張
 class Test::Unit::TestCase  
-  def self.flextures *args
-    setup{ Flextures::Loader::flextures *args }
+  def self.flextures *_
+    setup{ Flextures::Loader::flextures *_ }
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,23 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000 +09:00
+date: 2012-02-14 00:00:00.000000000 +09:00
 default_executable: 
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &80302920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *80302920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &80302680 !ruby/object:Gem::Requirement
+  requirement: &86821870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *80302680
+  version_requirements: *86821870
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &80302410 !ruby/object:Gem::Requirement
+  requirement: &86821630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +33,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *80302410
+  version_requirements: *86821630
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &80302150 !ruby/object:Gem::Requirement
+  requirement: &86821330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80302150
+  version_requirements: *86821330
 description: load and dump fixtures
 email: babanba.n@gmail.com
 executables: []
@@ -101,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -723323507
+      hash: -236599985
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: