using_yaml 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/using_yaml.rb

@@ -5,10 +5,6 @@ require 'using_yaml/patches/hash'
 
 module UsingYAML
   class << self
-    def cache
-      @@cache ||= {}
-    end
-
     def path(klass)
       return @@path[klass] if defined?(@@path)
     end
@@ -47,22 +43,23 @@ module UsingYAML
             else
               filename = key
               options  = value
-              using_yaml_file(filename, options)
+              using_yaml_file(filename)
             end
           end
         end
       end
     end
 
-    def using_yaml_file(filename, options = {})
+    def using_yaml_file(filename)
       define_method(filename) do
         pathname = using_yaml_path.join("#{filename}.yml").expand_path
-        data = UsingYAML.cache[pathname]
+        cache    = (@using_yaml_cache ||= {})
+        data     = @using_yaml_cache[pathname]
         return data if data
 
         begin
           data = YAML.load_file(pathname).to_ohash(pathname)
-          UsingYAML.cache[pathname] = data
+          @using_yaml_cache[pathname] = data
         rescue Exception => e
           $stderr.puts "(UsingYAML) Could not load #{filename}: #{e.message}" unless UsingYAML.squelched?
           nil
@@ -72,6 +69,8 @@ module UsingYAML
   end
 
   module InstanceMethods
+    attr_accessor :using_yaml_cache
+    
     def using_yaml_path
       path = UsingYAML.path(self.class.name)
       path = path.call(self) if path.is_a? Proc

data/spec/spec_helper.rb

@@ -13,3 +13,14 @@ class Person
   include UsingYAML
   using_yaml :children
 end
+
+def reset_person!
+  Person.class_eval do
+    include UsingYAML
+    using_yaml :children
+  end
+
+  UsingYAML.path = ['Person', nil]
+  @person.using_yaml_path = nil
+  @person.using_yaml_cache = nil
+end

data/spec/using_yaml/path_spec.rb

@@ -1,15 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-def reset_person!
-  Person.class_eval do
-    include UsingYAML
-    using_yaml :children
-  end
-
-  UsingYAML.path = ['Person', nil]
-  @person.using_yaml_path = nil
-end
-
 describe "UsingYAML#paths" do
   before(:each) do
     @person = Person.new

data/using_yaml.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{using_yaml}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marc Bowes"]
-  s.date = %q{2010-02-13}
+  s.date = %q{2010-02-15}
   s.description = %q{"Load, save and use YAML files as if they were objects"}
   s.email = %q{marcbowes@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: using_yaml
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Marc Bowes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-13 00:00:00 +02:00
+date: 2010-02-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency