orange 0.1.7 → 0.1.8

data/lib/orange-core/carton.rb

@@ -90,6 +90,24 @@ module Orange
       add_scaffold(name, :title, String, opts)
     end
     
+    # Define a helper for title type database stuff
+    # Show in a context if wrapped in one of the helpers
+    def self.datetime(name, opts = {})
+      add_scaffold(name, :datetime, DateTime, opts)
+    end
+    
+    # Define a helper for title type database stuff
+    # Show in a context if wrapped in one of the helpers
+    def self.date(name, opts = {})
+      add_scaffold(name, :date, Date, opts)
+    end
+    
+    # Define a helper for title type database stuff
+    # Show in a context if wrapped in one of the helpers
+    def self.time(name, opts = {})
+      add_scaffold(name, :time, Time, opts)
+    end
+    
     # Define a helper for fulltext type database stuff
     # Show in a context if wrapped in one of the helpers
     def self.fulltext(name, opts = {})

data/lib/orange-core/magick.rb

@@ -135,6 +135,7 @@ module Orange
   # might not be really there. It will silently swallow any errors that might arrise,
   # so this should be used with caution.
   class Ignore
+    def blank?; true; end
     def method_missing(name, *args, &block)
       return self
     end

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

@@ -3,12 +3,12 @@ module Orange::Middleware
   
   class Database < Base
     def init(opts = {})
-      opts = opts.with_defaults(:migration_url => (orange.options[:development_mode] ? '/__ORANGE_DB__/migrate' : false))
+      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|
         db = orange.options['database'] || 'sqlite3::memory:'
         orange.load_db!(db)
-        orange.upgrade_db!
+        orange.upgrade_db! unless opts[:no_auto_upgrade] || orange.options['no_auto_upgrade']
       end
       @options = opts
     end

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

@@ -14,14 +14,32 @@ module Orange::Middleware
     def init(opts = {})
       @resource = opts[:resource] || Orange::NotFound
       orange.load @resource.new, :not_found
+      orange.add_pulp Orange::Pulp::NotFoundHelper
     end
     
     # Sets the sitemap resource as the router if the resource can accept 
     # the path.
     def packet_call(packet)
       packet['route.router'] = orange[:not_found] unless packet['route.router']
-      pass packet
+      begin
+        pass packet
+      rescue Orange::NotFoundException
+        orange[:not_found].route(packet)
+        packet.finish
+      end
     end
     
   end
+end
+
+module Orange
+  class NotFoundException < Exception
+    
+  end
+  
+  module Pulp::NotFoundHelper
+    def not_found
+      raise Orange::NotFoundException.new
+    end
+  end
 end

data/lib/orange-core/resource.rb

@@ -48,7 +48,45 @@ module Orange
     end
     
     def options
-      @options
+      @options 
+    end
+    
+    # Renders a view, with all options set for haml to access.
+    # Calls #view_opts to generate the haml options. 
+    # @param [Orange::Packet] packet the packet we are returning a view for
+    # @param [Symbol] mode the mode we are trying to view (used to find template name)
+    # @param [optional, Array] args the args array
+    # @return [String] haml parsed string to be placed in packet[:content] by #route
+    def do_view(packet, mode, *args)
+      haml_opts = view_opts(packet, mode, *args)
+      orange[:parser].haml("#{mode.to_s}.haml", packet, haml_opts)
+    end
+    
+    
+    # Returns the options for including in template rendering. All keys passed in the args array
+    # will automatically be local variables in the haml template.
+    # In addition, the props, resource, and model_name variables will be available.
+    # @param [Orange::Packet] packet the packet we are returning a view for
+    # @param [Symbol] mode the mode we are trying to view (used to find template name)
+    # @param [boolean] is_list whether we want a list or not (view_opts will automatically look up
+    #   a single object or a list of objects, so we need to know which)
+    # @param [optional, Array] args the args array
+    # @return [Hash] hash of options to be used
+    def view_opts(packet, mode, *args)
+      opts = args.extract_options!.with_defaults({:path => ''})
+      all_opts = {:resource => self, :model_name => @my_orange_name}.merge!(opts)
+      all_opts.with_defaults! find_extras(packet, mode)
+      all_opts
+    end
+    
+    # Returns a hash of extra options to be set and made available by the haml parser.
+    # Overriding this method is useful for passing extra bits of info to rendering
+    # for certain view modes without rewriting all of the other scaffolding
+    # @param [Orange::Packet] packet the packet we are returning a view for
+    # @param [Symbol] mode the mode we are trying to view (used to find template name)
+    # @return [Hash] a hash of extras to be included in the rendering
+    def find_extras(packet, mode)
+      {}
     end
   end
 end

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

@@ -98,46 +98,87 @@ module Orange
       model_class.all || []
     end
     
-    # Returns a hash of extra options to be set and made available by the haml parser.
-    # Overriding this method is useful for passing extra bits of info to rendering
-    # for certain view modes without rewriting all of the other scaffolding
-    # @param [Orange::Packet] packet the packet we are returning a view for
-    # @param [Symbol] mode the mode we are trying to view (used to find template name)
-    # @return [Hash] a hash of extras to be included in the rendering
-    def find_extras(packet, mode)
-      {}
-    end
-    
     # Creates a new model object and saves it (if a post), then reroutes to the main page
     # @param [Orange::Packet] packet the packet being routed
-    def new(packet, *opts)
-      if packet.request.post?
-        model_class.new(packet.request.params[@my_orange_name.to_s]).save
+    def new(packet, opts = {})
+      no_reroute = opts.delete(:no_reroute)
+      if packet.request.post? || !opts.blank?
+        params = opts.with_defaults(packet.request.params[@my_orange_name.to_s] || {})
+        beforeNew(packet, params)
+        obj = onNew(packet, params)
+        afterNew(packet, obj, params)
+        obj.save if obj
       end
-      packet.reroute(@my_orange_name, :orange)
+      packet.reroute(@my_orange_name, :orange) unless (packet.request.xhr? || no_reroute)
+      obj || false
+    end
+    
+    # A callback for the actual new item event
+    def onNew(packet, opts = {})
+      model_class.new(opts)
+    end
+    
+    # A callback for before a new item is created
+    # @param [Orange::Packet] packet the packet being routed
+    def beforeNew(packet, opts = {})
+    end
+    
+    # A callback for after a new item is created
+    # @param [Orange::Packet] packet the packet being routed
+    # @param [Object] obj the model class just created
+    def afterNew(packet, obj, opts = {})
     end
     
     # Deletes an object specified by packet['route.resource_id'], then reroutes to main.
     # The request must come in as a delete. Rack::MethodOverride can be used to do this.
     # @param [Orange::Packet] packet the packet being routed
-    def delete(packet, *opts)
-      if packet.request.delete?
+    def delete(packet, opts = {})
+      no_reroute = opts.delete(:no_reroute)
+      if packet.request.delete? || !opts.blank?
+        id = opts.delete(:resource_id) || packet['route.resource_id']
         m = model_class.get(packet['route.resource_id'])
-        m.destroy if m
+        beforeDelete(packet, m, opts)
+        onDelete(packet, m, opts) if m
+        afterDelete(packet, m, opts)
       end
-      packet.reroute(@my_orange_name, :orange)
+      packet.reroute(@my_orange_name, :orange) unless (packet.request.xhr? || no_reroute)
+    end
+    
+    def beforeDelete(packet, obj, opts = {})
+    end
+    
+    # Delete object
+    def onDelete(packet, obj, opts = {})
+      obj.destroy
+    end
+    
+    def afterDelete(packet, obj, opts = {})
     end
     
     # Saves updates to an object specified by packet['route.resource_id'], then reroutes to main
     # @param [Orange::Packet] packet the packet being routed
-    def save(packet, *opts)
-      if packet.request.post?
+    def save(packet, opts = {})
+      no_reroute = opts.delete(:no_reroute)
+      if packet.request.post? || !opts.blank?
+        params = opts.with_defaults(packet.request.params[@my_orange_name.to_s] || {})
         m = model_class.get(packet['route.resource_id'])
         if m
-          m.update(packet.request.params[@my_orange_name.to_s])
+          beforeSave(packet, m, params)
+          onSave(packet, m, params)
+          afterSave(packet, m, params)
         end
       end
-      packet.reroute(@my_orange_name, :orange)
+      packet.reroute(@my_orange_name, :orange) unless (packet.request.xhr? || no_reroute)
+    end
+    
+    def beforeSave(packet, obj, opts = {})
+    end
+    
+    def onSave(packet, obj, opts = {})
+      obj.update(opts)
+    end
+    
+    def afterSave(packet, obj, opts = {})
     end
     
     # Calls #do_view with :show mode
@@ -231,6 +272,9 @@ module Orange
         when :boolean
           human_readable_name = human_readable_name + '?'
           ret = "<input type='hidden' name='#{model_name}[#{name}]' value='0' /><input type='checkbox' name='#{model_name}[#{name}]' value='1' #{'checked="checked"' if (val && val != '')}/>"
+        when :date
+          val.gsub!('"', '&quot;')
+          ret = "<input class=\"date\" type=\"text\" value=\"#{val}\" name=\"#{model_name}[#{name}]\" />"
         else
           val.gsub!('"', '&quot;')
           ret = "<input type=\"text\" value=\"#{val}\" name=\"#{model_name}[#{name}]\" />"

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

@@ -40,7 +40,11 @@ module Orange
         string ||= read_if_exists(views_dir, resource, file) if resource
         string ||= read_if_exists(views_dir, file)
       end
-      string ||= read_if_exists(@view_dirs.first, 'default_resource', file)
+      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
+        string ||= read_if_exists(views_dir, file)
+      end
       raise LoadError, "Couldn't find haml file '#{file}'" unless string
       
       haml_engine = Haml::Engine.new(string)

data/lib/orange-more.rb

@@ -14,4 +14,5 @@ require File.join(libdir, 'orange-more', 'disqus')
 require File.join(libdir, 'orange-more', 'testimonials')
 require File.join(libdir, 'orange-more', 'cloud')
 require File.join(libdir, 'orange-more', 'debugger')
-require File.join(libdir, 'orange-more', 'subsites')
+require File.join(libdir, 'orange-more', 'subsites')
+require File.join(libdir, 'orange-more', 'events')

data/lib/orange-more/administration/assets/css/admin.css

@@ -64,7 +64,9 @@ caption {background:#eee;}
 .last {margin-right:0;padding-right:0;}
 .top {margin-top:0;padding-top:0;}
 .bottom {margin-bottom:0;padding-bottom:0;}
-
+li.nobullet {list-style-type: none;}
+div.version_container {width:300px;margin:2px 0;padding:10px;border:1px solid #CECECE;-moz-border-radius:4px;-webkit-border-radius:4px;background: #EFEFEF;}
+span.version_info {padding: 0 5px;}
 /* forms.css */
 label {font-weight:bold;}
 fieldset {padding:1.4em;margin:0 0 1.5em 0;border:1px solid #ccc;}

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

@@ -17,7 +17,7 @@ module Orange::Middleware
     
     def init(opts = {})
       defs = {:locked => [:admin, :orange], :login => '/login', :logout => '/logout',
-              :handle_login => true, :openid => true, :single_user => true}
+              :handle_login => true, :openid => true, :single_user => false}
       opts = opts.with_defaults!(defs)
       @openid = opts[:openid]
       @locked = opts[:locked]
@@ -57,6 +57,7 @@ module Orange::Middleware
           false
         # Main_user can always log in (root access)
         elsif packet['user.id'] == packet['orange.globals']['main_user']
+          orange[:users].new(packet, :open_id => packet['user.id'], :name => 'Main User') unless packet['user', false]
           true
         else
           orange[:users].access_allowed?(packet, packet['user.id'])

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

@@ -16,31 +16,21 @@ module Orange
       model_class.first(:open_id => packet['user.id'])
     end
     
-    def new(packet, *opts)
-      if packet.request.post?
-        params = packet.request.params[@my_orange_name.to_s]
-        sites = params.delete 'sites'
-        m = model_class.new(params)
-        m.save
-        sites.each{|k,v| s = OrangeSite.first(:id => k); m.orange_sites << s if s} if sites
-        m.save
-      end
-      packet.reroute(@my_orange_name, :orange)
+    def onNew(packet, opts = {})
+      params = opts
+      sites = params.delete 'sites'
+      m = model_class.new(params)
+      m.save
+      sites.each{|k,v| s = OrangeSite.first(:id => k); m.orange_sites << s if s} if sites
+      m
     end
     
-    def save(packet, *opts)
-      if packet.request.post?
-        m = model_class.get(packet['route.resource_id'])
-        if m
-          params = packet.request.params[@my_orange_name.to_s]
-          sites = params.delete 'sites'
-          m.update(params)
-          m.orange_sites.destroy
-          sites.each{|k,v| s = OrangeSite.first(:id => k); m.orange_sites << s if s} if sites
-          m.save
-        end
-      end
-      packet.reroute(@my_orange_name, :orange)
+    def onSave(packet, obj, params ={})
+      sites = params.delete 'sites'
+      obj.update(params)
+      obj.orange_sites.destroy
+      sites.each{|k,v| s = OrangeSite.first(:id => k); m.orange_sites << s if s} if sites
+      obj.save
     end
     
     def find_extras(packet, mode)

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

@@ -16,46 +16,40 @@ module Orange
       end
     end
     
-    def new(packet, *opts)
-      if packet.request.post?
-        params = packet.request.params[@my_orange_name.to_s]
-        if(file = params['file'][:tempfile])
-          file_path = orange.app_dir('assets','uploaded', params['file'][:filename]) if params['file'][:filename]
-          # Check for secondary file (useful for videos/images with thumbnails)
-          if(params['file2'] && secondary = params['file2'][:tempfile])
-            secondary_path = orange.app_dir('assets','uploaded', params['file2'][:filename])
-          else
-            secondary_path = nil
-          end
-          # Move the files
-          FileUtils.cp(file.path, file_path)
-          FileUtils.cp(secondary.path, secondary_path) if secondary_path
-          
-          params['path'] = params['file'][:filename] if file_path
-          params['secondary_path'] = params['file2'][:filename] if secondary_path
-          params['mime_type'] = params['file'][:type] if file_path
-          params['secondary_mime_type'] = params['file2'][:type] if secondary_path
-          params.delete('file')
-          params.delete('file2')
-          
-          model_class.new(params).save
+    def onNew(packet, params = {})
+      m = false
+      if(file = params['file'][:tempfile])
+        file_path = orange.app_dir('assets','uploaded', params['file'][:filename]) if params['file'][:filename]
+        # Check for secondary file (useful for videos/images with thumbnails)
+        if(params['file2'] && secondary = params['file2'][:tempfile])
+          secondary_path = orange.app_dir('assets','uploaded', params['file2'][:filename])
+        else
+          secondary_path = nil
         end
+        # Move the files
+        FileUtils.cp(file.path, file_path)
+        FileUtils.cp(secondary.path, secondary_path) if secondary_path
+        
+        params['path'] = params['file'][:filename] if file_path
+        params['secondary_path'] = params['file2'][:filename] if secondary_path
+        params['mime_type'] = params['file'][:type] if file_path
+        params['secondary_mime_type'] = params['file2'][:type] if secondary_path
+        params.delete('file')
+        params.delete('file2')
+        
+        m = model_class.new(params)
       end
-      packet.reroute(@my_orange_name, :orange)
+      m
     end
     
-    def delete(packet, *opts)
-      if packet.request.delete?
-        m = model_class.get(packet['route.resource_id'])
-        begin
-          FileUtils.rm(orange.app_dir('assets','uploaded', m.path)) if m.path
-          FileUtils.rm(orange.app_dir('assets','uploaded', m.secondary_path)) if m.secondary_path
-        rescue
-          # Problem deleting file
-        end
-        m.destroy if m
+    def onDelete(packet, m, opts = {})
+      begin
+        FileUtils.rm(orange.app_dir('assets','uploaded', m.path)) if m.path
+        FileUtils.rm(orange.app_dir('assets','uploaded', m.secondary_path)) if m.secondary_path
+      rescue
+        # Problem deleting file
       end
-      packet.reroute(@my_orange_name, :orange)
+      m.destroy if m
     end
   end
 end

data/lib/orange-more/blog/cartons/blog.rb

@@ -4,5 +4,5 @@ class OrangeBlog < Orange::SiteCarton
   front do
     title :title
   end
-  has n, :posts, "OrangeBlogPost"
+  has n, :posts, "OrangeBlogPost", :child_key => [:blog_id]
 end

data/lib/orange-more/blog/cartons/blog_post.rb

@@ -21,7 +21,7 @@ class OrangeBlogPost < Orange::Carton
   
   def title=(t)
     self.attribute_set('title', t)
-    self.attribute_set('slug', str.downcase.gsub(/[']+/, "").gsub(/[^a-z0-9]+/, "_"))
+    self.attribute_set('slug', t.downcase.gsub(/[']+/, "").gsub(/[^a-z0-9]+/, "_"))
   end
   
   def publish

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

@@ -20,37 +20,26 @@ module Orange
     
     # Creates a new model object and saves it (if a post), then reroutes to the main page
     # @param [Orange::Packet] packet the packet being routed
-    def new(packet, *opts)
-      if packet.request.post?
-        params = packet.request.params[@my_orange_name.to_s]
-        params[:published] = false
-        params[:author] = packet['user', false] ? packet['user'].name : "Author"
-        
-        blog = OrangeBlog.first(:orange_site => (packet['subsite'].blank? ? packet['site'] : packet['subsite']))
-        blog.posts.new(params)
-        blog.save
-      end
-      packet.reroute(@my_orange_name, :orange)
+    def onNew(packet, params)
+      params[:published] = false
+      params[:author] = packet['user', false] ? packet['user'].name : "Author"
+      
+      blog = orange[:blog].blog_for_site(packet)
+      blog.posts.new(params)
+      blog
     end
     
     # Saves updates to an object specified by packet['route.resource_id'], then reroutes to main
     # @param [Orange::Packet] packet the packet being routed
-    def save(packet, *opts)
-      if packet.request.post?
-        m = model_class.get(packet['route.resource_id'])
-        if m
-          params = packet.request.params[@my_orange_name.to_s]
-          m.update(params)
-          m.blog = OrangeBlog.first(:orange_site => (packet['subsite'].blank? ? packet['site'] : packet['subsite']))
-          m.save
-        end
-      end
-      packet.reroute(@my_orange_name, :orange)
+    def onSave(packet, m, params = {})
+      m.update(params)
+      m.blog = orange[:blog].blog_for_site(packet) unless m.blog #ensure blog exists
+      m.save
     end
     
     def find_list(packet, mode, id =false)
       blog = orange[:blog].blog_for_site(packet)
-      blog.posts
+      blog ? blog.posts : [] 
     end
     
   end

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

@@ -70,13 +70,13 @@ module Orange
     def blog_for_site(packet, site_id = false)
       site_id ||= (packet['subsite'].blank? ? packet['site'].id : packet['subsite'].id)
       blog = OrangeBlog.first(:orange_site_id => site_id)
-      unless blog
+      if !blog && packet.request.post? # Only create a new blog if this is a post
         blog = OrangeBlog.new
         blog.title = 'An Orange Hosted Blog'
         blog.orange_site = packet['site']
         blog.save
       end
-      unless OrangeRoute.first(:resource => 'blog', :orange_site_id => packet['site'].id)
+      if packet.request.post? && !OrangeRoute.first(:resource => 'blog', :orange_site_id => packet['site'].id)
         orange[:sitemap, true].add_route_for(packet,
           :orange_site_id => site_id, 
           :resource => :blog, 

data/lib/orange-more/events.rb

@@ -0,0 +1 @@
+require File.join('orange-more', 'events', 'plugin')

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

@@ -0,0 +1,7 @@
+class OrangeCalendar < Orange::SiteCarton
+  id
+  admin do
+    title :name
+  end
+  has n, :events, "OrangeEvent"
+end

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

@@ -0,0 +1,48 @@
+class OrangeEvent < Orange::Carton
+  id
+  admin do
+    title :name
+    text :location
+    fulltext :description
+  end
+  orange do
+    time :starts
+    time :ends
+  end
+  def starts_time
+    self.starts.strftime("%I:%M %p")
+  end
+  def starts_date
+    self.starts.strftime("%m/%d/%Y")
+  end
+  def ends_time
+    self.ends.strftime("%I:%M %p")
+  end
+  def ends_date
+    self.ends.strftime("%m/%d/%Y")
+  end
+  def date_attr(attribute, datestr = false)
+    time_attr(attribute, false, datestr)
+  end
+  
+  def time_attr(attribute, timestr = false, datestr = false)
+    date = datestr || attribute_get(attribute).strftime("%m/%d/%Y")
+    time = timestr || attribute_get(attribute).strftime("%I:%M %p")
+    attribute_set(attribute, Time.parse(date + " " + time))
+  end
+  
+  def starts_time=(time)
+    time_attr(:starts, time)
+  end
+  def starts_date=(date)
+    date_attr(:starts, date)
+  end
+  def ends_time=(time)
+    time_attr(:ends, time)
+  end
+  def ends_date=(date)
+    date_attr(:ends, date)
+  end
+  
+  belongs_to :calendar, "OrangeCalendar", :child_key => [:orange_calendar_id]
+end

data/lib/orange-more/events/plugin.rb

@@ -0,0 +1,14 @@
+Dir.glob(File.join(File.dirname(__FILE__), 'cartons', '*.rb')).each {|f| require f }
+Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
+
+module Orange::Plugins
+  class Events < Base
+    views_dir       File.join(File.dirname(__FILE__), 'views')
+    
+    resource    Orange::CalendarResource.new
+    resource    Orange::EventResource.new
+  end
+end
+
+Orange.plugin(Orange::Plugins::Events.new)
+

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

@@ -0,0 +1,10 @@
+module Orange
+  class CalendarResource < ModelResource
+    use OrangeCalendar
+    call_me :calendar
+    
+    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

@@ -0,0 +1,10 @@
+module Orange
+  class EventResource < ModelResource
+    use OrangeEvent
+    call_me :events
+    
+    def find_extras(packet, mode, opts = {})
+      {:calendars => OrangeCalendar.all}
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+%form{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post'}
+  - for prop in props
+    %p= view_attribute(prop, model_name, :label => true)
+  %p
+    %label{:for => "#{model_name}-calendar"} Calendar
+    %br
+    %select{:id => "#{model_name}-calendar", :name => "#{model_name}[orange_calendar_id]"}
+      - for calendar in calendars
+        %option{:value => calendar.id}= calendar.name
+  %p
+    %label{:for => "#{model_name}-starts"} Starts
+    %br
+    %input{:type => 'text', :id => "#{model_name}-starts", :class => 'date', :name => "#{model_name}[starts_date]", :size => 10, :value => Time.now.strftime("%m/%d/%Y") }
+    at
+    %input{:type => 'text', :name => "#{model_name}[starts_time]", :size => 8, :value => Time.now.strftime("%I:%M %p") }
+  %p
+    %label{:for => "#{model_name}-ends"} Ends
+    %br
+    %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'}

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

@@ -0,0 +1,25 @@
+- if model
+  %form{:action => packet.route_to(model_name, model[:id], 'save'), :method => 'post'}
+    - for prop in props
+      %p!= view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]))
+    %p
+      %label{:for => "#{model_name}-calendar"} Calendar
+      %br
+      %select{:id => "#{model_name}-calendar", :name => "#{model_name}[orange_calendar_id]"}
+        - for calendar in calendars
+          %option{:value => calendar.id}= calendar.name
+    %p
+      %label{:for => "#{model_name}-starts"} Starts
+      %br
+      %input{:type => 'text', :id => "#{model_name}-starts", :size => 10, :class => 'date', :name => "#{model_name}[starts_date]", :value => model.starts_date}
+      at
+      %input{:type => 'text', :name => "#{model_name}[starts_time]", :size => 8, :value => model.starts_time}
+    %p
+      %label{:for => "#{model_name}-ends"} Ends
+      %br
+      %input{:type => 'text', :id => "#{model_name}-ends", :size => 10, :class => 'date', :name => "#{model_name}[ends_date]", :value => model.ends_date}
+      at
+      %input{:type => 'text', :name => "#{model_name}[ends_time]", :size => 8, :value => model.ends_time}
+    %input{:type => 'submit', :value => 'Save Changes'}
+- else
+  %p Couldn't find the item you're looking for.

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

@@ -12,8 +12,7 @@ module Orange
       end
     end
     
-    def new(packet, opts = {})
-      news = OrangeNews.first()
+    def beforeNew(packet, opts = {})
       unless OrangeRoute.first(:resource => 'news', :orange_site_id => packet['site'].id)
         orange[:sitemap, true].add_route_for(packet,
           :orange_site_id => packet['site'].id, 
@@ -23,8 +22,6 @@ module Orange
           :link_text => 'Orange News Archive'
         )
       end
-      
-      super(packet, opts)
     end
     
     def sitemap_row(packet, opts = {})

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

@@ -1,15 +1,38 @@
 module Orange
+  module Pulp::PageHelpers
+    def fuzzy_time(from_time)
+      to_time = Time.new
+      from_time = from_time.to_time if from_time.respond_to?(:to_time)
+      to_time = to_time.to_time if to_time.respond_to?(:to_time)
+      distance_in_minutes = (((to_time - from_time).abs)/60).round
+      distance_in_seconds = ((to_time - from_time).abs).round
+        case distance_in_minutes
+          when 0..1
+            return distance_in_minutes == 0 ? "Less than 1 minute ago" : "About 1 minute ago"
+          when 2..44           then "#{distance_in_minutes} minutes ago"
+          when 45..89          then "An hour ago"
+          when 90..1439        then "#{(distance_in_minutes.to_f / 60.0).round} hours ago"
+          when 1440..2879      then "Yesterday"
+          when 2880..43199     then "#{(distance_in_minutes / 1440).round} days ago"
+          when 43200..86399    then "1 Month ago"
+          when 86400..525599   then "#{(distance_in_minutes / 43200).round} months ago"
+          when 525600..1051199 then "1 year ago"
+          else                      "Over #{(distance_in_minutes / 525600).round} years ago"
+        end
+    end
+  end
   class PageResource < Orange::ModelResource
     use OrangePage
     call_me :pages
     def afterLoad
       orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Pages')
       options[:sitemappable] = true
-      
+      orange.add_pulp(Orange::Pulp::PageHelpers)
     end
     
-    def publish(packet, *opts)
-      if packet.request.post?
+    def publish(packet, opts = {})
+      no_reroute = opts[:no_reroute]
+      if packet.request.post? || !opts.blank?
         m = model_class.get(packet['route.resource_id'])
         if m
           params = {}
@@ -22,39 +45,30 @@ module Orange
           m.save
         end
       end
-      packet.reroute(@my_orange_name, :orange)
+      packet.reroute(@my_orange_name, :orange) unless (packet.request.xhr? || no_reroute)
     end
     
     # Creates a new model object and saves it (if a post), then reroutes to the main page
     # @param [Orange::Packet] packet the packet being routed
-    def new(packet, *opts)
-      if packet.request.post?
-        params = packet.request.params[@my_orange_name.to_s]
-        params[:published] = false
-        m = model_class.new(params)
-        m.orange_site = packet['site']
-        # m.versions.new(params.merge(:version => 1))
-        m.save
-      end
-      packet.reroute(@my_orange_name, :orange)
+    def onNew(packet, params = {})
+      params[:published] = false
+      m = model_class.new(params)
+      m.orange_site = packet['site']
+      # m.versions.new(params.merge(:version => 1))
+      m
     end
     
     # Saves updates to an object specified by packet['route.resource_id'], then reroutes to main
     # @param [Orange::Packet] packet the packet being routed
-    def save(packet, *opts)
-      if packet.request.post?
-        m = model_class.get(packet['route.resource_id'])
-        if m
-          params = packet.request.params[@my_orange_name.to_s]
-          params[:published] = false
-          m.update(params)
-          m.orange_site = packet['site']
-          m.save
-        end
-      end
-      packet.reroute(@my_orange_name, :orange)
+    def onSave(packet, params = {})
+      params[:published] = false
+      m.update(params)
+      m.orange_site = packet['site']
+      m.save
     end
     
+    
+    
     # Returns a single object found by the model class, given an id. 
     # If id isn't given, we return false.
     # @param [Orange::Packet] packet the packet we are returning a view for
@@ -76,5 +90,17 @@ module Orange
       end
       m
     end
+    
+    def find_extras(packet, mode, opts = {})
+      case mode
+      when :edit
+        return {:routes => orange[:sitemap].routes_for(packet)}
+      else {}
+      end
+    end
+    
+    def sitemap_row(packet, opts = {})
+      do_view(packet, :sitemap_row, opts)
+    end
   end
 end

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

@@ -32,8 +32,9 @@ class OrangeRoute < Orange::SiteCarton
   end
 
 
-  def self.create_home_for_site(site_id)
-    home = self.new({:orange_site_id => site_id, :slug => '_index_', :accept_args => false, :link_text => 'Home'})
+  def self.create_home_for_site(site_id, opts = {})
+    opts = opts.with_defaults({:orange_site_id => site_id, :slug => '_index_', :accept_args => false, :link_text => 'Home'})
+    home = self.new(opts)
     home.move(:root)
     home.save
     home

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

@@ -57,46 +57,39 @@ module Orange
     
     # Creates a new model object and saves it (if a post), then reroutes to the main page
     # @param [Orange::Packet] packet the packet being routed
-    def new(packet, *opts)
-      if packet.request.post?
-        params = packet.request.params[@my_orange_name.to_s]
-        params.merge!(:orange_site_id => (packet['subsite'].blank? ? packet['site'].id : packet['subsite'].id))
-        a = model_class.new(params)
-        a.move(:into => home(packet))
+    def onNew(packet, params = {})
+        params.with_defaults!(:orange_site_id => (packet['subsite'].blank? ? packet['site'].id : packet['subsite'].id))
+        model_class.new(params)
+    end
+    
+    def afterNew(packet, obj, params = {})
+      obj.move(:into => home(packet))
+    end
+    
+    def move(packet, obj, opts = {})
+      no_reroute = opts.delete(:no_reroute)
+      if packet.request.post? || !opts.blank?
+        dir = opts[:direction]
+        obj ||= find_one(packet, :move, (opts[:id] || packet['route.resource_id']))
+        obj.move(dir) if obj
       end
-      packet.reroute(@my_orange_name, :orange)
+      packet.reroute(@my_orange_name, :orange) unless (packet.request.xhr? || no_reroute)
     end
     
     def higher(packet, opts = {})
-      if packet.request.post?
-        me = find_one(packet, :higher, packet['route.resource_id'])
-        me.move(:higher) if me
-      end
-      packet.reroute(@my_orange_name, :orange)
+      move(packet, false, :direction => :higher)
     end
     
     def lower(packet, opts = {})
-      if packet.request.post?
-        me = find_one(packet, :lower, packet['route.resource_id'])
-        me.move(:lower) if me
-      end
-      packet.reroute(@my_orange_name, :orange)
+      move(packet, false, :direction => :lower)
     end
     
     def outdent(packet, opts = {})
-      if packet.request.post?
-        me = find_one(packet, :outdent, packet['route.resource_id'])
-        me.move(:outdent) if me
-      end
-      packet.reroute(@my_orange_name, :orange)
+      move(packet, false, :direction => :outdent)
     end
     
     def indent(packet, opts = {})
-      if packet.request.post?
-        me = find_one(packet, :indent, packet['route.resource_id'])
-        me.move(:indent) if me
-      end
-      packet.reroute(@my_orange_name, :orange)
+      move(packet, false, :direction => :indent)
     end
     
     def home(packet, opts = {})
@@ -105,7 +98,16 @@ module Orange
       else
         site_id = opts[:orange_site_id] || packet['site'].id 
       end
-      model_class.home_for_site(site_id) || model_class.create_home_for_site(site_id)
+      model_class.home_for_site(site_id) || create_home_for_site(packet, site_id)
+    end
+    
+    def create_home_for_site(packet, site_id)
+      page = orange[:pages, true].new(packet, :title => 'Homepage', :body => 'this is an orange webpage', :no_reroute => true)
+      if page
+        model_class.create_home_for_site(site_id, :resource => 'pages', :resource_id => page.id)
+      else
+        model_class.create_home_for_site(site_id)
+      end
     end
     
     def two_level(packet)
@@ -168,7 +170,7 @@ module Orange
     end
     
     def slug(str)
-      str.downcase.gsub(/[']+/, "").gsub(/[^a-z0-9]+/, "_")
+      str.downcase.gsub(/[']+/, "").gsub(/[^a-z0-9]+/, "-")
     end
     
     def find_list(packet, mode, *args)
@@ -188,7 +190,7 @@ module Orange
     end
     
     def sitemap_links(packet, opts = {})
-      packet.add_js('sitemap.js', :module => '_orange_')
+      packet.add_js('sitemap.js', :module => '_sitemap_')
       opts.with_defaults!({:list => routes_for(packet) })
       opts.merge!({:add_route_link => add_link_for(packet)})
       do_list_view(packet, :sitemap_links, opts)

data/spec/orange-core/spec_helper.rb

@@ -24,6 +24,7 @@ def mock_post
   p= mock("request", :null_object => true)
   p.stub!(:post?).and_return(true)
   p.stub!(:params).and_return({})
+  p.stub!(:xhr?).and_return(false)
   p
 end
 
@@ -31,6 +32,7 @@ def mock_delete
   p= mock("request", :null_object => true)
   p.stub!(:delete?).and_return(true)
   p.stub!(:params).and_return({})
+  p.stub!(:xhr?).and_return(false)
   p
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - David Haslem
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 -05:00
+date: 2010-03-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -163,6 +163,14 @@ files:
 - lib/orange-more/disqus/plugin.rb
 - lib/orange-more/disqus/resources/disqus_resource.rb
 - lib/orange-more/disqus/views/disqus/comment_thread.haml
+- lib/orange-more/events.rb
+- lib/orange-more/events/cartons/orange_calendar.rb
+- lib/orange-more/events/cartons/orange_event.rb
+- lib/orange-more/events/plugin.rb
+- lib/orange-more/events/resources/calendar_resource.rb
+- lib/orange-more/events/resources/event_resource.rb
+- lib/orange-more/events/views/events/create.haml
+- lib/orange-more/events/views/events/edit.haml
 - lib/orange-more/news.rb
 - lib/orange-more/news/cartons/news.rb
 - lib/orange-more/news/plugin.rb