flextures 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2712b12b0de4f85effbdb3be89c88fc0217397ef
-  data.tar.gz: 348adf4807760f5155eaa8d3b3e9b0d3a702aff2
+  metadata.gz: c41afb887951f1e3623d2747268339ddf6f63e5e
+  data.tar.gz: 7a24ceb00d32dc9ab13b5798ffaed6100bfe1500
 SHA512:
-  metadata.gz: bbc454cc0aa60de6d9562dced99c7a5c13bf2eb2a3dc4ccb83c92b5015bf254269a45650c11224d19265be01f94a9b216930e8a729d85db6c27cc1805199b0b2
-  data.tar.gz: 487d9167c8150ff3e416ef02db0d2147526694c7004205cc386d0061b4f9c4a81b70b6e7e4067f2c6a00da3417aaf0b12d3addb1c5a83513c481ceff55d83aba
+  metadata.gz: 3c3c5a75aa95ab7a9ecc68ceb87d87686c0329720537483d16223209b74cf90ed83ac3345ceac3a8b07bff7244029f9edcdf4f7fde066f9a3edc904fd71810e1
+  data.tar.gz: f060b8c9630a7c43b2f53ae7c9024ddb1326ccb4a09616d624dab14e545cb767b49059e94117bf153a01f67e8a351d38ec6092c585184c4082769ffb37f2b955

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    flextures (4.1.0)
+    flextures (4.2.0)
       activerecord
-      activerecord-import
       activesupport
 
 GEM
@@ -16,8 +15,6 @@ GEM
       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)

data/README.ja.md

@@ -30,7 +30,12 @@ gem化されているので、bundlerで次のように記述して、普通にb
  gem "flextures"
 ```
 
-ちなみに開発環境はruby1.9以上のバージョン、rails3以上、もしくはPadrinoを想定しています
+```
+bundle install
+bundle exec rails generator flextures:initializer
+```
+
+ちなみに開発環境はruby2.1以上のバージョン、rails4以上を想定しています
 
 ## 使い方
 
@@ -102,7 +107,7 @@ end
 
 ```ruby
 describe ItemShopController do
-  flextures :items, :users => :users_for_itmshop # users_for_itemshop.csv をロードする
+  flextures :items, :users => :users_for_itemshop # users_for_itemshop.csv をロードする
 end
 ```
 
@@ -155,12 +160,10 @@ Flextures::DumpFilter.define :users, {
 
 ### 設定ファイル
 
-`config/flextures.config.rb`　で設定ファイルを作成すると、データをロード＆ダンプするディレクトリなどの設定を変更できます
-
-
+`config/initializers/flextures.rb`　で設定ファイルを作成すると、データをロード＆ダンプするディレクトリなどの設定を変更できます
 
 ```ruby
-Flextures.configure do |config|
+Flextures::Configuration.configure do |config|
   # Load and dump directory change "spec/fixtures/" to "test/fixtures/"
   config.load_directory = "test/fixtures/"
   config.dump_directory = "test/fixtures/"

data/README.md

@@ -23,14 +23,23 @@ Major different point is four.
 ## How to install
 
 This program is implemented Rails Plug-in.
-You want to install this plug-in.
+If You want to install this plug-in.
 Please use bundler.
 
+In `Gemfile`
+
 ```
 gem "flextures"
 ```
 
-(Development emnvoriment must be ruby1.9 higer and rails3 higher)
+And execute below commands.
+
+```
+bundle install
+bundle exec rails generator flextures:initializer
+```
+
+(Development emnvoriment must be ruby2.1 higer and rails3 higher)
 
 ## How to use
 
@@ -82,6 +91,7 @@ Fixture load function implemented for Unittes Tools (for example, RSpec, Shoulda
 ```ruby
 describe ItemShopController do
   flextures :users, :items
+end
 ```
 
 flexture function can write like a "fixture" function, implemented in RSpec.
@@ -91,7 +101,8 @@ Flextures function can change load file name.
 
 ```ruby
 describe ItemShopController do
-  flextures :items, :users => :users_for_itmshop # load "users_for_itemshop.csv"
+  flextures :items, :users => :users_for_itemshop # load "users_for_itemshop.csv"
+end
 ```
 
 Other option information
@@ -147,7 +158,7 @@ Other options please see [wiki](https://github.com/baban/flextures/wiki/Factoryf
 In `config/initializers/flextures.rb`, configuration file can change load and dump directory
 
 ```ruby
-Flextures.configure do |config|
+Flextures::Configuration.configure do |config|
   # Load and dump directory change "spec/fixtures/" to "test/fixtures/"
   config.load_directory = "test/fixtures/"
   config.dump_directory = "test/fixtures/"

data/flextures.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'flextures/version'
@@ -20,7 +19,6 @@ Gem::Specification.new do |spec|
 
   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"

data/lib/flextures/flextures.rb

@@ -30,7 +30,7 @@ module Flextures
   def self.load_configurations
     if defined?(Rails) and Rails.root
       [
-        File.join( Rails.root.to_path,"/config/flextures.factory.rb" ),
+        File.join(Rails.root.to_path, "/config/flextures.factory.rb"),
       ].each { |fn| File.exist?(fn) && load(fn) }
     end
   end
@@ -38,7 +38,7 @@ module Flextures
   # @return [Array] flextures useable table names
   def self.deletable_tables
     tables = ActiveRecord::Base.connection.tables
-    Flextures::Configuration.ignore_tables.each { |name| tables.delete( name.to_s ) }
+    Flextures::Configuration.ignore_tables.each { |name| tables.delete(name.to_s) }
     tables
   end
 
@@ -95,7 +95,7 @@ module Flextures
 
       table_names = Flextures::deletable_tables.map{ |name| { table: name, file: name } } if table_names.empty?
 
-      # parse env["FIXTURES"] paameter
+      # parse env["FIXTURES"] parameter
       fixtures_args_parser = ->(s){
         names = s.split(',')
         if env["TABLE"] or env["T"] or env["MODEL"] or env["M"]
@@ -105,9 +105,9 @@ module Flextures
         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"]
@@ -127,8 +127,10 @@ 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.exist?(File.join(Flextures::Configuration.load_directory, "#{name}.csv")) or
+        File.exist?(File.join(Flextures::Configuration.load_directory, "#{name}.yml"))
+      }
     end
   end
 end

data/lib/flextures/flextures_loader.rb

@@ -3,7 +3,6 @@ require 'csv'
 require 'erb'
 
 require 'active_record'
-require 'activerecord-import'
 
 require 'flextures/flextures_base_config'
 require 'flextures/flextures'
@@ -18,9 +17,9 @@ module Flextures
         # @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 }
+          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,(k,v)| h[k]=v; h }
         end
       end
     end
@@ -321,7 +320,7 @@ module Flextures
     end
 
     # print warinig message that lack or not exist colum names
-    def self.warning( format, attributes, keys )
+    def self.warning(format, attributes, keys)
       (attributes-keys).each { |name| puts "Warning: #{format} colum is missing! [#{name}]" }
       (keys-attributes).each { |name| puts "Warning: #{format} colum is left over! [#{name}]" }
     end

data/lib/flextures/version.rb

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

data/lib/generators/flextures/initializer_generator.rb

@@ -0,0 +1,17 @@
+module Flextures
+  module Generators
+    class InitializerGenerator < Rails::Generators::Base
+      source_root File.expand_path("../templates", __FILE__)
+
+      def create_initializer_file
+        copy_file "flextures.rb", "config/initializers/flextures.rb"
+        copy_file "flextures.factory.rb", "config/flextures.factory.rb"
+      end
+
+      desc <<-MSG
+Description:
+  Creates flextures configuration files.
+      MSG
+    end
+  end
+end

data/lib/generators/flextures/templates/flextures.factory.rb

@@ -0,0 +1,8 @@
+# Flextures::Factory.define :users do |f|
+#   f.password = "hogehoge"
+#   f
+# end
+
+# Flextures::DumpFilter.define :users, {
+#   :encrypted_password => lambda { |v| Base64.encode64(v) }
+# }

data/lib/generators/flextures/templates/flextures.rb

@@ -0,0 +1,6 @@
+Flextures::Configuration.configure do |config|
+  # config.init_all_tables = true
+  # config.ignore_tables = ["schema_migrations"]
+  # config.load_directory = "test/fixtures/"
+  # config.dump_directory = "test/fixtures/"
+end

data/test/unit/flextures_args_test.rb

@@ -5,8 +5,7 @@ require 'test_helper'
 describe Flextures::ARGS do
   describe "if set TABLE='table_name' option " do
     before do
-      ENV["TABLE"] = "users"
-      @format = Flextures::ARGS.parse
+      @format = Flextures::ARGS.parse("TABLE"=>"users")
     end
 
     it "return table_name" do
@@ -16,16 +15,11 @@ describe Flextures::ARGS do
     it "filename is same table_name" do
       assert_equal "users", @format.first[:file]
     end
-
-    after do
-      ENV.delete("TABLE")
-    end
   end
 
   describe "if set T=table_name option " do
     before do
-      ENV["T"] = "s_user"
-      @format = Flextures::ARGS.parse
+      @format = Flextures::ARGS.parse("T"=>"s_user")
     end
 
     it "retrun table_name" do
@@ -35,17 +29,11 @@ describe Flextures::ARGS do
     it "filename is same table_name" do
       assert_equal "s_user", @format.first[:file]
     end
-
-    after do
-      ENV.delete("T")
-    end
   end
 
   describe " DIR=option " do
     before do
-      ENV["T"] = "users"
-      ENV["DIR"] = "test/fixtures/"
-      @format = Flextures::ARGS.parse
+      @format = Flextures::ARGS.parse("T"=>"users", "DIR"=>"test/fixtures/")
     end
 
     it "directory name is exist" do
@@ -59,18 +47,11 @@ describe Flextures::ARGS do
     it "file name is equal table name" do
       assert_equal "users", @format.first[:file]
     end
-
-    after do
-      ENV.delete("T")
-      ENV.delete("DIR")
-    end
   end
 
   describe " D=option " do
     before do
-      ENV["T"] = "users"
-      ENV["D"] = "test/fixtures/"
-      @format = Flextures::ARGS.parse
+      @format = Flextures::ARGS.parse("T"=>"users", "D"=>"test/fixtures/")
     end
 
     it "directory name" do
@@ -84,18 +65,11 @@ describe Flextures::ARGS do
     it "file name is equal table name" do
       assert_equal "users", @format.first[:file]
     end
-
-    after do
-      ENV.delete("T")
-      ENV.delete("D")
-    end
   end
 
   describe " FIXTURES=option " do
     before do
-      ENV["T"] = "users"
-      ENV["FIXTURES"] = "user_another"
-      @format = Flextures::ARGS.parse
+      @format = Flextures::ARGS.parse("T"=>"users", "FIXTURES"=>"user_another")
     end
 
     it "table name is exist" do
@@ -105,19 +79,12 @@ describe Flextures::ARGS do
     it " file name is changed by option's name " do
       assert_equal "user_another", @format.first[:file]
     end
-
-    after do
-      ENV.delete("T")
-      ENV.delete("FIXTURES")
-    end
   end
 
   describe " MINUS option " do
     describe "only one columns" do
       before do
-        ENV["T"]="users"
-        ENV["MINUS"]="id"
-        @format = Flextures::ARGS.parse
+        @format = Flextures::ARGS.parse("T"=>"users", "MINUS"=>"id")
       end
 
       it " option contain 'minus' parameters" do
@@ -127,31 +94,19 @@ describe Flextures::ARGS do
 
     describe "many columns" do
       before do
-        ENV["T"]="users"
-        ENV["MINUS"]="id,created_at,updated_at"
-        @format = Flextures::ARGS.parse
+        @format = Flextures::ARGS.parse("T"=>"users", "MINUS"=>"id,created_at,updated_at")
       end
 
       it " option contain 'minus' parameters" do
         assert_equal ["id","created_at","updated_at"], @format.first[:minus]
       end
     end
-
-    after do
-      ENV.delete("T")
-      ENV.delete("MINUS")
-    end
   end
 
   describe " PLUS options " do
-    before do
-      ENV["T"]="users"
-    end
-
     describe "only one columns" do
       before do
-        ENV["PLUS"]="hoge"
-        @format = Flextures::ARGS.parse
+        @format = Flextures::ARGS.parse("T"=>"users", "PLUS"=>"hoge")
       end
 
       it " option contain 'plus' parameters" do
@@ -161,18 +116,12 @@ describe Flextures::ARGS do
 
     describe "many columns" do
       before do
-        ENV["PLUS"]="hoge,mage"
-        @format = Flextures::ARGS.parse
+        @format = Flextures::ARGS.parse("T"=>"users", "PLUS"=>"hoge,mage")
       end
 
       it " option contain 'plus' parameters" do
         assert_equal ["hoge","mage"], @format.first[:plus]
       end
     end
-
-    after do
-      ENV.delete("T")
-      ENV.delete("PLUS")
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - baban
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  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
@@ -108,6 +94,9 @@ files:
 - lib/flextures/flextures_railtie.rb
 - lib/flextures/rspec_flextures_support.rb
 - lib/flextures/version.rb
+- lib/generators/flextures/initializer_generator.rb
+- lib/generators/flextures/templates/flextures.factory.rb
+- lib/generators/flextures/templates/flextures.rb
 - test/models/flextures_test.rb
 - test/test_helper.rb
 - test/unit/flextures_args_test.rb