djoini 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9f9dcce9a2cea1657efbb11e8c3ad0a27c93b21
-  data.tar.gz: 5cc72c0b04dbd0fa902eb8874af83ad367290a7f
+  metadata.gz: b700f33baed8016b867a71927f601d31ec5e9d70
+  data.tar.gz: d26e380685d6218174267720999183cb4337325b
 SHA512:
-  metadata.gz: 3bfd808f9adc29ef62bb575b405895eec3e06b10f085c291f06089885f70be270f8a01c88324fa01c6af742c33d4ecd02c77dad20e8d71b1310382a1018d6b2d
-  data.tar.gz: d7eee8957d3788e1e796187eb322b3f4be27650c89dab67881c6f471e996c4ab6bbfb10c99ca66e7ae684c90dc50c4b1aa1adb10d2b27c8dc7b3d3219d75b3c2
+  metadata.gz: 7761346fc6c2e014235a29c3a42b223a139ad7555c37ebdd1a573e19770c1ccea542ea18121ef0c1bf7c3dad4d29a501614527040fa879a7d59994a1487628a9
+  data.tar.gz: d3cae05b55ae0aa9eef74732cc18613d897baa8a1082f86c6cac6bad4778a1b01d243db516550a26e5c763885e60d08f033a220df1feb9e04f0f00bb0d449530

data/README.md

@@ -101,7 +101,7 @@ bundle exec rake djoini:load type=ini
 To specify location of fixtures use configuration module:
 
 ```ruby
-Djoini.config do |config|
+Djoini.configure do |config|
   config.fixtures_folder = 'path'
   config.fixtures_type = 'ini/json/mixed' 
 end

data/lib/djoini/version.rb

@@ -1,3 +1,3 @@
 module Djoini
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/lib/tasks/load.rake

@@ -4,26 +4,33 @@ namespace :djoini do
   task :load do |_, args|
     require_relative '../djoini'
 
+    load_configuration
+
+    load_database
+
+    _loader = Djoini::Files.new
+
+    _type = args[:type] || Djoini.configuration.fixtures_type
+
+    _loader.load_files(_type)
+  end
+
+  def load_configuration
     _config_path = File.join(Dir.pwd, '/config/initializers/djoini.rb')
+
     require _config_path if File.file?(_config_path)
     # To make sure configure was called if initializer wasn't found
     Djoini.configure {}
+  end
 
+  def load_database
     require 'yaml'
+
     _db_config_path = File.join(Dir.pwd, '/config/database.yml')
-    fail unless File.file?(_db_config_path)
-    _conn_info = YAML.load(File.read(_db_config_path))
-    Djoini::Connection.instance.establish_connection(_conn_info['postgres'])
 
-    # Path taken from configuration
-    _loader = Djoini::Files.new
+    fail unless File.file?(_db_config_path)
 
-    if args[:type] == 'ini' || Djoini.configuration.fixtures_type == 'ini'
-      _loader.load_files('ini')
-    elsif args[:type] == 'json' || Djoini.configuration.fixtures_type == 'json'
-      _loader.load_files('json')
-    else
-      _loader.load_files
-    end
+    _conn_config = YAML.load(File.read(_db_config_path))
+    Djoini::Connection.instance.establish_connection(_conn_config['postgres'])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: djoini
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - faul