caesars 0.5.1 → 0.5.2

data/CHANGES.txt

@@ -1,6 +1,17 @@
 CAESAR -- CHANGES
 
 
+#### 0.5.2 (2009-03-31) ###############################
+
+* NEW: Caesars.debug?, Caesars.enable_debug, Caesars.disable_debug
+* CHANGED: find_deferred now supports nested Arrays. See rdocs. 
+* BUG: Found bug related to string/symbol ambiguity when using find.
+It's not fixed yet so for now be mindful of which attributes are 
+strings and which are symbols. String attributes are stored as 
+strings but find and find_deferred look for symbols. The hash syntax
+and method accessors are not affected. 
+
+
 #### 0.5.1 (2009-03-11) ###############################
 
 * FIX: Method-syntax was broken for attributes of top level method
@@ -8,6 +19,7 @@ CAESAR -- CHANGES
 * UPDATED: docs and bin/example to reflect Caesars::Hash changes. 
 * FIX: instance_variables in Ruby 1.9.1 returns Symbols 
 
+
 #### 0.5.0 (2009-03-11) ###############################
 
 * FIX: find_deferred now gracefully handles nil errors

data/README.rdoc

@@ -11,9 +11,9 @@ One of:
 
 Or for GitHub fans:
 
+* gem install delano-caesars --source http://gems.github.com
 * git clone git://github.com/delano/caesar.git
-* gem sources -a http://gems.github.com (you only have to do this once, ever...), then:
-  * gem install delano-caesar
+
 
 == EXAMPLE 1 -- Flavour
 
@@ -133,10 +133,23 @@ Or for GitHub fans:
      # [... make changes to party.conf ...]
      
      @config.refresh
-		
+
+*party.conf*
+
+     food do 
+       oysters "10kg"
+       order do
+         self.oysters
+       end
+     end
+     
+     drink do
+       wine "12L"
+     end
+
 == More Info
 
-* GitHub[http://github.com/delano/caesar]
+* GitHub[http://github.com/delano/caesars]
 * Inspiration[http://www.youtube.com/watch?v=ycElb0tB9_U]
 * Recipe[http://twitter.com/solutious/status/1264327499]
 
@@ -147,6 +160,8 @@ Or for GitHub fans:
 == Thanks
 
 * Clams, Tomatoes, Vodka, and the rest of the crew. 
+* Caleb Buxton (http://cpb.ca) for early feedback.
+
 
 == License
 

data/caesars.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = %q{caesars}
-  s.version = "0.5.1"
-  s.date = %q{2009-03-11}
+  s.version = "0.5.2"
+  s.date = %q{2009-03-31}
   s.specification_version = 1 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 

data/lib/caesars.rb

@@ -7,7 +7,13 @@
 # See bin/example
 #
 class Caesars
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
+  @@debug = false
+  
+  def Caesars.enable_debug; @@debug = true; end
+  def Caesars.disable_debug; @@debug = false; end
+  def Caesars.debug?; @@debug; end
+  
   # A subclass of ::Hash that provides method names for hash parameters.
   # It's like a lightweight OpenStruct. 
   #     ch = Caesars::Hash[:tabasco => :lots!]
@@ -55,7 +61,9 @@ class Caesars
   def to_hash
     @caesars_properties.to_hash
   end
-
+  
+  # DEPRECATED -- use find_deferred
+  #
   # Look for an attribute, bubbling up to the parent if it's not found
   # +criteria+ is an array of attribute names, orders according to their
   # relationship. The last element is considered to the desired attribute.
@@ -69,12 +77,13 @@ class Caesars
   #
   # Returns the attribute if found or nil.
   #
-  def find_deferred(*criteria)
+  def find_deferred_old(*criteria)
     # This is a nasty implementation. Sorry me! I'll enjoy a few
     # caesars and be right with you. 
     att = criteria.pop
     val = nil
     while !criteria.empty?
+      p [criteria, att].flatten if Caesars.debug?
       val = find(criteria, att)
       break if val
       criteria.pop
@@ -84,6 +93,88 @@ class Caesars
     val
   end
   
+  # Look for an attribute, bubbling up through the parents until it's found.
+  # +criteria+ is an array of hierarchical attributes, ordered according to 
+  # their relationship. The last element is the desired attribute to find.
+  # Looking for 'ami':
+  #
+  #      find_deferred(:environment, :role, :ami)
+  #
+  # First checks at @caesars_properties[:environment][:role][:ami]
+  # Then, @caesars_properties[:environment][:ami]
+  # Finally, @caesars_properties[:ami]
+  #
+  # If the last element is an Array, it's assumed that only that combination
+  # should be returned.
+  # 
+  #      find_deferred(:environment, :role:, [:disks, '/file/path'])
+  #
+  # [:environment][:role][:disks]['/file/path']
+  # [:environment][:disks]['/file/path']
+  # [:disks]['/file/path']
+  #
+  # Other nested Arrays are treated special too. We look at the criteria from
+  # right to left and remove the first nested element we find.
+  #
+  #      find_deferred([:region, :zone], :environment, :role, :ami)
+  #
+  # [:region][:zone][:environment][:role][:ami]
+  # [:region][:environment][:role][:ami]
+  # [:environment][:role][:ami]
+  # [:environment][:ami]
+  # [:ami]
+  #
+  # Returns the attribute if found or nil.
+  #
+  def find_deferred(*criteria)
+    # The last element is assumed to be the attribute we're looking for. 
+    # The purpose of this function is to bubble up the hierarchy of a
+    # hash to find it.
+    att = criteria.pop  
+
+    # Account for everything being sent as an Array
+    # i.e. find([1, 2, :attribute])
+    # We don't use flatten b/c we don't want to disturb nested Arrays
+    if criteria.empty?
+      criteria = att
+      att = criteria.pop
+    end
+
+    found = nil
+    sacrifice = nil
+
+    while !criteria.empty?
+      p [criteria, att].flatten if Caesars.debug?
+      found = find(criteria, att)
+      break if found
+
+      # Nested Arrays are treated special. We look at the criteria from
+      # right to left and remove the first nested element we find.
+      #
+      # i.e. [['a', 'b'], 1, 2, [:first, :second], :attribute]
+      #
+      # In this example, :second will be removed first.
+      criteria.reverse.each_with_index do |el,index|
+        next unless el.is_a?(Array)    # Ignore regular criteria
+        next if el.empty?              # Ignore empty nested hashes
+        sacrifice = el.pop
+        break
+      end
+
+      # Remove empty nested Arrays
+      criteria.delete_if { |el| el.is_a?(Array) && el.empty? }
+
+      # We need to make a sacrifice
+      sacrifice = criteria.pop if sacrifice.nil?
+
+      break if (@limit ||= 0) > 5  # A failsafe
+      @limit += 1
+      sacrifice = nil
+    end
+
+    found || find(att)  # One last try in the root namespace
+  end
+  
   # Looks for the specific attribute specified. 
   # +criteria+ is an array of attribute names, orders according to their
   # relationship. The last element is considered to the desired attribute.
@@ -92,8 +183,11 @@ class Caesars
   # Unlike find_deferred, it will return only the value specified, otherwise nil. 
   def find(*criteria)
     criteria.flatten! if criteria.first.is_a?(Array)
+    p criteria if Caesars.debug?
+    # BUG: Attributes can be stored as strings and here we only look for symbols
     str = criteria.collect { |v| "[:'#{v}']" if v }.join
-    val = eval "@caesars_properties#{str} if defined?(@caesars_properties#{str})"
+    eval_str = "@caesars_properties#{str} if defined?(@caesars_properties#{str})"
+    val = eval eval_str
     val
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: caesars
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-11 00:00:00 -04:00
+date: 2009-03-31 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: caesars
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 1
 summary: "Caesars: A simple class for rapid DSL prototyping in Ruby."