orange 0.1.8 → 0.1.10

data/README.markdown

@@ -103,6 +103,7 @@ Required Gems
 * rack-openid
 * openid_dm_store
 * radius
+* crack
 
 All dependencies should be loaded if you install the gem except for the datamapper
 adapter relevant to your set up. If, for example, you want to use a mysql database,

data/lib/orange-core/application.rb

@@ -9,17 +9,17 @@ module Orange
   # the self.stack method, which will be used to create a new
   # Orange::Stack
   class Application
+    extend ClassInheritableAttributes
+    cattr_accessor :core, :stack_block
     # Initialize will set the core, and additionally accept any
     # other options to be added in to the opts array
     # @param [Orange::Core] core the orange core instance that this application will use
     # @param [Hash] *opts the optional arguments
     def initialize(core = false, *opts, &block)
-      @core = core
+      @core = core || self.class.core
       @options ||= {}
       @options = Orange::Options.new(*opts, &block).hash.with_defaults(self.class.opts)
-      orange.register(:stack_loaded) do |s|
-        stack_init
-      end
+      core.application(self) # Register self into core
       init
     end
     
@@ -106,12 +106,14 @@ 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 ||= Orange::Core.new
-      if @app.instance_of?(Proc)
-        Orange::Stack.new self, @core, &@app   # turn saved proc into a block arg
+    def self.app(core = false)
+      self.core = core if core
+      self.core ||= Orange::Core.new
+      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
       else
-        Orange::Stack.new self, @core
+        Orange::Stack.new self, self.core
       end
     end
     
@@ -120,8 +122,8 @@ module Orange
     # 
     # Each call to stack overrides the previous one.
     def self.stack(core = false, &block)
-      @core = core
-      @app = Proc.new           # pulls in the block and makes it a proc
+      self.core = core if core
+      self.stack_block = Proc.new           # pulls in the block and makes it a proc
     end
   end
 end

data/lib/orange-core/core.rb

@@ -65,12 +65,20 @@ module Orange
     def initialize(*args, &block)
       @options = Options.new(*args, &block).hash.with_defaults(DEFAULT_CORE_OPTIONS)
       @resources = {}
+      @application = false
+      @stack = false
+      @middleware = []
       @events = {}
       @file = __FILE__
       load(Orange::Parser.new, :parser)
       load(Orange::Mapper.new, :mapper)
       load(Orange::PageParts.new, :page_parts)
       Orange.plugins.each{|p| p.resources.each{|args| load(*args)} if p.has_resources?}
+      self.register(:stack_loaded) do |s| 
+        @middleware.each{|m| m.stack_init if m.respond_to?(:stack_init)}
+        @application.stack_init if @application
+      end
+      self.register(:stack_reloading){|s| @middleware = []} # Dump middleware on stack reload
       # load(Orange::AdminResource.new, :admin)
       afterLoad
       self
@@ -133,6 +141,26 @@ module Orange
       @resources[name] = resource.set_orange(self, name)
     end
     
+    # Takes an instance of Orange::Middleware::Base subclass and
+    # keeps it for later. This way we can provide introspection into the 
+    # middleware instances (useful for calling stack_init on them)
+    def middleware(middle = false)
+      @middleware << middle if middle
+      @middleware
+    end
+    
+    # Takes an instance of Orange::Application and saves it. 
+    def application(app = false)
+      @application = app if app
+      @application
+    end
+    
+    # Takes an instance of Orange::Stack and saves it. 
+    def stack(stack = false)
+      @stack = stack if stack
+      @stack
+    end
+    
     # Convenience self for consistent naming across middleware
     # @return [Orange::Core] self
     def orange;     self;     end
@@ -224,5 +252,9 @@ module Orange
     def self.add_pulp(inc)
       Packet.mixin inc
     end
+    
+    def inspect
+      "#<Orange::Core:0x#{self.object_id.to_s(16)}>"
+    end
   end
 end

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

@@ -11,7 +11,9 @@ require 'orange-core/packet'
 module Orange::Middleware
   class Base
     # Initialize will set the core and downstream app, then call init
-    # subclasses should override init instead of initialize
+    # subclasses should override init instead of initialize.
+    # If the subclass defines a stack_init, then it will be registered
+    # as a stack_loaded event.
     # @param [Object] app a downstream app 
     # @param [Orange::Core] core the orange core
     # @param [optional, Array] args any arguments
@@ -19,9 +21,11 @@ module Orange::Middleware
       @app = app
       @core = core
       init(*args)
+      core.middleware(self)
     end
     
     # A stub method that subclasses can override to handle initialization
+    # For initialization
     # @return [void]
     def init(*args)
     end

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

@@ -5,13 +5,17 @@ module Orange::Middleware
     def init(opts = {})
       opts = opts.with_defaults(:migration_url => (orange.options[:development_mode] ? '/__ORANGE_DB__/migrate' : false), :no_auto_upgrade => false)
       orange.mixin Orange::Mixins::DBLoader
-      orange.register(:stack_loaded) do |stack|
+      @options = opts
+    end
+    
+    def stack_init
+      unless orange.options.has_key?('database') && orange.options['database'] == false
         db = orange.options['database'] || 'sqlite3::memory:'
-        orange.load_db!(db)
-        orange.upgrade_db! unless opts[:no_auto_upgrade] || orange.options['no_auto_upgrade']
+        orange.load_db!(db) 
+        orange.upgrade_db! unless @options[:no_auto_upgrade]
       end
-      @options = opts
     end
+    
     def packet_call(packet)
       path = packet['route.path'] || packet.request.path_info
       if @options[:migration_url] && @options[:migration_url] == path

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

@@ -2,11 +2,11 @@ require 'orange-core/middleware/base'
 module Orange::Middleware
   
   class Globals < Base
-    def init(*args)
-      opts = args.extract_options!.with_defaults(:file => "__ORANGE__/config.yml")
+    def init(opts = {})
+      opts = opts.with_defaults(:file => "__ORANGE__/config.yml")
       @file = opts[:file].gsub('__ORANGE__', orange.app_dir)
       @globals = orange[:parser].yaml(@file) || {}
-      @globals.each{|k,v| orange.options[k] = v }
+      @globals.each{|k,v| orange.options[k] = v}
     end
     def packet_call(packet)
       packet['orange.globals'] ||= orange.options

data/lib/orange-core/packet.rb

@@ -210,7 +210,7 @@ module Orange
         break if matched
       end
       return @@matchers[matched].call(packet, matched.match(id), args) if matched
-      raise NoMethodError
+      raise NoMethodError.new("No method ##{id} found", id)
     end
   end
 end

data/lib/orange-core/resource.rb

@@ -15,7 +15,8 @@ module Orange
     def set_orange(orange, name)
       @orange = orange
       @my_orange_name = name
-      afterLoad
+      init
+      orange.register(:stack_loaded) { |s| stack_init } if self.respond_to? :stack_init
       self
     end
     
@@ -23,8 +24,11 @@ module Orange
       raise 'instantiate the resource before calling set orange'
     end
     
+    def init
+      afterLoad
+    end
+    
     def afterLoad
-      true
     end
     
     def self.call_me(name)

data/lib/orange-core/resources/parser.rb

@@ -1,6 +1,7 @@
 require 'orange-core/core'
 require 'haml'
 require 'yaml'
+require 'crack'
 
 module Orange
   class Parser < Resource
@@ -60,6 +61,14 @@ module Orange
       require 'hpricot'
       Hpricot(text)
     end
+    
+    def xml(text)
+      Crack::XML.parse(text)
+    end
+    
+    def json(text)
+      Crack::JSON.parse(text)
+    end
   end 
   
   module Pulp::ParserPulp

data/lib/orange-core/stack.rb

@@ -28,8 +28,9 @@ module Orange
     # @param [Symbol] prebuilt the optional prebuilt stack, if one isn't passed as block
     def initialize(app_class = nil, core = false, prebuilt = :none, &block)
       @build = Rack::Builder.new
-      @core = Orange::Core.new
+      @core = core || Orange::Core.new
       @auto_reload = false
+      @middleware = []
       @recapture = true
       @main_app = app_class
       if block_given?
@@ -193,9 +194,15 @@ module Orange
     # @return [Object] a full stack of middleware and the exit application,
     #   conforming to Rack guidelines
     def app
-      @app = false if @auto_reload      # Rebuild no matter what if autoload
-      @app ||= @build.to_app            # Build if necessary
-      orange.fire(:stack_loaded, @app)
+      if @auto_reload
+        orange.fire(:stack_reloading, @app) if orange.stack  # Alert we are rebuilding
+        @app = false                    # Rebuild no matter what if autoload
+      end
+      unless @app 
+        @app = @build.to_app            # Build if necessary
+        orange.stack self
+        orange.fire(:stack_loaded, @app)
+      end
       @app
     end
     
@@ -205,5 +212,10 @@ module Orange
       env['orange.core'] = @core
       app.call(env)
     end
+    
+    # Debug helping
+    def inspect
+      "#<Orange::Stack:0x#{self.object_id.to_s(16)} @build=#{@build.inspect}, @core=#{@core.inspect}>"
+    end
   end
 end

data/lib/orange-more/administration/middleware/access_control.rb

@@ -68,11 +68,11 @@ module Orange::Middleware
     end
     
     def need_to_handle?(packet)
-      @handle && ([@login, @logout].include? packet.request.path)
+      @handle && ([@login, @logout].include? packet.request.path.gsub(/\/$/, ''))
     end
     
     def handle_openid(packet)
-      if packet.env['REQUEST_PATH'] == @logout
+      if packet.request.path.gsub(/\/$/, '') == @logout
         packet.session['user.id'] = nil
         packet['user.id'] = nil
         after = packet.session['user.after_login'].blank? ? 

data/lib/orange-more/assets/resources/asset_resource.rb

@@ -3,15 +3,14 @@ module Orange
   class AssetResource < Orange::ModelResource
     use Orange::Asset
     call_me :assets
-    def afterLoad
+    
+    def stack_init
       orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Assets')
-      orange.register(:stack_loaded) do
-        orange[:radius, true].context.define_tag "asset" do |tag|
-          if tag.attr['id']
-            (m = model_class.first(:id => tag.attr['id'])) ? m.to_asset_tag : 'Invalid Asset'
-          else
-            ''
-          end
+      orange[:radius, true].context.define_tag "asset" do |tag|
+        if tag.attr['id']
+          (m = model_class.first(:id => tag.attr['id'])) ? m.to_asset_tag : 'Invalid Asset'
+        else
+          ''
         end
       end
     end

data/lib/orange-more/blog/resources/blog_post_resource.rb

@@ -2,7 +2,7 @@ module Orange
   class BlogResource < Orange::ModelResource
     use OrangeBlogPost
     call_me :blog_posts
-    def afterLoad
+    def stack_init
       orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Blog')      
     end
     

data/lib/orange-more/blog/resources/blog_resource.rb

@@ -2,7 +2,7 @@ module Orange
   class BlogPostResource < Orange::ModelResource
     use OrangeBlog
     call_me :blog
-    def afterLoad
+    def stack_init
       orange[:admin, true].add_link("Settings", :resource => @my_orange_name, :text => 'Blog')      
     end
     

data/lib/orange-more/cloud/resources/cloud_resource.rb

@@ -4,10 +4,8 @@ module Orange
   class CloudResource < Orange::Resource
     ORANGE_PING_KEY = "c99550a0430eb9054eb4b7ee290664cf"
     call_me :cloud
-    def afterLoad
-      orange.register(:stack_loaded) do |stack|
-        options[:ping_fm_key] = orange.options['ping_fm_key'] || false
-      end
+    def stack_init
+      options[:ping_fm_key] = orange.options['ping_fm_key'] || false
     end
     
     def microblog(packet, status, opts = {})

data/lib/orange-more/debugger/middleware/debugger.rb

@@ -32,4 +32,11 @@ module Orange::Pulp::DebuggerHelpers
       Rack::Utils.escape_html(obj.inspect)
     end
   end
-end
+end
+
+class Rack::Builder 
+  def inspect
+    "#<Rack::Builder:#{self.object_id.to_s(16)} @ins=#{@ins.map{|x| x.instance_of?(Proc)? x.call(nil) : x }.inspect} >"
+  end
+end
+

data/lib/orange-more/debugger/views/debug_bar.haml

@@ -61,4 +61,23 @@
             %tr
               %td #{h_debug key}
               %td.code
-                %div #{h_debug val}
+                %div #{h_debug val}
+    %h3#orange-info= 'Orange Core'
+    %table.req
+      %thead
+        %tr
+          %th Variable
+          %th Value
+      %tbody
+        %tr
+          %td Middleware
+          %td.code
+            %div #{h_debug packet.env['orange.core'].middleware}
+        %tr
+          %td Application
+          %td.code
+            %div #{h_debug packet.env['orange.core'].application}
+        %tr
+          %td Stack
+          %td.code
+            %div #{h_debug packet.env['orange.core'].stack}

data/lib/orange-more/events/cartons/orange_event.rb

@@ -2,13 +2,19 @@ class OrangeEvent < Orange::Carton
   id
   admin do
     title :name
-    text :location
+    text :location_name
+    text :location_address
+    text :location_address2
+    text :location_city
+    text :location_state
+    text :location_zip
     fulltext :description
   end
   orange do
     time :starts
     time :ends
   end
+  
   def starts_time
     self.starts.strftime("%I:%M %p")
   end

data/lib/orange-more/events/resources/calendar_resource.rb

@@ -6,5 +6,7 @@ module Orange
     def afterNew(packet, obj, opts = {})
       obj.orange_site = packet['site'] unless obj.orange_site
     end
+    
+    
   end
 end

data/lib/orange-more/events/resources/event_resource.rb

@@ -1,10 +1,42 @@
+require 'rest_client'
+
 module Orange
   class EventResource < ModelResource
+    # For integration with Eventbrite. Application key needs user
+    # key for full access.
+    ORANGE_EVENTBRITE_KEY = "ODQ5MDMzZWQwOWRl"
+    
     use OrangeEvent
     call_me :events
     
+    def stack_init
+      options[:eventbrite_key] = orange.options['eventbrite_key'] || false
+    end
+    
     def find_extras(packet, mode, opts = {})
-      {:calendars => OrangeCalendar.all}
+      extras = {:calendars => OrangeCalendar.all}
+      case mode
+      when :create
+        ev = eventbrite_venues
+        extras.merge!(:eventbrite_venues => eventbrite_venues) if options[:eventbrite_key]
+      end
+      extras
+    end
+    
+    def post_to_eventbrite
+      
+    end
+    
+    def eventbrite_venues
+      list = []
+      begin
+        response = RestClient.get("https://www.eventbrite.com/xml/user_list_venues?app_key=#{ORANGE_EVENTBRITE_KEY}&user_key=#{options[:eventbrite_key]}")
+        xml = orange[:parser].xml(response.body)
+        list = xml["venues"]["venue"].select{|x| !x['country'].blank? }
+      rescue
+        return false
+      end
+      list
     end
   end
 end

data/lib/orange-more/events/views/events/create.haml

@@ -19,4 +19,5 @@
     %input{:type => 'text', :id => "#{model_name}-ends", :size => 10, :class => 'date', :name => "#{model_name}[ends_date]", :value => (Time.now + 60*60).strftime("%m/%d/%Y") }
     at
     %input{:type => 'text', :name => "#{model_name}[ends_time]", :size => 8, :value => (Time.now + 60*60).strftime("%I:%M %p") }
-  %input{:type => 'submit', :value => 'Save New Event'}
+  %input{:type => 'submit', :value => 'Save New Event'}
+  

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

@@ -2,13 +2,10 @@ module Orange
   class NewsResource < Orange::ModelResource
     use OrangeNews
     call_me :news
-    def afterLoad
+    def stack_init
       orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'News')
-      
-      orange.register(:stack_loaded) do
-        orange[:radius, true].context.define_tag "latest_news" do |tag|
-          orange[:news].latest(tag.locals.packet)
-        end
+      orange[:radius, true].context.define_tag "latest_news" do |tag|
+        orange[:news].latest(tag.locals.packet)
       end
     end
     

data/lib/orange-more/pages/resources/page_resource.rb

@@ -24,12 +24,15 @@ module Orange
   class PageResource < Orange::ModelResource
     use OrangePage
     call_me :pages
-    def afterLoad
-      orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Pages')
+    def init
       options[:sitemappable] = true
       orange.add_pulp(Orange::Pulp::PageHelpers)
     end
     
+    def stack_init
+      orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Pages')
+    end
+    
     def publish(packet, opts = {})
       no_reroute = opts[:no_reroute]
       if packet.request.post? || !opts.blank?

data/lib/orange-more/sitemap/resources/sitemap_resource.rb

@@ -5,10 +5,10 @@ module Orange
   class SitemapResource < ModelResource
     use OrangeRoute
     call_me :sitemap
-    def afterLoad
+    def stack_init
       orange[:admin, true].add_link('Content', :resource => @my_orange_name, :text => 'Sitemap')
-      
     end
+    
     def route_actions(packet, opts = {})
       do_view(packet, :route_actions, opts)
     end

data/lib/orange-more/sitemap/views/default_resource/sitemap_row.haml

@@ -0,0 +1,27 @@
+- if route
+  .sitemap_item{:class => "sitemap_level_#{route.level}"}
+    - if route.level > 0
+      .move_actions.dent_actions
+        = form_link('Outdent', route_to(:sitemap, route.id, 'outdent'), false, {:method => 'post', :class => 'outdent arrow'}) if route.level > 1
+        %p= ' '
+      .move_actions
+        - if route.previous_sibling
+          = form_link('Up', route_to(:sitemap, route.id, 'higher'), false, {:method => 'post', :class => 'up arrow'}) 
+        - else
+          %p.disabled_up.arrow= ' '
+        - if route.next_sibling
+          = form_link('Down', route_to(:sitemap, route.id, 'lower'), false, {:method => 'post', :class => 'down arrow'}) 
+        - else
+          %p.disabled_down.arrow= ' '
+      .move_actions.dent_actions
+        = form_link('Indent', route_to(:sitemap, route.id, 'indent'), false, {:method => 'post', :class => 'indent arrow'}) if route.previous_sibling && route.previous_sibling.level == route.level
+        %p= ' '
+    %h4 #{route.link_text} <span>(#{route.full_path})</span>
+    .linked_to
+      %p 
+        Linked to: 
+        %a{:href => route.resource.blank? ?  '#' : route_to(route.resource, route.resource_id, 'edit')} [#{route.resource}] ##{route.resource_id}
+    .actions
+      = form_link('Delete', route_to(:sitemap, route.id, 'delete'), 'Are you sure you want to delete this?', {:method => 'delete'})
+      %a{:href => route_to(:sitemap, route.id, 'edit')} Edit
+    %br.clear

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

@@ -1,25 +1,23 @@
 module Orange
   class Slices < Orange::Resource
     call_me :slices
-    def afterLoad
-      orange.register(:stack_loaded){
-        orange[:radius].context.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))
-            else
-              content << "resource #{resource} doesn't respond to #{mode}"
-            end
+    def stack_init
+      orange[:radius].context.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))
           else
-            content << "resource #{resource} not loaded"
-          end  
-          content
-        end
-      }
+            content << "resource #{resource} doesn't respond to #{mode}"
+          end
+        else
+          content << "resource #{resource} not loaded"
+        end  
+        content
+      end
     end
     
     

data/lib/orange-more/subsites/resources/subsite_resource.rb

@@ -2,7 +2,7 @@ module Orange
   class SubsiteResource < Orange::ModelResource
     use OrangeSubsite
     call_me :subsites
-    def afterLoad
+    def stack_init
       orange[:admin, true].add_link("Settings", :resource => @my_orange_name, :text => 'Subsites')
     end
     

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

@@ -2,23 +2,22 @@ module Orange
   class TestimonialsResource < Orange::ModelResource
     use OrangeTestimonial
     call_me :testimonials
-    def afterLoad
+    def stack_init
       orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Testimonials')
-      orange.register(:stack_loaded) do
-        orange[:radius].context.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 })
-          else
-            ""
-          end
+      orange[:radius].context.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 })
+        else
+          ""
         end
       end
     end
+    
     def testimonial(packet, opts = {})
       do_view(packet, :testimonials, opts)
     end

data/spec/orange-core/application_spec.rb

@@ -14,6 +14,22 @@ describe Orange::Application do
         @wibble = true
       end
     end
+    # allow deep introspection into rack builder
+    class Rack::Builder 
+      attr_accessor :ins
+      # introspection into the Builder object's list of items
+      # builder uses Proc magic to chain the middleware together,
+      # so we undo it.
+      def ins_no_procs
+        @ins.map{|x| x.instance_of?(Proc)? x.call(nil) : x }
+      end
+    end
+    class Orange::Stack 
+      attr_accessor :build
+      def middlewarez
+        build.ins_no_procs
+      end
+    end
   end
   
   def app
@@ -126,6 +142,27 @@ describe Orange::Application do
     }.should change(x, :orange)
   end
   
+  it "should allow setting the core via #app" do
+    c = Orange::Core.new
+    x= MockApplication.app(c)
+    x.orange.should equal(c)
+  end
+  
+  it "should allow setting the core via #stack" do
+    c = Orange::Core.new
+    MockApplication.stack(c) do
+      run MockApplication.new(orange)
+    end
+    x= MockApplication.app
+    x.orange.should equal(c)
+    x.middlewarez.first.orange.should equal(c)
+    p = Orange::Packet.new(c, {'orange.core' => c})
+    Orange::Packet.should_receive(:new).with(c, {'orange.core' => c}).and_return(p)
+    lambda{
+      x.call({}) # We don't care about the error, we care about the should_receive
+    }.should raise_error 
+  end
+  
   it "should respond correctly to call" do
     x= MockApplication.new(Orange::Core.new)
     lambda{

data/spec/orange-core/core_spec.rb

@@ -60,9 +60,11 @@ describe Orange::Core do
     c.loaded?(:parser).should be_true
   end
   
-  it "should have no events by default" do
+  it "should have two events by default" do
     c= Orange::Core.new
-    c.events.should have(0).events
+    c.events.should have(2).events
+    c.events.should have_key(:stack_reloading)
+    c.events.should have_key(:stack_loaded)
   end
   
   it "should return a directory that contains core.rb when calling core_dir" do
@@ -167,7 +169,6 @@ describe Orange::Core do
   
   it "should add event to events list when register called" do
     c= Orange::Core.new
-    c.events.should be_empty
     c.register(:mock_event) {|x| x }
     c.events.should_not be_empty
     c.events.should have_key(:mock_event)
@@ -179,7 +180,6 @@ describe Orange::Core do
   
   it "should add events in specified order when registered with position" do
     c= Orange::Core.new
-    c.events.should be_empty
     c.register(:mock_event, 5) {|x| '5' }
     c.events.should_not be_empty
     c.events.should have_key(:mock_event)

data/spec/orange-core/middleware/base_spec.rb

@@ -1,18 +1,18 @@
 describe Orange::Middleware::Base do
   it "should call init after initializing" do
     lambda{
-      mid = MockOrangeDeathMiddleware.new(nil, nil, :foo => 'bar')
+      mid = MockOrangeDeathMiddleware.new(nil, Orange::Core.new, :foo => 'bar')
     }.should raise_error(RuntimeError, "middleware_init with foo=bar")
   end
   
   it "should create a packet and call packet call" do
-    mid = MockOrangeBasedMiddlewareTwo.new(nil, nil)
+    mid = MockOrangeBasedMiddlewareTwo.new(nil, Orange::Core.new)
     mid.should_receive(:packet_call).with(an_instance_of(Orange::Packet))
     mid.call({})
   end
   
   it "should pass the packet on by default for packet_call" do
-    mid = MockOrangeBasedMiddlewareTwo.new(nil, nil)
+    mid = MockOrangeBasedMiddlewareTwo.new(nil, Orange::Core.new)
     mid.should_receive(:pass).with(an_instance_of(Orange::Packet))
     mid.packet_call(empty_packet)
   end
@@ -23,8 +23,8 @@ describe Orange::Middleware::Base do
     my_hash = {:foo => :bar}
     app.should_receive(:call).with(my_hash).and_return([{},200,[]])
     app2.should_receive(:packet_call).with(an_instance_of(Orange::Packet))
-    mid = MockOrangeBasedMiddlewareTwo.new(app, nil)
-    mid2 = MockOrangeBasedMiddlewareTwo.new(app2, nil)
+    mid = MockOrangeBasedMiddlewareTwo.new(app, Orange::Core.new)
+    mid2 = MockOrangeBasedMiddlewareTwo.new(app2, Orange::Core.new)
     mid.call(my_hash)
     mid2.call(my_hash)
   end

data/spec/orange-core/mock/mock_middleware.rb

@@ -13,6 +13,10 @@ class MockMiddleware
 end
 
 class MockOrangeBasedMiddlewareTwo < Orange::Middleware::Base; end
+class MockOrangeBasedMiddlewareThree < Orange::Middleware::Base
+  def stack_init
+  end
+end
 class MockOrangeDeathMiddleware < Orange::Middleware::Base
   def init(*args)
     opts = args.extract_options!

data/spec/orange-core/mock/mock_resource.rb

@@ -7,6 +7,18 @@ class MockResource < Orange::Resource
   end
 end
 
+class MockResourceTwo < Orange::Resource
+  def mock_method
+    'MockResource#mock_method'
+  end
+  def afterLoad
+    @options[:mocked] = true
+  end
+  def stack_init
+    true
+  end
+end
+
 class MockHamlParser < Orange::Resource
   def haml(template, packet, opts)
     [template, packet, opts]

data/spec/orange-core/resource_spec.rb

@@ -44,6 +44,13 @@ describe Orange::Resource do
     me.should equal r
   end
   
+  it "should register for stack_loaded iff stack_init method present" do
+    c = Orange::Core.new
+    c.should_receive(:register).with(:stack_loaded).once
+    mid1 = c.load MockResource.new
+    mid2 = c.load MockResourceTwo.new
+  end
+  
   it "should return an error if setting orange on a class" do
     lambda {
       Orange::Resource.set_orange(Orange::Core.new, :mock)

data/spec/orange-core/stack_spec.rb

@@ -46,6 +46,17 @@ describe Orange::Stack do
     }.should raise_error(RuntimeError, "Mock Exitware")
   end
   
+  it "should accept a core object in initialization" do
+    c = Orange::Core.new
+    c2 = Orange::Core.new
+    
+    x = Orange::Stack.new(nil, c) do
+      run MockExitware.new
+    end
+    x.orange.should equal(c)
+    x.orange.should_not equal(c2)
+  end
+  
   it "should have the use function" do
     x= Orange::Stack.new do
       use MockMiddleware
@@ -101,6 +112,27 @@ describe Orange::Stack do
     x.app.should eql(x.app)
   end
   
+  it "should fire the stack events" do
+    c = Orange::Core.new
+    c2 = Orange::Core.new
+    x= Orange::Stack.new(nil, c) do
+      run MockExitware.new
+    end
+    x2= Orange::Stack.new(nil, c2) do
+      auto_reload!
+      run MockExitware.new
+    end
+    c.should_receive(:fire).with(:stack_loaded, anything()).once
+    c.should_receive(:fire).with(:stack_reloading, anything()).exactly(0).times
+    x.app
+    x.app
+    c2.should_receive(:fire).with(:stack_loaded, anything()).exactly(3).times
+    c2.should_receive(:fire).with(:stack_reloading, anything()).twice
+    x2.app
+    x2.app
+    x2.app
+  end
+  
   it "should rebuild stack if auto_reload! set" do
     x= Orange::Stack.new do
       auto_reload!
@@ -133,6 +165,22 @@ describe Orange::Stack do
     x.middlewarez.select{|y| y.instance_of?(Orange::Middleware::RouteSite)}.should_not be_empty
   end
   
+  it "should have routing, postrouting and responder middleware hooks" do
+    x = Orange::Stack.new do
+      run MockExitware.new
+    end
+    x.should respond_to(:routing)
+    x.should respond_to(:postrouting)
+    x.should respond_to(:responders)
+    q = mock(:plugins)
+    plugin = mock(:plugin)
+    Orange.should_receive(:plugins).exactly(3).times.and_return(q)
+    q.should_receive(:each).exactly(3).times.and_return([plugin])
+    x.routing
+    x.postrouting
+    x.responders
+  end
+  
   it "should add one less middleware when calling prerouting with opt :no_abstract_format" do
     x= Orange::Stack.new do
       no_recapture

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - David Haslem
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 -04:00
+date: 2010-04-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -199,6 +199,7 @@ files:
 - lib/orange-more/sitemap/middleware/flex_router.rb
 - lib/orange-more/sitemap/plugin.rb
 - lib/orange-more/sitemap/resources/sitemap_resource.rb
+- lib/orange-more/sitemap/views/default_resource/sitemap_row.haml
 - lib/orange-more/sitemap/views/sitemap/list.haml
 - lib/orange-more/sitemap/views/sitemap/route_actions.haml
 - lib/orange-more/sitemap/views/sitemap/sitemap_links.haml