smart_ioc 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d087ab33f12eb4a96aeedc806223df30c87f9b07
-  data.tar.gz: 04818970eaf8cab13deac3780cc24a9fbcaf13f8
+  metadata.gz: 4c7072e73dc2252039b8c04abc90aadbbf75c773
+  data.tar.gz: ee3f8369255712f3f5263767f276a383e8606420
 SHA512:
-  metadata.gz: a10d27b132fdbf112bcc29738f450a27b865acbc4e0061818dfc30a5d6594c0634fe63730c7586d52b58225ac6f1bd8ad75209143305efdb18c09989cbfd4548
-  data.tar.gz: 60ed44c13c5232429d1ebfd0290b6b33f9f44580c5eddcf47adad84ab6fa9314de95fb48c69490693c5d9d5846db74cab3bec874283f937fa6ab9814d2b92c21
+  metadata.gz: 6787d8889e1b732a0504b985420586554011fc7f4771a633172d66ca8b4c390bddea636524b33207ae086e0877c2ce3548d90a276bc3c9aa36fadf5954723533
+  data.tar.gz: b5007f88e1a4cc16e9410e737d488c0a85c5ae21a0a3b76800348936e518755318503b2d16c27209de7013d9cbccb139f593a13b6ce9bea1c2c7281a7f8dfe88

data/lib/smart_ioc/bean_file_loader.rb

@@ -6,19 +6,12 @@ class SmartIoC::BeanFileLoader
   # @param bean_name [Symbol] bean name
   # return nil
   def require_bean(bean_name)
-    locations = SmartIoC::BeanLocations.get_bean_locations(bean_name)
+    locations = SmartIoC::BeanLocations.get_bean_locations(bean_name).values.flatten
 
-    # load *.rb file if extra bean location was added or it was not loaded yet
-    location_count = locations.values.flatten.size
-
-    if !@loaded_locations.has_key?(bean_name) || @loaded_locations[bean_name] != location_count
-      locations.each do |package_name, locations|
-        locations.each do |location|
-          require location
-        end
-      end
-
-      @loaded_locations[bean_name] = location_count
+    locations.each do |location|
+      next if @loaded_locations.has_key?(location)
+      @loaded_locations[location] = true
+      load location
     end
 
     nil

data/lib/smart_ioc/version.rb

@@ -1,3 +1,3 @@
 module SmartIoC
-  VERSION = "0.1.17"
+  VERSION = "0.1.18"
 end

data/spec/smart_ioc/bean_factory_spec.rb

@@ -1,19 +1,23 @@
 require 'spec_helper'
 
 describe SmartIoC::BeanFactory do
-  class Repo
-    include SmartIoC::Iocify
-    bean :repo, context: :default, package: :bean_factory
-  end
+  before :all do
+    SmartIoC.clear
 
-  class TestRepo
-    include SmartIoC::Iocify
-    bean :repo, context: :test, package: :bean_factory
-  end
+    class Repo
+      include SmartIoC::Iocify
+      bean :repo, context: :default, package: :bean_factory
+    end
+
+    class TestRepo
+      include SmartIoC::Iocify
+      bean :repo, context: :test, package: :bean_factory
+    end
 
-  class DAO
-    include SmartIoC::Iocify
-    bean :dao, context: :default, package: :bean_factory
+    class DAO
+      include SmartIoC::Iocify
+      bean :dao, context: :default, package: :bean_factory
+    end
   end
 
   it 'returns proper bean for test context' do

data/spec/smart_ioc/bean_file_loader_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe SmartIoC::BeanFileLoader do
+  before :all do
+    SmartIoC.clear
+
+    dir_path = File.join(File.expand_path(File.dirname(__FILE__)), 'example/admins')
+    SmartIoC.find_package_beans(:admins, dir_path)
+
+    dir_path = File.join(File.expand_path(File.dirname(__FILE__)), 'example/utils')
+    SmartIoC.find_package_beans(:utils, dir_path)
+
+    @container = SmartIoC::Container.get_instance
+  end
+
+  it 'requires beans only once' do
+    repository = @container.get_bean(:repository, package: :admins, context: :test)
+    repository = @container.get_bean(:repository, package: :admins, context: :test)
+    expect(repository.get(1)).to eq(nil)
+  end
+end

data/spec/smart_ioc/object_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe Object do
+  before :all do
+    SmartIoC.clear
+  end
+
   describe '::inject' do
     before :all do
       class TestClass

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_ioc
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,7 @@ files:
 - smart_ioc.gemspec
 - spec/smart_ioc/bean_definition_spec.rb
 - spec/smart_ioc/bean_factory_spec.rb
+- spec/smart_ioc/bean_file_loader_spec.rb
 - spec/smart_ioc/bean_locator_spec.rb
 - spec/smart_ioc/example/admins/repository/admins_dao.rb
 - spec/smart_ioc/example/admins/repository/admins_repository.rb
@@ -113,6 +114,7 @@ summary: Inversion of Control Container
 test_files:
 - spec/smart_ioc/bean_definition_spec.rb
 - spec/smart_ioc/bean_factory_spec.rb
+- spec/smart_ioc/bean_file_loader_spec.rb
 - spec/smart_ioc/bean_locator_spec.rb
 - spec/smart_ioc/example/admins/repository/admins_dao.rb
 - spec/smart_ioc/example/admins/repository/admins_repository.rb