flextures 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8328cf4e63d076ce5c3f3c43d21587e2071d4bf0
-  data.tar.gz: cb2dbb205578cca24ca5aa0f6119d9faf52a9c75
+  metadata.gz: 2712b12b0de4f85effbdb3be89c88fc0217397ef
+  data.tar.gz: 348adf4807760f5155eaa8d3b3e9b0d3a702aff2
 SHA512:
-  metadata.gz: 03d903f64bf6cd1164a0a17b21709f653cf07162ac3a1987add57c9b6551ce6559115a533c164377ce219b8b82618d558c69e912882beeed94ac475cc57d76df
-  data.tar.gz: 623544ec5c0cd3a639002e20a14a3e9757ffaae977368993fec9f71a410fa00c8904090a979f953ab8bd9a9c11228c8a24a85d11b7ac771af604937e30b60d87
+  metadata.gz: bbc454cc0aa60de6d9562dced99c7a5c13bf2eb2a3dc4ccb83c92b5015bf254269a45650c11224d19265be01f94a9b216930e8a729d85db6c27cc1805199b0b2
+  data.tar.gz: 487d9167c8150ff3e416ef02db0d2147526694c7004205cc386d0061b4f9c4a81b70b6e7e4067f2c6a00da3417aaf0b12d3addb1c5a83513c481ceff55d83aba

data/Gemfile.lock

@@ -1,17 +1,31 @@
 PATH
   remote: .
   specs:
-    flextures (4.0.1)
+    flextures (4.1.0)
+      activerecord
+      activerecord-import
+      activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.5.2)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
+      builder (~> 3.1)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
+      arel (~> 6.0)
+    activerecord-import (0.13.0)
+      activerecord (>= 3.0)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    arel (6.0.3)
+    builder (3.2.2)
     i18n (0.7.0)
     json (1.8.3)
     minitest (5.4.0)
@@ -34,7 +48,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
   bundler (~> 1.6)
   flextures!
   minitest (= 5.4.0)
@@ -45,4 +58,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/flextures.gemspec

@@ -15,12 +15,13 @@ Gem::Specification.new do |spec|
 
   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.test_files    = ["test/unit/flextures_args_test.rb"]
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "activerecord"
+  spec.add_dependency "activesupport"
+  spec.add_dependency "activerecord-import"
+
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "activesupport"
-  #spec.add_development_dependency "minitest", "5.4.0"
 end

data/lib/flextures.rb

@@ -1,6 +1,7 @@
+require 'active_record'
+
 require 'flextures/version'
 require 'flextures/flextures_base_config'
-require 'flextures/flextures_extension_modules'
 require 'flextures/flextures'
 require 'flextures/flextures_factory'
 require 'flextures/flextures_loader'

data/lib/flextures/flextures.rb

@@ -1,31 +1,28 @@
-require 'ostruct'
-require 'csv'
 require "flextures/flextures_base_config"
-require "flextures/flextures_extension_modules"
 require "flextures/flextures_factory"
 
 module Flextures
   # 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 = ->{
+    a = -> do
       f = Factory::FACTORIES[table_name.to_sym]
       f && f[:model]
-    }
+    end
     # when program can guess Model name by table_name
-    b = ->{
+    b = -> do
       begin
         table_name.singularize.camelize.constantize
       rescue => e
         nil
       end
-    }
+    end
     # when cannot guess Model name
-    c = ->{
+    c = -> do
       Class.new(ActiveRecord::Base){ |o| o.table_name=table_name }
-    }
+    end
     a.call || b.call || c.call
   end
 
@@ -57,7 +54,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
@@ -69,7 +66,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
@@ -84,12 +81,12 @@ module Flextures
   # parse arguments functions.
   module ARGS
     # parse rake ENV parameters
-    def self.parse( option={} )
+    def self.parse(env={}, option={})
       table_names = []
-      if v = (ENV["T"] or ENV["TABLE"])
+      if v = (env["T"] or env["TABLE"])
         table_names = v.split(',').map{ |name| { table: name, file: name } }
       end
-      if v = (ENV["M"] or ENV["MODEL"])
+      if v = (env["M"] or env["MODEL"])
         table_names = v.split(',').map do |name|
           name = name.constantize.table_name
           { table: name, file: name }
@@ -98,30 +95,30 @@ module Flextures
 
       table_names = Flextures::deletable_tables.map{ |name| { table: name, file: name } } if table_names.empty?
 
-      # parse ENV["FIXTURES"] paameter
-      fixtures_args_parser =->(s){
+      # parse env["FIXTURES"] paameter
+      fixtures_args_parser = ->(s){
         names = s.split(',')
-        if ENV["TABLE"] or ENV["T"] or ENV["MODEL"] or ENV["M"]
-          [ table_names.first.merge( file: names.first ) ]
+        if env["TABLE"] or env["T"] or env["MODEL"] or env["M"]
+          [ table_names.first.merge(file: names.first) ]
         else
           names.map{ |name| { table: name, file: name } }
         end
       }
       # 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 = 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'
@@ -130,8 +127,8 @@ module Flextures
 
     # check exist filename block
     def self.exist
-      return->(name){ File.exists?( File.join(Flextures::Configuration.load_directory, "#{name}.csv") ) or
-                      File.exists?( File.join(Flextures::Configuration.load_directory, "#{name}.yml") ) }
+      return->(name){ File.exists?(File.join(Flextures::Configuration.load_directory, "#{name}.csv")) or
+                      File.exists?(File.join(Flextures::Configuration.load_directory, "#{name}.yml")) }
     end
   end
 end

data/lib/flextures/flextures_command.rb

@@ -2,7 +2,6 @@ require 'ostruct'
 require 'csv'
 
 require 'flextures/flextures_base_config'
-require 'flextures/flextures_extension_modules'
 require 'flextures/flextures'
 require 'flextures/flextures_factory'
 
@@ -11,7 +10,7 @@ module Flextures
     module Command
       def self.dump
         Flextures::load_configurations
-        table_names = Flextures::ARGS.parse
+        table_names = Flextures::ARGS.parse(ENV)
         puts "dumping..."
         case ENV["FORMAT"].to_s.to_sym
         when :yml,:yaml
@@ -25,7 +24,7 @@ module Flextures
 
       def self.load
         Flextures::load_configurations
-        table_names = Flextures::ARGS.parse
+        table_names = Flextures::ARGS.parse(ENV)
         Flextures::init_tables unless ENV["T"] or ENV["TABLE"] or ENV["M"] or ENV["MODEL"] or ENV["F"] or ENV["FIXTUES"]
         file_format = ENV["FORMAT"]
         puts "loading..."
@@ -42,7 +41,7 @@ module Flextures
       # load and dump data
       def self.generate
         Flextures::load_configurations
-        table_names = Flextures::ARGS.parse
+        table_names = Flextures::ARGS.parse(ENV)
         Flextures::init_tables unless ENV["T"] or ENV["TABLE"] or ENV["M"] or ENV["MODEL"] or ENV["F"] or ENV["FIXTUES"]
         file_format = ENV["FORMAT"]
         puts "generating..."

data/lib/flextures/flextures_loader.rb

@@ -1,15 +1,33 @@
 require 'ostruct'
 require 'csv'
+require 'erb'
+
+require 'active_record'
+require 'activerecord-import'
 
 require 'flextures/flextures_base_config'
-require 'flextures/flextures_extension_modules'
 require 'flextures/flextures'
 require 'flextures/flextures_factory'
 
 module Flextures
   # data loader
   class Loader
+    module ArrayEx
+      refine Array do
+        # @params [Array] keys hash keys
+        # @return [Hash] tanslated Hash data
+        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.reduce({}){ |h,pair| k,v=pair; h[k]=v; h }
+        end
+      end
+    end
+    using ArrayEx
+
     PARENT = Flextures
+    FORMATS = [ %i[csv erb], %i[erb csv], %i[csv], %i[yml erb], %i[erb yml], %i[yml] ]
 
     # column set default value
     COMPLETER = {
@@ -97,19 +115,17 @@ module Flextures
     end
 
     def self.cache?(params)
-      if params.first.is_a?(Hash)
-        param = params.first
-        param[:cache] == true
-      end
-    end
+      return unless params.first.is_a?(Hash)
 
-    def reset_cache
+      param = params.first
+      param[:cache] == true
     end
 
     # compare
     def equal_table_data?(src, dst)
       return false unless src.is_a?(Hash)
       return false unless dst.is_a?(Hash)
+
       (src.to_a - dst.to_a).empty?
     end
 
@@ -165,67 +181,82 @@ module Flextures
 
     # @return [Proc] order rule block (user Array#sort methd)
     def self.loading_order
-      ->(a,b){
+      ->(a,b) do
         a = Flextures::Configuration.table_load_order.index(a) || -1
         b = Flextures::Configuration.table_load_order.index(b) || -1
         b <=> a
-      }
+      end
     end
 
     # load fixture data
     # fixture file prefer YAML to CSV
     # @params [Hash] format file load format(table name, file name, options...)
     def self.load(format)
-      file_name, method = file_exist(format)
-      if method
-        send(method, format)
+      file_name, *exts = file_exist(format)
+      format[:erb] = exts.include?(:erb)
+      method = exts.detect { |k| [:csv, :yml].include?(k) }
+
+      return unless self.file_loadable?(format, file_name)
+
+      klass, filter = self.create_model_filter(format, file_name, method)
+
+      case method
+      when :csv
+        self.load_csv(format, klass, filter, file_name)
+      when :yml
+        self.load_yml(format, klass, filter, file_name)
       else
         puts "Warning: #{file_name} is not exist!" unless format[:silent]
       end
     end
 
-    # load CSV data
-    # @params [Hash] format file load format(table name, file name, options...)
-    def self.csv(format)
-      type = :csv
-      file_name, ext = file_exist(format, [type])
-      return unless self.file_loadable?(format, file_name)
-      klass, filter = self.create_model_filter(format, file_name, type)
-      self.load_csv(format, klass, filter, file_name)
+    def self.load_file(format, file_name)
+      file = nil
+      if format[:erb]
+        str = File.open(file_name){ |f| f.read }
+        file = ERB.new(str).result
+      else
+        file = File.open(file_name)
+      end
     end
 
-    # load YAML data
-    # @params [Hash] format file load format( table: name, file: name, options...)
-    def self.yml(format)
-      type = :yml
-      file_name, ext = file_exist(format, [type])
-
-      return unless self.file_loadable?(format, file_name)
-
-      klass, filter = self.create_model_filter(format, file_name, type)
-      self.load_yml(format, klass, filter, file_name)
+    def self.load_csv(format, klass, filter, file_name)
+      file = self.load_file(format, file_name)
+      CSV.open(file) do |csv|
+        self.load_csv_row(csv, format, klass, filter, file_name)
+      end
+      file_name
     end
 
-    def self.load_csv(format, klass, filter, file_name)
+    def self.load_csv_row(csv, format, klass, filter, file_name)
       attributes = klass.columns.map(&:name)
-      CSV.open(file_name) do |csv|
-        keys = csv.shift # active record column names
-        warning("CSV", attributes, keys) unless format[:silent]
+      keys = csv.shift # active record column names
+
+      warning("CSV", attributes, keys) unless format[:silent]
+
+      ActiveRecord::Base.transaction do
         csv.each do |values|
-          h = values.extend(Extensions::Array).to_hash(keys)
-          filter.call(h)
+          h = values.to_hash(keys)
+          o = filter.call(h)
+          o.save(validation: false)
         end
       end
-      file_name
     end
 
     def self.load_yml(format, klass, filter, file_name)
-      yaml = YAML.load(File.open(file_name))
+      file = self.load_file(format, file_name)
+      yaml = YAML.load(file)
+
       return false unless yaml # if file is empty
+
       attributes = klass.columns.map(&:name)
-      yaml.each do |k,h|
-        warning("YAML", attributes, h.keys) unless format[:silent]
-        filter.call(h)
+      ActiveRecord::Base.transaction do
+        yaml.each do |k,h|
+          warning("YAML", attributes, h.keys) unless format[:silent]
+
+          o = filter.call(h)
+          o.save(validation: false)
+        end
       end
       file_name
     end
@@ -257,6 +288,7 @@ module Flextures
     # return ["foo/bar/baz","foo/bar","foo",""]
     def self.stair_list(dir, stair=true)
       return [dir.to_s] unless stair
+
       l = []
       dir.to_s.split("/").reduce([]){ |a,d| a<< d; l.unshift(a.join("/")); a }
       l<< ""
@@ -272,10 +304,12 @@ module Flextures
       base_dir_name = Flextures::Configuration.load_directory
       self.stair_list(format[:dir], format[:stair]).each do |dir|
         file_path = File.join(base_dir_name, dir, file_name)
-        return ["#{file_path}.csv", :csv] if type.member?(:csv) and File.exist?("#{file_path}.csv")
-        return ["#{file_path}.yml", :yml] if type.member?(:yml) and File.exist?("#{file_path}.yml")
+        formats = FORMATS.select { |fmt| (type & fmt).present? }
+        formats.each do |fmt|
+          return ["#{file_path}.#{fmt.join('.')}", *fmt] if File.exist?("#{file_path}.#{fmt.join('.')}")
+        end
       end
-      [ File.join(base_dir_name, "#{file_name}.csv"), nil ]
+      ["#{File.join(base_dir_name, file_name)}.csv", nil]
     end
 
     # file load check
@@ -296,7 +330,6 @@ module Flextures
     def self.create_model_filter(format, file_name, type)
       table_name = format[:table].to_s
       klass = PARENT::create_model(table_name)
-      # binding.pry
       # if you use 'rails3_acts_as_paranoid' gem, that is not delete data 'delete_all' method
       klass.send(klass.respond_to?(:delete_all!) ? :delete_all! : :delete_all)
 
@@ -304,7 +337,6 @@ module Flextures
         filter = create_filter(klass, LoadFilter[table_name.to_sym], file_name, type, format)
         o = klass.new
         o = filter.call(o, h)
-        o.save(validate: false)
         o
       }
       [klass, filter]

data/lib/flextures/rspec_flextures_support.rb

@@ -146,8 +146,15 @@ module ActiveRecord
       end
 
       def flextures_set_options(options)
-        @flextures_loader_options = get_or_initialize_flextures_loader_options
-        @flextures_loader_options = @flextures_loader_options.merge(options)
+        get_or_initialize_flextures_loader_options.merge!(options)
+      end
+
+      def flextures_instance
+        self
+      end
+
+      def flextures_options
+        @flextures_loader_options
       end
     end
   end

data/lib/flextures/version.rb

@@ -1,3 +1,3 @@
 module Flextures
-  VERSION="4.0.1"
+  VERSION="4.1.0"
 end

metadata

@@ -1,37 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - baban
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,7 +39,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activerecord-import
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -75,7 +103,6 @@ files:
 - 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
@@ -85,7 +112,6 @@ files:
 - test/test_helper.rb
 - test/unit/flextures_args_test.rb
 - test/unit/flextures_dumper_test.rb
-- test/unit/flextures_extention_modules_test.rb
 - test/unit/flextures_hooks_test.rb
 - test/unit/flextures_loader_test.rb
 homepage: http://github.com/baban/flextures

data/lib/flextures/flextures_extension_modules.rb

@@ -1,19 +0,0 @@
-require 'ostruct'
-
-module Flextures
-  module Extensions
-    module Array
-      # use Object#extend
-      # @params [Array] keys hash keys
-      # @return [Hash] tanslated Hash data
-      # example:
-      # hash = array.extend(Extensions::Array).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.reduce({}){ |h,pair| k,v=pair; h[k]=v; h }
-      end
-    end
-  end
-end

data/test/unit/flextures_extention_modules_test.rb

@@ -1,42 +0,0 @@
-$:.push( File.join(File.dirname(File.expand_path(__FILE__)), '../') )
-require 'test_helper'
-
-describe :Extention do
-  describe "Array#to_hash" do
-    describe "when column size is equal data size" do
-      before do
-        @keys   = %W[id name hp]
-        @values = %W[1 hoge 100]
-        @h = @values.extend(Flextures::Extensions::Array).to_hash(@keys)
-      end
-
-      it "return hash" do
-        assert_equal @h, { "id"=>"1", "name"=>"hoge", "hp"=>"100" }
-      end
-    end
-
-    describe "when column size is bigger than data size" do
-      before do
-        @keys   = %W[id name hp]
-        @values = %W[1 hoge]
-        @h = @values.extend(Flextures::Extensions::Array).to_hash(@keys)
-      end
-
-      it "return hash, overflow key is filled 'nil'" do
-        assert_equal @h, { "id"=>"1", "name"=>"hoge", "hp"=> nil }
-      end
-    end
-
-    describe "when column size is smaller than data size" do
-      before do
-        @keys   = %W[id name]
-        @values = %W[1 hoge 200]
-        @h = @values.extend(Flextures::Extensions::Array).to_hash(@keys)
-      end
-
-      it "return hash, overflow value is cut offed" do
-        assert_equal @h, { "id"=>"1", "name"=>"hoge" }
-      end
-    end
-  end
-end