using_yaml 1.0.0 → 1.1.0

data/Rakefile

@@ -36,5 +36,26 @@ Spec::Rake::SpecTask.new do |t|
   t.spec_files = Rake::FileList["spec/**/*_spec.rb"]
   t.spec_opts = ["-c"]
 end
- 
+
+desc "Run a simple performance benchmark"
+task :benchmark do
+  require 'lib/using_yaml'
+  require 'benchmark'
+
+  was_squelched = UsingYAML.squelched?
+  UsingYAML.squelch!
+  class Person
+    include UsingYAML
+    using_yaml :children
+  end
+  p = Person.new
+  p.children # "cache" the nil
+  n = 10000
+  Benchmark.bmbm(10) do |x|
+    x.report("normal")  { n.times do; p.children && p.children['something'] && p.children['invalid']; end }
+    x.report("chained") { n.times do; p.children.something.invalid; end }
+  end
+  UsingYAML.unsquelch! unless was_squelched
+end
+
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/using_yaml/array.rb

@@ -25,5 +25,6 @@ module UsingYAML
 
     # Load in the extensions for this instance
     array.extend(extensions)
+    array
   end
 end

data/lib/using_yaml/hash.rb

@@ -13,7 +13,8 @@ module UsingYAML
         name = args.shift.to_s
 
         if args.empty?
-          send(:[], name) || UsingYAML.add_extensions(nil)
+          value = send(:[], name)
+          value.nil? ? UsingYAML::NilClass : value
         elsif args.size == 1 && name =~ /(.+)=/
           # This is an "alias" turning self.key= into self[key]=
           # Also extends the incoming value so that it behaves
@@ -53,5 +54,6 @@ module UsingYAML
 
     # Load in the extensions for this instance
     hash.extend(extensions)
+    hash
   end
 end

data/lib/using_yaml/nilclass.rb

@@ -1,10 +1,10 @@
 module UsingYAML
   def self.add_nilclass_extensions(instance, pathname)
     extensions = Module.new do
-      define_method(:method_missing) do
+      define_method(:method_missing) do |*args|
         # Child objects should not have #save
         if respond_to? :save
-          add_extensions(nil)
+          UsingYAML::NilClass
         else
           # One nil is the same as the next :)
           self
@@ -29,5 +29,6 @@ module UsingYAML
     end
 
     instance.extend(extensions)
+    instance
   end
 end

data/lib/using_yaml.rb

@@ -1,8 +1,9 @@
 require 'yaml'
 require 'pathname'
-require 'using_yaml/array'
-require 'using_yaml/hash'
-require 'using_yaml/nilclass'
+
+Dir[File.join(File.dirname(__FILE__), 'using_yaml/*')].each do |ext|
+  require ext
+end
 
 # UsingYAML provides convenient class extensions which make it easy to
 # interact with YAML-storage of settings files by defining accessors
@@ -21,6 +22,8 @@ require 'using_yaml/nilclass'
 #
 # See +using_yaml+ for usage information.
 module UsingYAML
+  NilClass = add_nilclass_extensions(nil, nil)
+  
   class << self
     # Extends the incoming Array/Hash with magic which makes it
     # possible to +save+ and (in the case of Hashes) use methods
@@ -31,10 +34,14 @@ module UsingYAML
         add_array_extensions(object, pathname)
       when Hash
         add_hash_extensions(object, pathname)
-      when NilClass
-        add_nilclass_extensions(object, pathname)
+      when ::NilClass
+        if pathname
+          add_nilclass_extensions(object, pathname)
+        else
+          UsingYAML::NilClass
+        end
       end
-      
+            
       object
     end
   
@@ -67,6 +74,11 @@ module UsingYAML
     def squelched?
       defined?(@@squelched) && @@squelched
     end
+
+    # Opposite of +squelch!+
+    def unsquelch!
+      @@squelched = false
+    end
   end
   
   def self.included(base)
@@ -130,7 +142,7 @@ module UsingYAML
 
         # If the yaml exists in our cache, then we don't need to hit
         # the disk.
-        return yaml if yaml
+        return yaml if @using_yaml_cache.has_key? pathname
 
         # Safe disk read which either reads and parses a YAML object
         # (and caches it against future reads) or graciously ignores
@@ -142,7 +154,7 @@ module UsingYAML
           @using_yaml_cache[pathname] = UsingYAML.add_extensions(YAML.load_file(pathname), pathname)
         rescue Exception => e
           $stderr.puts "(UsingYAML) Could not load #{filename}: #{e.message}" unless UsingYAML.squelched?
-          UsingYAML.add_extensions(nil)
+          @using_yaml_cache[pathname] = UsingYAML.add_extensions(nil, pathname)
         end
       end
 

data/spec/using_yaml/using_yaml_spec.rb

@@ -11,7 +11,12 @@ describe 'UsingYAML' do
     end
 
     it "should gracefully handle nil.nil..." do
-      @person.children.invalid.call.should be_nil
+      @person.children.something.invalid.should be_nil
+    end
+
+    it "should return false when expected" do
+      YAML.stubs(:load_file).with(anything).returns({ 'example' => false })
+      @person.children.example.should == false
     end
   end
 

data/using_yaml.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{using_yaml}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marc Bowes"]
-  s.date = %q{2010-03-06}
+  s.date = %q{2010-03-30}
   s.description = %q{"Load, save and use YAML files as if they were objects"}
   s.email = %q{marcbowes@gmail.com}
   s.extra_rdoc_files = [
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/marcbowes/UsingYAML}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{"Load, save and use YAML files"}
   s.test_files = [
     "spec/using_yaml/path_spec.rb",

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: using_yaml
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Marc Bowes
@@ -9,19 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-06 00:00:00 -05:00
+date: 2010-03-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 description: "\"Load, save and use YAML files as if they were objects\""
 email: marcbowes@gmail.com
 executables: []
@@ -59,18 +66,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: "\"Load, save and use YAML files\""