orange-more 0.5.8 → 0.6.0

data/lib/orange-more.rb

@@ -11,13 +11,7 @@ require File.join(libdir, 'orange-more', 'slices')
 require File.join(libdir, 'orange-more', 'blog')
 require File.join(libdir, 'orange-more', 'news')
 require File.join(libdir, 'orange-more', 'disqus')
-require File.join(libdir, 'orange-more', 'testimonials')
-require File.join(libdir, 'orange-more', 'adverts')
 require File.join(libdir, 'orange-more', 'contactforms')
 require File.join(libdir, 'orange-more', 'analytics')
-require File.join(libdir, 'orange-more', 'donations')
 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', 'events')
-require File.join(libdir, 'orange-more', 'members')
+require File.join(libdir, 'orange-more', 'debugger')

data/lib/orange-more/administration/cartons/user.rb

@@ -16,7 +16,10 @@ class OrangeUser < Orange::Carton
       true
     elsif !packet['subsite'].blank? && subsite_access
       true
-    else
+    else  
+      # nil out invalid user
+      packet.session['user.id'] = nil
+      packet['user.id'] = nil
       false
     end
   end

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

@@ -33,6 +33,7 @@ module Orange::Middleware
       
     def packet_call(packet)
       packet['user.id'] ||= (packet.session['user.id'] || false)
+      packet['openid.profile'] ||= (packet.session['openid.profile'] || false)
       packet['user'] = orange[:users].user_for(packet) unless packet['user.id'].blank?
       if @openid && need_to_handle?(packet)
         ret = handle_openid(packet)
@@ -56,26 +57,36 @@ module Orange::Middleware
     
     def access_allowed?(packet)
       return true unless @locked.include?(packet['route.context'])
-      if packet['user.id'] || packet['orange.globals']['main_user'] == false
-        if @single && (packet['user.id'] == packet['orange.globals']['main_user'] )
-          true
-        elsif @single
+      if packet['user.id'] || orange.options['main_user'].blank?
+        if @single 
+          return true if(main_user?(packet))
           # Current id no good. 
-          packet['user.id'] = false
-          packet.session['user.id'] = false
-          false
+          packet['user.id'] = nil
+          packet.session['user.id'] = nil
+          return false
         # Main_user can always log in (root access)
-        elsif packet['user.id'] == packet['orange.globals']['main_user']
+        elsif main_user?(packet)
           orange[:users].new(packet, :open_id => packet['user.id'], :name => 'Main User') unless packet['user', false]
-          true
+          return true
         else
-          orange[:users].access_allowed?(packet, packet['user.id'])
+          return orange[:users].access_allowed?(packet, packet['user.id'])
         end
       else
-        false
+        return false
       end
     end
     
+    def main_user?(packet)
+      id = packet['user.id'].gsub(/^https?:\/\//, '').gsub(/\/$/, '')
+      users = orange.options['main_users'] || []
+      users = users.dup.push(orange.options['main_user'])
+      users = users.flatten.compact
+      matches = users.select{|user| 
+        (user == id) || (id == user.gsub(/^https?:\/\//, '').gsub(/\/$/, ''))
+      }
+      matches.length > 0 ? true : false
+    end
+    
     def need_to_handle?(packet)
       @handle && ([@login, @logout].include? packet.request.path.gsub(/\/$/, ''))
     end
@@ -108,13 +119,14 @@ module Orange::Middleware
                 profile_data.merge! data_response.from_success_response( resp ).data
               end
             end
-            
+            packet.session['openid.profile'] = profile_data
+            packet['openid.profile'] = profile_data
             if packet['user.id'] =~ /^https?:\/\/(www.)?google.com\/accounts/
               packet['user.id'] = profile_data["http://axschema.org/contact/email"]
               packet['user.id'] = packet['user.id'].first if packet['user.id'].kind_of?(Array)
             end
             
-            if packet['user.id'] =~ /^https?:\/\/(www.)?yahoo.com/ || packet['user.id'] =~ /^https?:\/\/(me.)?yahoo.com/
+            if packet['user.id'] =~ /^https?:\/\/(www.)?yahoo.com/ || packet['user.id'] =~ /^https?:\/\/(my\.|me\.)?yahoo.com/
               packet['user.id'] = profile_data["http://axschema.org/contact/email"]
               packet['user.id'] = packet['user.id'].first if packet['user.id'].kind_of?(Array)
             end

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

@@ -9,7 +9,7 @@ module Orange::Middleware
       site = OrangeSite.first(:url.like => url)
       if site
         packet['site'] = site
-      elsif orange.options[:development_mode]
+      elsif orange.options[:development_mode] || OrangeSite.all.size == 0
         s = OrangeSite.new({:url => packet['route.site_url'], 
                               :name => 'An Orange Site'})
         s.save

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

@@ -8,7 +8,21 @@ module Orange
     
     def access_allowed?(packet, user)
       u = model_class.first(:open_id => user)
-      return false unless u
+      unless u
+        users = model_class.all
+        # Deep open id search (take out trailing slash, etc.)
+        id = user.gsub(/^https?:\/\//, '').gsub(/\/$/, '')
+        matches = users.select{|u|
+          (id == u.open_id.gsub(/^https?:\/\//, '').gsub(/\/$/, ''))
+        }
+        if(matches.length > 0 && matches.first.allowed?(packet))
+          packet.session['user.id'] = matches.first.open_id
+          packet['user.id'] = matches.first.open_id
+          return true
+        else
+          return false
+        end
+      end
       u.allowed?(packet)
     end
     

data/lib/orange-more/analytics/resources/analytics_resource.rb

@@ -6,6 +6,7 @@ module Orange
     def stack_init
       options[:email] = orange.options['ga_email']
       options[:password] = orange.options['ga_password']
+      options[:profile] = orange.options['ga_profile']
     end
     
     def gattica
@@ -23,7 +24,7 @@ module Orange
       # authenticate with the API via email/password
       ga = gattica
       accounts = ga.accounts
-      ga.profile_id = accounts.first.profile_id
+      ga.profile_id = options[:profile] || accounts.first.profile_id
       views = ""
       data = ga.get({ :start_date => '2009-01-01', 
                       :end_date => Time.now.localtime.strftime("%Y-%m-%d"),

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

@@ -10,9 +10,14 @@ class OrangeAsset < Orange::Carton
     string :secondary_path, :length => 255, :required => false
     string :secondary_mime_type
   end
+  property :s3_bucket, String, :length => 64, :required => false
   
   def file_path
-    File.join('', 'assets', 'uploaded', path)
+    if(s3_bucket)
+      "http://s3.amazonaws.com/#{s3_bucket}/#{path}"
+    else
+      File.join('', 'assets', 'uploaded', path)
+    end
   end
   
   def to_s
@@ -21,7 +26,26 @@ class OrangeAsset < Orange::Carton
     DOC
   end
   
+  def pdf?
+    mime_type =~ /^application\/pdf/
+  end
+  def image?
+    mime_type =~ /^image/
+  end
+  def file?
+    !(pdf? || image?)
+  end
+  
   def to_asset_tag(alt = "")
-    "<img src='#{file_path}' border='0' alt='#{alt}' />"
+    alt = alt.blank? ? caption : alt
+    alt = alt.blank? ? name : alt
+    case mime_type
+    when /^image/
+      "<img src='#{file_path}' border='0' alt='#{alt}' />"
+    when /^application\/pdf/
+      "<span class='pdf_link'><a href='#{file_path}'>#{alt}</a></span>"
+    else
+      "<span class='file_link'><a href='#{file_path}'>#{alt}</a></span>"
+    end
   end
 end

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

@@ -13,10 +13,21 @@ module Orange
     call_me :assets
     
     def stack_init
+      if orange.options[:s3_bucket]
+        require 'aws/s3'
+        options[:s3_bucket] = orange.options[:s3_bucket]
+        options[:s3_access_key_id] = orange.options[:s3_access_key_id]
+        options[:s3_secret_access_key] = orange.options[:s3_secret_access_key]
+      end
       orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Assets')
       orange[:radius, true].define_tag "asset" do |tag|
         if tag.attr['id']
-          (m = model_class.first(:id => tag.attr['id'])) ? m.to_asset_tag : 'Invalid Asset'
+          ret = (m = model_class.first(:id => tag.attr['id'])) ? m.to_asset_tag : 'Invalid Asset'
+          if tag.attr['wrap']
+            ret = "<div class='#{tag.attr['wrap']}'>#{ret}</div>"
+          else
+            ret
+          end
         else
           ''
         end
@@ -42,31 +53,80 @@ module Orange
     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])
+        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
-        # Move the files
-        FileUtils.cp(file.path, file_path)
-        FileUtils.chmod(0644, file_path)
-        FileUtils.cp(secondary.path, secondary_path) if secondary_path
-        FileUtils.chmod(0644, secondary_path) if secondary_path
         
-        params['path'] = params['file'][:filename] if file_path
-        params['secondary_path'] = params['file2'][:filename] if secondary_path
+        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.delete('file')
         params.delete('file2')
-        
+        params['s3_bucket'] = options[:s3_bucket] if options[:s3_bucket]
         m = model_class.new(params)
       end
       m
     end
     
+    def s3_connect!
+      if(options[:s3_bucket])
+        id = options[:s3_access_key_id] || ENV['S3_KEY']
+        secret = options[:s3_secret_access_key] || ENV['S3_SECRET']
+        AWS::S3::Base.establish_connection!(
+            :access_key_id     => id,
+            :secret_access_key => secret
+          )
+      end
+    end
+    
+    def ensure_dir!
+      if(options[:s3_bucket])
+        AWS::S3::Bucket.create(options[:s3_bucket]) unless AWS::S3::Bucket.find(options[:s3_bucket])
+      else
+        FileUtils.mkdir_p(orange.app_dir('assets','uploaded')) unless File.exists?(orange.app_dir('assets','uploaded'))
+      end
+    end
+    
+    def handle_new_file(filename, file)
+      s3_connect!
+      ensure_dir!
+      if(options[:s3_bucket])
+        filename = unique_s3_name(filename)
+        AWS::S3::S3Object.store(filename, file, options[:s3_bucket], :access => :public_read)
+      else
+        filename = unique_local_name(filename)
+        FileUtils.cp(file.path, orange.app_dir('assets','uploaded', filename))
+        FileUtils.chmod(0644, orange.app_dir('assets','uploaded', filename))
+      end
+      return filename
+    end
+    
+    def unique_s3_name(filename)
+      return filename unless AWS::S3::S3Object.exists?(filename, options[:s3_bucket])
+      i = 1
+      extname = File.extname(filename)
+      basename = File.basename(filename, extname)
+      while AWS::S3::S3Object.exists?("#{basename}_#{i}#{extname}", options[:s3_bucket])
+        i += 1
+      end
+      "#{basename}_#{i}#{extname}"
+    end
+    
+    def unique_local_name(filename)
+      return filename unless File.exists?(orange.app_dir('assets','uploaded', filename))
+      i = 1
+      extname = File.extname(filename)
+      basename = File.basename(filename, extname)
+      while File.exists?(orange.app_dir('assets', 'uploaded', "#{basename}_#{i}#{extname}"))
+        i += 1
+      end
+      "#{basename}_#{i}#{extname}"
+    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 = {})
@@ -98,8 +158,14 @@ module Orange
     
     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
+        if(m.s3_bucket)
+          s3_connect!
+          AWS::S3::S3Object.delete(m.path, m.s3_bucket) if m.path
+          AWS::S3::S3Object.delete(m.secondary_path, m.s3_bucket) if m.secondary_path
+        else
+          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
+        end
       rescue
         # Problem deleting file
       end

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

@@ -2,7 +2,7 @@ require 'dm-timestamps'
 class OrangeBlogPost < Orange::Carton
   id
   front do
-    title :title
+    title :title, :length => 255
     fulltext :body
   end
   admin do
@@ -10,7 +10,7 @@ class OrangeBlogPost < Orange::Carton
   end
   orange do
     boolean :published, :default => false
-    text :slug
+    text :slug, :length => 255
     text :author
   end
   
@@ -21,7 +21,7 @@ class OrangeBlogPost < Orange::Carton
   
   def title=(t)
     self.attribute_set('title', t)
-    self.attribute_set('slug', t.downcase.gsub(/[']+/, "").gsub(/[^a-z0-9]+/, "_"))
+    self.attribute_set('slug', t.downcase.gsub(/<\/?[^>]*>/, "").gsub(/[']+/, "").gsub(/[^a-z0-9]+/, "_"))
   end
   
   def published=(val)

data/lib/orange-more/contactforms/cartons/{contactforms_carton.rb → contactform_carton.rb}

@@ -1,8 +1,9 @@
-class OrangeContactForms < Orange::Carton
+class OrangeContactForm < Orange::Carton
   id
   admin do
     title :title
     text :to_address
+    text :from_address
   end
   
   def self.named(tag)

data/lib/orange-more/contactforms/resources/contactforms_resource.rb

@@ -2,20 +2,21 @@ require 'mail'
 
 module Orange
   class ContactFormsResource < Orange::ModelResource
-    use OrangeContactForms
+    use OrangeContactForm
     call_me :contactforms
+    expose :mailer
     def stack_init
       orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Contact Forms')
       orange[:radius].define_tag "contactform" do |tag|
-     	  if tag.attr["name"] && model_class.named(tag.attr["name"]).count >0
+        if tag.attr["name"] && model_class.named(tag.attr["name"]).count >0
           m = model_class.named(tag.attr["name"]).first #selects contactform based on title
-	      elsif model_class.all.count > 0
-	        if tag.attr["id"]
-      	    m = model_class.get(tag.attr["id"])
-	        else
-	          m = model_class.first
-	        end
-	      end
+        elsif model_class.all.count > 0
+          if tag.attr["id"]
+            m = model_class.get(tag.attr["id"])
+          else
+            m = model_class.first
+          end
+        end
         unless m.nil?
           template = tag.attr["template"] || "contactform"
           orange[:contactforms].contactform(tag.locals.packet, {:model => m, :template => template, :id => m.id})
@@ -34,17 +35,18 @@ module Orange
     def mailer(packet, opts = {})
       params = packet.request.params
       route = params['r']
-      if params['contact_phone'] != ''
+      # The contact phone number is a honeypot field.
+      if params['contact_phone'] != '' || params['contact_from'].blank? || params['contact_email_address'].blank?
         packet.flash['error'] = "An error has occurred. Please try your submission again."
         packet.reroute(route)
       end
-      path = packet['route.path']
+      path = packet['route.resource_path']
       parts = path.split('/')
       form = model_class.get(parts.last.to_i)
       mail = Mail.new do
-        from "WNSF <info@wnsf.org>"
+        from  "#{packet['site'].name} <#{form.from_address}>"
         to form.to_address
-        subject 'E-mail contact from WNSF.org - '+form.title
+        subject "E-mail contact from #{packet['site'].name}"
         body "From: "+params['contact_from']+" ("+params['contact_email_address']+")\n\nMessage:\n"+params['contact_message']
       end
       mail.delivery_method :sendmail

data/lib/orange-more/contactforms/views/contactforms/contactform.haml

@@ -1,3 +1,4 @@
+- packet.add_js('jquery.validate.pack.js', :module => "_contactforms_")
 :javascript
   $(function(){ 
     $('.contact_form').validate();

data/lib/orange-more/debugger/assets/css/debug_bar.css

@@ -9,6 +9,7 @@ body{
 	bottom: 0;
 	background-color: #333;
 	width: 100%;
+	z-index: 999;
 	font: medium "Lucida Grande", Lucida, Verdana, sans-serif;
 }
 #debug_bar h1{

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

@@ -64,6 +64,13 @@ module Orange
             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)
+          elsif orange.loaded?(:sitemap)
+            r.each do |route|
+              if route.default_slug? 
+                route.slug = orange[:sitemap].slug(m.title)
+                route.save
+              end
+            end
           end
         end
       end