gorillib 0.1.5 → 0.1.6

data/CHANGELOG.textile

@@ -1,3 +1,12 @@
+h3. 2011-08-21 - Version 0.1.6: Serialization and DeepHash
+
+* Serialization with #to_wire -- like #to_hash, but hands #to_wire down the line to any element that contains it (as opposed to `#to_hash`, which should just do that)
+* Hashlike#tree_merge: combined into the one version; gave it a block in the middle to do any fancy footwork
+* deep_hash -- allows dotted (a.b.c) access to a nested hash
+* Array#random_element -- gets a random member of the array.
+
+Will soon be deprecating Receiver, in favor of the far more powerful Icss::ReceiverModel in the icss library.
+
 h3. 2011-06-29 - Version 0.1.3: Fancier receivers
 
 * can now mix activemodel into a receiver, getting all its validation and other awesomeness

data/Gemfile

@@ -1,5 +1,7 @@
 source "http://rubygems.org"
 
+gem "json"
+
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/gorillib.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorillib}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Infochimps}]
-  s.date = %q{2011-08-02}
+  s.date = %q{2011-08-22}
   s.description = %q{Gorillib: infochimps lightweight subset of ruby convenience methods}
   s.email = %q{coders@infochimps.org}
   s.extra_rdoc_files = [
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "lib/gorillib/array/compact_blank.rb",
     "lib/gorillib/array/deep_compact.rb",
     "lib/gorillib/array/extract_options.rb",
+    "lib/gorillib/array/random.rb",
     "lib/gorillib/base.rb",
     "lib/gorillib/datetime/flat.rb",
     "lib/gorillib/datetime/parse.rb",
@@ -75,6 +76,7 @@ Gem::Specification.new do |s|
     "lib/gorillib/receiver/tree_diff.rb",
     "lib/gorillib/receiver/validations.rb",
     "lib/gorillib/receiver_model.rb",
+    "lib/gorillib/serialization.rb",
     "lib/gorillib/some.rb",
     "lib/gorillib/string/constantize.rb",
     "lib/gorillib/string/human.rb",
@@ -193,6 +195,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.12"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.7"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -209,6 +212,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<spork>, ["~> 0.9.0.rc5"])
       s.add_development_dependency(%q<watchr>, [">= 0"])
     else
+      s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.12"])
       s.add_dependency(%q<yard>, ["~> 0.6.7"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -226,6 +230,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<watchr>, [">= 0"])
     end
   else
+    s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.12"])
     s.add_dependency(%q<yard>, ["~> 0.6.7"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

data/lib/gorillib/array/random.rb

@@ -0,0 +1,8 @@
+class Array
+  #
+  # Choose a random element from the array
+  #
+  def random_element
+    self[rand(length)]
+  end unless method_defined?(:random_element)
+end

data/lib/gorillib/hashlike/tree_merge.rb

@@ -2,38 +2,40 @@ module Gorillib
   module Hashlike
     module TreeMerge
 
-      # Recursively merges using receive
-      #
-      # Modifies the full receiver chain in-place.
+      # Recursively merges hashlike objects
       #
       # For each key in keys,
-      # * if self's value is nil, receive the attribute.
+      # * if block_given? and yield(key,self_val,other_val) returns non-nil, set that
+      # * if self is missing value for key, receive the attribute.
       # * if self's attribute is an Array, append to it.
-      # * if self's value responds to tree_merge!, tree merge it.
+      # * if self's value responds to tree_merge!, deep merge it.
       # * if self's value responds_to merge!, merge! it.
       # * otherwise, receive the value from other_hash
       #
       def tree_merge!(other_hash)
-        keys.each do |key|
+        return self if other_hash.blank?
+        [self.keys, other_hash.keys].flatten.uniq.each do |key|
           # get other's val if any
           if    other_hash.has_key?(key.to_sym) then other_val = other_hash[key.to_sym]
           elsif other_hash.has_key?(key.to_s)   then other_val = other_hash[key.to_s]
           else  next ; end
-          #
+          # get self val if any
           self_val  = self[key]
-          # p ['receiver tree_merge', key, self_val.respond_to?(:tree_merge!), self[key], other_val]
+          # get block resolved result if any
+          if block_given? && yield(key, self_val, other_val)
+            next
+          end
+          # p ['hash tree_merge', key, self_val.respond_to?(:tree_merge!), self_val, '***************', other_val]
+          #
           case
           when other_val.nil?                     then next
-          when (not has_key?(key))                then _receive_attr(key, other_val)
-          when receiver_attrs[key][:merge_as] == :hash_of_arrays
-            self_val.merge!(other_val) do |k, v1, v2| case when v1.blank? then v2 when v2.blank? then v1 else v1 + v2 end end
+          when (not has_key?(key))                then self[key] = other_val
           when self_val.is_a?(Array)              then self[key] += other_val
           when self_val.respond_to?(:tree_merge!) then self[key] = self_val.tree_merge!(other_val)
           when self_val.respond_to?(:merge!)      then self[key] = self_val.merge!(other_val)
-          else                                         _receive_attr(key, other_val)
+          else                                         self[key] = other_val
           end
         end
-        run_after_receivers(other_hash)
         self
       end
 
@@ -41,36 +43,7 @@ module Gorillib
   end
 end
 
+
 class Hash
-  # Recursively merges using receive
-  #
-  # Modifies the full receiver chain in-place.
-  #
-  # For each key in keys,
-  # * if self's value is nil, receive the attribute.
-  # * if self's attribute is an Array, append to it.
-  # * if self's value responds to tree_merge!, deep merge it.
-  # * if self's value responds_to merge!, merge! it.
-  # * otherwise, receive the value from other_hash
-  #
-  def tree_merge!(other_hash)
-    [self.keys, other_hash.keys].flatten.uniq.each do |key|
-      # get other's val if any
-      if    other_hash.has_key?(key.to_sym) then other_val = other_hash[key.to_sym]
-      elsif other_hash.has_key?(key.to_s)   then other_val = other_hash[key.to_s]
-      else  next ; end
-      #
-      self_val  = self[key]
-      # p ['hash tree_merge', key, self_val.respond_to?(:tree_merge!), self_val, other_val]
-      case
-      when other_val.nil?                     then next
-      when (not has_key?(key))                then self[key] = other_val
-      when self_val.is_a?(Array)              then self[key] += other_val
-      when self_val.respond_to?(:tree_merge!) then self[key] = self_val.tree_merge!(other_val)
-      when self_val.respond_to?(:merge!)      then self[key] = self_val.merge!(other_val)
-      else                                         self[key] = other_val
-      end
-    end
-    self
-  end
+  include Gorillib::Hashlike::TreeMerge
 end

data/lib/gorillib/receiver.rb

@@ -1,5 +1,6 @@
 require 'gorillib/object/blank'
 require 'gorillib/object/try'
+require 'gorillib/object/try_dup'
 require 'gorillib/array/extract_options'
 require 'gorillib/metaprogramming/class_attribute'
 
@@ -169,7 +170,7 @@ protected
   def impose_defaults!(hsh)
     _receiver_defaults.each do |attr, val|
       next if attr_set?(attr)
-      self.instance_variable_set "@#{attr}", val
+      self.instance_variable_set "@#{attr}", val.try_dup
     end
   end
 
@@ -181,7 +182,7 @@ protected
   #
   # f = Foo.receive({:attribute => 'bad'})
   # => #<Foo:0x10156c820 @attribute="good">
-
+  #
   def replace_options!(hsh)
     self.receiver_attrs.each do |attr, info|
       val = self.instance_variable_get("@#{attr}")
@@ -191,7 +192,6 @@ protected
     end
   end
 
-
   def run_after_receivers(hsh)
     _after_receivers.each do |after_receiver|
       self.instance_exec(hsh, &after_receiver)

data/lib/gorillib/serialization.rb

@@ -0,0 +1,50 @@
+module Gorillib
+
+  module Hashlike
+    module Serialization
+      #
+      # Returns a hash with each key set to its associated value
+      #
+      # @example
+      #    my_hshlike = MyHashlike.new
+      #    my_hshlike[:a] = 100; my_hshlike[:b] = 200
+      #    my_hshlike.to_hash # => { :a => 100, :b => 200 }
+      #
+      # @return [Hash] a new Hash instance, with each key set to its associated value.
+      #
+      def to_wire(options={})
+        {}.tap do |hsh|
+          each do |attr,val|
+            hsh[attr] =
+              case
+              when val.respond_to?(:to_wire) then val.to_wire(options)
+              when val.respond_to?(:to_hash) then val.to_hash
+              else val ; end
+          end
+        end
+      end
+    end
+  end
+end
+
+module Gorillib::Hashlike
+  include ::Gorillib::Hashlike::Serialization
+end
+
+class ::Array
+  def to_wire(options={})
+    map{|item| item.respond_to?(:to_wire) ? item.to_wire : item }
+  end
+end
+
+class ::Hash
+  include ::Gorillib::Hashlike::Serialization
+end
+
+class ::Time
+  def to_wire(options={})
+    self.iso8601
+  end
+end
+
+

data/spec/receiver_spec.rb

@@ -467,7 +467,7 @@ describe Receiver do
 
     # ---------------------------------------------------------------------------
 
-    describe 'core class .receive method' do
+    it 'core class .receive method' do
       Symbol.receive('hi').should == :hi
       Integer.receive(3.4).should == 3
       Float.receive("4.5").should == 4.5

metadata

@@ -2,7 +2,7 @@
 name: gorillib
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Infochimps
@@ -10,11 +10,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-02 00:00:00 Z
+date: 2011-08-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: json
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -22,10 +33,10 @@ dependencies:
         version: 1.0.12
   type: :development
   prerelease: false
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,10 +44,10 @@ dependencies:
         version: 0.6.7
   type: :development
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -44,10 +55,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -55,10 +66,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: spork
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,10 +77,10 @@ dependencies:
         version: 0.9.0.rc5
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: RedCloth
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,10 +88,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -88,10 +99,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: watchr
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -99,10 +110,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -110,10 +121,10 @@ dependencies:
         version: 1.0.12
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -121,10 +132,10 @@ dependencies:
         version: 0.6.7
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -132,10 +143,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -143,10 +154,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -154,10 +165,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: spork
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -165,10 +176,10 @@ dependencies:
         version: 0.9.0.rc5
   type: :development
   prerelease: false
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: watchr
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -176,7 +187,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id015
+  version_requirements: *id016
 description: "Gorillib: infochimps lightweight subset of ruby convenience methods"
 email: coders@infochimps.org
 executables: []
@@ -200,6 +211,7 @@ files:
 - lib/gorillib/array/compact_blank.rb
 - lib/gorillib/array/deep_compact.rb
 - lib/gorillib/array/extract_options.rb
+- lib/gorillib/array/random.rb
 - lib/gorillib/base.rb
 - lib/gorillib/datetime/flat.rb
 - lib/gorillib/datetime/parse.rb
@@ -245,6 +257,7 @@ files:
 - lib/gorillib/receiver/tree_diff.rb
 - lib/gorillib/receiver/validations.rb
 - lib/gorillib/receiver_model.rb
+- lib/gorillib/serialization.rb
 - lib/gorillib/some.rb
 - lib/gorillib/string/constantize.rb
 - lib/gorillib/string/human.rb
@@ -315,7 +328,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 168082518924887953
+      hash: 2753005765957482332
       segments: 
       - 0
       version: "0"