flextures 3.0.1 → 3.1.0

data/Rakefile

@@ -1,57 +1 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "flextures"
-  gem.homepage = "http://github.com/baban/flextures"
-  gem.license = "MIT"
-  gem.summary = %Q{load and dump fixtures}
-  gem.description = %Q{load and dump fixtures}
-  gem.email = "babanba.n@gmail.com"
-  gem.authors = ["baban"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-=begin
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
-=end
-
-task :default => :test
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "flextures #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.options = ["--charset", "utf-8", "--line-numbers"] 
-end
-
+require "bundler/gem_tasks"

data/flextures.gemspec

@@ -1,75 +1,23 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'flextures/version'
 
-Gem::Specification.new do |s|
-  s.name = "flextures"
-  s.version = "3.0.1"
+Gem::Specification.new do |spec|
+  spec.name          = "flextures"
+  spec.version       = Flextures::VERSION
+  spec.authors       = ["baban"]
+  spec.email         = ["babanba.n@gmail.com"]
+  spec.summary       = %q{load and dump fixtures.}
+  spec.description   = %q{load and dump fixtures.}
+  spec.homepage      = "http://github.com/baban/flextures"
+  spec.license       = "MIT"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["baban"]
-  s.date = "2013-06-27"
-  s.description = "load and dump fixtures"
-  s.email = "babanba.n@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.ja.rdoc",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "CHANGELOG",
-    "Gemfile",
-    "Gemfile.lock",
-    "History.txt",
-    "LICENSE.txt",
-    "README.ja.rdoc",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "flextures.gemspec",
-    "lib/flextures.rb",
-    "lib/flextures/flextures.rake",
-    "lib/flextures/flextures.rb",
-    "lib/flextures/flextures_base_config.rb",
-    "lib/flextures/flextures_command.rb",
-    "lib/flextures/flextures_dumper.rb",
-    "lib/flextures/flextures_extension_modules.rb",
-    "lib/flextures/flextures_factory.rb",
-    "lib/flextures/flextures_loader.rb",
-    "lib/flextures/flextures_railtie.rb",
-    "lib/flextures/rspec_flextures_support.rb",
-    "lib/flextures/testunit_flextures_support.rb",
-    "lib/flextures/version.rb",
-    "test/test_helper.rb",
-    "test/unit/test_flextures.rb",
-    "test/unit/test_flextures_args.rb",
-    "test/unit/test_flextures_dumper.rb",
-    "test/unit/test_flextures_extention_modules.rb",
-    "test/unit/test_flextures_hooks.rb",
-    "test/unit/test_flextures_loader.rb",
-    "test/unit/test_simple.rb"
-  ]
-  s.homepage = "http://github.com/baban/flextures"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "load and dump fixtures"
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bundler>, ["= 1.3.5"])
-      s.add_development_dependency(%q<jeweler>, ["= 1.8.3"])
-    else
-      s.add_dependency(%q<bundler>, ["= 1.3.5"])
-      s.add_dependency(%q<jeweler>, ["= 1.8.3"])
-    end
-  else
-    s.add_dependency(%q<bundler>, ["= 1.3.5"])
-    s.add_dependency(%q<jeweler>, ["= 1.8.3"])
-  end
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake"
 end
-

data/lib/flextures/flextures.rb

@@ -2,16 +2,15 @@
 
 require 'ostruct'
 require 'csv'
-
 require "flextures/flextures_base_config"
 require "flextures/flextures_extension_modules"
 require "flextures/flextures_factory"
 
 module Flextures
-  # ActiveRecord Model is created that guess by table_name
+  # guessing ActiveRecord Model name by table_name and create
   # @params [String|Symbol] table_name
   # @params [ActiveRecord::Base] model class
-  def self.create_model table_name
+  def self.create_model( table_name )
     # when Model is defined in FactoryFilter
     a = ->{
       f = Factory::FACTORIES[table_name.to_sym]
@@ -26,7 +25,7 @@ module Flextures
       end
     }
     # when cannot guess Model name
-    c = ->{ 
+    c = ->{
       Class.new(ActiveRecord::Base){ |o| o.table_name=table_name }
     }
     a.call || b.call || c.call
@@ -36,16 +35,16 @@ module Flextures
   def self.init_load
     if defined?(Rails) and Rails.root
       [
-        "#{Rails.root.to_path}/config/flextures.config.rb",
-        "#{Rails.root.to_path}/config/flextures.factory.rb",
-      ].each { |fn| load(fn) if File.exist?(fn) }
+        File.join( Rails.root.to_path,"/config/flextures.config.rb" ),
+        File.join( Rails.root.to_path,"/config/flextures.factory.rb" ),
+      ].each { |fn| File.exist?(fn) && load(fn) }
     end
   end
 
   # @return [Array] flextures useable table names
   def self.deletable_tables
     tables = ActiveRecord::Base.connection.tables
-    Flextures::Config.ignore_tables.each { |name| tables.delete name }
+    Flextures::Config.ignore_tables.each { |name| tables.delete( name.to_s ) }
     tables
   end
 
@@ -61,7 +60,7 @@ module Flextures
     end
   end
 
-  def self.delete_tables *tables
+  def self.delete_tables( *tables )
     tables.each do |name|
       # if 'name' variable is 'database view', raise error
       begin
@@ -73,7 +72,7 @@ module Flextures
 
   # It is debug method to use like 'tab' method
   # @params [Proc] dumper write dump information
-  def self.table_tap &dumper
+  def self.table_tap( &dumper )
     tables = Flextures::deletable_tables
     tables.each do |name|
       # if 'name' variable is 'database view', raise error
@@ -85,10 +84,10 @@ module Flextures
     end
   end
 
-  # parse arguments functions
+  # parse arguments functions.
   module ARGS
     # parse rake ENV parameters
-    def self.parse option={}
+    def self.parse( option={} )
       table_names = []
       if v = (ENV["T"] or ENV["TABLE"])
         table_names = v.split(',').map{ |name| { table: name, file: name } }
@@ -111,24 +110,24 @@ module Flextures
           names.map{ |name| { table: name, file: name } }
         end
       }
-      # parse filename define parameters
+      # parse filename and define parameters.
       table_names = fixtures_args_parser.call ENV["FIXTURES"] if ENV["FIXTURES"]
       table_names = fixtures_args_parser.call ENV["FILE"]     if ENV["FILE"]
       table_names = fixtures_args_parser.call ENV["F"]        if ENV["F"]
 
-      table_names = table_names.map{ |option| option.merge dir: ENV["DIR"] } if ENV["DIR"]
-      table_names = table_names.map{ |option| option.merge dir: ENV["D"]   } if ENV["D"]
+      table_names = table_names.map{ |option| option.merge( dir: ENV["DIR"] ) } if ENV["DIR"]
+      table_names = table_names.map{ |option| option.merge( dir: ENV["D"] )   } if ENV["D"]
 
-      table_names = table_names.map{ |option| option.merge minus: ENV["MINUS"].to_s.split(",") } if ENV["MINUS"]
-      table_names = table_names.map{ |option| option.merge plus:  ENV["PLUS"].to_s.split(",")  } if ENV["PLUS"]
+      table_names = table_names.map{ |option| option.merge( minus: ENV["MINUS"].to_s.split(",") ) } if ENV["MINUS"]
+      table_names = table_names.map{ |option| option.merge( plus:  ENV["PLUS"].to_s.split(",") )  } if ENV["PLUS"]
 
-      table_names = table_names.map{ |option| option.merge silent: true }   if ENV["OPTION"].to_s.split(",").include?("silent")
-      table_names = table_names.map{ |option| option.merge unfilter: true } if ENV["OPTION"].to_s.split(",").include?("unfilter")
-      table_names = table_names.map{ |option| option.merge strict: true }   if ENV["OPTION"].to_s.split(",").include?("strict")
-      table_names = table_names.map{ |option| option.merge stair: true }    if ENV["OPTION"].to_s.split(",").include?("stair")
+      table_names = table_names.map{ |option| option.merge( silent: true ) }   if ENV["OPTION"].to_s.split(",").include?("silent")
+      table_names = table_names.map{ |option| option.merge( unfilter: true ) } if ENV["OPTION"].to_s.split(",").include?("unfilter")
+      table_names = table_names.map{ |option| option.merge( strict: true ) }   if ENV["OPTION"].to_s.split(",").include?("strict")
+      table_names = table_names.map{ |option| option.merge( stair: true ) }    if ENV["OPTION"].to_s.split(",").include?("stair")
 
-      # if mode is 'read mode' and file is not exist value is not return
-      table_names.select! &exist if option[:mode] && option[:mode] == 'read'
+      # if mode is 'read mode' and file is not exist, value is not return.
+      table_names.select!(&exist) if option[:mode] && option[:mode] == 'read'
       table_names
     end
 
@@ -139,4 +138,3 @@ module Flextures
     end
   end
 end
-

data/lib/flextures/flextures_base_config.rb

@@ -14,6 +14,7 @@ module Flextures
   module Config
     @@read_onlys=[]
     @@configs={
+      use_transactional_fixtures: nil, # override activerecord base "use_transactional_fixtures" option if you  set value boolean value
       ignore_tables: ["schema_migrations"], # 'ignore_tables' table data is not deleted by flextures delete_all method
       fixture_load_directory: "spec/fixtures/", # base load directory
       fixture_dump_directory: "spec/fixtures/", # dump load directory
@@ -30,5 +31,3 @@ module Flextures
     end
   end
 end
-
-

data/lib/flextures/flextures_command.rb

@@ -60,4 +60,3 @@ module Flextures
     end
   end
 end
-

data/lib/flextures/flextures_dumper.rb

@@ -65,7 +65,7 @@ module Flextures
             s = s.sub(/ +/, "")   if s[0]==' '
             is_nl = false
             is_nl |= s["\n"]
-            is_nl |= ["[","]","{","}","|","#","@","~","!","'","$","&","^","<",">","?","-","+","=",";",":",".",",","*","`","(",")"].member? s[0]
+            is_nl |= ["[","]","{","}","|","#","@","~","!","'","$","&","^","<",">","?","-","+","=",";",":",".",",","*","`","(",")"].member?(s[0])
             s = s.gsub(/\r\n/,"\n").gsub(/\r/,"\n") # 改行方法統一
             s = "|-\n    " + s.gsub(/\n/,"\n    ") if is_nl
           end
@@ -76,7 +76,7 @@ module Flextures
           d
         },
       }
-      procs = rules.inject(proc{ |d| d }) { |sum,i| sum * (rule_map[i] || i)  }
+      procs = rules.reduce(proc{ |d| d }) { |sum,i| sum * (rule_map[i] || i) }
       procs.call(val)
     end
 
@@ -86,13 +86,13 @@ module Flextures
         procs = (format == :yml)?
           [:nullstr, :null, proc { |d| Base64.encode64(d) } ] :
           [:null, proc { |d| Base64.encode64(d) } ]
-        self.translate_creater d, procs
+        self.translate_creater( d, procs )
       },
       boolean:->( d, format ){
         procs = (format == :yml) ?
           [ :nullstr, proc { !(0==d || ""==d || !d) } ] :
           [ proc { !(0==d || ""==d || !d) } ]
-        self.translate_creater d, procs
+        self.translate_creater( d, procs )
       },
       date:->( d, format ){
         procs = (format == :yml) ?
@@ -108,19 +108,19 @@ module Flextures
       },
       decimal:->( d, format ){
         procs = (format == :yml) ?
-          [:nullstr, :blank2num, :bool2num, proc { |d| d.to_f } ] : 
+          [:nullstr, :blank2num, :bool2num, proc { |d| d.to_f } ] :
           [:null2blankstr, :bool2num, proc { |d| d.to_f } ]
         self.translate_creater d, procs
       },
       float:->(d, format){
         procs = (format == :yml) ?
-          [:nullstr, :blank2num, :bool2num, proc { |d| d.to_f } ] : 
+          [:nullstr, :blank2num, :bool2num, proc { |d| d.to_f } ] :
           [:null2blankstr, :bool2num, proc { |d| d.to_f } ]
         self.translate_creater d, procs
       },
       integer:->( d, format ){
         procs = (format == :yml) ?
-          [:nullstr, :blank2num, :bool2num, proc { |d| d.to_i } ] : 
+          [:nullstr, :blank2num, :bool2num, proc { |d| d.to_i } ] :
           [:null2blankstr, :bool2num, proc { |d| d.to_i } ]
         self.translate_creater d, procs
       },
@@ -169,7 +169,7 @@ module Flextures
     # @params klass dump table Model
     # @params [Hash] options dump options
     # @return [Array] columns format information
-    def self.dump_attributes klass, options
+    def self.dump_attributes( klass, options )
       columns = klass.columns.map { |column| { name: column.name, type: column.type } }
       # option[:minus] colum is delete columns
       columns.reject! { |column| options[:minus].include?(column[:name]) } if options[:minus]
@@ -185,7 +185,7 @@ module Flextures
     # @params [Hash] options options
     # @params [Symbol] type format type (:yml or :csv)
     # @return [Proc] filter function
-    def self.create_filter attr_type, format, type
+    def self.create_filter( attr_type, format, type )
       filter = DumpFilter[format[:table].to_s.to_sym] || {}
       ->(row) {
         attr_type.map do |h|
@@ -198,7 +198,7 @@ module Flextures
     # data dump to csv format
     # @params [Hash] format file format data
     # @params [Hash] options dump format options
-    def self.csv format
+    def self.csv( format )
       klass = PARENT.create_model(format[:table])
       attr_type = self.dump_attributes klass, format
       filter = self.create_filter attr_type, format, :csv
@@ -206,7 +206,7 @@ module Flextures
     end
 
     # dump csv format data
-    def self.dump_csv klass, attr_type, values_filter, format
+    def self.dump_csv( klass, attr_type, values_filter, format )
       # TODO: 拡張子は指定してもしなくても良いようにする
       file_name = format[:file] || format[:table]
       dir_name = File.join( Flextures::Config.fixture_dump_directory, format[:dir].to_s )
@@ -226,15 +226,15 @@ module Flextures
     # data dump to yaml format
     # @params [Hash] format file format data
     # @params [Hash] options dump format options
-    def self.yml format
+    def self.yml( format )
       klass = PARENT::create_model(format[:table])
       attr_type = self.dump_attributes klass, format
       filter = self.create_filter attr_type, format, :yml
-      self.dump_yml klass, filter, format
+      self.dump_yml( klass, filter, format )
     end
 
     # dump yml format data
-    def self.dump_yml klass, values_filter, format
+    def self.dump_yml( klass, values_filter, format )
       # TODO: 拡張子は指定してもしなくても良いようにする
       table_name = format[:table]
       file_name = format[:file] || format[:table]
@@ -251,4 +251,3 @@ module Flextures
     end
   end
 end
-

data/lib/flextures/flextures_extension_modules.rb

@@ -10,7 +10,7 @@ module Flextures
       (self.methods - ::OpenStruct.new.methods)
         .select{ |name| name.to_s.match(/\w+=/) }
         .map{ |name| name.to_s.gsub(/=/,'').to_sym }
-        .inject({}){ |k,h| h[k]=self.send(k); h }
+        .reduce({}){ |k,h| h[k]=self.send(k); h }
     end
   end
 
@@ -21,14 +21,12 @@ module Flextures
       # @return [Hash] tanslated Hash data
       # example:
       # hash = array.extend(Extensions::Array).to_hash(keys)
-      def to_hash keys
+      def to_hash( keys )
         values = self
         values = values[0..keys.size-1]               if keys.size < values.size
         values = values+[nil]*(keys.size-values.size) if keys.size > values.size
-        [keys,values].transpose.inject({}){ |h,pair| k,v=pair; h[k]=v; h }
+        [keys,values].transpose.reduce({}){ |h,pair| k,v=pair; h[k]=v; h }
       end
     end
   end
 end
-
-

data/lib/flextures/flextures_factory.rb

@@ -10,11 +10,11 @@ module Flextures
     # @params [String] table_name
     # @params [Array] options arguments ActiveRecord Model
     # @params [Proc] block FactoryFilter
-    def self.define table_name, *options, &block
+    def self.define( table_name, *options, &block )
       h={ block: block }
       options.each do |o|
         begin
-          h[:model] = o if o.new.is_a? ActiveRecord::Base
+          h[:model] = o if o.new.is_a?(ActiveRecord::Base)
         rescue
         end
       end
@@ -24,7 +24,7 @@ module Flextures
     # get FactoryFilter
     # @params [String|Symbol] table_name
     # @return [Proc] filter block
-    def self.get table_name
+    def self.get( table_name )
       f = FACTORIES[table_name.to_sym]
       f && f[:block]
     end
@@ -40,16 +40,15 @@ module Flextures
     # @params options
     # @params block
     # @return Flextures::Factory
-    def self.define table_name, hash
+    def self.define( table_name, hash )
       FACTORIES[table_name.to_sym]=hash
     end
 
     # get FactoryFilter
-    def self.get table_name
+    def self.get( table_name )
       FACTORIES[table_name.to_sym]
     end
     def self.[](table_name); self.get(table_name); end
   end
   Factory = LoadFilter
 end
-