using_yaml 0.1.1 → 0.2.0

data/Rakefile

@@ -18,31 +18,8 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
-task :default => :test
-
 require 'rake/rdoctask'
+
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
@@ -51,3 +28,13 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+require 'spec/rake/spectask'
+
+desc "Run specs"
+Spec::Rake::SpecTask.new do |t|
+  t.spec_files = Rake::FileList["spec/**/*_spec.rb"]
+  t.spec_opts = ["-c"]
+end
+ 
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/using_yaml.rb

@@ -9,14 +9,20 @@ module UsingYAML
       @@cache ||= {}
     end
 
-    def config(klass, key, value = nil)
-      @@config ||= {}
-      case value
-      when nil
-        (@@config[klass] ||= {})[key] = value
-      else
-        @@config[klass]
-      end
+    def path(klass)
+      return @@path[klass] if defined?(@@path)
+    end
+
+    def path=(args)
+      (@@path ||= {})[args.first] = args.last
+    end
+
+    def squelch!
+      @@squelched = true
+    end
+
+    def squelched?
+      defined?(@@squelched) && @@squelched
     end
   end
   
@@ -33,10 +39,10 @@ module UsingYAML
           using_yaml_file(filename)
         when Hash
           arg.each do |key, value|
-            case value
-            when Symbol
-              UsingYAML.config(self.class, key, value)
-            when Hash
+            case key
+            when :path
+              UsingYAML.path = [self.inspect, value]
+            else
               filename = key
               options  = value
               using_yaml_file(filename, options)
@@ -52,13 +58,22 @@ module UsingYAML
         data = UsingYAML.cache[pathname]
         return data if data
 
-        data = YAML.load_file(pathname).to_ohash(pathname) rescue nil
-        UsingYAML.cache[pathname] = data
+        begin
+          data = YAML.load_file(pathname).to_ohash(pathname)
+          UsingYAML.cache[pathname] = data
+        rescue Exception => e
+          $stderr.puts "(UsingYAML) Could not load #{filename}: #{e.message}" unless UsingYAML.squelched?
+          nil
+        end
       end
     end
 
     def using_yaml_path
-      @using_yaml_path ||= Pathname.new(UsingYAML.config(self.class, :pathname) || File.dirname(__FILE__))
+      @using_yaml_path ||= Pathname.new(UsingYAML.path(self.inspect) || ENV['HOME'])
+    end
+
+    def using_yaml_path=(path)
+      @using_yaml_path = path && Pathname.new(path)
     end
   end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+require 'rubygems'
+require 'spec'
+require 'mocha'
+require File.dirname(__FILE__) + '/../lib/using_yaml.rb'
+ 
+Spec::Runner.configure do |config|
+  config.mock_with :mocha
+end
+
+UsingYAML.squelch!
+
+class Person
+  include UsingYAML
+  using_yaml :children
+end

data/spec/using_yaml/path_spec.rb

@@ -0,0 +1,35 @@
+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
+  end
+
+  it "should return $HOME for non-existant pathnames" do
+    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/
+    reset_person!
+  end
+
+  it "should return path/to/defined for locally set pathnames" do
+    Person.class_eval do
+      using_yaml :children, :path => "local"
+    end
+    Person.using_yaml_path.expand_path.to_s.should =~ /local/
+    reset_person!
+  end
+end

data/spec/using_yaml/using_yaml_spec.rb

@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe 'UsingYAML#core' do
+  before(:each) do
+    @person = Person.new
+  end
+
+  it "should return nil for invalid settings files" do
+    @person.children.should be_nil
+  end
+
+  it "should return valid settings files" do
+    YAML.stubs(:load_file).with(anything).returns({})
+    @person.children.should == {}
+  end
+end

data/using_yaml.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{using_yaml}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marc Bowes"]
-  s.date = %q{2010-02-12}
+  s.date = %q{2010-02-13}
   s.description = %q{"Load, save and use YAML files as if they were objects"}
   s.email = %q{marcbowes@gmail.com}
   s.extra_rdoc_files = [
@@ -26,8 +26,9 @@ Gem::Specification.new do |s|
      "lib/using_yaml.rb",
      "lib/using_yaml/open_hash.rb",
      "lib/using_yaml/patches/hash.rb",
-     "test/helper.rb",
-     "test/test_using_yaml.rb",
+     "spec/spec_helper.rb",
+     "spec/using_yaml/path_spec.rb",
+     "spec/using_yaml/using_yaml_spec.rb",
      "using_yaml.gemspec"
   ]
   s.homepage = %q{http://github.com/marcbowes/UsingYAML}
@@ -36,8 +37,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{"Load, save and use YAML files"}
   s.test_files = [
-    "test/test_using_yaml.rb",
-     "test/helper.rb"
+    "spec/using_yaml/path_spec.rb",
+     "spec/using_yaml/using_yaml_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: using_yaml
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Marc Bowes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-12 00:00:00 +02:00
+date: 2010-02-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,8 +41,9 @@ files:
 - lib/using_yaml.rb
 - lib/using_yaml/open_hash.rb
 - lib/using_yaml/patches/hash.rb
-- test/helper.rb
-- test/test_using_yaml.rb
+- spec/spec_helper.rb
+- spec/using_yaml/path_spec.rb
+- spec/using_yaml/using_yaml_spec.rb
 - using_yaml.gemspec
 has_rdoc: true
 homepage: http://github.com/marcbowes/UsingYAML
@@ -73,5 +74,6 @@ signing_key:
 specification_version: 3
 summary: "\"Load, save and use YAML files\""
 test_files: 
-- test/test_using_yaml.rb
-- test/helper.rb
+- spec/using_yaml/path_spec.rb
+- spec/using_yaml/using_yaml_spec.rb
+- spec/spec_helper.rb

data/test/helper.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'using_yaml'
-
-class Test::Unit::TestCase
-end

data/test/test_using_yaml.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestUsingYAML < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end