orange-more 0.6.5 → 0.7.1

data/lib/orange-more/administration/resources/user_resource.rb

@@ -20,7 +20,9 @@ module Orange
           packet.session['user.id'] = matches.first.open_id
           packet['user.id'] = matches.first.open_id
           return true
-        else
+        else  
+          packet['user.id'] = nil
+          packet.session['user.id'] = nil
           return false
         end
       end

data/lib/orange-more/assets/cartons/asset_carton.rb

@@ -22,7 +22,7 @@ class OrangeAsset < Orange::Carton
   
   def to_s
     <<-DOC
-    {"id": #{self.id}, "html": "#{self.to_asset_tag}"}
+    {"id": #{self.id}, "name": "#{self.name}", "caption": "#{self.caption}", "html": "#{self.to_asset_tag}"}
     DOC
   end
   

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

@@ -4,7 +4,7 @@ module Orange
     # Define a helper for input type="text" type database stuff
     # Show in a context if wrapped in one of the helpers
     def self.asset(name, opts = {})
-      add_scaffold(name, :asset, Integer, opts)
+      add_scaffold(name, :asset, Integer, opts.with_defaults(:lazy => true))
     end
   end
   
@@ -72,6 +72,26 @@ module Orange
       m
     end
     
+    def onSave(packet, obj, params = {})
+      if(params['file'] && file = params['file'][:tempfile])
+        file_path = handle_new_file(params['file'][:filename], file)
+        if(params['file2'] && secondary = params['file2'][:tempfile]) 
+          secondary_path = handle_new_file(params['file2'][:filename], secondary)
+        else
+          secondary_path = nil
+        end
+        
+        params['path'] = file_path if file_path
+        params['secondary_path'] = secondary_path if secondary_path
+        params['mime_type'] = params['file'][:type] if file_path
+        params['secondary_mime_type'] = params['file2'][:type] if secondary_path
+        params['s3_bucket'] = options[:s3_bucket] if options[:s3_bucket]
+      end
+      params.delete('file')
+      params.delete('file2')
+      obj.update(params)
+    end
+    
     def s3_connect!
       if(options[:s3_bucket])
         id = options[:s3_access_key_id] || ENV['S3_KEY']

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

@@ -30,7 +30,11 @@ module Orange::Pulp::DebuggerHelpers
     when String
       Rack::Utils.escape_html(obj)
     else
-      Rack::Utils.escape_html(obj.inspect)
+      begin 
+        Rack::Utils.escape_html(obj.inspect)
+      rescue Exception => e
+        "Object #{obj.class.to_s} could not be inspected"
+      end
     end
   end
 end

data/lib/orange-more/disqus/views/disqus/comment_thread.haml

@@ -1,6 +1,8 @@
 .disqus_comments
   - if packet['orange.globals'][:development_mode]
     %script{:type => 'text/javascript'} var disqus_developer = 1;
+  -# Trim trailing slashes from path identifier
+  %script{:type => 'text/javascript'} var disqus_identifier = "#{packet['route.path','/comments'].gsub(/\/$/,'')}";
   #disqus_thread
   %script{:type => 'text/javascript', :src => 'http://disqus.com/forums/orangesparkleball/embed.js'}
   %noscript

data/lib/orange-more/news/base.rb

@@ -1,2 +1,2 @@
 require 'orange-more/news/resources/news_resource'
-require 'orange-more/news/cartson/news'
+require 'orange-more/news/cartons/news'

data/lib/orange-more/sitemap/cartons/route.rb

@@ -26,7 +26,11 @@ class OrangeRoute < Orange::SiteCarton
       end
     end
   end
-
+  
+  def default_slug?
+    /^page-\d+/ =~ slug
+  end
+  
   def self.home_for_site(site_id)
     site_id = OrangeSite.get(site_id) unless site_id.is_a? OrangeSite
     root(:orange_site => site_id) 

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

@@ -228,9 +228,9 @@ module Orange
       include_subsite = opts.delete(:include_subsite) || false
       m = model_class.first(opts)
       if !packet['subsite'].blank? && include_subsite
-        return orange[:subsites].url_for(packet).gsub(/\/$/, '') + (m ? m.full_path : '#not_found')
+        return orange[:subsites].url_for(packet).gsub(/\/$/, '') + (m ? packet.route_to(m) : '#not_found')
       else
-        return (m ? m.full_path : '#not_found')
+        return (m ? packet.route_to(m) : '#not_found')
       end
     end
     

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

@@ -16,14 +16,15 @@
       .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>
+    %h4 #{route.link_text} <span>(#{route_to(route)})</span>
     .linked_to
       %p 
         Linked to: 
         %a{:href => route.resource.blank? ?  '#' : route_to(route.resource, route.resource_id, 'edit')} [#{route.resource}] ##{route.resource_id}
       %p  
         Views:
-        = orange[:analytics].pageviews(route.full_path)
+        - if(orange.loaded?(:analytics))
+          = orange[:analytics].pageviews(route_to(route))
     .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

data/lib/orange-more/sitemap/views/sitemap/breadcrumb.haml

@@ -1,12 +1,12 @@
 - if model
   %p
     - for a in model.ancestors
-      %a{:href => a.full_path}= a.link_text
+      %a{:href => route_to(a)}= a.link_text
       >
     %span.here= model.link_text
 - else # Possibly a restful route
   %p
     - home = orange[:sitemap].home(packet)
-    %a{:href => home.full_path}= home.link_text
+    %a{:href => route_to(home)}= home.link_text
     >
     %span.here= packet['route.resource'].to_s.capitalize

data/lib/orange-more/sitemap/views/sitemap/one_level.haml

@@ -1,7 +1,7 @@
 %ul.nav
   %li.first
-    %a{:href => model.full_path} Home
+    %a{:href => route_to(model)} Home
   - for item in model.children
     - next unless item.show_in_nav
     %li
-      %a{:href => item.full_path}= orange[:sitemap].link_text_for(item)
+      %a{:href => route_to(item)}= orange[:sitemap].link_text_for(item)

data/lib/orange-more/sitemap/views/sitemap/sitemap_links.haml

@@ -5,10 +5,10 @@
       %a{:href => add_route_link + '/' + slug_me} Add one?
 - else
   .sitemap_links_info.success
-    %h4 Current Route: #{list.first.full_path} #{list.size > 1 ? '(and ' + (list.size - 1).to_s + ' others)' : ''}
+    %h4 Current Route: #{route_to(list.first)} #{list.size > 1 ? '(and ' + (list.size - 1).to_s + ' others)' : ''}
     %a.more_info{:href=>'#'} More Info
     .sitemap_links{:style => 'display:none'}
       - for obj in list
         .sitemap_link
-          %span Path: #{obj.full_path}
+          %span Path: #{route_to(obj)}
       %a{:href => add_route_link + '/' + slug_me} Add another?

data/lib/orange-more/sitemap/views/sitemap/table_row.haml

@@ -16,14 +16,15 @@
       .move_actions.dent_actions
         = form_link('Indent', route_to(model_name, model.id, 'indent'), false, {:method => 'post', :class => 'indent arrow'}) if model.previous_sibling && model.previous_sibling.level == model.level
         %p= ' '
-    %h4 #{orange[:sitemap].link_text_for(model)} <span>(#{model.full_path})</span>
+    %h4 #{orange[:sitemap].link_text_for(model)} <span>(#{route_to(model)})</span>
     .linked_to
       %p 
         Linked to: 
         %a{:href => model.resource.blank? ?  '#' : route_to(model.resource, model.resource_id, 'edit')} [#{model.resource}] ##{model.resource_id}
       %p  
         Views:
-        = orange[:analytics].pageviews(route.full_path)
+        - if(orange.loaded?(:analytics))
+          = orange[:analytics].pageviews(route_to(route))
     .actions
       = form_link('Delete', route_to(model_name, model.id, 'delete'), 'Are you sure you want to delete this?', {:method => 'delete'})
       %a{:href => route_to(model_name, model.id, 'edit')} Edit

data/lib/orange-more/sitemap/views/sitemap/two_level.haml

@@ -1,13 +1,13 @@
 %ul.nav
   %li.first
-    %a{:href => model.full_path} Home
+    %a{:href => route_to(model)} Home
   - for item in model.children
     - next unless item.show_in_nav
     %li
-      %a{:href => item.full_path}= orange[:sitemap].link_text_for(item)
+      %a{:href => route_to(item)}= orange[:sitemap].link_text_for(item)
       - unless item.descendants.empty?
         %ul.subnav
           - for x in item.children
             - next unless x.show_in_nav
             %li
-              %a{:href => x.full_path}= orange[:sitemap].link_text_for(x)
+              %a{:href => route_to(x)}= orange[:sitemap].link_text_for(x)

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: orange-more
 version: !ruby/object:Gem::Version 
-  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 5
-  version: 0.6.5
+  - 7
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - David Haslem
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 -04:00
+date: 2010-10-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: orange-core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 5
@@ -38,11 +35,9 @@ dependencies:
   name: dm-is-awesome_set
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
         segments: 
         - 0
         - 11
@@ -54,11 +49,9 @@ dependencies:
   name: dm-timestamps
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -70,11 +63,9 @@ dependencies:
   name: rack-openid
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -84,11 +75,9 @@ dependencies:
   name: openid_dm_store
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -98,11 +87,9 @@ dependencies:
   name: radius
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -112,11 +99,9 @@ dependencies:
   name: rest-client
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -126,11 +111,9 @@ dependencies:
   name: mail
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -140,11 +123,9 @@ dependencies:
   name: gattica
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -154,11 +135,9 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -168,11 +147,9 @@ dependencies:
   name: rack-test
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -308,38 +285,6 @@ files:
 - lib/orange-more/slices/resources/radius.rb
 - lib/orange-more/slices/resources/slices.rb
 - README.markdown
-- spec/orange-core/application_spec.rb
-- spec/orange-core/carton_spec.rb
-- spec/orange-core/core_spec.rb
-- spec/orange-core/magick_spec.rb
-- spec/orange-core/middleware/base_spec.rb
-- spec/orange-core/middleware/globals_spec.rb
-- spec/orange-core/middleware/rerouter_spec.rb
-- spec/orange-core/middleware/restful_router_spec.rb
-- spec/orange-core/middleware/route_context_spec.rb
-- spec/orange-core/middleware/route_site_spec.rb
-- spec/orange-core/middleware/show_exceptions_spec.rb
-- spec/orange-core/middleware/static_file_spec.rb
-- spec/orange-core/middleware/static_spec.rb
-- spec/orange-core/mock/mock_app.rb
-- spec/orange-core/mock/mock_carton.rb
-- spec/orange-core/mock/mock_core.rb
-- spec/orange-core/mock/mock_middleware.rb
-- spec/orange-core/mock/mock_mixins.rb
-- spec/orange-core/mock/mock_model_resource.rb
-- spec/orange-core/mock/mock_pulp.rb
-- spec/orange-core/mock/mock_resource.rb
-- spec/orange-core/mock/mock_router.rb
-- spec/orange-core/orange_spec.rb
-- spec/orange-core/packet_spec.rb
-- spec/orange-core/resource_spec.rb
-- spec/orange-core/resources/mapper_spec.rb
-- spec/orange-core/resources/model_resource_spec.rb
-- spec/orange-core/resources/parser_spec.rb
-- spec/orange-core/resources/routable_resource_spec.rb
-- spec/orange-core/spec_helper.rb
-- spec/orange-core/stack_spec.rb
-- spec/stats.rb
 has_rdoc: true
 homepage: http://github.com/therabidbanana/orange
 licenses: []
@@ -350,27 +295,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Plugins for Orange