flextures 1.9.13 → 1.9.14

data/VERSION

@@ -1 +1 @@
-1.9.13
+1.9.14

data/flextures.gemspec

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

data/lib/flextures/flextures_dumper.rb

@@ -3,117 +3,141 @@
 module Flextures
   # データを吐き出す処理をまとめる
   module Dumper
+    # procに機能追加、関数合成のためのメソッドを追加する
+    class Proc < ::Proc
+      def *(other)
+        if self.lambda? and other.lambda?
+          lambda {|*x| other.call(self.call(*x)) }
+        elsif not self.lambda? and not other.lambda?
+          Proc.new {|*x| other.call(self.call(*x)) }
+        else
+          raise ArgumentError, "lambda/Proc type mismatch"
+        end
+      end
+    end
+
+    def self.proc(&b)
+      Proc.new(b)
+    end
+    
+    def self.translate_creater( val, rules )
+      rule_map ={ 
+        nullstr: proc { |d|
+          return "null" if d.nil?
+          d
+        },
+        null: proc { |d|
+          return nil if d.nil?
+          d
+        },
+        blankstr: proc { |d|
+          return "null" if d==""
+          d
+        },
+        false2nullstr: proc { |d|
+          return "null" if d==false
+          d
+        },
+        blank2num: proc { |d|
+          return 0 if d==""
+          d
+        },
+        bool2num: proc { |d|
+          return 0 if d==false
+          return 1 if d==true
+          d
+        },
+        ymlspecialstr: proc { |s|
+          if s.kind_of?(String)
+            s = s.gsub(/\t/,"  ")                  if s["\t"]
+            s = s.sub(/ +/, "")                    if s[0]==' '
+            is_nl = false
+            is_nl |= s["\n"]
+            is_nl |= ["[","]","{","}","|","#","@","~","!","'","$","&","^","<",">","?","-","+","=",";",":",".",",","*","`","(",")"].member? s[0]
+            s = s.gsub(/\r\n/,"\n").gsub(/\r/,"\n") # 改行方法統一
+            s = "|-\n    " + s.gsub(/\n/,"\n    ") if is_nl
+          end
+          s
+        },
+        ymlnulltime: proc { |d|
+          return "null" if d.nil?
+          return "null" if d==""
+          return "null" if d==false
+          d
+        },
+      }
+      pr = rules.inject(proc{ |d| d }) { |sum,i| sum * (rule_map[i] || i)  }
+      pr.call(val)
+    end
+
     PARENT = Flextures
 
     TRANSLATER = {
       binary:->( d, format ){
-        if format == :yml
-          return "null" if d.nil?
-        end
-        return nil if d.nil?
-        Base64.encode64(d)
+        procs = (format == :yml)?
+          [:nullstr, :null, proc { |d| Base64.encode64(d) } ] :
+          [:null, proc { |d| Base64.encode64(d) } ]
+        self.translate_creater d, procs
       },
       boolean:->( d, format ){
-        if format == :yml
-          return "null" if d.nil?
-        end
-        (0==d || ""==d || !d) ? false : true
+        procs = (format == :yml) ?
+          [ :nullstr, proc { !(0==d || ""==d || !d) } ] :
+          [ proc { !(0==d || ""==d || !d) } ]
+        self.translate_creater d, procs
       },
       date:->( d, format ){
-        if format == :yml
-          return "null" if d.nil?
-          return "null" if d==""
-          return "null" if d==false
-        end
-        d.to_s
+        procs = (format == :yml) ?
+          [:nullstr, :blankstr, :false2nullstr, proc { |d| d.to_s }] :
+          [proc { |d| d.to_s }]
+        self.translate_creater d, procs
       },
       datetime:->( d, format ){
-        if format == :yml
-          return "null" if d.nil?
-          return "null" if d==""
-          return "null" if d==false
-        end
-        d.to_s
+        procs = (format == :yml) ?
+          [:nullstr, :blankstr, :false2nullstr, proc { |d| d.to_s }] :
+          [proc { |d| d.to_s }]
+        self.translate_creater d, procs
       },
       decimal:->( d, format ){
-        if format == :yml
-          return "null" if d.nil?
-        end
-        return 0 if d==""
-        return 0 if d==false
-        d.to_i
+        procs = (format == :yml) ?
+          [:nullstr, :blank2num, :bool2num, proc { |d| d.to_i } ] : 
+          [:blank2num, :bool2num, proc { |d| d.to_i } ]
+        self.translate_creater d, procs
       },
       float:->(d, format){
-        if format == :yml
-          return "null" if d.nil?
-        end
-        return 0 if d==""
-        return 0 if d==false
-        d.to_f
+        procs = (format == :yml) ?
+          [:nullstr, :blank2num, :bool2num, proc { |d| d.to_f } ] : 
+          [:blank2num, :bool2num, proc { |d| d.to_f } ]
+        self.translate_creater d, procs
       },
       integer:->( d, format){
-        if format == :yml
-          return "null" if d.nil?
-        end
-        return 0 if d==""
-        return 0 if d==false
-        d.to_i
+        procs = (format == :yml) ?
+          [:nullstr, :blank2num, :bool2num, proc { |d| d.to_i } ] : 
+          [:blank2num, :bool2num, proc { |d| d.to_i } ]
+        self.translate_creater d, procs
       },
-      string:->( s, format ){
-        if format == :yml
-          return "null"                            if s.nil?
-          if s.kind_of?(String)
-            s = s.gsub(/\t/,"  ")                  if s["\t"]
-            s = s.sub(/ +/, "")                    if s[0]==' '
-            is_nl = false
-            is_nl |= s["\n"]
-            is_nl |= ["[","]","{","}","|","#","@","~","!","'","$","&","^","<",">","?","-","+","=",";",":",".",",","*","`","(",")"].member? s[0]
-            s = s.gsub(/\r\n/,"\n").gsub(/\r/,"\n") # 改行方法統一
-            s = "|-\n    " + s.gsub(/\n/,"\n    ") if is_nl
-          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
+      string:->( d, format ){
+        procs = (format == :yml) ?
+          [:nullstr, :ymlspecialstr] :
+          [:null, proc{ |s| s.to_s.gsub(/\r\n/,"\n").gsub(/\r/,"\n") } ]
+        self.translate_creater d, procs
       },
-      text:->( s, format ){
-        if format == :yml
-          return "null"                            if s.nil?
-          if s.kind_of?(String)
-            s = s.gsub(/\t/,"  ")                  if s["\t"]
-            s = s.sub(/ +/, "")                    if s[0]==' '
-            is_nl = false
-            is_nl |= s["\n"]
-            is_nl |= ["[","]","{","}","|","#","@","~","!","'","$","&","^","<",">","?","-","+","=",";",":",".",",","*","`","(",")"].member? s[0]
-            s = s.gsub(/\r\n/,"\n").gsub(/\r/,"\n") # 改行方法統一
-            s = "|-\n    " + s.gsub(/\n/,"\n    ") if is_nl
-          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
+      text:->( d, format ){
+        procs = (format == :yml) ?
+          [:nullstr, :ymlspecialstr] :
+          [:null, proc{ |s| s.to_s.gsub(/\r\n/,"\n").gsub(/\r/,"\n") } ]
+        self.translate_creater d, procs
       },
       time:->( d, format ){
-        if format == :yml
-          return "null" if d.nil?
-          return "null" if d==""
-          return "null" if d==false
-        end
-        d.to_s
+        procs = (format == :yml) ?
+          [:ymlnulltime, proc { |d| d.to_s }] :
+          [proc { |d| d.to_s }]
+        self.translate_creater d, procs
       },
       timestamp:->( d, format ){
-        if format == :yml
-          return "null" if d.nil?
-          return "null" if d==""
-          return "null" if d==false
-        end
-        d.to_s
+        procs = (format == :yml) ?
+          [:ymlnulltime, proc { |d| d.to_s }] :
+          [proc { |d| d.to_s }]
+        self.translate_creater d, procs
       },
     }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 1.9.13
+  version: 1.9.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -806754019
+      hash: -317783267
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: