caesars 0.6.1 → 0.6.2

data/CHANGES.txt

@@ -1,10 +1,18 @@
 CAESARS -- CHANGES
 
 
-#### 0.6.1 (2009-05-02) ###############################
+#### 0.6.2 (2009-05-03) ###############################
+
+* FIXED: When setting Caesars::Config.verbose it would get reset after a refresh. 
+* FIXED: Handling a keyword that's passed to both forced_hash and chill
+* ADDED: Print message to STDERR when force refreshing in debug or verbose mode
+* ADDED: Caesars::SyntaxError
 
-* ADDED: known_symbol? and known_symbol_by_glass? 
 
+#### 0.6.1 (2009-05-02) ###############################
+
+* ADDED: known_symbol? and known_symbol_by_glass?
+ 
 #### 0.6.0 (2009-04-30) ###############################
 
 * ADDED: Forced reloading for Caesars::Config.refresh. This allows

data/caesars.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "caesars"
   s.rubyforge_project = "caesars"
-  s.version = "0.6.1"
+  s.version = "0.6.2"
   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

@@ -88,9 +88,18 @@ class Caesars
   attr_accessor :caesars_properties
   
   class Error < RuntimeError
+    attr_accessor :backtrace
     def initialize(obj=nil); @obj = obj; end
     def message; "#{self.class}: #{@obj}"; end
   end
+  class SyntaxError < Caesars::Error
+    def message
+      msg = "Syntax error in #{@obj}"
+      bt = @backtrace 
+      msg << " in " << bt.first.scan(/\`(.+?)'/).flatten.first if bt
+      msg
+    end
+  end
   
   def initialize(name=nil)
     @caesars_name = name if name
@@ -376,7 +385,8 @@ class Caesars
         
         return nil if caesars_names.empty? && b.nil?
         return method_missing(this_meth, *caesars_names, &b) if caesars_names.empty?
-
+        
+        # TODO: This should be a loop
         caesars_name = caesars_names.shift
         
         prev = @caesars_pointer
@@ -387,17 +397,30 @@ class Caesars
           return
         end
         
-        @caesars_pointer = hash   # This is needed but I don't know why
+        # The pointer is pointing to the hash that contains "this_meth". 
+        # We wan't to make it point to the this_meth hash so when we call 
+        # the block, we'll create new entries in there. 
+        @caesars_pointer = hash  
+        
         if b
           if Caesars.chilled?(this_meth)
+            # We're done processing this_meth so we want to return the pointer
+            # to the level above. 
+            @caesars_pointer = prev
             @caesars_pointer[this_meth][caesars_name] = b
           else
+            # Since the pointer is pointing to the this_meth hash, all keys
+            # created in the block we be placed inside. 
             b.call 
+            # We're done processing this_meth so we want to return the pointer
+            # to the level above. 
+            @caesars_pointer = prev
+            @caesars_pointer[this_meth][caesars_name] = hash
           end
         end
-        @caesars_pointer = prev
-        @caesars_pointer[this_meth][caesars_name] = hash
-        @caesars_pointer = prev        
+        
+        @caesars_pointer = prev    
+        
       end
     }
     nil
@@ -526,8 +549,8 @@ end
 #
 class Caesars::Config
   attr_accessor :paths
-  attr_accessor :options
-  attr_accessor :verbose
+  attr_reader :options
+  attr_reader :verbose
   
   @@glasses = []
   
@@ -556,6 +579,11 @@ class Caesars::Config
     refresh
   end
   
+  def verbose=(enable)
+    @verbose = enable == true
+    @options[:verbose] = @verbose
+  end
+  
   # Reset all config instance variables to nil.
   def caesars_init
     # Remove instance variables used to populate DSL data
@@ -593,7 +621,7 @@ class Caesars::Config
   def refresh
     caesars_init    # Delete all current configuration
     @@glasses.each { |glass| extend glass }
-
+    
     begin
       current_path = nil  # used in error messages
       @paths.each do |path|
@@ -612,15 +640,16 @@ class Caesars::Config
         STDERR.puts "Too many forced refreshed (#{@forced_refreshes})"
         exit 9
       end
-      STDERR.puts ex.message if Caesars.debug?
+      STDERR.puts ex.message if @verbose || Caesars.debug?
       refresh
       
     #rescue Caesars::Error => ex
     #  STDERR.puts ex.message
     #  STDERR.puts ex.backtrace if Caesars.debug?
     rescue ArgumentError, SyntaxError => ex
-      STDERR.puts "Syntax error in #{current_path}."
-      raise ex
+      newex = Caesars::SyntaxError.new(current_path)
+      newex.backtrace = ex.backtrace
+      raise newex
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: caesars
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-02 00:00:00 -04:00
+date: 2009-05-03 00:00:00 -04:00
 default_executable: 
 dependencies: []