gluer 0.0.3 → 0.0.4

data/lib/gluer/file.rb

@@ -22,7 +22,7 @@ module Gluer
       touch
     end
 
-    def rollback_all
+    def unload
       registration_pool.rollback
       registration_pool.clear
     end

data/lib/gluer/file_pool.rb

@@ -1,6 +1,6 @@
 require 'gluer/configuration'
 require 'gluer/file'
-require 'gluer/ordered_set'
+require 'set'
 
 module Gluer
   class FilePool
@@ -9,19 +9,21 @@ module Gluer
     end
 
     def get(path)
-      files.detect { |file| file.path == path }
+      files.fetch(path)
     end
 
     def clear
-      @files = OrderedSet.new
+      @files = Hash.new
     end
 
     def update
-      new_files = OrderedSet.new(collect)
-      diff = files - new_files
-      diff.each(&:rollback_all)
-      self.files = new_files
-      files.each(&:reload)
+      updated_file_paths = Set.new(collect)
+      (current_file_paths - updated_file_paths).each do |old_path|
+        files.delete(old_path).unload
+      end
+      updated_file_paths.each do |path|
+        (files[path] ||= File.new(path)).reload
+      end
     end
 
   private
@@ -30,8 +32,11 @@ module Gluer
     def collect
       base_path = Gluer.config.base_path
       signature = Gluer.config.magic_signature
-      filtered_file_paths = Gluer.config.file_filter.call(base_path, signature)
-      filtered_file_paths.map { |path| File.new(path) }
+      Gluer.config.file_filter.call(base_path, signature)
+    end
+
+    def current_file_paths
+      Set.new(files.keys)
     end
   end
 end

data/lib/gluer/version.rb

@@ -1,3 +1,3 @@
 module Gluer
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/file_pool_spec.rb

@@ -0,0 +1,121 @@
+require 'gluer/file_pool'
+require 'set'
+
+describe Gluer::FilePool do
+  subject { Gluer::FilePool.new }
+
+  let(:file_paths)     { ['path1', 'path2', 'path3'] }
+  let(:reloaded_files) { Hash.new }
+
+  def stub_file(path)
+    stub('File', :path => path).tap do |file|
+      file.stub(:unload)
+      file.stub(:reload) { reloaded_files[path] = file }
+    end
+  end
+
+  before do
+    @old_file_filter = Gluer.config.file_filter
+    Gluer.config.file_filter = ->(base_path, signature) { file_paths }
+
+    Gluer::File.stub(:new) { |path| stub_file(path) }
+
+    reloaded_files.clear
+  end
+
+  after do
+    Gluer.config.file_filter = @old_file_filter
+  end
+
+  describe "#update" do
+    before { subject.update }
+
+    it "reloads each file" do
+      Set[*reloaded_files.keys].should == Set[*file_paths]
+    end
+
+    it "makes them available from #get" do
+      expect { subject.get('path1') }.to_not raise_error
+      expect { subject.get('path2') }.to_not raise_error
+      expect { subject.get('path3') }.to_not raise_error
+    end
+
+    context "when filtering doesn't change in next call" do
+      before do
+        @file1 = reloaded_files['path1']
+        @file2 = reloaded_files['path2']
+        @file3 = reloaded_files['path3']
+
+        reloaded_files.clear
+      end
+
+      it "does not unload existing files" do
+        @file1.should_not_receive(:unload)
+        @file2.should_not_receive(:unload)
+        @file3.should_not_receive(:unload)
+
+        subject.update
+      end
+
+      it "keeps existing files available from #get" do
+        subject.update
+        expect { subject.get('path1') }.to_not raise_error
+      end
+
+      it "reloads existing files" do
+        @file1.should_receive(:reload)
+        @file2.should_receive(:reload)
+        @file3.should_receive(:reload)
+
+        subject.update
+      end
+    end
+
+    context "when filtering changes in next call" do
+      before do
+        new_file_paths = file_paths - ['path1'] + ['path4']
+        Gluer.config.file_filter = ->(base_path, signature) { new_file_paths }
+
+        @file1 = reloaded_files['path1']
+        @file2 = reloaded_files['path2']
+        @file3 = reloaded_files['path3']
+
+        reloaded_files.clear
+      end
+
+      it "unloads the filtered out file" do
+        @file1.should_receive(:unload)
+
+        subject.update
+      end
+
+      it "does not reload the filtered out file" do
+        @file1.should_not_receive(:reload)
+
+        subject.update
+      end
+
+      specify "getting the unloaded file results in key error" do
+        subject.update
+        expect { subject.get('path1') }.to raise_error(KeyError)
+      end
+
+      it "reloads existing files" do
+        @file2.should_receive(:reload)
+        @file3.should_receive(:reload)
+
+        subject.update
+      end
+
+      it "loads the new file" do
+        subject.update
+        expect(reloaded_files.keys).to include('path4')
+      end
+
+      it "makes the new file available from #get" do
+        subject.update
+        expect { subject.get('path4') }.to_not raise_error
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gluer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,6 +119,7 @@ files:
 - lib/gluer/registration_hook.rb
 - lib/gluer/registration_pool.rb
 - lib/gluer/version.rb
+- spec/file_pool_spec.rb
 - spec/integration/default_usage_spec.rb
 - spec/registration_spec.rb
 - spec/spec_helper.rb
@@ -137,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -643542908819081747
+      hash: -2018170584366941344
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -146,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -643542908819081747
+      hash: -2018170584366941344
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -154,6 +155,7 @@ signing_key:
 specification_version: 3
 summary: Configuration reloader
 test_files:
+- spec/file_pool_spec.rb
 - spec/integration/default_usage_spec.rb
 - spec/registration_spec.rb
 - spec/spec_helper.rb