flextures 1.0.6 → 1.0.8

data/VERSION

@@ -1,2 +1,2 @@
-1.0.6
+1.0.8
 

data/flextures.gemspec

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

data/lib/flextures/flextures.rb

@@ -13,9 +13,17 @@ module Flextures
 
   # テーブルモデルの作成
   def self.create_model table_name
-    klass = Class.new ActiveRecord::Base
-    klass.table_name=table_name
-    klass
+    a = proc {
+      begin
+        table_name.singularize.camelize.constantize
+      rescue => e
+        nil
+      end
+    }
+    b = proc { 
+      Class.new(ActiveRecord::Base){ |o| o.table_name=table_name }
+    }
+    a.call || b.call
   end
 
   # 設定ファイルが存在すればロード
@@ -175,16 +183,14 @@ module Flextures
       inpfile = "#{dir_name}#{file_name}.csv"
       klass = PARENT::create_model table_name
       attributes = klass.columns.map &:name
-      filter = create_filter klass.columns, Factory[table_name]
+      filter = create_filter klass, Factory[table_name]
       klass.delete_all
       CSV.open( inpfile ) do |csv|
         keys = csv.shift # keyの設定
         warning "CSV", attributes, keys
         csv.each do |values|
           h = values.extend(Extensions::Array).to_hash(keys)
-          h = filter.call h
-          o = klass.new 
-          h.each{ |k,v| o[k]=v }
+          o = filter.call h
           o.save
         end
       end
@@ -198,13 +204,11 @@ module Flextures
       inpfile = "#{dir_name}#{file_name}.yml"
       klass = PARENT::create_model table_name
       attributes = klass.columns.map &:name
-      filter = create_filter klass.columns, Factory[table_name]
+      filter = create_filter klass, Factory[table_name]
       klass.delete_all
       YAML.load(File.open(inpfile)).each do |k,h|
         warning "YAML", attributes, h.keys
-        h = filter.call h
-        o = klass.new 
-        h.each{ |k,v| o[k]=v }
+        o = filter.call h
         o.save
       end
     end
@@ -216,7 +220,8 @@ module Flextures
     end
 
     # フィクスチャから取り出した値を、加工して欲しいデータにするフィルタを作成して返す
-    def self.create_filter columns, factory=nil
+    def self.create_filter klass, factory=nil
+      columns = klass.columns
       # テーブルからカラム情報を取り出し
       column_hash = {}
       columns.each { |col| column_hash[col.name] = col }
@@ -225,17 +230,17 @@ module Flextures
       not_nullable_columns = columns.select { |c| !c.null }.map &:name
       # ハッシュを受け取って、必要な値に加工してからハッシュで返すラムダを返す
       return->(h){
-        h.select! { |k,v| column_hash[k] } # テーブルに存在しないキーが定義されているときは削除
+        # テーブルに存在しないキーが定義されているときは削除
+        h.select! { |k,v| column_hash[k] }
+        o = klass.new 
         # 値が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) }
+        h.each{ |k,v| nil==v || o[k] = TRANSLATER[column_hash[k].type].call(v) }
+        not_nullable_columns.each{ |k| o[k]==nil && o[k] = TRANSLATER[column_hash[k].type].call(k) }
         # FactoryFilterを動作させる
-        st = OpenStruct.new(h)
-        factory.call(st) if factory
-        h = st.to_hash
+        factory.call(o) if factory
         # 値がnilの列にデフォルト値を補間
-        lack_columns.each { |k| nil==h[k] && h[k] = COMPLETER[column_hash[k].type].call }
-        h
+        lack_columns.each { |k| nil==o[k] && o[k] = COMPLETER[column_hash[k].type].call }
+        o
       }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000 +09:00
+date: 2012-01-26 00:00:00.000000000 +09:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &77415060 !ruby/object:Gem::Requirement
+  requirement: &80302920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77415060
+  version_requirements: *80302920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &77414810 !ruby/object:Gem::Requirement
+  requirement: &80302680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *77414810
+  version_requirements: *80302680
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &77414570 !ruby/object:Gem::Requirement
+  requirement: &80302410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *77414570
+  version_requirements: *80302410
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &77414320 !ruby/object:Gem::Requirement
+  requirement: &80302150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77414320
+  version_requirements: *80302150
 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: 259543443
+      hash: -723323507
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: