orange 0.5.4 → 0.5.5

data/lib/orange-core/core.rb

@@ -203,11 +203,11 @@ module Orange
     #   causing the fire. This is passed to each Proc registered.
     # @return [Boolean] returns false if nothing has been registered for the
     #   event, otherwise true.
-    def fire(event, packet)
+    def fire(event, packet, *args)
       return false unless @events[event]
       @events[event].compact!
       for callback in @events[event]
-        callback.call(packet)
+        callback.call(packet, *args)
       end
       true
     end

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

@@ -141,6 +141,7 @@ module Orange
         before = beforeDelete(packet, m, opts)
         onDelete(packet, m, opts) if m && before
         afterDelete(packet, m, opts) if before
+        orange.fire(:model_resource_deleted, packet, {:resource_id => id, :resource => @my_orange_name})
       end
       packet.reroute(@my_orange_name, :orange) unless (packet.request.xhr? || no_reroute)
     end

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

@@ -22,6 +22,15 @@ module Orange
       true
     end
     
+    def link_for(packet, news)
+      match = news.link.match(/\[(\d+)\]/)
+      if match
+        orange[:sitemap, true].to_href(packet, match[1].to_i)
+      else
+        news.link
+      end
+    end
+    
     def sitemap_row(packet, opts = {})
       do_view(packet, :sitemap_row, opts)
     end

data/lib/orange-more/news/views/news/archive.haml

@@ -2,11 +2,11 @@
   - for news in list
     .news_item
       %h2.news_title
-        %a{:href => news.link} #{news.title}
+        %a{:href => (resource.link_for(packet, news))} #{news.title}
       .news_description
         = news.description
       %p
-        %a{:href => news.link, :class => 'view_story'} View Story »
+        %a{:href => (resource.link_for(packet, news)), :class => 'view_story'} View Story »
 .news_nav
   - if page > 1
     %a.newer{:href => "#{archive_url}/page/#{page-1}"} Newer Posts

data/lib/orange-more/news/views/news/latest.haml

@@ -1,8 +1,8 @@
 - list.each do |news|
   .news_item
     %p.news_title
-      %a{:href => news.link} #{news.title}
+      %a{:href => (resource.link_for(packet, news))} #{news.title}
     .news_description
       = news.description
     %p
-      %a{:href => news.link, :class => 'view_story'} View Story »
+      %a{:href => (resource.link_for(packet, news)), :class => 'view_story'} View Story »

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

@@ -49,18 +49,19 @@ module Orange
           m.versions.new(params.merge(:version => max + 1))
           m.save
           
-          r = orange[:sitemap, true].routes_for(packet, :resource_id => m.id, :resource => @my_orange_name)
+          r = orange[:sitemap, true].routes_for(packet, :resource_id => m.id, :resource => @my_orange_name, :orange_site_id => m.orange_site.id)
           # Add route if none.
           if (r.blank? && orange.loaded?(:sitemap))
+            
             route_hash = {
-              :orange_site_id => m.orange_site_id, 
+              :orange_site_id => m.orange_site.id, 
               :resource => @my_orange_name, 
               :resource_id => m.id,
               :slug => orange[:sitemap].slug_for(m, params), 
               :show_in_nav => false,
               :link_text => "{title}"
             }
-            parents = orange[:sitemap].routes_for(packet, :resource => '', :resource_id => '', :slug => "pages")
+            parents = orange[:sitemap].routes_for(packet, :resource => '', :resource_id => '', :slug => "pages", :orange_site_id => m.orange_site.id)
             route_hash[:parent] = parents.first unless parents.blank?
             orange[:sitemap].add_route_for(packet, route_hash)
           end
@@ -74,7 +75,7 @@ module Orange
     def onNew(packet, params = {})
       params[:published] = false
       m = model_class.new(params)
-      m.orange_site = packet['subsite', false] ? packet['subsite'] : packet['site'] unless m.orange_site
+      m.orange_site = (packet['subsite', false] ? packet['subsite'] : packet['site']) unless m.orange_site
       # m.versions.new(params.merge(:version => 1))
       m
     end
@@ -82,30 +83,30 @@ module Orange
     # Saves updates to an object specified by packet['route.resource_id'], then reroutes to main
     # @param [Orange::Packet] packet the packet being routed
     def onSave(packet, m, params = {})
-      r = orange[:sitemap, true].routes_for(packet, :resource_id => m.id, :resource => @my_orange_name)
+      r = orange[:sitemap, true].routes_for(packet, :resource_id => m.id, :resource => @my_orange_name, :orange_site_id => m.orange_site.id)
       # Add route if none.
       if (r.blank? && orange.loaded?(:sitemap))
         route_hash = {
-          :orange_site_id => m.orange_site_id, 
+          :orange_site_id => m.orange_site.id, 
           :resource => @my_orange_name, 
           :resource_id => m.id,
           :slug => orange[:sitemap].slug_for(m, params), 
           :show_in_nav => false,
           :link_text => "{title}"
         }
-        parents = orange[:sitemap].routes_for(packet, :resource => '', :resource_id => '', :slug => "pages")
+        parents = orange[:sitemap].routes_for(packet, :resource => '', :resource_id => '', :slug => "pages", :orange_site_id => m.orange_site.id)
         route_hash[:parent] = parents.first unless parents.blank?
         orange[:sitemap].add_route_for(packet, route_hash)
       end
       if (params["published"] == "1")
         params["published"] = true
-        m.orange_site = packet['subsite', false] ? packet['subsite'] : packet['site'] unless m.orange_site
+        m.orange_site = (packet['subsite', false] ? packet['subsite'] : packet['site']) unless m.orange_site
         
         m.update(params)
         orange[:pages].publish(packet, :no_reroute => true, :model => m)
       else
         params["published"] = false
-        m.orange_site = packet['subsite', false] ? packet['subsite'] : packet['site'] unless m.orange_site
+        m.orange_site = (packet['subsite', false] ? packet['subsite'] : packet['site']) unless m.orange_site
         m.update(params)
       end
     end

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

@@ -10,14 +10,33 @@ module Orange
       orange[:radius, true].define_tag "link" do |tag|
         packet = tag.locals.packet
         slug = tag.expand
-        route = orange[:sitemap].find_route(packet, {:slug => slug})
+        id = tag.attr['id'] if tag.attr['id']
+        route = orange[:sitemap].find_route(packet, {:id => id}) if id
+        route = orange[:sitemap].find_route(packet, {:slug => slug}) unless route
         route = orange[:sitemap].find_route(packet, {:link_text => slug}) unless route
         
-        full_path = route ? route.full_path : "#not-found"
-        link_text = route ? route.link_text : "(Broken link tag)"
-        link_text = tag.attr["text"] if tag.attr["text"]
-	      "<a href='#{full_path}'>#{link_text}</a>"
+        orange[:sitemap].to_html(packet, route, tag.attr["text"])
       end
+      orange.register(:model_resource_deleted) do |packet, opts|
+        model_class.all(opts).destroy!
+      end
+    end
+    
+    def to_href(packet, route)
+      unless route.is_a? model_class
+        route = model_class.get(route)
+      end
+      full_path = route ? route.full_path : "#not-found"
+    end
+    
+    def to_html(packet, route, text = false)
+      unless route.is_a? model_class
+        route = model_class.get(route)
+      end
+      full_path = route ? route.full_path : "#not-found"
+      link_text = route ? link_text_for(route) : "(Broken link tag)"
+      link_text = text if text
+      "<a href='#{full_path}'>#{link_text}</a>"
     end
     
     def route_actions(packet, opts = {})
@@ -170,7 +189,7 @@ module Orange
       keys = {}
       keys[:resource] = opts[:resource] || packet['route.resource'] 
       keys[:resource_id] = opts[:resource_id] || packet['route.resource_id'] 
-      keys[:orange_site_id] = opts[:orange_site_id] || packet['subsite'].blank? ? packet['site'].id : packet['subsite'].id
+      keys[:orange_site_id] = opts[:orange_site_id] || (packet['subsite'].blank? ? packet['site'].id : packet['subsite'].id)
       keys[:slug] = opts[:slug]
       keys.delete_if{|k,v| v.blank? }
       model_class.all(keys)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - David Haslem