using_yaml 0.3.1 → 0.3.3

data/README.rdoc

@@ -41,7 +41,46 @@ From Gemcutter:
 
 == Pathname
 
-Coming soon!
+By default, UsingYAML will look for .yml files in your home directory. There are several ways to configure this:
+
+=== With strings:
+
+   class ExampleUsage
+     include UsingYAML
+
+     using_yaml :example, :path => '/your/path/here'
+   end
+
+=== Using a Proc:
+
+   class ExampleUsage
+     include UsingYAML
+
+     using_yaml :example, :path => lambda { |c| c.pathname }
+     attr_accessor :pathname
+   end
+
+   example = ExampleUsage.new
+   example.pathname = '/your/path/here'
+
+=== Overriding using_yaml_path:
+
+   class ExampleUsage
+     include UsingYAML
+
+     using_yaml :example
+     
+     def using_yaml_path
+       '/your/code/here'
+     end
+   end
+
+
+== Error messages
+
+By default, UsingYAML will return nil for missing files. It will also complain on STDERR. If you want to disable the complaint:
+
+  UsingYAML.squelch!
 
 == Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.3

data/lib/using_yaml/open_hash.rb

@@ -1,31 +1,44 @@
-def OpenHash(hash, pathname = nil)
-  Module.new do
-    hash.each_pair do |key, value|
-      define_method(key) do
-        case value
-        when Hash
-          value.to_ohash
-        when Array
-          value.collect { |i| i === Hash ? i.to_ohash : i }
-        else
-          value
+module OpenHash
+  class << self
+    def from_hash(hash, pathname = nil)
+      Module.new do
+        hash.each_pair do |key, value|
+          define_method(key) do
+            value.respond_to?(:to_ohash) ? value.to_ohash : value
+          end
+
+          define_method("#{key}=") do |value|
+            case value
+            when Hash
+              send(:[]=, key, value.to_ohash)
+            else
+              send(:[]=, key, value)
+            end
+          end
         end
-      end
 
-      define_method("#{key}=") do |value|
-        case value
-        when Hash
-          send(:[]=, key, value.to_ohash)
-        else
-          send(:[]=, key, value)
+        if pathname
+          define_method(:save) do
+            File.open(pathname, 'w') do |f|
+              f.puts self.to_yaml
+            end
+          end
         end
       end
     end
 
-    if pathname
-      define_method(:save) do
-        File.open(pathname, 'w') do |f|
-          f.puts self.to_yaml
+    def from_array(array, pathname = nil)
+      Module.new do
+        array.each do |e|
+          e.to_ohash(e)
+        end
+        
+        if pathname
+          define_method(:save) do
+            File.open(pathname, 'w') do |f|
+              f.puts self.to_yaml
+            end
+          end
         end
       end
     end

data/lib/using_yaml/patches/array.rb

@@ -0,0 +1,5 @@
+class Array
+  def to_ohash(pathname)
+    self.extend OpenHash.from_array(self, pathname)
+  end
+end

data/lib/using_yaml/patches/hash.rb

@@ -1,5 +1,5 @@
 class Hash
   def to_ohash(pathname)
-    self.extend OpenHash(self, pathname)
+    self.extend OpenHash.from_hash(self, pathname)
   end
 end

data/lib/using_yaml.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'pathname'
 require 'using_yaml/open_hash'
+require 'using_yaml/patches/array'
 require 'using_yaml/patches/hash'
 
 module UsingYAML

data/spec/using_yaml/using_yaml_spec.rb

@@ -10,7 +10,14 @@ describe 'UsingYAML#core' do
   end
 
   it "should return valid settings files" do
-    YAML.stubs(:load_file).with(anything).returns({})
-    @person.children.should == {}
+    YAML.stubs(:load_file).with(anything).returns({ 'foo' => 'bar' })
+    @person.children.should == { 'foo' => 'bar' }
+    @person.children.foo.should == 'bar'
+  end
+
+  it "should work with arrays" do
+    YAML.stubs(:load_file).with(anything).returns([ { 'foo' => 'bar' } ])
+    @person.children.class.name.should == 'Array'
+    @person.children.first.should == { 'foo' => 'bar' }
   end
 end

data/using_yaml.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{using_yaml}
-  s.version = "0.3.1"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marc Bowes"]
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/using_yaml.rb",
      "lib/using_yaml/open_hash.rb",
+     "lib/using_yaml/patches/array.rb",
      "lib/using_yaml/patches/hash.rb",
      "spec/spec_helper.rb",
      "spec/using_yaml/path_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: using_yaml
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors: 
 - Marc Bowes
@@ -40,6 +40,7 @@ files:
 - VERSION
 - lib/using_yaml.rb
 - lib/using_yaml/open_hash.rb
+- lib/using_yaml/patches/array.rb
 - lib/using_yaml/patches/hash.rb
 - spec/spec_helper.rb
 - spec/using_yaml/path_spec.rb