tarvit-helpers 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caa66ce8ca236d132715e53cc7895f433a0755e4
-  data.tar.gz: 4ecc3de185ae7a4e57bbf938c67e5d51ddb73ab6
+  metadata.gz: b16138a784f01b8049d41ba0dde396852b91b7fe
+  data.tar.gz: e72adcab6aae27ca0708b4b37f16e7a59876083e
 SHA512:
-  metadata.gz: fe34c1d4c4ac253edf4bd2eb4ab3ab585af0d121d91715c4adddd4c80155bf3461f8db68a37b8800c57eeb667c15cf4bdfa69be8a4c06ec0b3b3997ef18d46ad
-  data.tar.gz: 6503d663d1c6cc53c259c1abb134b3cc9f2f3d52bf3cf880e1d3c1ac27f55eaf7cb483bfcb191a1638d34b34bdf800a23b478afb9192d8b99fba778d83a6696e
+  metadata.gz: a5de6712b2f92d44d639efe4e6a0e753084e84db72ed89e9b834e624b58e701d7c65904ea2c070ec35f05b7ddb1ae6ec4cfe9c137ab310716e47961f1b17cffa
+  data.tar.gz: 099c85a226640012916bcf82bfbe297acff36943cea0ad1ce57013df306457ddf7581d8452721a36923c0011acbbf5fe02d5da23867347474e00d8d5b828a3ec

data/VERSION

@@ -1 +1 @@
-0.0.22
+0.0.23

data/lib/tarvit-helpers/modules/recursive_loader.rb

@@ -9,10 +9,9 @@ module TarvitHelpers
     end
 
     def load_modules(dir, priorities=[])
-      load_ruby_files(dir)
-      dirs = global_dirs(dir)
-      (priorities.select{|p| dirs.include?(p)} + dirs ).each do |subdir|
-        load_modules_in dir.join(subdir)
+      load_ruby_files(dir, priorities)
+      prioritize(global_dirs(dir), priorities).each do |subdir|
+        load_modules dir.join(subdir), priorities
       end
     end
 
@@ -34,7 +33,7 @@ module TarvitHelpers
     private
 
     def global_dirs(dir)
-      (valid_directories(dir)).uniq
+      (valid_directories(dir)).uniq.sort
     end
 
     def valid_directories(dir)
@@ -43,16 +42,29 @@ module TarvitHelpers
       end
     end
 
-    def load_ruby_files(dir)
-      ruby_files(dir).each do |rb|
+    def load_ruby_files(dir, priorities=[])
+      prioritize_files(ruby_files(dir), priorities).each do |rb|
         send(method, dir.join(rb))
       end
     end
 
+    RB_EXT = '.rb'
+
     def ruby_files(dir)
       Dir.open(dir).entries.select do |entry|
-        entry.ends_with? '.rb'
+        entry.ends_with? RB_EXT
+      end.sort
+    end
+
+    def prioritize(list, priorities)
+      (priorities.select{|p| list.include?(p) } + list ).uniq
+    end
+
+    def prioritize_files(files, priorities)
+      files_priorities = priorities.map do |p|
+        p.include?(RB_EXT) ? p : (p+RB_EXT)
       end
+      prioritize(files, files_priorities)
     end
   end
 end

data/spec/modules/recursive_loader_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe RecursiveLoader do
+
+  before :each do
+    $arr = []
+    @dir = Pathname.new(File.expand_path('./spec/support/load'))
+  end
+
+  it 'load with default order' do
+    loader.load_modules(@dir)
+    expect($arr).to eq([:a, :b, :c, :d, :e, :a, :b])
+  end
+
+  it 'load with default order' do
+    loader.load_modules(@dir, %w{ b })
+    expect($arr).to eq([:b, :a, :c, :d, :e, :b, :a])
+  end
+
+  it 'load with default order' do
+    loader.load_modules(@dir, %w{ z y x })
+    expect($arr).to eq([:a, :b, :a, :b, :d, :e, :c])
+  end
+
+  def loader(method = :load)
+    RecursiveLoader.new(method)
+  end
+
+end

data/spec/support/load/a.rb

@@ -0,0 +1 @@
+$arr << :a

data/spec/support/load/b.rb

@@ -0,0 +1 @@
+$arr << :b

data/spec/support/load/x/c.rb

@@ -0,0 +1 @@
+$arr << :c

data/spec/support/load/y/d.rb

@@ -0,0 +1 @@
+$arr << :d

data/spec/support/load/y/e.rb

@@ -0,0 +1 @@
+$arr << :e

data/spec/support/load/z/a.rb

@@ -0,0 +1 @@
+$arr << :a

data/spec/support/load/z/b.rb

@@ -0,0 +1 @@
+$arr << :b

data/tarvit-helpers.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: tarvit-helpers 0.0.22 ruby lib
+# stub: tarvit-helpers 0.0.23 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "tarvit-helpers"
-  s.version = "0.0.22"
+  s.version = "0.0.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Vitaly Tarasenko"]
-  s.date = "2015-10-28"
+  s.date = "2015-11-16"
   s.description = " Simple extensions to standard Ruby classes and useful helpers. "
   s.email = "vetal.tarasenko@gmail.com"
   s.extra_rdoc_files = [
@@ -45,9 +45,17 @@ Gem::Specification.new do |s|
     "spec/modules/hash_presenter/simple_spec.rb",
     "spec/modules/hash_presenter_spec.rb",
     "spec/modules/non_shared_accessors_spec.rb",
+    "spec/modules/recursive_loader_spec.rb",
     "spec/modules/simple_crypt_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/base_tests/base_hash_presenter_test.rb",
+    "spec/support/load/a.rb",
+    "spec/support/load/b.rb",
+    "spec/support/load/x/c.rb",
+    "spec/support/load/y/d.rb",
+    "spec/support/load/y/e.rb",
+    "spec/support/load/z/a.rb",
+    "spec/support/load/z/b.rb",
     "tarvit-helpers.gemspec"
   ]
   s.homepage = "http://github.com/tarvit/tarvit-helpers"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tarvit-helpers
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Vitaly Tarasenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -128,9 +128,17 @@ files:
 - spec/modules/hash_presenter/simple_spec.rb
 - spec/modules/hash_presenter_spec.rb
 - spec/modules/non_shared_accessors_spec.rb
+- spec/modules/recursive_loader_spec.rb
 - spec/modules/simple_crypt_spec.rb
 - spec/spec_helper.rb
 - spec/support/base_tests/base_hash_presenter_test.rb
+- spec/support/load/a.rb
+- spec/support/load/b.rb
+- spec/support/load/x/c.rb
+- spec/support/load/y/d.rb
+- spec/support/load/y/e.rb
+- spec/support/load/z/a.rb
+- spec/support/load/z/b.rb
 - tarvit-helpers.gemspec
 homepage: http://github.com/tarvit/tarvit-helpers
 licenses: