orange 0.2.5 → 0.2.6

data/lib/orange-more/slices/resources/radius.rb

@@ -6,7 +6,7 @@ module Orange
   class Radius < Resource
     call_me :radius
     def afterLoad
-      @context = ::Radius::Context.new
+      @context = ::Radius::PacketContext.new
       orange.fire(:radius_loaded, self)
     end
     
@@ -18,10 +18,18 @@ module Orange
       @context.define_tag(*args, &block)
     end
     
+    def parse_text(packet, text = false)
+      content = text
+      unless content.blank? 
+        parser = ::Radius::PacketParser.new(context, :tag_prefix => 'o')
+        parser.parse(content, packet)
+      end
+    end
+    
     def parse(packet)
       content = packet[:content, false]
       unless content.blank? 
-        parser = ::Radius::Parser.new(context, :tag_prefix => 'o')
+        parser = ::Radius::PacketParser.new(context, :tag_prefix => 'o')
         packet[:content] = parser.parse(content, packet)
       end
     end
@@ -34,7 +42,7 @@ module Radius
   # defines how tags should be expanded. See the QUICKSTART[link:files/QUICKSTART.html]
   # for a detailed explaination of its usage.
   #
-  class Parser
+  class PacketParser < Parser
     def parse(string, packet = false)
       @stack = [ParseContainerTag.new { |t| t.contents.to_s }]
       tokenize(string)
@@ -69,7 +77,7 @@ module Radius
       raise MissingEndTagError.new(@stack.last.name, @stack) if @stack.length != 1
     end
   end
-  class Context
+  class PacketContext < Context
 
     # Returns the value of a rendered tag. Used internally by Parser#parse.
     def render_tag(name, attributes = {}, packet = false, &block)

data/lib/orange-more/slices/resources/slices.rb

@@ -2,14 +2,14 @@ module Orange
   class Slices < Orange::Resource
     call_me :slices
     def stack_init
-      orange[:radius].context.define_tag "slice" do |tag|
+      orange[:radius].define_tag "slice" do |tag|
         content = ''
         resource = (tag.attr['resource'] || :slices).to_sym
         id = tag.attr['id'] || nil
         mode = (tag.attr['mode'] || tag.attr['chunk'] || (id ? :show : :index )).to_sym
         if orange.loaded?(resource)
           if orange[resource].respond_to?(mode) || resource == :slices
-            content << (id ? orange[resource].__send__(mode, tag.locals.packet, :id => id) : orange[resource].__send__(mode, tag.locals.packet))
+            content << (id ? orange[resource].__send__(mode, tag.locals.packet, :id => id) : orange[resource].__send__(mode, tag.locals.packet, {:attrs => tag.attr}))
           else
             content << "resource #{resource} doesn't respond to #{mode}"
           end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - David Haslem
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-07 00:00:00 -04:00
+date: 2010-05-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency