using_yaml 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/using_yaml.rb

@@ -32,6 +32,8 @@ module UsingYAML
 
   module ClassMethods
     def using_yaml(*args)
+      include InstanceMethods
+      
       args.each do |arg|
         case arg
         when Symbol, String
@@ -54,7 +56,7 @@ module UsingYAML
 
     def using_yaml_file(filename, options = {})
       define_method(filename) do
-        pathname = self.class.using_yaml_path.join("#{filename}.yml").expand_path
+        pathname = using_yaml_path.join("#{filename}.yml").expand_path
         data = UsingYAML.cache[pathname]
         return data if data
 
@@ -67,9 +69,13 @@ module UsingYAML
         end
       end
     end
+  end
 
+  module InstanceMethods
     def using_yaml_path
-      @using_yaml_path ||= Pathname.new(UsingYAML.path(self.inspect) || ENV['HOME'])
+      path = UsingYAML.path(self.class.name)
+      path = path.call(self) if path.is_a? Proc
+      @using_yaml_path ||= Pathname.new(path || ENV['HOME'])
     end
 
     def using_yaml_path=(path)

data/spec/using_yaml/path_spec.rb

@@ -7,7 +7,7 @@ def reset_person!
   end
 
   UsingYAML.path = ['Person', nil]
-  Person.using_yaml_path = nil
+  @person.using_yaml_path = nil
 end
 
 describe "UsingYAML#paths" do
@@ -16,12 +16,12 @@ describe "UsingYAML#paths" do
   end
 
   it "should return $HOME for non-existant pathnames" do
-    Person.using_yaml_path.expand_path.to_s.should == ENV['HOME']
+    @person.using_yaml_path.expand_path.to_s.should == ENV['HOME']
   end
 
   it "should return path/to/defined for globally set pathnames" do
-    Person.using_yaml_path = "global"
-    Person.using_yaml_path.expand_path.to_s.should =~ /global/
+    @person.using_yaml_path = "global"
+    @person.using_yaml_path.expand_path.to_s.should =~ /global/
     reset_person!
   end
 
@@ -29,7 +29,17 @@ describe "UsingYAML#paths" do
     Person.class_eval do
       using_yaml :children, :path => "local"
     end
-    Person.using_yaml_path.expand_path.to_s.should =~ /local/
+    @person.using_yaml_path.expand_path.to_s.should =~ /local/
+    reset_person!
+  end
+
+  it "should return path/to/lambda for lambda paths" do
+    Person.class_eval do
+      using_yaml :children, :path => lambda { |s| s.pathname }
+      attr_accessor :pathname
+    end
+    @person.pathname = 'lambda'
+    @person.using_yaml_path.expand_path.to_s.should =~ /lambda/
     reset_person!
   end
 end

data/using_yaml.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{using_yaml}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marc Bowes"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: using_yaml
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Marc Bowes