wheels 0.0.48 → 0.0.49

data/VERSION

@@ -1 +1 @@
-0.0.48
+0.0.49

data/app/controllers/access_control_entries_controller.rb

@@ -1,8 +1,7 @@
 class AccessControlEntriesController < InheritedResources::Base
   ajax_loading
   before_filter :authenticate_user!
-  belongs_to :user, :optional => true
-  has_scope :by_resource, :using => [:resource_class, :resource_id]
+  belongs_to :page, :forum, :user, :role, :polymorphic => true
   has_scope :by_role, :using=>[:role_id]
   has_scope :by_class, :using=>[:class]
   respond_to :html, :js
@@ -11,10 +10,11 @@ class AccessControlEntriesController < InheritedResources::Base
     a = AccessControlEntry.new
     a.user_id = params[:user_id]
     a.role_id = params[:role_id]
-    a.resource_class_name = params[:resource_class]
-    a.options[:id] = params[:resource_id]
+    a.resource_type = params[:page_id] ? "Page" : (params[:forum_id] ? "Forum" : nil)
+    a.options[:id] = params[:page_id] || params[:forum_id]
     return a
   end
+
   helper_method :new_ace
 end
 

data/app/controllers/external_links_controller.rb

@@ -0,0 +1,5 @@
+class ExternalLinksController < InheritedResources::Base
+  respond_to :html, :js
+  ajax_loading
+end
+

data/app/controllers/feedbacks_controller.rb

@@ -0,0 +1,10 @@
+class FeedbacksController < InheritedResources::Base
+  def create
+    create! do |format|
+      FeedbackMailer.submit_feedback(@feedback).deliver
+      flash[:notice] = "Thanks for your feedback!"
+      format.html { redirect_to "/" }
+    end
+  end
+end
+

data/app/controllers/menus_controller.rb

@@ -0,0 +1,2 @@
+class MenusController < InheritedResources::Base
+end

data/app/controllers/pages_controller.rb

@@ -1,9 +1,8 @@
 class PagesController < InheritedResources::Base
   respond_to :js, :html
   ajax_loading
-  belongs_to :parent, :optional=>true, :collection_name => :children,
-             :parent_class=>Page, :param=>:page_id, :instance_name=>:parent_page
   before_filter :set_collection_name
+  before_filter :parse_request_url, :only=>:show
 
   def set_collection_name
     if params[:page_id]
@@ -11,6 +10,13 @@ class PagesController < InheritedResources::Base
     end
   end
 
+  def parse_request_url
+    if params["level1"]
+      @sitemap = Sitemap.find_by_path(*[1,2,3,4].map{|i|params["level#{i}"]})
+      @page = @sitemap.resource
+    end
+  end
+
   before_filter :authenticate_user!, :except=>[:show]
   before_filter :maybe_authenticate, :only=>[:show]
   before_filter :resource, :only=>[:update, :show, :destroy, :edit]
@@ -22,13 +28,15 @@ class PagesController < InheritedResources::Base
   end
 
   def resource
-    page_id = params[:id]
-    if page_id.is_numeric?
-      @page ||= Page.find(page_id)
-    else
-      @page ||= Page.where(["lower(pages.title) = ?", page_id.downcase.gsub(/[_]/, ' ')]).first
+    unless @page
+      page_id = params[:id]
+      if page_id.is_numeric?
+        @page ||= Page.find(page_id)
+      else
+        @page ||= Page.where(["lower(pages.title) = ?", page_id.downcase.gsub(/[_]/, ' ')]).first
+      end
+      @attachments ||= @page.attachments
     end
-    @attachments ||= @page.attachments
     @page
   end
 
@@ -38,15 +46,8 @@ class PagesController < InheritedResources::Base
     end
   end
 
-  def show
-    show! do |format|
-      set_children
-    end
-  end
-
   def edit
     edit! do |format|
-      set_children
       @attachment = Attachment.new(:page=>@page)
       @s3provider = S3Provider.new(:key=>"attachments/#{current_user.id}")
     end
@@ -56,12 +57,6 @@ class PagesController < InheritedResources::Base
     create! { (@parent_page ? page_child_path(@parent_page, @page) : @page) }
   end
 
-  def new
-    new! do |format|
-      set_children
-    end
-  end
-
   def update
     update! do |format|
       if params[:child_id]
@@ -72,13 +67,5 @@ class PagesController < InheritedResources::Base
       end
     end
   end
-
-  def set_children
-    if @parent_page
-      @children = @parent_page.children
-    else
-      @children = @page.children
-    end
-  end
 end
 

data/app/controllers/sitemaps_controller.rb

@@ -0,0 +1,135 @@
+class SitemapsController < InheritedResources::Base
+  ajax_loading
+  respond_to :html, :js, :json
+  before_filter :parse_request_url, :only=>:show
+  before_filter :resource, :except=>[:new, :create, :index]
+  before_filter :collection, :only=>[:index]
+  before_filter :new_resource, :only=>[:new, :create]
+  before_filter :authenticate_user!, :authorize_action!
+
+  def index
+    collection.reject!{|t| t==Sitemap.lost_and_found} if Sitemap.lost_and_found.children.empty?
+    index! do |format|
+      format.json{render :json=>collection.as_json}
+    end
+  end
+
+  def parse_request_url
+    if params[:level1]
+      @sitemap = Sitemap.find_by_path(*[1,2,3,4].map{|t|params["level#{i}".to_sym]})
+    end
+  end
+
+  def create
+    @sitemap = new_resource
+    @sitemap.resource = @sitemap.resource_type.constantize.new
+    @sitemap.save
+    respond_with @sitemap do |format|
+      format.json {render :json=> json_obj.as_json}
+    end
+  end
+
+  def json_obj
+    {
+      :status => @sitemap.errors.empty? ? 1 : 0,
+      :errors => @sitemap.errors,
+      :id     => @sitemap.id,
+      :resource_type => @sitemap.resource_type,
+      :resource_id   => @sitemap.resource_id,
+      :menu_text     => @sitemap.menu_text,
+    }
+  end
+
+  def show
+    show! do |format|
+      format.html{
+        if resource.resource.is_a? ExternalLink
+          redirect_to resource.resource.url
+        elsif resource.resource.is_a? Page
+
+        end
+      }
+      format.json{render :json=>resource.as_json}
+      format.js{redirect_to(url_for(resource.resource)+'.js')}
+    end
+  end
+
+  def destroy
+    if resource.parent == Sitemap.lost_and_found
+      resource.destroy
+    else
+      resource.parent = Sitemap.lost_and_found
+      resource.save
+    end
+    respond_with resource
+  end
+
+  def update
+    resource.parent = parent
+    update! do |format|
+      if params[:sitemap]["position"]
+        childrunz = Array.new(parent.children.sort{|t,u| t.position <=> u.position})
+        childrunz.delete(resource)
+        childrunz.insert(params[:sitemap]["position"].to_i, resource)
+        childrunz.each_with_index do |child, idx|
+          child.position = idx
+          child.save
+        end
+      end
+      format.json {render :json=> json_obj.as_json}
+    end
+  end
+
+  def sort
+    params[:formula_herb_children].each_with_index do |id, index|
+      FormulaHerb.update_all(['position=?', index+1], ['id=?', id])
+    end
+    render :nothing => true
+  end
+
+
+
+  #helper methods
+
+  def authorize_action!
+    authorize! :manage, Sitemap
+  end
+
+  def resource
+    @sitemap ||= Sitemap.find(params[:id]) if params[:id]
+  end
+
+  def collection
+    @sitemaps ||= SitemapArray.new(parent.children)
+  end
+
+  def new_resource
+    @sitemap ||= Sitemap.new(params[:sitemap])
+  end
+
+  def parent
+    unless @parent
+      if params[:parent_id]
+        @parent = Sitemap.find(params[:parent_id])
+      else
+        if params[:action] == "index"
+          @parent = Sitemap.root
+        else
+          @parent = resource.try(:parent)
+        end
+      end
+    end
+    @parent
+  end
+
+  private
+  def resource_would_be_orphaned?
+    resource.resource.sitemaps.size==1 &&
+        resource.resource.sitemaps[0] == resource
+  end
+
+  def resource_is_in_lost_and_found?
+    resource.parent==Sitemap.lost_and_found
+  end
+end
+

data/app/helpers/application_helper.rb

@@ -1,12 +1,13 @@
 module ApplicationHelper
-  def menu_item(name, href)
-    content_tag(:li, content_tag(:a, content_tag(:span, name), :href=>href))
+  load_main_menu
+  def menu_node(name, url)
+    content_tag(:li, content_tag(:a, content_tag(:span, name, :class=>name.underscore.gsub(/ /, '_')), :href=>url))
   end
   def include_ckeditor
     content_for :head do
       javascript_include_tag('/ckeditor/ckeditor.js',
         '/ckeditor/adapters/jquery.js',
-        "galleries/configure_ckeditor.js")
+        "galleries/configure_ckeditor.js", 'ckeditor_loaded')
     end
   end
 end

data/app/helpers/external_links_helper.rb

@@ -0,0 +1,2 @@
+module ExternalLinksHelper
+end

data/app/helpers/feedbacks_helper.rb

@@ -0,0 +1,2 @@
+module FeedbacksHelper
+end

data/app/helpers/menus_helper.rb

@@ -0,0 +1,2 @@
+module MenusHelper
+end

data/app/helpers/sitemaps_helper.rb

@@ -0,0 +1,12 @@
+module SitemapsHelper
+  def authenticity_token_json
+    unless protect_against_forgery?
+      ''
+    else
+      %("#{request_forgery_protection_token.to_s}" : "#{form_authenticity_token}",\n)
+    end
+  end
+
+
+end
+

data/app/mailers/feedback_mailer.rb

@@ -0,0 +1,10 @@
+class FeedbackMailer < ActionMailer::Base
+  default :from => "mailer-no-reply@cagym.com"
+
+  def submit_feedback(feedback)
+    @feedback = feedback
+    #attachments["rails.png"] = File.read("#{Rails.root}/public/images/rails.png")
+    mail(:to => "hipkin@pacbell.net", :subject => %(CAGYM.com user feedback: #{feedback.subject}))
+  end
+end
+

data/app/models/ability.rb

@@ -11,7 +11,7 @@ class Ability
 
   def initialize(user)
     user ||= User.nobody
-    puts all_aces_for(user).map{|t| "#{t.resource_class_name} #{t.options.inspect}"}.join("\n")
+    puts all_aces_for(user).map{|t| "#{t.resource_type} #{t.options.inspect}"}.join("\n")
     self.class.initializers.each{|t| self.send(t, user)}
     all_aces_for(user).each do |ace|
       ace.configure(self)
@@ -36,6 +36,7 @@ class Ability
         can :manage, Blog, :user_id => user.id
         can :edit, Profile, :user_id => user.id
         cannot :read, User
+        can :manage, User, :id => user.id
     end
   end
 end

data/app/models/access_control_entry.rb

@@ -1,31 +1,33 @@
 class AccessControlEntry < ActiveRecord::Base
   belongs_to :user
   belongs_to :role
+  belongs_to :resource, :polymorphic=>true
+  validates :resource_type, :presence=>true
 
-  scope :by_resource, lambda {|resource_class_name, resource_id|
-    where(:resource_class_name=>resource_class_name).
+  scope :by_resource, lambda {|resource_type, resource_id|
+    where(:resource_type=>resource_type).
     where(:resource_id=>resource_id)
   }
   scope :by_role, lambda {|role_id|
     where(:role_id=>role_id)
   }
   scope :by_class, lambda {|class_name|
-    where(:resource_class_name=>class_name)
+    where(:resource_type=>class_name)
   }
 
-  def resource
-    @resource ||= self.resource_class_name.constantize
-  end
+#  def resource
+#    @resource ||= self.resource_type.constantize if self.resource_type
+#  end
 
-  def resource=(res)
-    @resource = res
-    if res.type==Class
-      self.resource_class_name = res.name
-    else
-      self.options[:id] = res.id
-      self.resource_class_name = res.class.name
-    end
-  end
+#  def resource=(res)
+#    @resource = res
+#    if res.type==Class
+#      self.resource_type = res.name
+#    else
+#      self.options[:id] = res.id
+#      self.resource_type = res.class.name
+#    end
+#  end
 
   def options
     @options ||= (self.serialized_options ? eval(self.serialized_options) : {})

data/app/models/external_link.rb

@@ -0,0 +1,4 @@
+class ExternalLink < ActiveRecord::Base
+  has_many :sitemaps, :as=>:resource
+end
+

data/app/models/feedback.rb

@@ -0,0 +1,13 @@
+class Feedback < ActiveRecord::Base
+  validates :email, :presence=>true, :email=>true
+  validates :name, :presence=>true, :length=>{:minimum=>6}
+  validates :phone, :presence=>true
+  validates :subject, :presence=>true
+
+
+
+  def self.jq_validation
+    JQueryValidator.new
+  end
+end
+

data/app/models/image.rb

@@ -5,6 +5,6 @@ class Image < ActiveRecord::Base
       :storage => :s3,
       :s3_credentials => "#{Rails.root}/config/amazon_s3.yml",
       :path => "/images/:user_email/:style/:filename",
-      :styles => {:medium => "300x300>", :thumb => "100x100>" }
+      :styles => {:large=>"700x700>", :medium => "300x300>", :thumb => "100x100>" }
 end
 

data/app/models/menu.rb

@@ -0,0 +1,4 @@
+class Menu < ActiveRecord::Base
+  has_many :sitemaps, :as=>:resource
+end
+

data/app/models/page.rb

@@ -1,10 +1,7 @@
 class Page < ActiveRecord::Base
   has_many :attachments
-  validates :title, :presence=>true
-  belongs_to :parent, :class_name=>'Page', :foreign_key=>'parent_id'
-  has_many :children, :class_name=>'Page', :foreign_key=>'parent_id'
+  has_many :sitemaps, :as=>:resource
+  has_many :access_control_entries, :as=>:resource
   acts_as_taggable
-
-  scope :orphans, where(:parent_id=>nil)
 end
 

data/app/models/sitemap.rb

@@ -0,0 +1,153 @@
+class Sitemap < ActiveRecord::Base
+  has_many :children, :class_name=>'Sitemap', :foreign_key=>'parent_id', :dependent => :destroy do
+    def sorted
+      sort{|t, u| t.position <=> u.position}
+    end
+  end
+
+  belongs_to :parent, :class_name=>'Sitemap', :foreign_key=>'parent_id'
+  belongs_to :resource, :polymorphic => true
+  before_create :create_resource
+  before_destroy :on_before_destroy
+  after_save :reload_root
+  validates :resource, :presence=>true
+  accepts_nested_attributes_for :children
+
+
+  def reload_root
+    Sitemap.instance_variable_set('@_root', nil)
+  end
+
+  def on_before_destroy
+    resource.destroy if resource && resource.sitemaps.size==1
+  end
+
+  scope :orphans, where(:parent_id=>nil).where("menu_text <> 'root'")
+
+  def as_json(*a)
+    {
+      :data=>{
+        :title=>self.menu_text,
+        :icon=>icon_name,
+      },
+      :attr=>{
+        :id=>"node_#{id}",
+        :rel=>resource_type.underscore,
+        :data_menu_text => self.menu_text,
+        :data_resource_type => self.resource_type,
+        :data_resource_id => self.resource_id,
+        :data_id => self.id
+      },
+      :state=>treeview_state,
+      :children=> children.sort{|t,u| t.position <=> u.position}
+    }.as_json(*a)
+   end
+
+  def resource_attributes=(attrib={})
+    raise "Cant build resource without resource_type" if resource_type.empty?
+    resource = create_resource
+    resource.attributes = attrib
+    resource.save
+  end
+
+  def create_resource
+    resource ||= resource_type.constantize.new unless resource_type.nil?
+  end
+
+  def url
+    if self == Sitemap.main_menu
+      '/'
+    elsif resource.is_a? ExternalLink
+      resource.url
+    else
+      "#{(a=parent.url)=='/'?'':a}/#{menu_text.gsub(/ /, '_')}"
+    end
+  end
+
+
+  #########################################################################
+  #
+  # Class Methods
+  #
+  #########################################################################
+
+  def self.root
+    @_root ||= Sitemap.find_by_menu_text_and_parent_id('root', nil)
+  end
+
+  def self.lost_and_found
+    root.children.select{|t| t.menu_text=='Lost + Found'}[0]
+  end
+
+  def self.main_menu
+    root.children.select{|t| t.menu_text=='Main Menu'}[0]
+  end
+
+  def self.find_by_path(*path_args)
+    path = path_args.reverse
+    path.delete(nil)
+    obj = Sitemap.main_menu
+    while (path_piece=path.pop)
+      obj = obj.children.select{|t| t.menu_text.downcase==path_piece.downcase.gsub(/_/, ' ')}[0]
+      raise "Path error '#{path_piece}' in '#{path_args.join('/')}'" unless obj
+    end
+    return obj
+  end
+
+  #########################################################################
+  #
+  # Private Methods
+  #
+  #########################################################################
+
+  private
+  def build_resource(params={})
+    if resource_class
+      a = resource_class.new(params)
+      self.resource = a
+      a
+    end
+  end
+
+  def create_resource(params={})
+    if resource_class
+      a = resource_class.create(params)
+      self.resource = a
+      a
+    end
+  end
+
+  def new_model
+    resource_class.new(:sitemaps=>[self]) if resource_class
+  end
+
+  def resource_class
+    resource_type.camelize.constantize unless resource_type.empty?
+  end
+
+  def icon_name
+    case resource_type
+    when "Page"
+      "page"
+    when "ExternalLink"
+      "folder"
+    when "Menu"
+      "drive"
+    end
+  end
+
+  def treeview_state
+    if resource.is_a?(ExternalLink) || children.empty?
+      "leaf"
+    else
+      "open"
+    end
+  end
+end
+
+class SitemapArray < Array
+  def to_json
+    "[" + map(&:to_json).join(",") + "]"
+  end
+end
+

data/app/models/user.rb

@@ -1,11 +1,16 @@
 class User < ActiveRecord::Base
-  after_create :create_profile
   belongs_to :role
   has_many :blogs, :dependent => :destroy
   has_one :profile, :dependent => :destroy
   has_many :galleries, :dependent => :destroy
   has_many :access_control_entries, :dependent=>:destroy
 
+  accepts_nested_attributes_for :profile
+
+  def initialize(*args)
+    super(*args)
+    build_profile unless profile
+  end
 
   def self.nobody
     User.new(:role=>Role.nobody)
@@ -16,6 +21,7 @@ class User < ActiveRecord::Base
   end
 
   def create_profile
+
     Profile.create(:user=>self) unless self.profile
   end
 

data/app/validators/email_validator.rb

@@ -0,0 +1,22 @@
+require 'mail'
+class EmailValidator < ActiveModel::EachValidator
+  def validate_each(record,attribute,value)
+    begin
+      m = Mail::Address.new(value)
+      # We must check that value contains a domain and that value is an email address
+      r = m.domain && m.address == value
+      t = m.__send__(:tree)
+      # We need to dig into treetop
+      # A valid domain must have dot_atom_text elements size > 1
+      # user@localhost is excluded
+      # treetop must respond to domain
+      # We exclude valid email values like <user@localhost.com>
+      # Hence we use m.__send__(tree).domain
+      r &&= (t.domain.dot_atom_text.elements.size > 1)
+    rescue Exception => e
+      r = false
+    end
+    record.errors[attribute] << (options[:message] || "is invalid") unless r
+  end
+end
+

data/app/views/access_control_entries/_form.html.haml

@@ -22,7 +22,7 @@
       = f.text_field :verb, :class=>"verb"
     %li
       .name Resource
-      = f.select :resource_class_name, [["Forum", "Forum"], ["Page", "Page"]]
+      = f.select :resource_type, [["Forum", "Forum"], ["Page", "Page"]]
       = f.hidden_field :resource_id
     %li
       .name options

data/app/views/access_control_entries/_index.html.haml

@@ -1,4 +1,4 @@
-%h1 Listing Access Control Entries for
+%h1 Listing Access Control Entries for #{parent.class.name} #{parent.id}
 
 %ul.listing#ace_listing
   - @access_control_entries.each do |ace|
@@ -8,7 +8,7 @@
         %li= ace.role.name if ace.role
         %li= ace.can ? "Can" : "Cannot"
         %li= ace.verb
-        %li= ace.resource_class_name
+        %li= ace.resource_type
         %li= ace.options_str if ace.options_str
         - if can? :edit, ace
           %li= link_to "Edit", edit_access_control_entry_path(ace), :remote=>true
@@ -35,7 +35,7 @@
         = f.text_field :verb, :class=>"verb"
       %li
         .name Resource
-        = f.select :resource_class_name, [["Forum", "Forum"], ["Page", "Page"]]
+        = f.select :resource_type, [["Forum", "Forum"], ["Page", "Page"]]
         = f.hidden_field :resource_id
       %li
         .name options