orange 0.4.0 → 0.5.1

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

@@ -21,50 +21,62 @@ module Orange
     end
     
     def haml(file, packet_binding, *vars, &block)
+      
       opts = vars.extract_options!
-      if packet_binding.is_a? Orange::Packet
-        context = packet_binding['route.context'].to_s 
-      end
+      # Initial info
       temp = opts.delete(:template)
       opts[:resource_name] = opts[:resource].orange_name.to_s if 
           opts[:resource] && opts[:resource].respond_to?(:orange_name)
       resource = (opts[:resource_name] || '').downcase
-      opts.merge :orange => orange
       
-      string = false
-      if temp
-        string ||= read_if_exists('templates', file) 
-        @template_dirs.each do |templates_dir|
-          string ||= read_if_exists(templates_dir, file)
-        end unless string
+      if packet_binding.is_a? Orange::Packet
+        context = packet_binding['route.context'].to_s
+        unless temp
+          packet_binding['parser.haml-templates'] ||= {}
+          haml_engine = packet_binding['parser.haml-templates']["#{context}-#{resource}-#{file}"] || false
+        end
       end
+      unless haml_engine
+        opts.merge :orange => orange
       
-      if context
-        #Check for context specific overrides
-        string ||= read_if_exists('views', resource, context+"."+file) if resource
-        string ||= read_if_exists('views', context+"."+file)
-        @view_dirs.each do |views_dir|
-          string ||= read_if_exists(views_dir, resource, context+"."+file) if resource
-          string ||= read_if_exists(views_dir, context+"."+file)
-        end unless string
-      end
+        string = false
+        if temp
+          string ||= read_if_exists('templates', file) 
+          @template_dirs.each do |templates_dir|
+            string ||= read_if_exists(templates_dir, file)
+          end unless string
+        end
       
-      # Check for standard views
-      string ||= read_if_exists('views', resource, file) if resource
-      string ||= read_if_exists('views', file)
-      @view_dirs.each do |views_dir|
-        string ||= read_if_exists(views_dir, resource, file) if resource
-        string ||= read_if_exists(views_dir, file)
-      end unless string
+        if context
+          #Check for context specific overrides
+          string ||= read_if_exists('views', resource, context+"."+file) if resource
+          string ||= read_if_exists('views', context+"."+file)
+          @view_dirs.each do |views_dir|
+            string ||= read_if_exists(views_dir, resource, context+"."+file) if resource
+            string ||= read_if_exists(views_dir, context+"."+file)
+          end unless string
+        end
       
-      # Check for default resource views
-      string ||= read_if_exists('views', 'default_resource', file)
-      @view_dirs.each do |views_dir|
-        string ||= read_if_exists(views_dir, 'default_resource', file) if resource
-      end unless string
-      raise LoadError, "Couldn't find haml file '#{file}'" unless string
+        # Check for standard views
+        string ||= read_if_exists('views', resource, file) if resource
+        string ||= read_if_exists('views', file)
+        @view_dirs.each do |views_dir|
+          string ||= read_if_exists(views_dir, resource, file) if resource
+          string ||= read_if_exists(views_dir, file)
+        end unless string
       
-      haml_engine = Haml::Engine.new(string)
+        # Check for default resource views
+        string ||= read_if_exists('views', 'default_resource', file)
+        @view_dirs.each do |views_dir|
+          string ||= read_if_exists(views_dir, 'default_resource', file) if resource
+        end unless string
+        raise LoadError, "Couldn't find haml file '#{file}'" unless string
+        
+        haml_engine = Haml::Engine.new(string)
+        if packet_binding.is_a? Orange::Packet
+          packet_binding['parser.haml-templates']["#{context}-#{resource}-#{file}"] = haml_engine
+        end
+      end
       out = haml_engine.render(packet_binding, opts, &block)
     end
     

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

@@ -230,9 +230,9 @@ module Orange
     
     def slug_for(model, props)
       hash = model.attributes
-      return slug(model.title) if hash.has_key?(:title)
-      return slug(model.name) if hash.has_key?(:name)
-      return 'route-'+model.id
+      # return slug(model.title) if hash.has_key?(:title)
+      # return slug(model.name) if hash.has_key?(:name)
+      return 'page-'+model.id
     end
     
     def link_text_for(route)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 0
-  version: 0.4.0
+  - 5
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - David Haslem