flextures 2.0.0 → 2.0.1

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/flextures.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flextures"
-  s.version = "2.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["baban"]
-  s.date = "2012-08-16"
+  s.date = "2012-08-28"
   s.description = "load and dump fixtures"
   s.email = "babanba.n@gmail.com"
   s.extra_rdoc_files = [

data/lib/flextures/flextures_dumper.rb

@@ -4,7 +4,6 @@ module Flextures
   # データを吐き出す処理をまとめる
   module Dumper
     PARENT = Flextures
-
     # procに機能追加、関数合成のためのメソッドを追加する
     class Proc < ::Proc
       def *(other)
@@ -32,10 +31,14 @@ module Flextures
           return nil if d.nil?
           d
         },
-        blankstr: proc { |d|
+        blank2null: proc { |d|
           return "null" if d==""
           d
         },
+        blankstr: proc { |d|
+          return '""' if d==""
+          d
+        },
         false2nullstr: proc { |d|
           return "null" if d==false
           d
@@ -85,20 +88,20 @@ module Flextures
       },
       date:->( d, format ){
         procs = (format == :yml) ?
-          [:nullstr, :blankstr, :false2nullstr, proc { |d| d.to_s }] :
+          [:nullstr, :blank2null, :false2nullstr, proc { |d| d.to_s }] :
           [proc { |d| d.to_s }]
         self.translate_creater d, procs
       },
       datetime:->( d, format ){
         procs = (format == :yml) ?
-          [:nullstr, :blankstr, :false2nullstr, proc { |d| d.to_s }] :
+          [:nullstr, :blank2null, :false2nullstr, proc { |d| d.to_s }] :
           [proc { |d| d.to_s }]
         self.translate_creater d, procs
       },
       decimal:->( d, format ){
         procs = (format == :yml) ?
-          [:nullstr, :blank2num, :bool2num, proc { |d| d.to_i } ] : 
-          [:blank2num, :bool2num, proc { |d| d.to_i } ]
+          [:nullstr, :blank2num, :bool2num, proc { |d| d.to_f } ] : 
+          [:blank2num, :bool2num, proc { |d| d.to_f } ]
         self.translate_creater d, procs
       },
       float:->(d, format){
@@ -115,13 +118,13 @@ module Flextures
       },
       string:->( d, format ){
         procs = (format == :yml) ?
-          [:nullstr, :ymlspecialstr] :
+          [:blankstr, :nullstr, :ymlspecialstr] :
           [:null, proc{ |s| s.to_s.gsub(/\r\n/,"\n").gsub(/\r/,"\n") } ]
         self.translate_creater d, procs
       },
       text:->( d, format ){
         procs = (format == :yml) ?
-          [:nullstr, :ymlspecialstr] :
+          [:blankstr, :nullstr, :ymlspecialstr] :
           [:null, proc{ |s| s.to_s.gsub(/\r\n/,"\n").gsub(/\r/,"\n") } ]
         self.translate_creater d, procs
       },
@@ -150,7 +153,9 @@ module Flextures
     def self.csv format
       file_name = format[:file] || format[:table]
       dir_name = format[:dir] || DUMP_DIR
-      outfile = "#{dir_name}#{file_name}.csv"
+      # 指定されたディレクトリを作成
+      recursive_mkdir(dir_name)
+      outfile = File.join(dir_name, "#{file_name}.csv")
       table_name = format[:table]
       klass = PARENT.create_model(table_name)
       attributes = klass.columns.map { |column| column.name }
@@ -175,7 +180,9 @@ module Flextures
     def self.yml format
       file_name = format[:file] || format[:table]
       dir_name = format[:dir] || DUMP_DIR
-      outfile = "#{dir_name}#{file_name}.yml"
+      # 指定されたディレクトリを作成
+      recursive_mkdir(dir_name)
+      outfile = File.join(dir_name, "#{file_name}.yml")
       table_name = format[:table]
       klass = PARENT::create_model(table_name)
       attributes = klass.columns.map { |colum| colum.name }
@@ -199,6 +206,13 @@ module Flextures
       end
       outfile
     end
+
+    def self.recursive_mkdir(path)
+      return if FileTest.exist?(path)
+      dir = File.dirname(path)
+      recursive_mkdir(dir)
+      Dir.mkdir(path)
+    end
   end
 end
 

data/lib/flextures/flextures_loader.rb

@@ -13,6 +13,8 @@ module Flextures
   module Loader 
     PARENT = Flextures
 
+    @@table_cache = {}
+
     # 型に応じて勝手にdefault値を設定する
     COMPLETER = {
       binary:->{ 0 },
@@ -114,6 +116,9 @@ module Flextures
     # ハッシュで指定
     # fixtures :users => :users2
     def self.flextures *fixtures
+      options = {}
+      options = fixtures.shift if fixtures.size > 1 and fixtures.first.is_a?(Hash)
+
       # :allですべてのfixtureを反映
       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 # ハッシュ取り出し
@@ -137,6 +142,8 @@ module Flextures
     def self.csv format
       table_name, file_name, ext = file_exist format, [:csv]
 
+      @@table_cache[table_name.to_sym] = file_name
+
       print "try loading #{file_name}.csv\n" unless [:fun].include? format[:loader]
       return nil unless File.exist? "#{file_name}.csv"
 
@@ -161,6 +168,8 @@ module Flextures
     def self.yml format
       table_name, file_name, ext = file_exist format, [:yml]
 
+      @@table_cache[table_name.to_sym] = file_name
+
       print "try loading #{file_name}.yml\n" unless [:fun].include? format[:loader]
       return nil unless File.exist? "#{file_name}.yml"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 454224659
+      hash: -596499121
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: