tworgy-ruby 0.4.0 → 0.4.1

data/Rakefile

@@ -6,7 +6,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "tworgy-ruby"
     gem.summary = %Q{Handy Ruby extensions}
-    gem.description = %Q{fdsfsad}
+    gem.description = %Q{Handy Ruby extensions}
     gem.email = "code@tworgy.com"
     gem.homepage = "http://github.com/matholroyd/tworgy-ruby"
     gem.authors = ["Mat Holroyd"]

data/lib/tworgy/{recursively.rb → hash_and_array_extensions.rb}

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 class Array
   def recursively(&block)
     map do |item|
@@ -12,6 +14,10 @@ class Array
   def recursively!(&block)
     replace(recursively(&block))
   end
+  
+  def ostructify 
+    collect { |i| (i.is_a?(Hash) || i.is_a?(Array)) ? i.ostructify : i }
+  end
 end
 
 class Hash
@@ -25,16 +31,24 @@ class Hash
       yield hash
     end
   end
-  
+   
   def recursively!(&block)
     replace(recursively(&block))
   end
 
   def ostructify
-    result = inject({}) do |hash, (key, value)|
-      hash[key] = value.is_a?(Hash) ? value.ostructify : value
+    temp = inject({}) do |hash, (key, value)|
+      hash[key] = (value.is_a?(Hash) || value.is_a?(Array)) ? value.ostructify : value
       hash
     end
-    OpenStruct.new result
+    result = OpenStruct.new temp
+    
+    if result.instance_variable_get('@table')[:id] != nil
+      def result.id
+        instance_variable_get('@table')[:id]
+      end
+    end
+    result
   end
 end
+

data/lib/tworgy/testing.rb

@@ -0,0 +1,12 @@
+def capture_stderr
+  result = ""
+  begin
+    $stderr = StringIO.new 
+    yield
+    $stderr.rewind
+    result = $stderr.read
+  ensure 
+    $stderr = STDERR
+  end
+  result
+end

data/lib/tworgy-ruby-testing.rb

@@ -0,0 +1 @@
+require 'tworgy/testing'

data/lib/tworgy-ruby.rb

@@ -1,4 +1,4 @@
-require 'tworgy/recursively'
+require 'tworgy/hash_and_array_extensions'
 require 'tworgy/standard_extensions'
 require 'tworgy/tmail'
 require 'tworgy/dbc'

data/spec/lib/tworgy/hash_and_array_extensions_spec.rb

@@ -0,0 +1,57 @@
+require File.expand_path(File.dirname(__FILE__) + '../../../spec_helper')
+
+describe "recursively" do
+  
+  describe Hash do
+  
+    it 'should symbolize the keys recursively' do
+      {'a' => {'b' => 3}}.recursively { |hash| symbolize_keys(hash) }.should == {:a => {:b => 3}}
+    end
+    
+    describe 'ostructify' do
+      before :each do
+        @object = {:person => {:name => 'bob', :age => 5}, :array => [{:something => 'in the array'}]}.ostructify
+      end
+      
+      it 'should turn a nested hash into nested OpenStructs' do
+        @object.person.name.should == 'bob' 
+        @object.person.age.should == 5
+      end
+      
+      it 'should keep ostructify all the way past arrays' do
+        @object.array[0].something.should == 'in the array'
+      end 
+      
+      it 'should replace the "def id" if id was defined, so dont get those annoying ruby warnings' do
+        capture_stderr {
+          o = {:id => 1}.ostructify
+          o.id.should == 1
+        }.should == "" 
+      end 
+      
+    end 
+  end 
+  
+  describe Array do
+    describe 'ostructify' do
+      before :each do
+        @object = [{:person => {:name => 'bob', :age => 5}}, {:animal => 'dog'}].ostructify
+      end
+      
+      it 'should recursively ostructify things in the array' do
+        @object[0].person.name.should == 'bob'
+        @object[0].person.age.should == 5
+        @object[1].animal.should == 'dog'
+      end
+    end
+  end
+end
+
+def symbolize_keys(hash)
+  hash.inject({}) do |result, (key, value)|
+    result[key.to_sym] = value
+    result
+  end
+end
+
+

data/spec/lib/tworgy/testing_spec.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.dirname(__FILE__) + '../../../spec_helper')
+
+describe 'rspec helper' do
+  it 'should capture nothing' do
+    capture_stderr {
+      1 + 1
+      1.to_s
+    }.should == ""
+  end 
+   
+  it 'should capture errors on stderr' do
+    capture_stderr {
+      [].id
+    }.should =~ /Object#id will be deprecated/
+  end
+  
+end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rubygems'
 require 'tworgy-ruby'
+require 'tworgy-ruby-testing'
 require 'spec'
 require 'spec/autorun'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tworgy-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Mat Holroyd
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 +11:00
+date: 2009-12-08 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.9
     version: 
-description: fdsfsad
+description: Handy Ruby extensions
 email: code@tworgy.com
 executables: []
 
@@ -35,12 +35,15 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- lib/tworgy-ruby-testing.rb
 - lib/tworgy-ruby.rb
 - lib/tworgy/dbc.rb
-- lib/tworgy/recursively.rb
+- lib/tworgy/hash_and_array_extensions.rb
 - lib/tworgy/standard_extensions.rb
+- lib/tworgy/testing.rb
 - lib/tworgy/tmail.rb
-- spec/lib/tworgy/recursively_spec.rb
+- spec/lib/tworgy/hash_and_array_extensions_spec.rb
+- spec/lib/tworgy/testing_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -72,5 +75,6 @@ signing_key:
 specification_version: 3
 summary: Handy Ruby extensions
 test_files: 
-- spec/lib/tworgy/recursively_spec.rb
+- spec/lib/tworgy/hash_and_array_extensions_spec.rb
+- spec/lib/tworgy/testing_spec.rb
 - spec/spec_helper.rb

data/spec/lib/tworgy/recursively_spec.rb

@@ -1,31 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '../../../spec_helper')
-
-describe "recursively" do
-  
-  describe Hash do
-  
-    it 'should symbolize the keys recursively' do
-      {'a' => {'b' => 3}}.recursively { |hash| symbolize_keys(hash) }.should == {:a => {:b => 3}}
-    end
-    
-    describe 'ostructify' do
-      before :each do
-        @object = {:person => {:name => 'bob', :age => 5}}.ostructify
-      end
-      
-      it 'should turn a nested hash into nested OpenStructs' do
-        @object.person.name.should == 'bob'
-        @object.person.age.should == 5
-      end
-    end
-  end
-end
-
-def symbolize_keys(hash)
-  hash.inject({}) do |result, (key, value)|
-    result[key.to_sym] = value
-    result
-  end
-end
-
-