radius 0.7.4 → 0.8.0

data/lib/radius/context.rb

@@ -58,6 +58,7 @@ module Radius
       else
         tag_definition_block = @definitions[qualified_tag_name(name.to_s)]
         if tag_definition_block
+          # puts name: name, attributes: attributes
           stack(name, attributes, block) do |tag|
             tag_definition_block.call(tag).to_s
           end
@@ -95,7 +96,7 @@ module Radius
       def stack(name, attributes, block)
         previous = @tag_binding_stack.last
         previous_locals = previous.nil? ? globals : previous.locals
-        locals = DelegatingOpenStruct.new(previous_locals)
+        locals = previous_locals.dup
         binding = TagBinding.new(self, locals, name, attributes, block)
         @tag_binding_stack.push(binding)
         result = yield(binding)

data/lib/radius/delegating_open_struct.rb

@@ -8,30 +8,26 @@ module Radius
     end
 
     def dup
-      rv = self.class.new
-      rv.instance_variable_set(:@hash, @hash.dup)
-      rv
+      self.class.new.tap do |copy|
+        copy.instance_variable_set(:@hash, @hash.dup)
+        copy.object = @object
+      end
     end
     
     def method_missing(method, *args, &block)
-      symbol = (method.to_s =~ /^(.*?)=$/) ? $1.intern : method
-      if (0..1).include?(args.size)
-        if args.size == 1
-          @hash[symbol] = args.first
-        else
-          if @hash.has_key?(symbol)
-            @hash[symbol]
-          else
-            unless object.nil?
-              @object.send(method, *args, &block)
-            else
-              nil
-            end
-          end
-        end
+      return super if args.size > 1
+      
+      symbol = method.to_s.chomp('=').to_sym
+      
+      if method.to_s.end_with?('=')
+        @hash[symbol] = args.first
       else
-        super
+        @hash.fetch(symbol) { @object&.public_send(method, *args, &block) }
       end
     end
+
+    def respond_to_missing?(method, include_private = false)
+      (args.size <= 1) || super
+    end
   end
 end

data/lib/radius/ord_string.rb

@@ -1,13 +1,11 @@
 module Radius
   class OrdString < String
-    unless "a"[0] == 97 # test for lower than Ruby 1.9
-      def [](*args)
-        if args.size == 1 && args.first.is_a?(Integer)
-          slice(args.first).ord
-        else
-          super
-        end
+    def [](*args)
+      if args.size == 1 && args.first.is_a?(Integer)
+        slice(args.first).ord
+      else
+        super
       end
     end
   end
-end
+end