gorillib 0.1.2 → 0.1.3

data/CHANGELOG.textile

@@ -1,3 +1,14 @@
+h3. 2011-06-29 - Version 0.1.3: Fancier receivers
+
+* can now mix activemodel into a receiver, getting all its validation and other awesomeness
+* added receiver_model as an experimental 'I'm a fancy cadillac-style receiver'
+
+h3. 2011-06-24 Version 0.1.2: Receiver body fixes
+
+* Better @Object.try@ (via active_support)
+* Receiver body can now be an interpolated string or a hash; this lets you use anonymous classes. Added tuple methods (does an in-order traversal).
+* Bugfix for inclusion order in ActsAsHash
+
 h3. Version 0.1.0: Hashlike refactor, Receiver arrives
 
 v0.1.0 brings

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/gorillib.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorillib}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = %q{2011-06-24}
+  s.date = %q{2011-06-29}
   s.description = %q{Gorillib: infochimps lightweight subset of ruby convenience methods}
   s.email = %q{coders@infochimps.org}
   s.extra_rdoc_files = [
@@ -71,8 +71,10 @@ Gem::Specification.new do |s|
     "lib/gorillib/receiver/active_model_shim.rb",
     "lib/gorillib/receiver/acts_as_hash.rb",
     "lib/gorillib/receiver/acts_as_loadable.rb",
+    "lib/gorillib/receiver/locale/en.yml",
     "lib/gorillib/receiver/tree_diff.rb",
     "lib/gorillib/receiver/validations.rb",
+    "lib/gorillib/receiver_model.rb",
     "lib/gorillib/some.rb",
     "lib/gorillib/string/constantize.rb",
     "lib/gorillib/string/human.rb",
@@ -97,7 +99,6 @@ Gem::Specification.new do |s|
     "spec/hash/zip_spec.rb",
     "spec/hashlike/behave_same_as_hash_spec.rb",
     "spec/hashlike/hashlike_behavior_spec.rb",
-    "spec/hashlike/hashlike_via_accessors_fuzzing_spec.rb",
     "spec/hashlike/hashlike_via_accessors_spec.rb",
     "spec/hashlike_spec.rb",
     "spec/logger/log_spec.rb",
@@ -152,7 +153,6 @@ Gem::Specification.new do |s|
     "spec/hash/zip_spec.rb",
     "spec/hashlike/behave_same_as_hash_spec.rb",
     "spec/hashlike/hashlike_behavior_spec.rb",
-    "spec/hashlike/hashlike_via_accessors_fuzzing_spec.rb",
     "spec/hashlike/hashlike_via_accessors_spec.rb",
     "spec/hashlike_spec.rb",
     "spec/logger/log_spec.rb",

data/lib/gorillib/hashlike.rb

@@ -803,10 +803,10 @@ module Gorillib
 
     def self.included(base)
       base.class_eval do
-        base.send(:include, EnumerateFromKeys) unless base.method_defined?(:each_pair)
-        unless base.include?(Enumerable)
-          base.send(:include, Enumerable)
-          base.send(:include, OverrideEnumerable)
+        include EnumerateFromKeys unless method_defined?(:each_pair)
+        unless include?(Enumerable)
+          include Enumerable
+          include OverrideEnumerable
         end
 
         # included here so they win out over Enumerable

data/lib/gorillib/receiver/active_model_shim.rb

@@ -1,19 +1,32 @@
-require 'active_model'
+# require 'active_model'
+
+require 'active_model/deprecated_error_methods'
+require 'active_model/errors'
+require 'active_model/naming'
+require 'active_model/validator'
+require 'active_model/translation'
+require 'active_model/validations'
+require 'active_support/i18n'
+I18n.load_path << File.join(File.expand_path(File.dirname(__FILE__)), 'locale/en.yml')
 
 module Receiver
-  class ActiveModelShim
-    extend ActiveModel::Naming
+  module ActiveModelShim
 
     def to_model
       self
     end
 
-    def valid?()      true  end
     def new_record?() true  end
     def destroyed?()  false end
-
     def errors
       @_errors ||= ActiveModel::Errors.new(self)
     end
+
+    def self.included(base)
+      base.class_eval do
+        extend  ActiveModel::Naming
+        include ActiveModel::Validations
+      end
+    end
   end
 end

data/lib/gorillib/receiver/acts_as_hash.rb

@@ -185,9 +185,11 @@ module Receiver
     end
 
     def self.included base
-      base.send(:include, Gorillib::Hashlike)
-      base.extend(ClassMethods)
-      base.send(:include, InstanceMethods)
+      base.class_eval do
+        include Gorillib::Hashlike
+        extend  ClassMethods
+        include InstanceMethods
+      end
     end
   end
 end

data/lib/gorillib/receiver/locale/en.yml

@@ -0,0 +1,27 @@
+en:
+  errors:
+    # The default format to use in full error messages.
+    format: "%{attribute} %{message}"
+
+    # The values :model, :attribute and :value are always available for interpolation
+    # The value :count is available when applicable. Can be used for pluralization.
+    messages:
+      inclusion:                "is not included in the list"
+      exclusion:                "is reserved"
+      invalid:                  "is invalid"
+      confirmation:             "doesn't match confirmation"
+      accepted:                 "must be accepted"
+      empty:                    "can't be empty"
+      blank:                    "can't be blank"
+      too_long:                 "is too long (maximum is %{count} characters)"
+      too_short:                "is too short (minimum is %{count} characters)"
+      wrong_length:             "is the wrong length (should be %{count} characters)"
+      not_a_number:             "is not a number"
+      not_an_integer:           "must be an integer"
+      greater_than:             "must be greater than %{count}"
+      greater_than_or_equal_to: "must be greater than or equal to %{count}"
+      equal_to:                 "must be equal to %{count}"
+      less_than:                "must be less than %{count}"
+      less_than_or_equal_to:    "must be less than or equal to %{count}"
+      odd:                      "must be odd"
+      even:                     "must be even"

data/lib/gorillib/receiver_model.rb

@@ -0,0 +1,21 @@
+require 'gorillib/hashlike'
+require 'gorillib/hashlike/tree_merge'
+require 'gorillib/receiver'
+require 'gorillib/receiver/acts_as_hash'
+require 'gorillib/receiver/acts_as_loadable'
+require 'gorillib/receiver/active_model_shim'
+
+module Gorillib
+  module ReceiverModel
+    def self.included base
+      base.class_eval do
+        include Receiver
+        include Receiver::ActsAsHash
+        include Receiver::ActsAsLoadable
+        include Gorillib::Hashlike
+        include Gorillib::Hashlike::TreeMerge
+        include Receiver::ActiveModelShim
+      end
+    end
+  end
+end

data/spec/hashlike/behave_same_as_hash_spec.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__)+'/../spec_helper'
 require 'enumerator'
 require 'gorillib/hashlike'
+require 'gorillib/enumerable/sum'
 
 require GORILLIB_ROOT_DIR('spec/support/hashlike_helper')
 require GORILLIB_ROOT_DIR('spec/support/hashlike_fuzzing_helper')
@@ -53,7 +54,6 @@ describe Gorillib::Hashlike do
       end
     end
 
-
     #
     # With a few exceptions (see HASHLIKE_DEPENDENT_METHODS), all hashlike methods go through only the following core methods:
     #
@@ -64,7 +64,7 @@ describe Gorillib::Hashlike do
     # these exceptions call a tightly-bound peer:
     #
     HASHLIKE_DEPENDENT_METHODS = Hash.new([]).merge({
-        :merge => [:update], :rassoc => [:key], :flatten => [:to_hash], :invert => [:to_hash],
+        :merge => [:update], :rassoc => [:key], :flatten => [:to_hash], :invert => [:to_hash], :sum => [:inject, :map],
         :keep_if => [:select!], :delete_if => [:reject!], :select => [:select!, :keep_if], :reject => [:reject!, :delete_if],
       })
     Enumerable.public_instance_methods.map(&:to_sym).each{|meth| HASHLIKE_DEPENDENT_METHODS[meth] << :each }

metadata

@@ -2,7 +2,7 @@
 name: gorillib
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Infochimps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-24 00:00:00 -05:00
+date: 2011-06-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -242,8 +242,10 @@ files:
 - lib/gorillib/receiver/active_model_shim.rb
 - lib/gorillib/receiver/acts_as_hash.rb
 - lib/gorillib/receiver/acts_as_loadable.rb
+- lib/gorillib/receiver/locale/en.yml
 - lib/gorillib/receiver/tree_diff.rb
 - lib/gorillib/receiver/validations.rb
+- lib/gorillib/receiver_model.rb
 - lib/gorillib/some.rb
 - lib/gorillib/string/constantize.rb
 - lib/gorillib/string/human.rb
@@ -268,7 +270,6 @@ files:
 - spec/hash/zip_spec.rb
 - spec/hashlike/behave_same_as_hash_spec.rb
 - spec/hashlike/hashlike_behavior_spec.rb
-- spec/hashlike/hashlike_via_accessors_fuzzing_spec.rb
 - spec/hashlike/hashlike_via_accessors_spec.rb
 - spec/hashlike_spec.rb
 - spec/logger/log_spec.rb
@@ -315,7 +316,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -517886677893709781
+      hash: 1350507123130852997
       segments: 
       - 0
       version: "0"
@@ -348,7 +349,6 @@ test_files:
 - spec/hash/zip_spec.rb
 - spec/hashlike/behave_same_as_hash_spec.rb
 - spec/hashlike/hashlike_behavior_spec.rb
-- spec/hashlike/hashlike_via_accessors_fuzzing_spec.rb
 - spec/hashlike/hashlike_via_accessors_spec.rb
 - spec/hashlike_spec.rb
 - spec/logger/log_spec.rb

data/spec/hashlike/hashlike_via_accessors_fuzzing_spec.rb

@@ -1,37 +0,0 @@
-# require File.dirname(__FILE__)+'/../spec_helper'
-# require GORILLIB_ROOT_DIR('spec/support/hashlike_fuzzing_helper')
-# require 'gorillib/hashlike'
-# require 'gorillib/hashlike/hashlike_via_accessors'
-# 
-# class UsingHashlikeViaAccessors
-#   include Gorillib::Hashlike::HashlikeViaAccessors
-#   include Gorillib::Hashlike
-# 
-#   attr_accessor :a, :b, :c, :nil_val, :false_val, :z
-# 
-#   # We override these just to be able to compare exceptions.
-#   def to_s()
-#     '{' + [:a, :b, :c, :nil_val, :false_val, :z].map{|k| [k, self[k]].join('=>') }.join(',') + '}'
-#   end
-#   def ==(other_hash)
-#     (length == other_hash.length) && all?{|k,v| v == other_hash[k] }
-#   end
-# end
-# 
-# 
-# describe Gorillib::Hashlike::HashlikeViaAccessors do
-#   include HashlikeFuzzingHelper
-# 
-# 
-#   before do
-#     @total = 0
-#     hsh = { :a  => 3,  :b  => 4, :c => nil, :nil_val => nil, :false_val => false, :z => nil }
-#     @hsh_symk = hsh.dup
-#     @hsh_strk = {} ; hsh.each{|k,v| @hsh_strk[k.to_s] = v }
-#     @hsh_wia   = hsh.with_indifferent_access
-#     @hshlike  = InternalHash.new.merge(hsh)
-# 
-#     p [@hshlike]
-#   end
-# 
-# end