senotrusov-ruby-xml-mapper 1.0.4 → 1.0.5

data/lib/ruby-xml-mapper/file_cache.rb

@@ -0,0 +1,46 @@
+
+#  Copyright 2008-2009 Stanislav Senotrusov <senotrusov@gmail.com>
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+ 
+class RubyXmlMapper::FileCache
+  def initialize
+    @items = {}
+    @mutex = Mutex.new
+  end
+  
+  def get filename, &block
+    @mutex.synchronize do
+      @items[filename] ||= RubyXmlMapper::FileCacheItem.new(filename)
+    end
+    
+    @items[filename].get &block
+  end
+  
+  def any_changes?
+    !no_changes?
+  end
+  
+  def no_changes?
+    @mutex.synchronize do
+      @items.all? { |filename, item| item.no_changes? }
+    end
+  end
+  
+  def clear
+    @mutex.synchronize do
+      @items.clear
+    end
+  end 
+  
+end

data/lib/ruby-xml-mapper/file_cache_item.rb

@@ -0,0 +1,48 @@
+
+#  Copyright 2008-2009 Stanislav Senotrusov <senotrusov@gmail.com>
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+ 
+
+class RubyXmlMapper::FileCacheItem
+  def initialize filename
+    @filename = filename
+    @mutex = Mutex.new
+  end
+  
+  def get
+    raise(RubyXmlMapper::CircularReference, "in `#{@filename}'") if @mutex.locked?
+    
+    @mutex.synchronize do
+      mtime = File.mtime(@filename)
+      
+      if @data && @mtime == mtime
+        return @data
+        
+      elsif block_given?
+        @mtime = mtime
+        return (@data = yield)
+        
+      else
+        return @data
+      end
+    end
+  end
+  
+  def no_changes?
+    @mutex.synchronize do
+      File.mtime(@filename) == @mtime
+    end
+  end
+  
+end

data/lib/ruby-xml-mapper.rb

@@ -23,9 +23,16 @@
 
 require 'libxml'
 
+module RubyXmlMapper
+  class CircularReference < StandardError; end
+end
+
+require 'ruby-xml-mapper/file_cache_item'
+require 'ruby-xml-mapper/file_cache'
+
 module RubyXmlMapper
   mattr_accessor :file_cache
-  self.file_cache = {}
+  self.file_cache = RubyXmlMapper::FileCache.new
   
   def self.included model
     model.extend RubyXmlMapper::RubyXmlMapperClassMethods
@@ -154,7 +161,9 @@ module RubyXmlMapper
     end
     
     def new_from_xml_file file_name
-      RubyXmlMapper.file_cache[file_name] ||= new_from_xml_node(parse_xml_file(file_name))
+      RubyXmlMapper.file_cache.get(file_name) do
+        new_from_xml_node(parse_xml_file(file_name))
+      end
     end
 
     def new_from_xml_node node

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: senotrusov-ruby-xml-mapper
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Stanislav Senotrusov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-30 00:00:00 -07:00
+date: 2009-08-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,8 @@ files:
 - README
 - LICENSE
 - lib/ruby-xml-mapper
+- lib/ruby-xml-mapper/file_cache_item.rb
+- lib/ruby-xml-mapper/file_cache.rb
 - lib/ruby-xml-mapper/basic_containers.rb
 - lib/ruby-xml-mapper.rb
 - test/rss.rb