flextures 1.9.9 → 1.9.10

data/VERSION

@@ -1 +1 @@
-1.9.9
+1.9.10

data/flextures.gemspec

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

data/lib/flextures/flextures_dumper.rb

@@ -65,8 +65,11 @@ module Flextures
           if s.kind_of?(String)
             s = s.gsub(/\t/,"  ")                  if s["\t"]
             s = s.sub(/ +/, "")                    if s[0]==' '
+            is_nl = false
+            is_nl |= s["\n"]
+            is_nl |= ["[","]","{","}","|","#","@","~","!","'","$","&","^","<",">","?","-","+","=",";",":",".",",","*","`","(",")"].member? s[0]
             s = s.gsub(/\r\n/,"\n").gsub(/\r/,"\n") # 改行方法統一
-            s = "|-\n    " + s.gsub(/\n/,"\n    ") if s["\n"]
+            s = "|-\n    " + s.gsub(/\n/,"\n    ") if is_nl
           end
         end
         if format == :csv
@@ -82,8 +85,11 @@ module Flextures
           if s.kind_of?(String)
             s = s.gsub(/\t/,"  ")                  if s["\t"]
             s = s.sub(/ +/, "")                    if s[0]==' '
+            is_nl = false
+            is_nl |= s["\n"]
+            is_nl |= ["[","]","{","}","|","#","@","~","!","'","$","&","^","<",">","?","-","+","=",";",":",".",",","*","`","(",")"].member? s[0]
             s = s.gsub(/\r\n/,"\n").gsub(/\r/,"\n") # 改行方法統一
-            s = "|-\n    " + s.gsub(/\n/,"\n    ") if s["\n"]
+            s = "|-\n    " + s.gsub(/\n/,"\n    ") if is_nl
           end
         end
         if format == :csv

data/lib/flextures/flextures_loader.rb

@@ -101,17 +101,6 @@ module Flextures
       [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 で使用する
     #
     # 全テーブルが対象
@@ -124,15 +113,27 @@ module Flextures
       # :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 # ハッシュ取り出し
-      fixtures.each{ |table_name| Loader::load table: table_name }
-      fixtures_hash.each{ |k,v| Loader::load table: k, file: v } if fixtures_hash
+      fixtures.each{ |table_name| Loader::load table: table_name, loader: :fun }
+      fixtures_hash.each{ |k,v| Loader::load table: k, file: v,   loader: :fun } if fixtures_hash
       fixtures
     end
 
+    # csv 優先で存在している fixtures をロード
+    def self.load format
+      table_name, file_name, method = file_exist format
+      if method
+        send(method, format)
+      else
+        # ファイルが存在しない時
+        print "Warning: #{file_name}  is not exist!\n" 
+      end
+    end
+
     # CSVのデータをロードする
     def self.csv format
       table_name, file_name, ext = file_exist format, [:csv]
 
+      print "try loading #{file_name}.yml\n" unless [:fun].include? format[:loader]
       return nil unless File.exist? "#{file_name}.csv"
 
       klass = PARENT::create_model table_name
@@ -155,13 +156,20 @@ module Flextures
     def self.yml format
       table_name, file_name, ext = file_exist format, [:yml]
 
+      print "try loading #{file_name}.yml\n" unless [:fun].include? format[:loader]
       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("#{file_name}.yml")).each do |k,h|
+      attributes, filter = ->{
+        klass = PARENT::create_model table_name
+        klass.delete_all
+        attributes = klass.columns.map &:name
+        filter = create_filter klass, Factory[table_name], file_name, :yml
+        [attributes, filter]
+      }.call
+
+      yaml = YAML.load(File.open("#{file_name}.yml"))
+      return false unless yaml # ファイルの中身が空の場合
+      yaml.each do |k,h|
         warning "YAML", attributes, h.keys
         o = filter.call h
         o.save

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 1.9.9
+  version: 1.9.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-04-27 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: 497886195
+      hash: -722953521
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: