wheels 0.1.15 → 0.1.16

data/VERSION

@@ -1 +1 @@
-0.1.15
+0.1.16

data/app/controllers/pages_controller.rb

@@ -2,11 +2,8 @@ class PagesController < InheritedResources::Base
   respond_to :js, :html
   ajax_loading
   before_filter :authenticate_user!, :except=>[:show]
-  before_filter :parse_request_url, :only=>:show
-  before_filter :resource, :only=>[:update, :show, :destroy, :edit]
-  before_filter :maybe_authenticate, :only=>[:show]
-  before_filter :set_collection_name
-  authorize_resource
+  before_filter :authorize_resource, :except=>[:index, :show]
+
   has_scope :tagged_with, :as => :tag
 
   has_scope :accessible_by, :type=>:boolean, :default=>true do |c,s|
@@ -14,10 +11,31 @@ class PagesController < InheritedResources::Base
   end
 
   def show
-    resource
     @sidebar = true
-    @child_pages = @sitemap.children.accessible_by(current_ability)
-    show!
+    if params[:id]
+      @sitemap ||= resource.sitemaps.sort{|t,u| t.url.size <=> u.url.size}[0]
+      @page = resource
+    else
+      @sitemap = Sitemap.from_request_params(params)
+      @page = @sitemap.try(:resource)
+    end
+    if @page
+      @child_pages = @sitemap.children.is_a?(Array) ? [] : @sitemap.children.accessible_by(current_ability)
+
+      if can_access_resources?
+        respond_with @page, @sitemap, @child_pages, @attachments
+      else
+        if user_signed_in?
+          flash[:notice] = "How did you find that page?  Please contact your administrator if you believe you should have access to that resource."
+          redirect_to root_url
+        else
+          authenticate_user!
+        end
+      end
+    else
+      flash[:notice] = "Sorry, we couldn't find the resource you were looking for!"
+      redirect_to root_url
+    end
   end
 
   def edit
@@ -42,39 +60,19 @@ class PagesController < InheritedResources::Base
     end
   end
 
-  def set_collection_name
-    if params[:page_id]
-      self.resources_configuration[:self][:collection_name] = :children
-    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
-
-
   def resource
-    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
-    @sitemap ||= @page.sitemaps.sort{|t,u| t.url.size <=> u.url.size}[0]
-    @page
+    return @page ||= Page.find(params[:id])
+    @attachments = @page.attachments
   end
 
   def maybe_authenticate
     unless user_signed_in?
-      authenticate_user! unless current_ability.can? :read, resource
+      authenticate_user! unless current_ability.can?(:read, resource) && current_ability.can?(:read, @sitemap)
     end
   end
 
+  def can_access_resources?
+    current_ability.can?(params[:action].to_sym, resource) && current_ability.can?(params[:action].to_sym, @sitemap)
+  end
 end
 

data/app/controllers/users_controller.rb

@@ -1,5 +1,5 @@
 class UsersController < InheritedResources::Base
-  respond_to :html, :js, :only=>[:edit, :show, :update]
+  respond_to :html, :js, :only=>[:edit, :show, :update, :change_password]
   respond_to :json, :only=>[:verify_password]
 
   before_filter :authenticate_user!, :resource
@@ -9,12 +9,22 @@ class UsersController < InheritedResources::Base
   end
 
   def update
-    resource
-
+    if params[:commit] == "Update Account"
+      @user = User.find(params[:id])
+      @user._validators.delete_if{|k,v| k.in?(:password, :password_confirmation)}
+      params[:user].delete_if{|k,v| k.in?("password", "password_confirmation")}
+      @user.class_eval do
+        attr_accessor :old_password
+        validates :email, :presence => true, :email => true
+        validates :old_password, :presence=>true, :password=>true
+      end
+    else
+      @user = resource
+    end
 
     update! do |success, failure|
       failure.html{redirect_to my_account_path}
-      success.html{flash[:notice] = "Your password has been updated."; redirect_to root_url}
+      success.html{flash[:notice] = "Your account has been updated."; redirect_to root_url}
     end
   end
 

data/app/models/access_control_entry.rb

@@ -19,10 +19,10 @@ class AccessControlEntry < ActiveRecord::Base
 
   def resource=(res)
     @res = res
-    if res.is_a? Class then resource_type = res.name
+    if res.is_a? Class then self.resource_type = res.name
     else
-      resource_id = res.id
-      resource_type = res.class.name
+      self.resource_id = res.id
+      self.resource_type = res.class.name
     end
   end
 

data/app/models/profile.rb

@@ -2,12 +2,11 @@ class Profile < ActiveRecord::Base
   acts_as_tagger
   belongs_to :user
   validates_uniqueness_of :alias
+  validates :phone, :phone=>true
   has_attached_file :image,
       :storage => :s3,
       :s3_credentials => "#{Rails.root}/config/amazon_s3.yml",
       :path => "/:style/:filename",
       :styles => { :medium => "300x300>", :thumb => "100x100>" }
-
-
 end
 

data/app/models/sitemap.rb

@@ -1,4 +1,11 @@
 class Sitemap < ActiveRecord::Base
+  after_create :create_resource
+  after_save :reload_root
+  alias_attribute :name, :menu_text
+  before_destroy :on_before_destroy
+  belongs_to :parent, :class_name=>'Sitemap', :foreign_key=>'parent_id'
+  belongs_to :resource, :polymorphic => true
+  has_many :access_control_entries, :as => :resource
   has_many :children, :class_name=>'Sitemap', :foreign_key=>'parent_id', :dependent => :destroy do
     def sorted
       sort{|t, u| if t.nil? || t.position.nil?; 1;
@@ -6,35 +13,9 @@ class Sitemap < ActiveRecord::Base
                   else t.position <=> u.position end}
     end
   end
-
-  has_many :access_control_entries, :as => :resource
-
-  alias_attribute :name, :menu_text
-
-  def self.new_main_menu_page(name)
-    Sitemap.create( :parent=>self.main_menu,
-                    :menu_text=>name,
-                    :resource=>Page.create(:title=>name),
-                    :position=>Sitemap.main_menu.children.count)
-  end
-
-  belongs_to :parent, :class_name=>'Sitemap', :foreign_key=>'parent_id'
-  belongs_to :resource, :polymorphic => true
-  after_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'")
+  validates :resource, :presence=>true
 
   def as_json(*a)
     {
@@ -54,7 +35,7 @@ class Sitemap < ActiveRecord::Base
       :state=>treeview_state,
       :children=> children.sorted
     }.as_json(*a)
-   end
+  end
 
   def resource_attributes=(attrib={})
     raise "Cant build resource without resource_type" if resource_type.empty?
@@ -63,13 +44,6 @@ class Sitemap < ActiveRecord::Base
     resource.save
   end
 
-  def create_resource
-    if self.resource_type && !self.resource_id
-      self.resource = resource_type.constantize.new
-      self.save
-    end
-  end
-
   def url
     if self == Sitemap.main_menu
       '/'
@@ -80,6 +54,21 @@ class Sitemap < ActiveRecord::Base
     end
   end
 
+  #  Callbacks
+  def reload_root
+    Sitemap.instance_variable_set('@_root', nil)
+  end
+
+  def on_before_destroy
+    resource.destroy if resource && resource.sitemaps.size==1
+  end
+
+  def create_resource
+    if self.resource_type && !self.resource_id
+      self.resource = resource_type.constantize.new
+      self.save
+    end
+  end
 
   #########################################################################
   #
@@ -87,8 +76,9 @@ class Sitemap < ActiveRecord::Base
   #
   #########################################################################
 
-  def self.root
-    @_root ||= Sitemap.find_by_menu_text_and_parent_id('root', nil)
+  def self.from_request_params(params)
+    puts params.slice(:level1, :level2, :level3, :level4).values.inspect + "\n"*30
+    find_by_path params.slice(:level1, :level2, :level3, :level4).values
   end
 
   def self.lost_and_found
@@ -99,26 +89,38 @@ class Sitemap < ActiveRecord::Base
     root.children.select{|t| t.menu_text=='Main Menu'}[0]
   end
 
+  def self.root
+    @_root ||= Sitemap.find_by_menu_text_and_parent_id('root', nil)
+  end
+
+  def self.new_main_menu_page(name)
+    Sitemap.create( :parent=>self.main_menu,
+                    :menu_text=>name,
+                    :resource=>Page.create(:title=>name),
+                    :position=>Sitemap.main_menu.children.count)
+  end
+
   def self.settings
     root.children.select{|t| t.menu_text=='Settings'}[0]
   end
 
+  #########################################################################
+  #
+  # Private Methods
+  #
+  #########################################################################
   def self.find_by_path(*path_args)
+    path_args.flatten!
     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
+      break unless obj
     end
     return obj
   end
 
-  #########################################################################
-  #
-  # Private Methods
-  #
-  #########################################################################
 
   private
   def build_resource(params={})
@@ -137,14 +139,6 @@ class Sitemap < ActiveRecord::Base
     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"
@@ -156,6 +150,14 @@ class Sitemap < ActiveRecord::Base
     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 treeview_state
     if resource.is_a?(Menu)
       "open"

data/app/models/user.rb

@@ -6,9 +6,6 @@ class User < ActiveRecord::Base
   has_many :access_control_entries, :dependent=>:destroy
   before_create :create_profile
 
-  form_attributes( {"Edit your profile" => :profile_attributes},
-    {"Change your password" => [:old_password, :new_password, {"Re-type password"=>:password_confirmation}]})
-
   accepts_nested_attributes_for :profile
 
   def initialize(*args)
@@ -58,18 +55,17 @@ class User < ActiveRecord::Base
     save
   end
   devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable, :token_authenticatable, :lockable, :timeoutable
-
 end
 
 class FullyValidatedUser < User
   def class
     User
   end
+  _validators[:password].delete_if{|t| t.is_a? ActiveModel::Validations::PresenceValidator}
   attr_accessor :old_password
   validates :email, :presence => true, :email => true
-  validates :old_password, :presence=>true  , :password=>true
+  validates :old_password, :presence=>true, :password=>true
   validates :password, :length=>{:minimum=>6}
   validates :password_confirmation, :equal_to=>{:other=>:password}
-  validates :phone, :phone=>true
 end
 

data/app/views/users/change_password.html.haml

@@ -0,0 +1,38 @@
+%h1 Change Password
+
+.form
+  = form_for resource do |f|
+    -if resource.errors.any?
+      #errorExplanation
+        %h2= "#{pluralize(resource.errors.count, "error")} prohibited this change:"
+        %ul
+          - resource.errors.full_messages.each do |msg|
+            %li= msg
+    .field
+      .fieldName= label_tag "Please enter your old password for verification."
+      .fieldValue= f.password_field :old_password, :id=>"old_password"
+    .field
+      .fieldName= label_tag "New Password:"
+      .fieldValue= f.password_field :password, :id=>"password"
+    .field
+      .fieldName= label_tag "Confirm Password:"
+      .fieldalue= f.password_field :password_confirmation
+    .submit= f.submit "Change Password"
+
+:css
+  .extra_form_data {
+    display: none;
+  }
+
+= content_for :head do
+  = javascript_include_tag %w(jquery.validate jquery-validate/additional-methods.js)
+
+
+:javascript
+  var checkingPassword = true;
+  $(function(){
+
+  $('form').validate({onkeyup: function(element) {}});
+  $('#old_password').rules("add", {verify_user : true, alphanumeric: true})
+  });
+

data/app/views/users/edit.html.haml

@@ -1,4 +1,4 @@
-%h1 Change Your Password
+%h1 Update your personal info:
 
 .form
   = form_for resource do |f|
@@ -10,7 +10,6 @@
             %li= msg
 
     .fieldGroup
-      .fieldGroupTitle Edit your personal info
       = f.fields_for :profile do |pf|
         .field
           .fieldName= pf.label :first_name
@@ -30,18 +29,10 @@
         .field
           .fieldName= pf.label :position
           .fieldValue= pf.text_field :position
-    .fieldGroup
-      .fieldGroupTitle Change your password
     .field
-      .fieldName= label_tag "Old Password:"
+      .fieldName= label_tag "Please enter your password for verification:"
       .fieldValue= f.password_field :old_password, :id=>"old_password"
-    .field
-      .fieldName= label_tag "New Password:"
-      .fieldValue= f.password_field :password, :id=>"password"
-    .field
-      .fieldName= label_tag "Confirm Password:"
-      .fieldalue= f.password_field :password_confirmation
-    .submit= f.submit "Change Password"
+    .submit= f.submit "Update Account"
 
 :css
   .extra_form_data {
@@ -49,7 +40,7 @@
   }
 
 = content_for :head do
-  = javascript_include_tag %w(jquery.validate jquery-validate/extra-methods.js)
+  = javascript_include_tag %w(jquery.validate jquery-validate/additional-methods.js)
 
 
 :javascript

data/lib/wheels/routes.rb

@@ -50,7 +50,10 @@ module ActionDispatch::Routing
       match '/css' => 'app_configs#css'
       match '/admin' => "sitemaps#index"
       match "my_account" => "users#edit"
+      match "change_password" => "users#change_password"
       match "verify_password" => "users#verify", :format=>:json
+      match '/:level1(/:level2(/:level3(/:level4)))' =>'pages#show'
+
     end
   end
 end

data/wheels.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wheels}
-  s.version = "0.1.15"
+  s.version = "0.1.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Gannon"]
-  s.date = %q{2010-09-16}
+  s.date = %q{2010-09-17}
   s.description = %q{Call rails generate wheels.}
   s.email = %q{tgannon@gmail.com}
   s.extra_rdoc_files = [
@@ -216,6 +216,7 @@ Gem::Specification.new do |s|
      "app/views/sitemaps/index.json.erb",
      "app/views/sitemaps/new.html.haml",
      "app/views/sitemaps/new.js.erb",
+     "app/views/users/change_password.html.haml",
      "app/views/users/edit.html.haml",
      "app/views/users/index.html.haml",
      "config/amazon_s3.yml",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 15
-  version: 0.1.15
+  - 16
+  version: 0.1.16
 platform: ruby
 authors: 
 - Tyler Gannon
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-16 00:00:00 -07:00
+date: 2010-09-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -239,6 +239,7 @@ files:
 - app/views/sitemaps/index.json.erb
 - app/views/sitemaps/new.html.haml
 - app/views/sitemaps/new.js.erb
+- app/views/users/change_password.html.haml
 - app/views/users/edit.html.haml
 - app/views/users/index.html.haml
 - config/amazon_s3.yml