class_loader 3.0.0 → 3.0.1

data/Rakefile

@@ -4,7 +4,7 @@ project(
   name: "class_loader",
   gem: true,
   summary: "Automatically find, load and reload classes",
-  version: '3.0.0',
+  # version: '3.0.0',
 
   author: "Alexey Petrushin",
   homepage: "http://github.com/alexeypetrushin/class_loader"

data/lib/class_loader/class_loader.rb

@@ -1,9 +1,11 @@
 require 'class_loader/support'
+require 'monitor'
 
 module ClassLoader
   @loaded_classes = {}
+  @monitor = Monitor.new
   class << self
-    attr_reader :loaded_classes
+    attr_reader :loaded_classes, :monitor
 
     # Hierarchically searching for class file, according to modules hierarchy.
     #
@@ -13,65 +15,69 @@ module ClassLoader
     # - '/lib/a/b/c.rb' - there's nothing, moving up in hierarchy.
     # - '/lib/a/c.rb' - got and load it.
     def load namespace, const
-      original_namespace = namespace
-      namespace = nil if namespace == Object or namespace == Module
-      target_namespace = namespace
+      monitor.synchronize do
+        original_namespace = namespace
+        namespace = nil if namespace == Object or namespace == Module
+        target_namespace = namespace
+
+        # Need this hack to work with anonymous classes.
+        namespace = eval "#{name_hack(namespace)}" if namespace
+
+        # Hierarchically searching for class name.
+        begin
+          class_name = namespace ? "#{namespace.name}::#{const}" : const.to_s
+          class_file_name = get_file_name class_name
+
+          # Trying to load class file, if its exist.
+          loaded = begin
+            require class_file_name
+            true
+          rescue LoadError => e
+            # Not the best way - hardcoding error messages, but it's the fastest way
+            # to check existence of file & load it.
+            raise e unless e.message =~ /no such file.*#{Regexp.escape(class_file_name)}/
+            false
+          end
 
-      # Need this hack to work with anonymous classes.
-      namespace = eval "#{name_hack(namespace)}" if namespace
+          if loaded
+            # Checking that class hasn't been loaded previously, sometimes it may be caused by
+            # weird class definition code.
+            if loaded_classes.include? class_name
+              raise_without_self NameError, \
+                "something wrong with '#{const}' referenced from '#{original_namespace}' scope!"
+            end
 
-      # Hierarchically searching for class name.
-      begin
-        class_name = namespace ? "#{namespace.name}::#{const}" : const.to_s
-        class_file_name = get_file_name class_name
+            # Checking that class defined in correct namespace, not the another one.
+            unless namespace ? namespace.const_defined?(const, false) : Object.const_defined?(const, false)
+              raise_without_self NameError, \
+                "class name '#{class_name}' doesn't correspond to file name '#{class_file_name}'!"
+            end
 
-        # Trying to load class file, if its exist.
-        loaded = begin
-          require class_file_name
-          true
-        rescue LoadError => e
-          # Not the best way - hardcoding error messages, but it's the fastest way
-          # to check existence of file & load it.
-          raise e unless e.message =~ /no such file.*#{Regexp.escape(class_file_name)}/
-          false
-        end
+            # Getting the class itself.
+            klass = namespace ? namespace.const_get(const, false) : Object.const_get(const, false)
 
-        if loaded
-          # Checking that class hasn't been loaded previously, sometimes it may be caused by
-          # weird class definition code.
-          if loaded_classes.include? class_name
-            raise_without_self NameError, \
-              "something wrong with '#{const}' referenced from '#{original_namespace}' scope!"
-          end
+            loaded_classes[class_name] = klass
 
-          # Checking that class defined in correct namespace, not the another one.
-          unless namespace ? namespace.const_defined?(const, false) : Object.const_defined?(const, false)
-            raise_without_self NameError, \
-              "class name '#{class_name}' doesn't correspond to file name '#{class_file_name}'!"
+            return klass
           end
 
-          # Getting the class itself.
-          klass = namespace ? namespace.const_get(const, false) : Object.const_get(const, false)
-
-          loaded_classes[class_name] = klass
+          # Moving to higher namespace.
+          global_also_tried = namespace == nil
+          namespace = Module.namespace_for namespace.name if namespace
+        end until global_also_tried
 
-          return klass
-        end
-
-        # Moving to higher namespace.
-        global_also_tried = namespace == nil
-        namespace = Module.namespace_for namespace.name if namespace
-      end until global_also_tried
-
-      return nil
+        return nil
+      end
     end
 
     # Dynamic class loading is not thread safe (known Ruby bug), to workaround it
     # You can forcefully preload all Your classes in production when Your app starts.
     def preload path
-      Dir.glob("#{path}/**/*.rb").each do |class_path|
-        class_file_name = class_path.sub("#{path}/", '').sub(/\.rb$/, '')
-        require class_file_name
+      monitor.synchronize do
+        Dir.glob("#{path}/**/*.rb").each do |class_path|
+          class_file_name = class_path.sub("#{path}/", '').sub(/\.rb$/, '')
+          require class_file_name
+        end
       end
     end
 
@@ -83,7 +89,7 @@ module ClassLoader
 
     def watcher
       require 'class_loader/watcher'
-      @watcher ||= ClassLoader::Watcher.new
+      @watcher ||= ClassLoader::Watcher.new monitor
     end
 
     protected

data/lib/class_loader/watcher.rb

@@ -1,7 +1,8 @@
 class ClassLoader::Watcher
   attr_accessor :paths, :interval
 
-  def initialize
+  def initialize monitor
+    @monitor = monitor
     @paths, @files = [], {}
     @interval = 2
   end
@@ -23,22 +24,24 @@ class ClassLoader::Watcher
   end
 
   def check
-    paths.each do |path|
-      Dir.glob("#{path}/**/*.rb").each do |class_path|
-        updated_at = File.mtime class_path
-        if last_updated_at = files[class_path]
-          if last_updated_at < updated_at
-            class_file_name = class_path.sub "#{path}/", ''
-            warn "reloading #{class_file_name}"
-            load class_file_name
+    monitor.synchronize do
+      paths.each do |path|
+        Dir.glob("#{path}/**/*.rb").each do |class_path|
+          updated_at = File.mtime class_path
+          if last_updated_at = files[class_path]
+            if last_updated_at < updated_at
+              class_file_name = class_path.sub "#{path}/", ''
+              warn "reloading #{class_file_name}"
+              load class_file_name
+            end
+          else
+            files[class_path] = updated_at
           end
-        else
-          files[class_path] = updated_at
         end
       end
     end
   end
 
   protected
-    attr_reader :files, :thread
+    attr_reader :files, :thread, :monitor
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: class_loader
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
   prerelease: 
 platform: ruby
 authors: