wheels 0.0.17 → 0.0.18

data/VERSION

@@ -1 +1 @@
-0.0.17
+0.0.18

data/app/controllers/blogs_controller.rb

@@ -1,17 +1,18 @@
 class BlogsController < InheritedResources::Base
   respond_to :html, :xml
-  belongs_to :user, :optional=>true
-  before_filter :load_current_user
+  before_filter
+  has_scope :tagged_with, :as => :tag
+  belongs_to :user, :optional => true
 
   def collection
     @blogs ||= end_of_association_chain.
       paginate(:page => params[:page], :order => 'created_at DESC' )
   end
 
-  def load_current_user
-    unless params[:user_id]
-      @user ||= (current_user ? User.find(current_user.id) : User.super_user)
-    end
+  def begin_of_association_chain
+    @user ||= (current_user ? User.find(current_user.id) : super_user)
+    @tags = Blog.where(:user_id=>@user.id).tag_counts.sort{|t, u| t.count <=> u.count}
+    return @user
   end
 end
 

data/app/controllers/galleries_controller.rb

@@ -24,10 +24,10 @@ class GalleriesController < InheritedResources::Base
 
   def show
     show! do |format|
-      images = paginated_images_for(@gallery)
+      @images = paginated_images_for(@gallery)
       if params[:CKEditorFuncNum]
         format.html{
-          render :action=>:show, :layout=>"image_dialog", :locals=>{:images=>images}
+          render :action=>:show, :layout=>"image_dialog"
         }
       end
     end
@@ -44,7 +44,7 @@ class GalleriesController < InheritedResources::Base
 
   def load_user
     unless params[:user_id]
-      @user ||= (current_user ? User.find(current_user.id) : User.super_user)
+      @user ||= (current_user ? User.find(current_user.id) : super_user)
     end
   end
   helper_method :ckeditor_params, :paginated_images_for

data/app/controllers/pages_controller.rb

@@ -0,0 +1,11 @@
+class PagesController < InheritedResources::Base
+  def resource
+    page_id = params[:id] || Layout.current[:default_page]
+    if page_id.is_numeric?
+      @page ||= Page.find(page_id)
+    else
+      @page ||= Page.where(["pages.title.tolower() = ?", page_id.downcase])
+    end
+  end
+end
+

data/app/controllers/profiles_controller.rb

@@ -5,7 +5,7 @@ class ProfilesController < InheritedResources::Base
 
   def load_current_user
     unless params[:user_id]
-      @user ||= (current_user ? User.find(current_user.id) : User.super_user)
+      @user ||= (current_user ? User.find(current_user.id) : super_user)
     end
   end
 

data/app/helpers/blogs_helper.rb

@@ -0,0 +1,10 @@
+module BlogsHelper
+  def include_ckeditor
+    content_for :head do
+      javascript_include_tag('/ckeditor/ckeditor.js',
+        '/ckeditor/adapters/jquery.js',
+        "galleries/configure_ckeditor.js")
+    end
+  end
+end
+

data/app/helpers/pages_helper.rb

@@ -0,0 +1,11 @@
+module PagesHelper
+  def include_ckeditor
+    content_for :head do
+      javascript_include_tag('/ckeditor/ckeditor.js',
+        '/ckeditor/adapters/jquery.js',
+        "galleries/configure_ckeditor.js")
+    end
+  end
+
+end
+

data/app/models/ability.rb

@@ -1,23 +1,40 @@
 class Ability
   include CanCan::Ability
+  initializer :init_wheels
 
   def initialize(user)
+    initializers.each{|t| self.send(t, user)}
+  end
+
+  def init_wheels(user)
     can :read, :all
     return cannot :read, User unless user
+    roles = Role.all
     user ||= User.new
+    def roles.find_by_name(name); self.select{|t| t.name==name}[0]; end;
     case user.role_id
-      when Role::SUPER
+      when roles.find_by_name("Super")
         can :manage, :all
-      when Role::ADMIN
+      when roles.find_by_name("Admin")
         can :manage, :all
-      when Role::USER
+      when roles.find_by_name("User")
         can :manage, Gallery, :user_id => user.id
         can :manage, Blog, :user_id => user.id
         can :edit, Profile, :user_id => user.id
         cannot :read, User
     end
     can :read, :all
+  end
+
 
+  def self.initializer(*method_names)
+    method_names.each{|t| initializers << t}
   end
+
+  def initializers
+    @initializers ||= []
+  end
+
+
 end
 

data/app/models/blog.rb

@@ -1,6 +1,7 @@
 class Blog < ActiveRecord::Base
+  acts_as_taggable
   belongs_to :user
-  validates_presence_of :user_id
+  validates_presence_of :user_id, :title
   has_many :images
   cattr_reader :per_page
   @@per_page = 5

data/app/models/image.rb

@@ -1,8 +1,10 @@
 class Image < ActiveRecord::Base
   belongs_to :gallery
+  acts_as_taggable
   has_attached_file :image,
       :storage => :s3,
       :s3_credentials => "#{Rails.root}/config/amazon_s3.yml",
-      :path => "/:style/:filename"
+      :path => "/images/:style/:filename",
+      :styles => { :medium => "300x300>", :thumb => "100x100>" }
 end
 

data/app/models/page.rb

@@ -0,0 +1,5 @@
+class Page < ActiveRecord::Base
+  has_many :images
+
+end
+

data/app/models/page_revision.rb

@@ -0,0 +1,2 @@
+class PageRevision < ActiveRecord::Base
+end

data/app/models/profile.rb

@@ -1,4 +1,5 @@
 class Profile < ActiveRecord::Base
+  acts_as_tagger
   belongs_to :user
   validates_uniqueness_of :alias
   has_attached_file :image,

data/app/models/tagging.rb

@@ -0,0 +1,4 @@
+class ActsAsTaggableOn::Tagging
+
+end
+

data/app/models/user.rb

@@ -1,16 +1,6 @@
 class User < ActiveRecord::Base
   before_create :create_profile
   belongs_to :role
-
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :confirmable, :lockable and :timeoutable
-  devise :database_authenticatable, :registerable, :confirmable, :token_authenticatable,
-         :recoverable, :rememberable, :trackable, :validatable
-
-  def self.super_user
-    @@super_user ||= User.where(:role_id=>Role::SUPER).first
-  end
-
   has_many :blogs, :dependent => :destroy
   has_one :profile, :dependent => :destroy
   has_many :galleries, :dependent => :destroy
@@ -19,6 +9,16 @@ class User < ActiveRecord::Base
     self.profile ||= Profile.create(:user => self)
   end
 
+  def role?(role)
+    if role.kind_of?(Role)
+      return role==self.role
+    elsif role.is_numeric?
+      return self.role_id==role
+    else
+      return self.role.name.underscore==role.underscore
+    end
+  end
+
   def role=(role)
     if role.kind_of? Role
       self.role_id = role.id
@@ -37,8 +37,13 @@ class User < ActiveRecord::Base
     save
   end
 
+  # Include default devise modules. Others available are:
+  # :token_authenticatable, :confirmable, :lockable and :timeoutable
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :trackable, :validatable,
+         :token_authenticatable, :confirmable, :lockable, :timeoutable
+
   # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation,
-                  :blogs, :profile, :role, :galleries
+  attr_accessible :email, :password, :password_confirmation
 end
 

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

@@ -1,13 +1,4 @@
-= content_for(:head) do
-  = javascript_include_tag '/ckeditor/ckeditor.js'
-  = javascript_include_tag '/ckeditor/adapters/jquery.js'
-  :javascript
-    $(function(){
-      config = {
-        filebrowserBrowseUrl : '#{galleries_path}'
-      };
-      $('.ckeditor_textarea').ckeditor(config);
-    });
+- include_ckeditor
 
 = form_for [@blog.user, @blog], :html=>{:multipart=>true} do |f|
   -if @blog.errors.any?
@@ -20,6 +11,9 @@
   .field
     = f.label :title
     = f.text_field :title
+  .field
+    = f.label "tag_list"
+    .tag_list= f.text_area :tag_list
   .field
     = f.label :body
     = f.text_area :body, :class=>'ckeditor_textarea'

data/app/views/blogs/index.html.haml

@@ -17,3 +17,7 @@
 
 = will_paginate @blogs
 
+- content_for(:tags) do
+  - for tag in @tags
+    %li= link_to tag.name, user_blogs_path(@user, :tag=>tag.name)
+

data/app/views/blogs/show.html.haml

@@ -1,9 +1,8 @@
-%p
-  %b Title:
-  = @blog.title
+%h1= @blog.title
+.tag_list!= tag_list @blog
 %p
   %b Body:
-  = raw @blog.body
+  != raw @blog.body
 = link_to 'Edit', edit_resource_url
 \|
 = link_to 'Back', collection_url

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

@@ -24,6 +24,7 @@
   = form_for [@gallery, Image.new(:gallery=>@gallery)], :html=>{:id=>'upload', :multipart=>true} do |f|
     - params.slice(:CKEditor, :CKEditorFuncNum, :langCode).each do |key, val|
       = hidden_field_tag key, val
-    = f.file_field :image
-    = f.submit :disable_with=>"Uploading..."
+    .upload_field= f.file_field :image
+    .tag_field= f.text_field :tag_list
+    = f.submit "Upload Image", :disable_with=>"Uploading..."
 

data/app/views/galleries/_show.html.haml

@@ -11,9 +11,9 @@
 
 %h1= gallery.name.empty? ? "Name your gallery" : gallery.name
 - if can? :update, gallery
-  = link_to 'Edit', edit_gallery_path(gallery)
+  = link_to 'Edit', edit_gallery_path(gallery, ckeditor_params)
 - if can? :manage, gallery
-  = link_to 'Destroy', gallery, "data-confirm"=>"You'll shoot your eye out!", :method=>"delete"
+  = link_to 'Destroy', gallery_path(gallery, ckeditor_params), "data-confirm"=>"You'll shoot your eye out!", :method=>"delete"
 %ul#image_gallery
   - images.each do |image|
     %li

data/app/views/galleries/show.html.haml

@@ -1,4 +1,4 @@
-= render :partial => "show", :locals=>{:images=>images, :gallery=>@gallery}
+= render :partial => "show", :locals=>{:images=>@images, :gallery=>@gallery}
 
-= will_paginate images
+= will_paginate @images
 

data/app/views/layouts/application.html.haml

@@ -0,0 +1,48 @@
+!!! 5
+%html
+  %head
+    %title Your Awesome Web Site
+    = csrf_meta_tag
+    /[if lt IE 9]
+      = javascript_include_tag 'html5'
+    = javascript_include_tag :defaults, "loadbehind.js", "jquery.growl.js"
+    = stylesheet_link_tag 'menu.css','dreamy'
+    = yield(:head)
+
+    :javascript
+      function setTitle(title){
+        $('title').html(title);
+      }
+  %body
+    #wrapper
+      #header
+        %h1 Artful Dodgin
+      #menu
+        %ul
+          %li
+            %a{:href => "/profile"} Profile
+          %li
+            %a{:href => "/blog"} Blog
+          %li
+            %a{:href => "/galleries"} Galleries
+      #sidebar
+        #feed
+          %a.feed-button{:href=>'/blog.xml'}
+        %ul
+          = yield(:tags)
+        #sidebar-bottom
+          \ 
+      #content
+        = yield
+      #footer
+        #footer-valid
+          %a{:href => "http://validator.w3.org/check/referer"} xhtml
+          |
+          %a{:href => "http://www.ginger-ninja.net/"} ginger ninja!
+          - if user_signed_in?
+            Hi #{link_to current_user.profile.alias, user_profile_path(current_user)}#{link_to('Logout', destroy_user_session_path)}
+          - else
+            = link_to('Log in', new_user_session_path)
+          #copyright
+            Copyright © 2010 #{link_to "Apycom jQuery Menus", "http://apycom.com/"}
+

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

@@ -0,0 +1,19 @@
+- include_ckeditor
+
+= form_for @page do |f|
+  -if @page.errors.any?
+    #errorExplanation
+      %h2= "#{pluralize(@page.errors.count, "error")} prohibited this page from being saved:"
+      %ul
+        - @page.errors.full_messages.each do |msg|
+          %li= msg
+
+  .field
+    = f.label :title
+    = f.text_field :title
+  .field
+    = f.label :body
+    = f.text_area :body, :class=>'ckeditor_textarea'
+  .actions
+    = f.submit 'Save'
+

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

@@ -0,0 +1,7 @@
+%h1 Editing page
+
+= render 'form'
+
+= link_to 'Show', @page
+\|
+= link_to 'Back', pages_path

data/app/views/pages/index.html.haml

@@ -0,0 +1,21 @@
+%h1 Listing pages
+
+%table
+  %tr
+    %th Title
+    %th Body
+    %th
+    %th
+    %th
+
+  - @pages.each do |page|
+    %tr
+      %td= page.title
+      %td= page.body
+      %td= link_to 'Show', page
+      %td= link_to 'Edit', edit_page_path(page)
+      %td= link_to 'Destroy', page, :confirm => 'Are you sure?', :method => :delete
+
+%br
+
+= link_to 'New page', new_page_path

data/app/views/pages/new.html.haml

@@ -0,0 +1,5 @@
+%h1 New page
+
+= render 'form'
+
+= link_to 'Back', pages_path

data/app/views/pages/show.html.haml

@@ -0,0 +1,6 @@
+%h1= @page.title
+.page_content!= @page.body
+
+- if can? :edit, @page
+  = link_to 'Edit', edit_page_path(@page)
+

data/db/migrate/create_blogs.rb

@@ -1,4 +1,4 @@
-class AddFieldsToBlogs < ActiveRecord::Migration
+class CreateBlogs < ActiveRecord::Migration
   def self.up
     create_table :blogs do |t|
       t.integer :user_id

data/db/migrate/create_roles.rb

@@ -4,9 +4,6 @@ class CreateRoles < ActiveRecord::Migration
       t.string :name
       t.timestamps
     end
-    Role.create(:name=>'Super')
-    Role.create(:name=>'Admin')
-    Role.create(:name=>'User')
   end
 
   def self.down

data/db/migrate/insert_admin_user_and_roles.rb

@@ -7,13 +7,13 @@ class InsertAdminUserAndRoles < ActiveRecord::Migration
                 :password=>"<%= user_password %>",
                 :confirmed_at=>DateTime::now,
                 :role=>:super)
-    user.profile.attributes = {
+    Profile.create(
       :first_name => "<%= user_first_name %>",
       :last_name => "<%= user_last_name %>",
       :blog_title => "<%= user_blog_title %>",
-      :alias => "<%= user_alias %>"
-    }
-    user.profile.save
+      :alias => "<%= user_alias %>",
+      :user => user
+      )
   end
 
   def self.down

data/lib/generators/app_layout/LICENCE

@@ -0,0 +1,20 @@
+Copyright (c) 2010 Kevin Faustino
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/generators/app_layout/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Explain the generator
+
+Example:
+    rails generate app_template Thing
+
+    This will create:
+        what/will/it/create

data/lib/generators/app_layout/app_layout_generator.rb

@@ -0,0 +1,18 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+require 'rails/generators/generated_attribute'
+require 'rails/generators/active_record'
+
+
+class AppLayoutGenerator < Rails::Generators::Base
+  include Rails::Generators::Migration
+  source_root File.expand_path('../../../../', __FILE__)
+  require File.join(File.dirname(__FILE__), 'core_extensions.rb')
+  desc "Installs files needed for App Template gem."
+
+  def copy_files
+    template a= 'app/views/layouts/application.html.haml',
+                a
+  end
+end
+

data/lib/generators/app_layout/core_extensions.rb

@@ -0,0 +1,51 @@
+module Rails
+  module Generators
+    module Actions
+
+      attr_accessor :stategies
+      attr_accessor :recipes
+      attr_reader :template_options
+
+      def initialize_templater
+        self.recipes = []
+        @stategies = []
+        @template_options = {}
+      end
+
+      def execute_stategies
+        stategies.each {|stategy| stategy.call }
+      end
+
+      def recipe(name)
+        recipes << name
+        File.join File.dirname(__FILE__), 'recipes', "#{name}.rb"
+      end
+
+      # TODO: Refactor loading of files
+
+      def load_snippet(name, group)
+        path = File.expand_path name, snippet_path(group)
+        File.read path
+      end
+
+      def load_template(name, group, match={})
+        path = File.expand_path name, template_path(group)
+        contents = File.read path
+        match.each do |key, value|
+          contents.gsub! "\%#{key.to_s}\%", value
+        end
+        contents
+      end
+
+      def snippet_path(name)
+        File.join(File.dirname(__FILE__), 'snippets', name)
+      end
+
+      def template_path(name)
+        File.join(File.dirname(__FILE__), 'templates', name)
+      end
+
+    end
+  end
+end
+

data/lib/generators/update_wheels/LICENCE

@@ -0,0 +1,20 @@
+Copyright (c) 2010 Kevin Faustino
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/generators/update_wheels/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Explain the generator
+
+Example:
+    rails generate app_template Thing
+
+    This will create:
+        what/will/it/create

data/lib/generators/update_wheels/core_extensions.rb

@@ -0,0 +1,51 @@
+module Rails
+  module Generators
+    module Actions
+
+      attr_accessor :stategies
+      attr_accessor :recipes
+      attr_reader :template_options
+
+      def initialize_templater
+        self.recipes = []
+        @stategies = []
+        @template_options = {}
+      end
+
+      def execute_stategies
+        stategies.each {|stategy| stategy.call }
+      end
+
+      def recipe(name)
+        recipes << name
+        File.join File.dirname(__FILE__), 'recipes', "#{name}.rb"
+      end
+
+      # TODO: Refactor loading of files
+
+      def load_snippet(name, group)
+        path = File.expand_path name, snippet_path(group)
+        File.read path
+      end
+
+      def load_template(name, group, match={})
+        path = File.expand_path name, template_path(group)
+        contents = File.read path
+        match.each do |key, value|
+          contents.gsub! "\%#{key.to_s}\%", value
+        end
+        contents
+      end
+
+      def snippet_path(name)
+        File.join(File.dirname(__FILE__), 'snippets', name)
+      end
+
+      def template_path(name)
+        File.join(File.dirname(__FILE__), 'templates', name)
+      end
+
+    end
+  end
+end
+