flextures 1.9.7 → 1.9.8

data/Gemfile.lock

@@ -7,7 +7,7 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.6.5)
+    json (1.6.6)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)

data/VERSION

@@ -1 +1 @@
-1.9.7
+1.9.8

data/flextures.gemspec

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

data/lib/flextures/flextures.rb

@@ -44,16 +44,35 @@ module Flextures
   end
 
   # テーブル情報の初期化
-  def self.init_tables
+  def self.init_tables(ignore_tables=[])
     tables = ActiveRecord::Base.connection.tables
     tables.delete "schema_migrations"
-    tables.each{ |name|
+    tables.delete ignore_tables
+    tables.each do |name|
       # テーブルではなくviewを拾って止まる場合があるのでrescueしてしまう
       begin
-        Class.new(ActiveRecord::Base){ |o| o.table_name= name }.delete_all
+        klass = Class.new(ActiveRecord::Base){ |o| o.table_name= name }
+        klass.delete_all
       rescue => e
+        p :init_table_error
+        p klass.table_name
       end
-    }
+    end
+  end
+
+  # デバッグ用のメソッド、渡されたブロックを実行する
+  # 主にテーブルの今の中身を覗きたい時に使う
+  def self.table_tap &dumper
+    tables = ActiveRecord::Base.connection.tables
+    tables.delete "schema_migrations"
+    tables.each do |name|
+      # テーブルではなくviewを拾って止まる場合があるのでrescueしてしまう
+      begin
+        klass = Class.new(ActiveRecord::Base){ |o| o.table_name= name; }
+        dumper.call klass
+      rescue => e
+      end
+    end
   end
 
   # 引数解析

data/lib/flextures/flextures_dumper.rb

@@ -6,69 +6,107 @@ module Flextures
     PARENT = Flextures
 
     TRANSLATER = {
-      binary:->(d, format ){
+      binary:->( d, format ){
+        if format == :yml
+          return "null" if d.nil?
+        end
         d.to_s
       },
-      boolean:->(d, format ){
+      boolean:->( d, format ){
+        if format == :yml
+          return "null" if d.nil?
+        end
         (0==d || ""==d || !d) ? false : true
       },
-      date:->(d, format ){
+      date:->( d, format ){
         if format == :yml
           return "null" if d.nil?
+          return "null" if d==""
+          return "null" if d==false
         end
-        Time.parse(d.to_s).to_s
+        d.to_s
       },
-      datetime:->(d, format ){
-        Time.parse(d.to_s).to_s
+      datetime:->( d, format ){
+        if format == :yml
+          return "null" if d.nil?
+          return "null" if d==""
+          return "null" if d==false
+        end
+        d.to_s
       },
-      decimal:->(d, format ){
+      decimal:->( d, format ){
+        if format == :yml
+          return "null" if d.nil?
+        end
+        return 0 if d==""
+        return 0 if d==false
         d.to_i
       },
       float:->(d, format){
+        if format == :yml
+          return "null" if d.nil?
+        end
+        return 0 if d==""
+        return 0 if d==false
         d.to_f
       },
-      integer:->(d, format){
+      integer:->( d, format){
+        if format == :yml
+          return "null" if d.nil?
+        end
+        return 0 if d==""
+        return 0 if d==false
         d.to_i
       },
-      string:->(s, format ){
+      string:->( s, format ){
         if format == :yml
-          return "null"                          if s.nil?
-          s = s.to_s
-          s = s.gsub(/\t/,"  ")                  if s["\t"]
-          s = s.sub(/ +/, "")                    if s[0]==' '
-          s = "|-\n    " + s.gsub(/\n/,"\n    ") if s["\n"]
+          return "null"                            if s.nil?
+          if s.kind_of?(String)
+            s = s.gsub(/\t/,"  ")                  if s["\t"]
+            s = s.sub(/ +/, "")                    if s[0]==' '
+            s = s.gsub(/\r\n/,"\n").gsub(/\r/,"\n") # 改行方法統一
+            s = "|-\n    " + s.gsub(/\n/,"\n    ") if s["\n"]
+          end
         end
-        if format == :yml
+        if format == :csv
           return nil if s.nil? # nil は空白文字 
           s = s.to_s
+          s = s.gsub(/\r\n/,"\n").gsub(/\r/,"\n")
         end
         s
       },
-      text:->(s, format){
+      text:->( s, format ){
         if format == :yml
-          return "null"                          if s.nil?
-          s = s.to_s
-          s = s.gsub(/\t/,"  ")                  if s["\t"]
-          s = s.sub(/ +/, "")                    if s[0]==' '
-          s = "|-\n    " + s.gsub(/\n/,"\n    ") if s["\n"]
+          return "null"                            if s.nil?
+          if s.kind_of?(String)
+            s = s.gsub(/\t/,"  ")                  if s["\t"]
+            s = s.sub(/ +/, "")                    if s[0]==' '
+            s = s.gsub(/\r\n/,"\n").gsub(/\r/,"\n") # 改行方法統一
+            s = "|-\n    " + s.gsub(/\n/,"\n    ") if s["\n"]
+          end
         end
         if format == :csv
           return nil if s.nil? # nil は空白文字
           s = s.to_s
+          s = s.gsub(/\r\n/,"\n").gsub(/\r/,"\n")
         end
         s
       },
-      time:->(d, format ){
+      time:->( d, format ){
         if format == :yml
           return "null" if d.nil?
+          return "null" if d==""
+          return "null" if d==false
         end
-        Time.parse(d.to_s).to_s
+        d.to_s
       },
-      timestamp:->(d, format ){
+      timestamp:->( d, format ){
         if format == :yml
           return "null" if d.nil?
+          return "null" if d==""
+          return "null" if d==false
         end
-        Time.parse(d.to_s).to_s
+        d.to_s
       },
     }
 

data/lib/flextures/flextures_loader.rb

@@ -30,17 +30,53 @@ module Flextures
 
     # 型の変換を行う
     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) },
+      binary:->(d){
+        d.to_i
+      },
+      boolean:->(d){
+        return d if d.nil?
+        (0==d || ""==d || !d) ? false : true
+      },
+      date:->(d){
+        return d   if d.nil?
+        return nil if d==""
+        Date.parse(d.to_s)
+      },
+      datetime:->(d){
+        return d   if d.nil?
+        return nil if d==""
+        DateTime.parse(d.to_s)
+      },
+      decimal:->(d){
+        return d   if d.nil?
+        d.to_i
+      },
+      float:->(d){
+        return d   if d.nil?
+        d.to_f
+      },
+      integer:->(d){
+        return d   if d.nil?
+        d.to_i
+      },
+      string:->(d){
+        return d   if d.nil?
+        d.to_s
+      },
+      text:->(d){
+        return d   if d.nil?
+        d.to_s
+      },
+      time:->(d){
+        return d   if d.nil?
+        return nil if d==""
+        DateTime.parse(d.to_s)
+      },
+      timestamp:->(d){
+        return d   if d.nil?
+        return nil if d==""
+        DateTime.parse(d.to_s)
+      },
     }
 
     # csv 優先で存在している fixtures をロード
@@ -78,7 +114,7 @@ module Flextures
       inpfile = "#{dir_name}#{file_name}.csv"
       klass = PARENT::create_model table_name
       attributes = klass.columns.map &:name
-      filter = create_filter klass, Factory[table_name],  file_name, :csv
+      filter = create_filter klass, Factory[table_name], file_name, :csv
       klass.delete_all
       CSV.open( inpfile ) do |csv|
         keys = csv.shift # keyの設定

data/lib/flextures/rspec_flextures_support.rb

@@ -14,9 +14,7 @@ module RSpec
     module FlextureSupport
       @@configs={ load_count: 0 }
       def self.included(m)
-        # 一番外側のdescribeにだけ追加
-        #m.after { Flextures::init_tables } if @@configs[:load_count]==0
-        @@configs[:load_count] += 1
+        Flextures::init_tables
       end
     end
   end
@@ -29,21 +27,15 @@ end
 # 既存のsetup_fixturesの機能を上書きする必要があったのでこちらを作成
 module ActiveRecord
   module TestFixtures
-    @@flextures_config = { count: 0 }
-
-    alias :flextures_backup_setup_fixtures :setup_fixtures
+    alias :setup_fixtures_bkup :setup_fixtures
     def setup_fixtures
       Flextures::init_load
-      Flextures::init_tables if @@flextures_config[:count] == 0
-      @@flextures_config[:count] += 1
-
-      flextures_backup_setup_fixtures
+      setup_fixtures_bkup
     end
 
-    alias :flextures_backup_teardown_fixtures :teardown_fixtures
+    alias :teardown_fixtures_bkup :teardown_fixtures
     def teardown_fixtures
-      Flextures::init_tables if Flextures::Config.init_all_tables
-      flextures_backup_teardown_fixtures
+      teardown_fixtures_bkup
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 1.9.7
+  version: 1.9.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -377856707
+      hash: 294980813
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: