flextures 0.9.1 → 0.9.4

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.4

data/flextures.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flextures}
-  s.version = "0.9.1"
+  s.version = "0.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["baban"]
-  s.date = %q{2011-11-06}
+  s.date = %q{2011-11-07}
   s.description = %q{load and dump fixtures}
   s.email = %q{babanba.n@gmail.com}
   s.extra_rdoc_files = [

data/lib/flextures/flextures.rake

@@ -1,44 +1,37 @@
 # encoding: utf-8
 
-require 'ostruct'
-require 'csv'
-
-require 'flextures/flextures_base_config'
 require 'flextures/flextures'
-require 'flextures/flextures_extension_modules'
-require 'flextures/flextures_factory'
-#require 'flextures/rspec_flextures_support'
 
 namespace :db do
   namespace :flextures do
-    desc "Dump data to the test/fixtures/ directory. Use TABLE=table_name"
+    desc "Dump data to csv format"
     task :dump => :environment do
       Flextures::ARGS.parse.each { |fmt| Flextures::Dumper::csv(fmt) }
     end
 
-    desc "Dump data to the test/fixtures/ directory. Use TABLE=table_name"
+    desc "Dump data to prefer csv format"
     task :csvdump => :environment do
-      #Flextures::ARGS.parse.each { |fmt| Flextures::Dumper::csv(fmt) }
+      Flextures::ARGS.parse.each { |fmt| Flextures::Dumper::csv(fmt) }
     end
 
-    desc "Dump data to the test/fixtures/ directory. Use TABLE=table_name"
+    desc "Dump data to yaml format"
     task :ymldump => :environment do
-      #Flextures::ARGS.parse.each { |fmt| Flextures::Dumper::yml(fmt) }
+      Flextures::ARGS.parse.each { |fmt| Flextures::Dumper::yml(fmt) }
     end
 
-    desc "Dump data to the test/fixtures/ directory. Use TABLE=table_name"
+    desc "load fixture data csv format"
     task :load => :environment do
-      #Flextures::ARGS.parse.each { |fmt| Flextures::Loader::load(fmt) }
+      Flextures::ARGS.parse.each { |fmt| Flextures::Loader::load(fmt) }
     end
 
-    desc "Dump data to the test/fixtures/ directory. Use TABLE=table_name"
+    desc "load fixture data only csv format files"
     task :csvload => :environment do
-      #Flextures::ARGS.parse.each { |fmt| Flextures::Loader::csv(fmt) }
+      Flextures::ARGS.parse.each { |fmt| Flextures::Loader::csv(fmt) }
     end
 
-    desc "Dump data to the test/fixtures/ directory. Use TABLE=table_name"
+    desc "load fixture files only yaml format"
     task :ymlload => :environment do
-      #Flextures::ARGS::parse.each { |fmt| Flextures::Loader::yml(fmt) }
+      Flextures::ARGS::parse.each { |fmt| Flextures::Loader::yml(fmt) }
     end
   end
 end

data/lib/flextures/flextures.rb

@@ -6,9 +6,6 @@ require 'csv'
 require 'flextures/flextures_base_config'
 require 'flextures/flextures_extension_modules'
 require 'flextures/flextures_factory'
-require 'flextures/rspec_flextures_support.rb' if defined?(RSpec)
-load    "#{Rails.root.to_path}/config/flextures.config.rb"  if defined?(Rails) and Rails.root
-load    "#{Rails.root.to_path}/config/flextures.factory.rb" if defined?(Rails) and Rails.root
 
 module Flextures
   LOAD_DIR = Config.fixture_load_directory
@@ -16,8 +13,11 @@ module Flextures
 
   # 引数解析
   module ARGS
-    # 書き出し・読み込み すべきファイルとオプションを書きだす
+    # 書き出し 、読み込み すべきファイルとオプションを書きだす
     def self.parse option={}
+      load "#{Rails.root.to_path}/config/flextures.config.rb"  if defined?(Rails) and Rails.root
+      load "#{Rails.root.to_path}/config/flextures.factory.rb" if defined?(Rails) and Rails.root
+      
       table_names = ""
       table_names = ENV["TABLE"].split(",") if ENV["TABLE"]
       table_names = ENV["T"].split(",") if ENV["T"]
@@ -86,10 +86,10 @@ module Flextures
 
       File.open(outfile,"w") do |f|
         klass.all.each_with_index do |row,idx| 
-          f<< "#{table_name}_#{idx}:¥n" +
+          f<< "#{table_name}_#{idx}:\n" +
             attributes.map { |column|
               v = trans row.send(column)
-              "  #{column}: #{v}¥n"
+              "  #{column}: #{v}\n"
             }.join
         end
       end
@@ -113,6 +113,7 @@ module Flextures
       time:->{ DateTime.now },
       timestamp:->{ DateTime.now },
     }
+    
     # 型の変換を行う
     TRANSLATER = {
       binary:->(d){ d.to_i },
@@ -159,7 +160,6 @@ module Flextures
       klass = PARENT::create_model table_name
       attributes = klass.columns.map &:name
       filter = create_filter klass.columns, Factory[table_name]
-      #filter2 = create_filter2 klass.columns, Factory[table_name]
       klass.delete_all
       CSV.open( inpfile ) do |csv|
         keys = csv.shift # keyの設定
@@ -189,8 +189,8 @@ module Flextures
     
     # 欠けたカラムを検知してメッセージを出しておく
     def self.warning format, attributes, keys
-      (attributes-keys).each { |name| print "Warning: #{format} colum is missing! [#{name}]¥n" }
-      (keys-attributes).each { |name| print "Warning: #{format} colum is left over! [#{name}]¥n" }
+      (attributes-keys).each { |name| print "Warning: #{format} colum is missing! [#{name}]\n" }
+      (keys-attributes).each { |name| print "Warning: #{format} colum is left over! [#{name}]\n" }
     end
 
     # フィクスチャから取り出した値を、加工して欲しいデータにするフィルタを作成して返す
@@ -200,7 +200,7 @@ module Flextures
       columns.each { |col| column_hash[col.name] = col }
       # 自動補完が必要なはずのカラム
       lack_columns = columns.select { |c| !c.null and !c.default }.map &:name
-      # ハッシュを受け取って、必要な値に加工してからハッシュで返す
+      # ハッシュを受け取って、必要な値に加工してからハッシュで返すラムダを返す
       return->(h){
         h.select! { |k,v| column_hash[k] } # テーブルに存在しないキーが定義されているときは削除
         # 値がnilでないなら型をDBで適切なものに変更

data/lib/flextures/flextures_extension_modules.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 require 'ostruct'
-require 'csv'
 
 module Flextures
   # Plug-in 内部拡張
@@ -9,11 +8,11 @@ module Flextures
     # hashに変化させる
     def to_hash
       h={}
-      (self.methods - OpenStruct.new.methods)
-        .select{ |name| name.match(/¥w+=/) }
+      (self.methods - ::OpenStruct.new.methods)
+        .select{ |name| name.to_s.match(/\w+=/) }
         .map{ |name| name.to_s.gsub(/=/,'').to_sym }
         .each{ |k| h[k]=self.send(k) }
-        h
+      h
     end
   end
 

data/lib/flextures/flextures_factory.rb

@@ -1,13 +1,5 @@
 # encoding: utf-8
 
-require 'ostruct'
-require 'csv'
-
-require 'flextures/flextures_base_config'
-require 'flextures/flextures_extension_modules'
-require 'flextures/flextures'
-require 'flextures/flextures_factory'
-
 module Flextures
   # ロードするデータを必要に応じて加工する
   class Factory

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-06 00:00:00.000000000 +09:00
+date: 2011-11-07 00:00:00.000000000 +09:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &87123700 !ruby/object:Gem::Requirement
+  requirement: &80353760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87123700
+  version_requirements: *80353760
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &87123460 !ruby/object:Gem::Requirement
+  requirement: &80353520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *87123460
+  version_requirements: *80353520
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &87123220 !ruby/object:Gem::Requirement
+  requirement: &80353280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *87123220
+  version_requirements: *80353280
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &87122980 !ruby/object:Gem::Requirement
+  requirement: &80353040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87122980
+  version_requirements: *80353040
 description: load and dump fixtures
 email: babanba.n@gmail.com
 executables: []
@@ -100,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -599778417
+      hash: -410806225
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: