caesars 0.6.5 → 0.6.6

data/CHANGES.txt

@@ -1,6 +1,13 @@
 CAESARS -- CHANGES
 
 
+#### 0.6.6 (2009-05-12) ###############################
+
+* CHANGE: Renamed OrderedHash to Caesars::OrderedHash to eliminate change of namespace conflicts
+* CHANGE: Caesars::VERSION is now a String an includes the TINY (0.6.6)
+* FIX: OrderedHash.merge was making an inappropriate call to dup
+
+
 #### 0.6.5 (2009-05-10) ###############################
 
 * FIXED: OrderHash was missing from 0.6.4 release

data/README.rdoc

@@ -168,6 +168,11 @@ Or for GitHub fans:
 * Caleb Buxton (http://cpb.ca) for early feedback.
 * Solutious Inc (http://solutious.com)
 
+== Related Projects
+
+* DSLify[http://github.com/auser/dslify]
+
+
 == License
 
 See: LICENSE.txt

data/caesars.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "caesars"
   s.rubyforge_project = "caesars"
-  s.version = "0.6.5"
+  s.version = "0.6.6"
   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=
 
@@ -22,7 +22,7 @@
   bin/party.conf
   caesars.gemspec
   lib/caesars.rb
-  lib/orderedhash.rb
+  lib/caesars/orderedhash.rb
   )
 
   #  s.add_dependency ''

data/lib/{orderedhash.rb → caesars/orderedhash.rb}

@@ -8,12 +8,12 @@
 # THANKS
 #    Andrew Johnson for his suggestions and fixes of Hash[],
 #    merge, to_a, inspect and shift
-class OrderedHash < ::Hash
+class Caesars::OrderedHash < ::Hash
     attr_accessor :order
 
     class << self
         def [] *args
-          hsh = OrderedHash.new
+          hsh = Caesars::OrderedHash.new
           if Hash === args[0]
             hsh.replace args[0]
           elsif (args.size % 2) != 0
@@ -146,7 +146,9 @@ class OrderedHash < ::Hash
     end
     alias :merge! update
     def merge hsh2
-        self.dup update(hsh2)
+        ##self.dup update(hsh2)   ## 2009-05-12 -- delano
+        update hsh2               ## dup doesn't take an argument
+                                  ## and there's no need for it here
     end
     def select
         ary = []
@@ -157,7 +159,7 @@ class OrderedHash < ::Hash
       Hash
     end
     def __class__
-      OrderedHash
+      Caesars::OrderedHash
     end
 
     attr_accessor "to_yaml_style"
@@ -192,8 +194,6 @@ class OrderedHash < ::Hash
       @order.each_with_index { |k, index| yield k, self[k], index }
       self
     end
-end # class OrderedHash
+end # class Caesars::OrderedHash
+
 
-def OrderedHash(*a, &b)
-  OrderedHash.new(*a, &b)
-end

data/lib/caesars.rb

@@ -1,4 +1,4 @@
-require 'orderedhash'
+
 
 # Caesars -- Rapid DSL prototyping in Ruby.
 #
@@ -8,14 +8,16 @@ require 'orderedhash'
 # See bin/example
 #
 class Caesars
-  VERSION = 0.6
+  require 'caesars/orderedhash'
+  
+  VERSION = "0.6.6"
   @@debug = false
   @@chilled = {}
   @@forced_array = {}
   @@forced_ignore = {}
   @@known_symbols = []
   @@known_symbols_by_glass = {}
-  HASH_TYPE = (RUBY_VERSION =~ /1.9/) ? ::Hash : ::OrderedHash
+  HASH_TYPE = (RUBY_VERSION =~ /1.9/) ? ::Hash : Caesars::OrderedHash
   
   def Caesars.enable_debug; @@debug = true; end
   def Caesars.disable_debug; @@debug = false; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: caesars
 version: !ruby/object:Gem::Version 
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-10 00:00:00 -04:00
+date: 2009-05-18 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -33,7 +33,7 @@ files:
 - bin/party.conf
 - caesars.gemspec
 - lib/caesars.rb
-- lib/orderedhash.rb
+- lib/caesars/orderedhash.rb
 has_rdoc: true
 homepage: http://github.com/delano/caesars
 licenses: []