angry_hash 0.0.5 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.1.0

data/angry_hash.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{angry_hash}
-  s.version = "0.0.5"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lachie Cox"]
-  s.date = %q{2010-06-02}
+  s.date = %q{2010-08-07}
   s.description = %q{A stabler mash with different emphases. Used in plus2 projects AngryMob and Igor.}
   s.email = %q{lachie@plus2.com.au}
   s.files = [
@@ -19,10 +19,13 @@ Gem::Specification.new do |s|
      "angry_hash.gemspec",
      "examples/accessors_eg.rb",
      "examples/creation_eg.rb",
+     "examples/dsl.eg.rb",
      "examples/dup_eg.rb",
      "examples/eg_helper.rb",
      "examples/merge_eg.rb",
      "lib/angry_hash.rb",
+     "lib/angry_hash/dsl.rb",
+     "lib/angry_hash/extension_tracking.rb",
      "lib/angry_hash/merge_string.rb"
   ]
   s.homepage = %q{http://github.com/plus2/angry_hash}

data/examples/accessors_eg.rb

@@ -33,3 +33,14 @@ eg 'accessor= Hash' do
   @a.d = d
   Assert( ! same_obj( d, @a.d ) )
 end
+
+eg 'accessor?' do
+  Assert(   @a.b? )
+  Assert( ! @a.c? )
+  Assert(   @a.b.c? )
+  Assert( ! @a.b.x? )
+
+  @a.b.f = false
+
+  Assert( ! @a.b.f? )
+end

data/examples/creation_eg.rb

@@ -38,5 +38,6 @@ eg 'creation duplicates' do
   Assert(a1.c[7].__id__ != a2.c[7].__id__)
 end
 
+
 #eg 'cycle detection' do
 #end

data/examples/dsl.eg.rb

@@ -0,0 +1,18 @@
+require 'eg_helper'
+
+eg 'eval a block as dsl' do
+  original = AngryHash[ :a => 'x', :b => {:c => 1}, :d => 'z' ]
+
+  original.__eval_as_dsl do
+    foo 'bar'
+    a 'y'
+    b :e => 2
+  end
+
+  Assert(original.foo == 'bar')
+  Assert(original.a   == 'y')
+  Assert(original.d   == 'z')
+
+  Assert(original.b.c == 1)
+  Assert(original.b.e == 2)
+end

data/examples/dup_eg.rb

@@ -1,61 +1,15 @@
 require 'eg_helper'
 
+require 'angry_hash/extension_tracking'
+AngryHash.send :include, AngryHash::ExtensionTracking
+
 eg.setup do
   @original = { 'database' => {
-    "micropower_micropower_sandbox"=>
-    {"app_owner"=>"micropower_micropower_sandbox", "server"=>:db},
-      "amc_accred_staging"=>
-    {"app_owner"=>"amc_accred", "server"=>:plus2staging_local_mysql},
-      "post_froggy"=>
-    {"app_owner"=>"froggy_owner",
-      "backup"=>{"to_s3"=>true},
-      "server"=>:postfrog},
-      "isg_url_shortener"=>
-    {"app_owner"=>"isg_sandbox_v5", "server"=>:isg_forums_mysql},
-      "isg_forums"=>{"app_owner"=>"isg_forums", "server"=>:isg_forums_mysql},
-      "eggs_eggs"=>
-    {"app_owner"=>"eggs_eggs",
-      "backup"=>{"to_s3"=>true},
-      "server"=>:db,
-      "admin_owner"=>"eggs_admin"},
-      "myfrogdb"=>{"app_owner"=>:myfroggy, "server"=>:myfrog},
-      "amc_exam_staging"=>
-    {"app_owner"=>"amc_exam", "server"=>:plus2staging_local_mysql},
-      "micropower_golfo"=>{"app_owner"=>:golfo, "server"=>:linode_golfo_mysql},
-      "linode_golfo"=>{"app_owner"=>:golfo, "server"=>:linode_golfo_mysql},
-      "halal_staging"=>
-    {"app_owner"=>"halal", "server"=>:plus2staging_local_postgres},
-      "eggs_enag"=>
-    {"app_owner"=>"eggs_enag", "backup"=>{"to_s3"=>true}, "server"=>:db},
-      "amc_store"=>
-    {"app_owner"=>"amc_store", "backup"=>{"to_s3"=>true}, "server"=>:amc},
-      "weatherzone_wengine"=>
-    {"app_owner"=>"weatherzone_wengine", "server"=>:linode_postgres},
-      "weatherzone_wzfb_staging"=>
-    {"app_owner"=>"weatherzone_wzfb_staging", "server"=>:db},
-      "amc_ncmr"=>
-    {"app_owner"=>"amc_ncmr", "backup"=>{"to_s3"=>true}, "server"=>:amc},
-      "westpac_thinkbank_staging"=>
-    {"app_owner"=>"westpac_thinkbank_staging", "server"=>:db},
-      "micropower_micropower_staging"=>
-    {"app_owner"=>"micropower", "server"=>:staging_mysql},
-      "weatherzone_wx_staging"=>
-    {"app_owner"=>"weatherzone_wx_staging", "server"=>:db},
-      "isg_sandbox_v4"=>
-    {"app_owner"=>"isg_sandbox_v5", "server"=>:isg_forums_mysql},
-      "eggs_aecl"=>
-    {"app_owner"=>"eggs_aecl", "backup"=>{"to_s3"=>true}, "server"=>:db},
-      "eggs_hwag"=>
-    {"app_owner"=>"eggs_hwag", "backup"=>{"to_s3"=>true}, "server"=>:db},
-      "plus2_gemcutter"=>{"app_owner"=>"plus2_gemcutter", "server"=>:db},
-      "isg_sandbox_v5"=>
-    {"app_owner"=>"isg_sandbox_v5", "server"=>:isg_forums_mysql},
-      "amc_exam"=>
-    {"app_owner"=>"amc_exam", "backup"=>{"to_s3"=>true}, "server"=>:amc},
-      "weatherzone_wzfb"=>
-    {"app_owner"=>"weatherzone_wzfb", "backup"=>{"to_s3"=>true}, "server"=>:db},
-      "amc_store_staging"=>
-    {"app_owner"=>"amc_store", "server"=>:plus2staging_local_mysql}
+    "micropower_micropower_sandbox" => {"app_owner" => "micropower_micropower_sandbox", "server" => :db},
+    "post_froggy"                   => {"app_owner" => "froggy_owner", "backup"                  => {"to_s3"                       => true}, "server" => :postfrog},
+    "myfrogdb"                      => {"app_owner" => :myfroggy, "server"                       => :myfrog},
+    "eggs_hwag"                     => {"app_owner" => "eggs_hwag", "backup"                     => {"to_s3"                       => true}, "server" => :db},
+    "isg_sandbox_v5"                => {"app_owner" => "isg_sandbox_v5", "server"                => :isg_forums_mysql},
   }}    
 end
 
@@ -67,11 +21,34 @@ eg 'duping copies symbols' do
   Assert( ah2.database.isg_sandbox_v5.server == @original['database']['isg_sandbox_v5']['server'] )
 end
 
+def same_obj(a,b)
+  a.__id__ == b.__id__
+end
+
+def diff_obj(a,b)
+  ! same_obj(a,b)
+end
+
+eg 'dup is deep' do
+  ah  = AngryHash[ @original ]
+  ah2 = ah.dup
+
+  Assert( diff_obj ah                            , ah2 )
+  Assert( diff_obj ah.database                   , ah2.database )
+  Assert( diff_obj ah.database.post_froggy       , ah2.database.post_froggy )
+  Assert( diff_obj ah.database.post_froggy.backup, ah2.database.post_froggy.backup )
+
+end
+
 module Extendo
   def as_dag
     dag = dup
     dag
   end
+
+  def is_extended?
+    true
+  end
 end
 
 eg 'duping from ext' do
@@ -80,9 +57,30 @@ eg 'duping from ext' do
 
   ah2 = ah.as_dag
 
-  Show( AngryHash.shooper )
   Show( ah.__id__ )
   Show( ah2.__id__ )
   
   Show( ah2 )
 end
+
+module ExtendoDb
+  def is_db_extended?
+    true
+  end
+end
+
+eg 'extension preservation' do
+  ah = AngryHash[ @original ]
+  Assert( ! ah.is_extended? )
+  Assert( ! ah.database.post_froggy.is_db_extended? )
+
+  ah.extend(Extendo)
+  ah.database.post_froggy.extend(ExtendoDb)
+
+  Assert(   ah.is_extended? )
+  Assert(   ah.database.post_froggy.is_db_extended? )
+
+  ah2 = ah.dup
+  Show( ah2.is_extended? )
+  Show( ah2.database.post_froggy.is_db_extended? )
+end

data/examples/eg_helper.rb

@@ -14,3 +14,11 @@ end
 
 require 'rubygems'
 require 'exemplor'
+
+class Object
+  def tapp(tag=nil)
+    print "#{tag}=" if tag
+    pp self
+    self
+  end
+end

data/examples/merge_eg.rb

@@ -130,5 +130,6 @@ eg 'merge with symbol key' do
 
   merged = orig.merge(:key=>"db")
 
+  Show( merged )
   Assert( merged.keys[1].is_a?(String) )
 end

data/lib/angry_hash/dsl.rb

@@ -0,0 +1,44 @@
+class AngryHash
+  module DSL
+    # from ActiveSupport 3
+    if defined? ::BasicObject
+      # A class with no predefined methods that behaves similarly to Builder's
+      # BlankSlate. Used for proxy classes.
+      class BasicObject < ::BasicObject
+        undef_method :==
+        undef_method :equal?
+
+        # Let BasicObject at least raise exceptions.
+        def raise(*args)
+          ::Object.send(:raise, *args)
+        end
+      end
+    else
+      class BasicObject #:nodoc:
+        instance_methods.each do |m|
+          undef_method(m) if m.to_s !~ /(?:^__|^nil\?$|^send$|^object_id$|^instance_eval$)/
+        end
+      end
+    end
+
+    class Env < BasicObject
+      def __store
+        @store ||= {}
+      end
+      def method_missing(method,*args,&blk)
+        method_s = method.to_s
+        if method_s[/[A-Za-z0-9]$/] && args.size == 1
+          __store[method.to_s] = args.first
+        else
+          super
+        end
+      end
+    end
+
+    def __eval_as_dsl(&blk)
+      env = Env.new
+      env.instance_eval(&blk)
+      deep_update(env.__store)
+    end
+  end
+end

data/lib/angry_hash/extension_tracking.rb

@@ -0,0 +1,12 @@
+class AngryHash
+	module ExtensionTracking
+		def self.included(base)
+			# base.extend ClassMethods
+		end
+	end
+
+	def extend(mod)
+		puts "extending AH #{__id__} with #{mod}"
+		super
+	end
+end

data/lib/angry_hash.rb

@@ -1,7 +1,7 @@
+
 class AngryHash < Hash
-  def self.shooper
-    "mooper"
-  end
+  require 'angry_hash/dsl'
+  include AngryHash::DSL
 
   def self.[](other)
     super(__convert(other))
@@ -19,6 +19,10 @@ class AngryHash < Hash
     regular_reader(__convert_key(key))
   end
 
+  def id
+    regular_reader('id')
+  end
+
   def dup_and_store(key,value)
     regular_writer(__convert_key(key), self.class.__convert_value(value))
   end
@@ -39,7 +43,8 @@ class AngryHash < Hash
   end
 
   def deep_merge(other_hash)
-    self.regular_merge(other_hash) do |key, oldval, newval|
+    # XXX this should convert other to AHash!
+    self.regular_merge( other_hash ) do |key, oldval, newval|
       oldval = AngryHash.__convert_value(oldval)
       newval = AngryHash.__convert_value(newval)
 
@@ -119,17 +124,20 @@ class AngryHash < Hash
 
     case method_s[-1]
     when ?=
-      #regular_writer(key,args.first)
+      return super unless args.size == 1 && !block_given?
       self[ key ] = args.first
 
     when ??
+      return super unless args.empty? && !block_given?
       !! self[key]
 
     when ?!
+      return super unless args.empty?
       self[key] = AngryHash.new unless self.key?(key)
       self[key]
 
     else
+      return super unless args.empty? && !block_given?
       self[method_s]
     end
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 5
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - Lachie Cox
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 +10:00
+date: 2010-08-07 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -33,10 +33,13 @@ files:
 - angry_hash.gemspec
 - examples/accessors_eg.rb
 - examples/creation_eg.rb
+- examples/dsl.eg.rb
 - examples/dup_eg.rb
 - examples/eg_helper.rb
 - examples/merge_eg.rb
 - lib/angry_hash.rb
+- lib/angry_hash/dsl.rb
+- lib/angry_hash/extension_tracking.rb
 - lib/angry_hash/merge_string.rb
 has_rdoc: true
 homepage: http://github.com/plus2/angry_hash