flextures 1.9.8 → 1.9.9

data/VERSION

@@ -1 +1 @@
-1.9.8
+1.9.9

data/flextures.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flextures"
-  s.version = "1.9.8"
+  s.version = "1.9.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["baban"]
-  s.date = "2012-04-20"
+  s.date = "2012-04-24"
   s.description = "load and dump fixtures"
   s.email = "babanba.n@gmail.com"
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "lib/flextures/flextures.rake",
     "lib/flextures/flextures.rb",
     "lib/flextures/flextures_base_config.rb",
+    "lib/flextures/flextures_command.rb",
     "lib/flextures/flextures_dumper.rb",
     "lib/flextures/flextures_extension_modules.rb",
     "lib/flextures/flextures_factory.rb",

data/lib/flextures.rb

@@ -6,6 +6,7 @@ require 'flextures/flextures'
 require 'flextures/flextures_factory'
 require 'flextures/flextures_loader'
 require 'flextures/flextures_dumper'
+require 'flextures/flextures_command'
 require 'flextures/flextures_railtie' if defined? Rails
 require 'flextures/rspec_flextures_support' if defined? RSpec
 require 'flextures/testunit_flextures_support' if defined? Test::Unit::TestCase

data/lib/flextures/flextures.rake

@@ -6,57 +6,32 @@ namespace :db do
   namespace :flextures do
     desc "Dump data to csv format"
     task :dump => :environment do
-      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
+      Flextures::Rake::Command::dump
     end
 
     desc "Dump data to prefer csv format"
     task :csvdump => :environment do
-      table_names = Flextures::ARGS.parse
-      Flextures::init_load
-      table_names.each { |fmt| Flextures::Dumper::csv(fmt) }
+      Flextures::Rake::Command::csvdump
     end
 
     desc "Dump data to yaml format"
     task :ymldump => :environment do
-      table_names = Flextures::ARGS.parse
-      Flextures::init_load
-      table_names.each { |fmt| Flextures::Dumper::yml(fmt) }
+      Flextures::Rake::Command::ymldump
     end
 
     desc "load fixture data csv format"
     task :load => :environment do
-      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
+      Flextures::Rake::Command::load
     end
 
     desc "load fixture data only csv format files"
     task :csvload => :environment do
-      table_names = Flextures::ARGS.parse
-      Flextures::init_load
-      Flextures::init_tables
-      table_names.each { |fmt| Flextures::Loader::csv(fmt) }
+      Flextures::Rake::Command::csvload
     end
 
     desc "load fixture files only yaml format"
     task :ymlload => :environment do
-      table_names = Flextures::ARGS::parse
-      Flextures::init_load
-      Flextures::init_tables
-      table_names.each { |fmt| Flextures::Loader::yml(fmt) }
+      Flextures::Rake::Command::ymlload
     end
   end
 end

data/lib/flextures/flextures.rb

@@ -43,19 +43,32 @@ module Flextures
     end
   end
 
-  # テーブル情報の初期化
-  def self.init_tables(ignore_tables=[])
+  # 前テーブル削除のときにほんとうに消去して良いテーブル一覧を返す
+  def self.deletable_tables
     tables = ActiveRecord::Base.connection.tables
     tables.delete "schema_migrations"
-    tables.delete ignore_tables
+    tables
+  end
+
+  # テーブル情報の初期化
+  def self.init_tables
+    tables = Flextures::deletable_tables
     tables.each do |name|
       # テーブルではなくviewを拾って止まる場合があるのでrescueしてしまう
       begin
-        klass = Class.new(ActiveRecord::Base){ |o| o.table_name= name }
-        klass.delete_all
+        Class.new(ActiveRecord::Base){ |o| o.table_name= name }.delete_all
+      rescue => e
+      end
+    end
+  end
+
+  # テーブル情報の初期化
+  def self.delete_tables *tables
+    tables.each do |name|
+      # テーブルではなくviewを拾って止まる場合があるのでrescueしてしまう
+      begin
+        Class.new(ActiveRecord::Base){ |o| o.table_name= name }.delete_all
       rescue => e
-        p :init_table_error
-        p klass.table_name
       end
     end
   end
@@ -63,8 +76,7 @@ module Flextures
   # デバッグ用のメソッド、渡されたブロックを実行する
   # 主にテーブルの今の中身を覗きたい時に使う
   def self.table_tap &dumper
-    tables = ActiveRecord::Base.connection.tables
-    tables.delete "schema_migrations"
+    tables = Flextures::deletable_tables
     tables.each do |name|
       # テーブルではなくviewを拾って止まる場合があるのでrescueしてしまう
       begin
@@ -87,7 +99,7 @@ module Flextures
         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 } }
+        table_names = Flextures::deletable_tables.map{ |table| { table: table }  }
       end
       # ENV["FIXTURES"]の中身を解析
       fixtures_args_parser =->(s){
@@ -100,7 +112,7 @@ module Flextures
       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"]
       # 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] == 'read'
       table_names
     end
 

data/lib/flextures/flextures_command.rb

@@ -0,0 +1,65 @@
+# 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
+  module Rake
+    module Command
+      def self.dump
+        Flextures::init_load
+        table_names = Flextures::ARGS.parse
+        puts "dumping..."
+        if ["yml","yaml"].member? ENV["FORMAT"]
+          table_names.map { |fmt| Flextures::Dumper::yml(fmt) }
+        else
+          table_names.map { |fmt| Flextures::Dumper::csv(fmt) }
+        end
+      end
+
+      def self.csvdump
+        Flextures::init_load
+        puts "dumping..."
+        table_names = Flextures::ARGS.parse
+        table_names.map { |fmt| Flextures::Dumper::csv(fmt) }
+      end
+
+      def self.ymldump
+        Flextures::init_load
+        puts "dumping..."
+        table_names = Flextures::ARGS.parse
+        table_names.map { |fmt| Flextures::Dumper::yml(fmt) }
+      end
+
+      def self.load
+        table_names = Flextures::ARGS.parse
+        Flextures::init_load
+        Flextures::init_tables
+        puts "loading..."
+        table_names.map { |fmt| Flextures::Loader::load(fmt) }
+      end
+
+      def self.csvload
+        table_names = Flextures::ARGS.parse
+        Flextures::init_load
+        Flextures::init_tables
+        puts "loading..."
+        table_names.map { |fmt| Flextures::Loader::csv(fmt) }
+      end
+
+      def self.ymlload
+        table_names = Flextures::ARGS::parse
+        Flextures::init_load
+        Flextures::init_tables
+        puts "loading..."
+        table_names.map { |fmt| Flextures::Loader::yml(fmt) }
+      end
+    end
+  end
+end
+

data/lib/flextures/flextures_dumper.rb

@@ -10,7 +10,8 @@ module Flextures
         if format == :yml
           return "null" if d.nil?
         end
-        d.to_s
+        return nil if d.nil?
+        Base64.encode64(d)
       },
       boolean:->( d, format ){
         if format == :yml
@@ -132,6 +133,7 @@ module Flextures
           csv<< attr_type.map { |h| trans(row[h[:name]], h[:type], :csv) }
         end
       end
+      outfile
     end
 
     # yaml で fixtures を dump
@@ -142,7 +144,6 @@ module Flextures
       table_name = format[:table]
       klass = PARENT::create_model(table_name)
       attributes = klass.columns.map { |colum| colum.name }
-
       columns = klass.columns
       # テーブルからカラム情報を取り出し
       column_hash = {}
@@ -161,6 +162,7 @@ module Flextures
             }.join
         end
       end
+      outfile
     end
   end
 end

data/lib/flextures/flextures_loader.rb

@@ -31,7 +31,8 @@ module Flextures
     # 型の変換を行う
     TRANSLATER = {
       binary:->(d){
-        d.to_i
+        return d if d.nil?
+        Base64.encode64(d)
       },
       boolean:->(d){
         return d if d.nil?
@@ -79,14 +80,36 @@ module Flextures
       },
     }
 
-    # csv 優先で存在している fixtures をロード
-    def self.load format
+    # どのファイルが存在するかチェック
+    # @param [Hash] format ロードしたいファイルの情報
+    # @return 存在するファイルの種類(csv,yml)、どちも存在しないならnil
+    def self.file_exist format, type = [:csv,:yml]
+      table_name = format[:table].to_s
       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
+
+      ext=->{
+        if    type.member?(:csv) and File.exist? "#{dir_name}#{file_name}.csv"
+          :csv
+        elsif type.member?(:yml) and File.exist? "#{dir_name}#{file_name}.yml"
+          :yml
+        else
+          nil
+        end
+      }.call
+
+      [table_name, "#{dir_name}#{file_name}",ext]
+    end
+
+    # csv 優先で存在している fixtures をロード
+    def self.load format
+      table_name, file_name, method = file_exist format
+      if method
+        self::send(method, format)
+      else
+        # ファイルが存在しない時
+        print "Warning: #{file_name}  is not exist!\n" 
+      end
     end
 
     # fixturesをまとめてロード、主にテストtest/unit, rspec で使用する
@@ -99,7 +122,7 @@ module Flextures
     # fixtures :users => :users2
     def self.flextures *fixtures
       # :allですべてのfixtureを反映
-      fixtures = ActiveRecord::Base.connection.tables if fixtures.size== 1 and :all == fixtures.first
+      fixtures = Flextures::deletable_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
@@ -108,15 +131,15 @@ module Flextures
 
     # 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"
+      table_name, file_name, ext = file_exist format, [:csv]
+
+      return nil unless File.exist? "#{file_name}.csv"
+
       klass = PARENT::create_model table_name
       attributes = klass.columns.map &:name
       filter = create_filter klass, Factory[table_name], file_name, :csv
       klass.delete_all
-      CSV.open( inpfile ) do |csv|
+      CSV.open( "#{file_name}.csv" ) do |csv|
         keys = csv.shift # keyの設定
         warning "CSV", attributes, keys
         csv.each do |values|
@@ -125,23 +148,25 @@ module Flextures
           o.save
         end
       end
+      "#{file_name}.csv"
     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"
+      table_name, file_name, ext = file_exist format, [:yml]
+
+      return nil unless File.exist? "#{file_name}.yml"
+
       klass = PARENT::create_model table_name
       attributes = klass.columns.map &:name
       filter = create_filter klass, Factory[table_name], file_name, :yml
       klass.delete_all
-      YAML.load(File.open(inpfile)).each do |k,h|
+      YAML.load(File.open("#{file_name}.yml")).each do |k,h|
         warning "YAML", attributes, h.keys
         o = filter.call h
         o.save
       end
+      "#{file_name}.yml"
     end
 
     # 欠けたカラムを検知してメッセージを出しておく
@@ -165,11 +190,12 @@ module Flextures
         h.select! { |k,v| column_hash[k] }
         o = klass.new 
         # 値がnilでないなら型をDBで適切なものに変更
-        h.each{ |k,v| nil==v || o[k] = TRANSLATER[column_hash[k].type].call(v) }
-        not_nullable_columns.each{ |k| o[k]==nil && o[k] = TRANSLATER[column_hash[k].type].call(k) }
+        h.each{ |k,v| nil==v || o[k] = (TRANSLATER[column_hash[k].type] ? TRANSLATER[column_hash[k].type].call(v) : nil) }
         # FactoryFilterを動作させる
         factory.call(*[o, :load, filename, ext][0,factory.arity]) if factory
         # 値がnilの列にデフォルト値を補間
+        not_nullable_columns.each{ |k| o[k]==nil && o[k] = (COMPLETER[column_hash[k].type] ? COMPLETER[column_hash[k].type].call : nil) }
+        # 列ごと抜けているデータを保管
         lack_columns.each { |k| nil==o[k] && o[k] = COMPLETER[column_hash[k].type].call }
         o
       }

data/lib/flextures/rspec_flextures_support.rb

@@ -4,16 +4,32 @@
 module RSpec
   module Core
     module Hooks
+      # 引数で渡されたファイルを読み込みする
       def flextures *_
         before { Flextures::Loader::flextures *_ }
       end
+
+      # 引数で渡されたテーブルのデータをdeleteする
+      def flextures_delete *_
+        before {
+          if _.empty?
+            Flextures::init_tables
+          else
+            Flextures::delete_tables *_
+          end
+        }
+      end
+
+      def flextures_set_config
+        # TODO: ハッシュで渡された設定をセットする
+      end
     end
   end
 
   module Rails
     module FlextureSupport
-      @@configs={ load_count: 0 }
       def self.included(m)
+        # 実行前にテーブルの初期化
         Flextures::init_tables
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 1.9.8
+  version: 1.9.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,7 @@ files:
 - lib/flextures/flextures.rake
 - lib/flextures/flextures.rb
 - lib/flextures/flextures_base_config.rb
+- lib/flextures/flextures_command.rb
 - lib/flextures/flextures_dumper.rb
 - lib/flextures/flextures_extension_modules.rb
 - lib/flextures/flextures_factory.rb
@@ -89,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 294980813
+      hash: 497886195
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: