orange 0.2.4 → 0.2.5

data/lib/orange-core/application.rb

@@ -19,7 +19,7 @@ module Orange
       @core = core || self.class.core
       @options ||= {}
       @options = Orange::Options.new(*opts, &block).hash.with_defaults(self.class.opts)
-      core.application(self) # Register self into core
+      @core.application(self) # Register self into core
       init
     end
     
@@ -106,9 +106,12 @@ module Orange
     # Returns an instance of Orange::Stack to be run by Rack
     #
     # Usually, you'll call this in the rackup file: `run MyApplication.app`
-    def self.app(core = false)
-      self.core = core if core
-      self.core ||= Orange::Core.new
+    def self.app(c = false)
+      if c
+        self.core = c 
+      else
+        self.core ||= Orange::Core.new
+      end
       return self.core.stack unless self.core.stack.blank?
       if self.stack_block.instance_of?(Proc)
         Orange::Stack.new self, self.core, &self.stack_block   # turn saved proc into a block arg

data/lib/orange-core/core.rb

@@ -156,11 +156,16 @@ module Orange
     end
     
     # Takes an instance of Orange::Stack and saves it. 
-    def stack(stack = false)
-      @stack = stack if stack
+    def stack(new_stack = false)
+      @stack = new_stack if new_stack
       @stack
     end
     
+    # Takes an instance of Orange::Stack and saves it.
+    def stack=(new_stack)
+      @stack = new_stack
+    end
+    
     # Convenience self for consistent naming across middleware
     # @return [Orange::Core] self
     def orange;     self;     end

data/lib/orange-core/middleware/template.rb

@@ -8,10 +8,6 @@ module Orange::Middleware
       @core.add_pulp(Orange::Pulp::Template)
       @core.mixin(Orange::Mixins::Template)
       
-      # Establish a default template chooser
-      @core.template_chooser do |packet|
-        false
-      end
     end
     
     def packet_call(packet)
@@ -51,9 +47,13 @@ end
 
 module Orange::Mixins::Template
   def template_for(packet)
-    @template_chooser.call(packet)
+    template_chooser.call(packet)
   end
   def template_chooser(&block)
-    @template_chooser = Proc.new
+    if block_given?
+      @template_chooser = Proc.new
+    else
+      @template_chooser ||= Proc.new {|packet| false}
+    end
   end
 end

data/lib/orange-core/stack.rb

@@ -29,6 +29,7 @@ module Orange
     def initialize(app_class = nil, core = false, prebuilt = :none, &block)
       @build = Rack::Builder.new
       @core = core || Orange::Core.new
+      @core.stack = self # Set a back reference in the core.
       @auto_reload = false
       @app = false
       @middleware = []
@@ -200,13 +201,16 @@ module Orange
         @app = false                    # Rebuild no matter what if autoload
       end
       unless @app 
-        @app = @build.to_app            # Build if necessary
-        orange.stack self
+        @app = do_build            # Build if necessary
         orange.fire(:stack_loaded, @app)
       end
       @app
     end
     
+    def do_build
+      @build.to_app
+    end
+    
     # Sets the core and then passes on to the stack, according to standard 
     # rack procedure
     def call(env)

data/lib/orange-more/news/resources/news_resource.rb

@@ -4,7 +4,7 @@ module Orange
     call_me :news
     def stack_init
       orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'News')
-      orange[:radius, true].context.define_tag "latest_news" do |tag|
+      orange[:radius, true].define_tag "latest_news" do |tag|
         orange[:news].latest(tag.locals.packet)
       end
     end

data/lib/orange-more/slices/middleware/radius_parser.rb

@@ -10,7 +10,7 @@ module Orange::Middleware
   class RadiusParser < Base
     def init(opts = {})
       @contexts = opts[:contexts] || [:live]
-      orange.load Orange::Radius.new, :radius
+      # orange.load Orange::Radius.new, :radius
     end
     
     # Passes packet then parses the return

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

@@ -4,6 +4,7 @@ module Orange
   # Radius resource is for exposing the Radius context
   # and allowing parsing.
   class Radius < Resource
+    call_me :radius
     def afterLoad
       @context = ::Radius::Context.new
       orange.fire(:radius_loaded, self)
@@ -13,6 +14,10 @@ module Orange
       @context
     end
     
+    def define_tag(*args, &block)
+      @context.define_tag(*args, &block)
+    end
+    
     def parse(packet)
       content = packet[:content, false]
       unless content.blank? 

data/lib/orange-more/testimonials/resources/testimonials_resource.rb

@@ -4,14 +4,15 @@ module Orange
     call_me :testimonials
     def stack_init
       orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Testimonials')
-      orange[:radius].context.define_tag "testimonials" do |tag|
+      orange[:radius].define_tag "testimonials" do |tag|
      	  if tag.attr["tag"] && model_class.all.count >0
           m = model_class.with_tag(tag.attr["tag"]).first(:offset => rand(model_class.with_tag(tag.attr["tag"]).count)) #selects testimonial based on tag
 	      elsif model_class.all.count > 0
       	  m = model_class.first(:offset => rand(model_class.all.count)) #selects a random testimonial
 	      end
         unless m.nil?
-          orange[:testimonials].testimonial(tag.locals.packet, {:model => m })
+          template = tag.attr["template"] || "testimonials"
+          orange[:testimonials].testimonial(tag.locals.packet, {:model => m, :template => template})
         else
           ""
         end
@@ -19,7 +20,8 @@ module Orange
     end
     
     def testimonial(packet, opts = {})
-      do_view(packet, :testimonials, opts)
+      template = opts[:template].to_sym || :testimonials
+      do_view(packet, template, opts)
     end
   end
 end

metadata

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