Permalink
Browse files

無視テーブル設定追加

  • Loading branch information...
1 parent 3ce29ce commit 654c634b5b1d8cdabaf7225bbb8b0e2881431698 @baban committed May 12, 2012
Showing with 7 additions and 3 deletions.
  1. +3 −3 lib/flextures/flextures_command.rb
  2. +4 −0 lib/flextures/flextures_loader.rb
@@ -37,24 +37,24 @@ def self.ymldump
end
def self.load
- table_names = Flextures::ARGS.parse
Flextures::init_load
+ table_names = Flextures::ARGS.parse
Flextures::init_tables unless ENV["T"] or ENV["TABLE"] or ENV["M"] or ENV["MODEL"] or ENV["F"] or ENV["FIXTUES"]
puts "loading..."
table_names.map { |fmt| Flextures::Loader::load(fmt) }
end
def self.csvload
- table_names = Flextures::ARGS.parse
Flextures::init_load
+ table_names = Flextures::ARGS.parse
Flextures::init_tables unless ENV["T"] or ENV["TABLE"] or ENV["M"] or ENV["MODEL"] or ENV["F"] or ENV["FIXTUES"]
puts "loading..."
table_names.map { |fmt| Flextures::Loader::csv(fmt) }
end
def self.ymlload
- table_names = Flextures::ARGS::parse
Flextures::init_load
+ table_names = Flextures::ARGS::parse
Flextures::init_tables unless ENV["T"] or ENV["TABLE"] or ENV["M"] or ENV["MODEL"] or ENV["F"] or ENV["FIXTUES"]
puts "loading..."
table_names.map { |fmt| Flextures::Loader::yml(fmt) }
@@ -62,10 +62,14 @@ module Loader
},
string:->(d){
return d if d.nil?
+ return d.to_yaml if d.is_a?(Hash)
+ return d.to_yaml if d.is_a?(Array)
d.to_s
},
text:->(d){
return d if d.nil?
+ return d.to_yaml if d.is_a?(Hash)
+ return d.to_yaml if d.is_a?(Array)
d.to_s
},
time:->(d){

0 comments on commit 654c634

Please sign in to comment.