flextures 1.0.2 → 1.0.3

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/flextures.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flextures}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["baban"]

data/lib/flextures/flextures.rb

@@ -17,7 +17,8 @@ module Flextures
     klass.table_name=table_name
     klass
   end
-  
+
+  # 設定ファイルが存在すればロード
   def self.init_load
     if defined?(Rails) and Rails.root
       [
@@ -40,8 +41,8 @@ module Flextures
       table_names = ActiveRecord::Base.connection.tables if ""==table_names
       table_names = table_names.map{ |name| { table: name } }
       table_names = table_names.map{ |option| option.merge dir: ENV["DIR"] } if ENV["DIR"]
-      table_names.first[:file] = ENV["FIXTURES"] if ENV["FIXTURES"] # ファイル名は最初のものしか指定できない
-      table_names.first[:file] = ENV["F"] if ENV["F"]
+      table_names = ENV["FIXTURES"].split(',').map{ |name| { table: name }  } if ENV["FIXTURES"] 
+      table_names = ENV["F"].split(',').map{ |name| { table: name } } if ENV["F"]
       # read mode だとcsvもyaml存在しないファイルは返さない
       table_names.select! &exist if option[:mode] && option[:mode].to_sym == :read 
       table_names
@@ -98,7 +99,7 @@ module Flextures
             attributes.map { |column|
               v = trans row.send(column)
               "  #{column}: #{v}\n"
-            }.join
+            }.*
         end
       end
     end
@@ -175,7 +176,11 @@ module Flextures
         keys = csv.shift # keyの設定
         warning "CSV", attributes, keys
         csv.each do |values|
-          klass.create filter.call values.extend(Extensions::Array).to_hash(keys)
+          h = values.extend(Extensions::Array).to_hash(keys)
+          o = klass.new filter.call h
+          # idだけ特別扱いで保存
+          o.id = h["id"] if o.respond_to?(:id)
+          o.save
         end
       end
     end
@@ -193,7 +198,9 @@ module Flextures
       klass.delete_all
       YAML.load(File.open(inpfile)).each do |k,h|
         warning "YAML", attributes, h.keys
-        klass.create filter.call h
+        o = klass.new filter.call h
+        o.id = h["id"] if o.respond_to?(:id)
+        o.save
       end
     end
     
@@ -210,11 +217,13 @@ module Flextures
       columns.each { |col| column_hash[col.name] = col }
       # 自動補完が必要なはずのカラム
       lack_columns = columns.select { |c| !c.null and !c.default }.map &:name
+      not_nullable_columns = columns.select { |c| !c.null }.map &:name
       # ハッシュを受け取って、必要な値に加工してからハッシュで返すラムダを返す
       return->(h){
         h.select! { |k,v| column_hash[k] } # テーブルに存在しないキーが定義されているときは削除
         # 値がnilでないなら型をDBで適切なものに変更
         h.each{ |k,v| nil==v || h[k] = TRANSLATER[column_hash[k].type].call(v) }
+        not_nullable_columns.each{ |k| h[k]==nil && h[k] = TRANSLATER[column_hash[k].type].call(k) }
         # FactoryFilterを動作させる
         st = OpenStruct.new(h)
         factory.call(st) if factory

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &90300620 !ruby/object:Gem::Requirement
+  requirement: &78827590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *90300620
+  version_requirements: *78827590
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &90299730 !ruby/object:Gem::Requirement
+  requirement: &78827320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *90299730
+  version_requirements: *78827320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &90298880 !ruby/object:Gem::Requirement
+  requirement: &78827080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *90298880
+  version_requirements: *78827080
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &90298600 !ruby/object:Gem::Requirement
+  requirement: &78826840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *90298600
+  version_requirements: *78826840
 description: load and dump fixtures
 email: babanba.n@gmail.com
 executables: []
@@ -101,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 440737501
+      hash: 250641213
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: