ruby-nuggets 0.6.8 → 0.6.9

data/.rspec

@@ -1,2 +1 @@
 --colour
---require spec/spec_helper.rb

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to ruby-nuggets version 0.6.8
+This documentation refers to ruby-nuggets version 0.6.9
 
 
 == DESCRIPTION

data/Rakefile

@@ -1,4 +1,4 @@
-require %q{lib/nuggets/version}
+require File.expand_path(%q{../lib/nuggets/version}, __FILE__)
 
 begin
   require 'hen'

data/lib/nuggets/file/sub_mixin.rb

@@ -42,7 +42,7 @@ module Nuggets
   # +block+ and returns the new content.
   def sub(name, *args)
     content = read(name)
-    content.sub!(*args, &block_given? ? Proc.new : nil)
+    content.sub!(*args, &block_given? ? ::Proc.new : nil)
     content
   end
 
@@ -56,7 +56,7 @@ module Nuggets
     res = nil
 
     replace(name) { |content|
-      res = content.sub!(*args, &block_given? ? Proc.new : nil)
+      res = content.sub!(*args, &block_given? ? ::Proc.new : nil)
       content
     }
 
@@ -70,7 +70,7 @@ module Nuggets
   # +block+ and returns the new content.
   def gsub(name, *args)
     content = read(name)
-    content.gsub!(*args, &block_given? ? Proc.new : nil)
+    content.gsub!(*args, &block_given? ? ::Proc.new : nil)
     content
   end
 
@@ -84,7 +84,7 @@ module Nuggets
     res = nil
 
     replace(name) { |content|
-      res = content.gsub!(*args, &block_given? ? Proc.new : nil)
+      res = content.gsub!(*args, &block_given? ? ::Proc.new : nil)
       content
     }
 

data/lib/nuggets/hash/deep_merge.rb

@@ -0,0 +1,5 @@
+require 'nuggets/hash/deep_merge_mixin'
+
+class Hash
+  include Nuggets::Hash::DeepMergeMixin
+end

data/lib/nuggets/hash/deep_merge_mixin.rb

@@ -0,0 +1,54 @@
+#--
+###############################################################################
+#                                                                             #
+# A component of ruby-nuggets, some extensions to the Ruby programming        #
+# language.                                                                   #
+#                                                                             #
+# Copyright (C) 2007-2011 Jens Wille                                          #
+#                                                                             #
+# Authors:                                                                    #
+#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#                                                                             #
+# ruby-nuggets is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; either version 3 of the License, or (at your option)   #
+# any later version.                                                          #
+#                                                                             #
+# ruby-nuggets is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with ruby-nuggets. If not, see <http://www.gnu.org/licenses/>.              #
+#                                                                             #
+###############################################################################
+#++
+
+module Nuggets
+  class Hash
+    module DeepMergeMixin
+
+  # call-seq:
+  #   hash.deep_merge(other_hash) => aHash
+  #
+  # Merges nested hashes recursively (see Hash#merge).
+  def deep_merge(other)
+    merge(other) { |key, old, new|
+      old.respond_to?(:deep_merge) ? old.deep_merge(new) : new
+    }
+  end
+
+  # call-seq:
+  #   hash.deep_merge!(other_hash) => hash
+  #
+  # Destructive version of #deep_merge.
+  def deep_merge!(other)
+    replace(deep_merge(other))
+  end
+
+  alias_method :deep_update, :deep_merge!
+
+    end
+  end
+end

data/lib/nuggets/string/evaluate_mixin.rb

@@ -30,14 +30,17 @@ module Nuggets
     module EvaluateMixin
 
   # call-seq:
-  #   str.evaluate(binding = TOPLEVEL_BINDING) => new_str
+  #   str.evaluate([binding, [filename, [lineno]]]) => new_str
   #
   # Basically turns Kernel#eval into an instance method of String -- inspired
   # by Ruby Cookbook example 1.3. This allows to pre-populate strings with
-  # substitution expressions ("#{...}") that can get evaluated in a different
-  # environment (= +binding+) at a later point.
-  def evaluate(binding = TOPLEVEL_BINDING)
-    eval(%Q{"#{gsub(/\\*"/) { |m| "#{"\\" * m.length}#{m}" }}"}, binding)
+  # substitution expressions <tt>"#{...}"</tt> that can get evaluated in a
+  # different environment (= +binding+) at a later point.
+  #
+  # Passes optional arguments +filename+ and +lineno+ on to Kernel#eval.
+  def evaluate(binding = TOPLEVEL_BINDING, filename = nil, lineno = nil)
+    buffer = gsub(/\\*"/) { |m| "#{"\\" * m.length}#{m}" }
+    eval(%Q{"#{buffer}"}, binding, filename || __FILE__, lineno || __LINE__)
   end
 
     end

data/lib/nuggets/version.rb

@@ -4,7 +4,7 @@ module Nuggets
 
     MAJOR = 0
     MINOR = 6
-    TINY  = 8
+    TINY  = 9
 
     class << self
 

data/spec/nuggets/file/replace_spec.rb

@@ -0,0 +1,104 @@
+require 'nuggets/file/replace'
+require 'nuggets/tempfile/open'
+
+describe File, 'when extended by', Nuggets::File::ReplaceMixin do
+
+  it { (class << File; ancestors; end).should include(Nuggets::File::ReplaceMixin) }
+
+  before :each do
+    @txt = <<-EOT.freeze
+The fox went out on a chilly night
+Prayed for the moon to give him light
+For he had many a mile to go that night
+Before he reached the town o
+    EOT
+
+    @res1 = <<-EOT.freeze
+He ran til he came to a great big bin
+Where the ducks and the geese were kept therein
+Said, a couple of you are going to grease my chin
+Before I leave this town o
+    EOT
+
+    @res2 = <<-EOT.freeze
+THE FOX WENT OUT ON A CHILLY NIGHT
+PRAYED FOR THE MOON TO GIVE HIM LIGHT
+FOR HE HAD MANY A MILE TO GO THAT NIGHT
+BEFORE HE REACHED THE TOWN O
+    EOT
+  end
+
+  example do
+    tempfile { |path|
+      res = File.replace(path) { @res1 }
+      res.should == @res1
+      File.read(path).should == @res1
+    }
+  end
+
+  example do
+    tempfile { |path|
+      res = File.replace(path) { |content| content }
+      res.should == @txt
+      File.read(path).should == @txt
+    }
+  end
+
+  example do
+    tempfile { |path|
+      res = File.replace(path) { |content| @res1 }
+      res.should == @res1
+      File.read(path).should == @res1
+    }
+  end
+
+  example do
+    tempfile { |path|
+      res = File.replace(path) { |content| content.upcase }
+      res.should == @res2
+      File.read(path).should == @res2
+    }
+  end
+
+  example do
+    lambda { File.replace(tempfile) { @res1 } }.should raise_error(Errno::ENOENT)
+  end
+
+  example do
+    begin
+      res = File.replace(path = tempfile, true) { @res1 }
+      res.should == @res1
+      File.read(path).should == @res1
+    ensure
+      File.unlink(path) if path
+    end
+  end
+
+  example do
+    begin
+      res = File.replace(path = tempfile, true) { |content| content }
+      res.should == ''
+      File.read(path).should == ''
+    ensure
+      File.unlink(path) if path
+    end
+  end
+
+  example do
+    begin
+      res = File.replace(path = tempfile, true) { |content| @res1 }
+      res.should == @res1
+      File.read(path).should == @res1
+    ensure
+      File.unlink(path) if path
+    end
+  end
+
+  def tempfile
+    t = Tempfile.open('nuggets_file_replace_spec_temp') { |f| f.puts @txt }
+    block_given? ? yield(t.path) : t.path
+  ensure
+    t.close(true) if t
+  end
+
+end

data/spec/nuggets/file/sub_spec.rb

@@ -0,0 +1,158 @@
+require 'nuggets/file/sub'
+require 'nuggets/tempfile/open'
+
+describe File, 'when extended by', Nuggets::File::SubMixin do
+
+  it { (class << File; ancestors; end).should include(Nuggets::File::SubMixin) }
+
+  before :each do
+    @txt = <<-EOT.freeze
+The fox went out on a chilly night
+Prayed for the moon to give him light
+For he had many a mile to go that night
+Before he reached the town o
+    EOT
+
+    @res1 = <<-EOT.freeze
+The fox went out on a chilly nXIGHTX
+Prayed for the moon to give him light
+For he had many a mile to go that night
+Before he reached the town o
+    EOT
+
+    @res2 = <<-EOT.freeze
+The fox went out on a chilly nXIGHTX
+Prayed for the moon to give him lXIGHTX
+For he had many a mile to go that nXIGHTX
+Before he reached the town o
+    EOT
+  end
+
+  example do
+    tempfile { |path|
+      res = File.sub(path, /ight/, 'XIGHTX')
+      res.should == @res1
+      @txt.should_not == @res1
+      File.read(path).should == @txt
+    }
+  end
+
+  example do
+    tempfile { |path|
+      res = File.sub(path, /XightX/, 'xIGHTx')
+      res.should == @txt
+      File.read(path).should == @txt
+    }
+  end
+
+  example do
+    tempfile { |path|
+      res = File.sub(path, /ight/) { |m| "X#{m.upcase}X" }
+      res.should == @res1
+      @txt.should_not == @res1
+      File.read(path).should == @txt
+    }
+  end
+
+  example do
+    tempfile { |path|
+      res = File.sub(path, /XightX/) { |m| "x#{m.upcase}x" }
+      res.should == @txt
+      File.read(path).should == @txt
+    }
+  end
+
+  example do
+    tempfile { |path|
+      res = File.gsub(path, /ight/, 'XIGHTX')
+      res.should == @res2
+      @txt.should_not == @res2
+      File.read(path).should == @txt
+    }
+  end
+
+  example do
+    tempfile { |path|
+      res = File.gsub(path, /ight/) { |m| "X#{m.upcase}X" }
+      res.should == @res2
+      @txt.should_not == @res2
+      File.read(path).should == @txt
+    }
+  end
+
+  example do
+    tempfile { |path|
+      res = File.sub!(path, /ight/, 'XIGHTX')
+      res.should == @res1
+      @txt.should_not == @res1
+      File.read(path).should == @res1
+    }
+  end
+
+  example do
+    tempfile { |path|
+      res = File.sub!(path, /XightX/, 'xIGHTx')
+      res.should be_nil
+      File.read(path).should == @txt
+    }
+  end
+
+  example do
+    tempfile { |path|
+      res = File.sub!(path, /ight/) { |m| "X#{m.upcase}X" }
+      res.should == @res1
+      @txt.should_not == @res1
+      File.read(path).should == @res1
+    }
+  end
+
+  example do
+    tempfile { |path|
+      res = File.sub!(path, /XightX/) { |m| "x#{m.upcase}x" }
+      res.should be_nil
+      File.read(path).should == @txt
+    }
+  end
+
+  example do
+    tempfile { |path|
+      res = File.gsub!(path, /ight/, 'XIGHTX')
+      res.should == @res2
+      @txt.should_not == @res2
+      File.read(path).should == @res2
+    }
+  end
+
+  example do
+    tempfile { |path|
+      res = File.gsub!(path, /ight/) { |m| "X#{m.upcase}X" }
+      res.should == @res2
+      @txt.should_not == @res2
+      File.read(path).should == @res2
+    }
+  end
+
+  example do
+    lambda { File.sub(tempfile, /ight/, 'XIGHTX') }.should raise_error(Errno::ENOENT)
+  end
+
+  example do
+    lambda { File.sub!(tempfile, /ight/, 'XIGHTX') }.should raise_error(Errno::ENOENT)
+  end
+
+  example do
+    lambda { File.gsub(tempfile, /ight/, 'XIGHTX') }.should raise_error(Errno::ENOENT)
+  end
+
+  example do
+    lambda { File.gsub!(tempfile, /ight/, 'XIGHTX') }.should raise_error(Errno::ENOENT)
+  end
+
+  def tempfile
+    t = Tempfile.open('nuggets_file_sub_spec_temp') { |f| f.puts @txt }
+    block_given? ? yield(t.path) : t.path
+  ensure
+    t.close(true) if t
+  end
+
+end

data/spec/nuggets/hash/deep_merge_spec.rb

@@ -0,0 +1,80 @@
+require 'nuggets/hash/deep_merge'
+
+describe Hash, 'when extended by', Nuggets::Hash::DeepMergeMixin do
+
+  it { Hash.ancestors.should include(Nuggets::Hash::DeepMergeMixin) }
+
+  example do
+    { :a => 1 }.deep_merge(:a => 2).should == { :a => 2 }
+  end
+
+  example do
+    { :a => 1 }.deep_merge(:b => 2).should == { :a => 1, :b => 2 }
+  end
+
+  example do
+    { :a => { :b => 1 } }.deep_merge(:b => 2).should == { :a => { :b => 1 }, :b => 2 }
+  end
+
+  example do
+    { :a => { :b => 1 } }.deep_merge(:a => { :b => 2 }).should == { :a => { :b => 2 } }
+  end
+
+  example do
+    lambda { { :a => { :b => { :c => 1 } } }.deep_merge(:a => { :b => 2 }) }.should raise_error(TypeError)
+  end
+
+  example do
+    { :a => { :b => { :c => 1 } } }.deep_merge(:a => { :b => { :c => 2 } }).should == { :a => { :b => { :c => 2 } } }
+  end
+
+  example do
+    { :a => { :b => { :c => 1 } } }.deep_merge(:a => { :b => { :d => 2 } }).should == { :a => { :b => { :c => 1, :d => 2 } } }
+  end
+
+  example do
+    { :a => { :b => { :c => 1 } } }.deep_merge(:a => { :b => { :c => 2 }, :d => 3 }).should == { :a => { :b => { :c => 2 }, :d => 3 } }
+  end
+
+  example do
+    { :a => { :b => { :c => 1 }, :d => 2 } }.deep_merge(:a => { :b => { :c => 2 }, :d => 3 }).should == { :a => { :b => { :c => 2 }, :d => 3 } }
+  end
+
+  example do
+    { :a => { :b => { :c => 1 }, :d => 2 }, :e => 3 }.deep_merge(:a => { :b => { :c => 2 }, :d => 3 }).should == { :a => { :b => { :c => 2 }, :d => 3 }, :e => 3 }
+  end
+
+  example do
+    { :a => { :b => { :c => 1 } }, :d => { :e => 3 } }.deep_merge(:a => { :b => { :c => 2 } }, :d => { :e => 4 }).should == { :a => { :b => { :c => 2 } }, :d => { :e => 4 } }
+  end
+
+  context do
+
+    before :each do
+      @sub_hash1 = { :b => 1 }
+      @sub_hash2 = { :b => 2 }
+
+      @hash1 = { :a => @sub_hash1 }
+      @hash2 = { :a => @sub_hash2 }
+      @hash3 = { :a => { :b => 2} }
+    end
+
+    example do
+      @hash1.deep_merge(@hash2).should == @hash3
+      @hash1.should_not == @hash3
+
+      @sub_hash1[:b].should == 1
+      @sub_hash2[:b].should == 2
+    end
+
+    example do
+      @hash1.deep_merge!(@hash2).should == @hash3
+      @hash1.should == @hash3
+
+      @sub_hash1[:b].should == 1
+      @sub_hash2[:b].should == 2
+    end
+
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-nuggets
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 6
-  - 8
-  version: 0.6.8
+  - 9
+  version: 0.6.9
 platform: ruby
 authors: 
 - Jens Wille
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 +01:00
+date: 2011-02-11 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -67,6 +67,8 @@ files:
 - lib/nuggets/hash/insert.rb
 - lib/nuggets/hash/unroll.rb
 - lib/nuggets/hash/unroll_mixin.rb
+- lib/nuggets/hash/deep_merge_mixin.rb
+- lib/nuggets/hash/deep_merge.rb
 - lib/nuggets/hash/nest.rb
 - lib/nuggets/hash/at.rb
 - lib/nuggets/hash/in_order.rb
@@ -146,7 +148,10 @@ files:
 - spec/nuggets/proc/bind_spec.rb
 - spec/nuggets/hash/unroll_spec.rb
 - spec/nuggets/hash/nest_spec.rb
+- spec/nuggets/hash/deep_merge_spec.rb
 - spec/nuggets/file/which_spec.rb
+- spec/nuggets/file/replace_spec.rb
+- spec/nuggets/file/sub_spec.rb
 - spec/nuggets/string/evaluate_spec.rb
 - spec/nuggets/string/xor_spec.rb
 - spec/nuggets/string/wc_spec.rb
@@ -175,7 +180,7 @@ rdoc_options:
 - --all
 - --line-numbers
 - --title
-- ruby-nuggets Application documentation (v0.6.8)
+- ruby-nuggets Application documentation (v0.6.9)
 - --inline-source
 require_paths: 
 - lib
@@ -200,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: prometheus
-rubygems_version: 1.5.0
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Some extensions to the Ruby programming language.