wheels 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/generators/wheels/wheels_generator.rb

@@ -6,7 +6,7 @@ require 'rails/generators/active_record'
 class WheelsGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
   require File.join(File.dirname(__FILE__), 'core_extensions.rb')
-  source_root File.expand_path('../../../../', __FILE__)
+  source_root File.expand_path('../templates/wheels/', __FILE__)
   desc "Installs files needed for App Template gem."
 
 #      argument :scope, :required => false, :default => nil,

data/wheels.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wheels}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Gannon"]
@@ -23,57 +23,6 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
-     "app/controllers/application_controller.rb",
-     "app/controllers/blogs_controller.rb",
-     "app/controllers/galleries_controller.rb",
-     "app/controllers/images_controller.rb",
-     "app/controllers/profiles_controller.rb",
-     "app/controllers/users_controller.rb",
-     "app/models/ability.rb",
-     "app/models/blog.rb",
-     "app/models/gallery.rb",
-     "app/models/image.rb",
-     "app/models/profile.rb",
-     "app/models/role.rb",
-     "app/models/user.rb",
-     "app/views/blogs/_form.html.haml",
-     "app/views/blogs/edit.html.haml",
-     "app/views/blogs/index.html.haml",
-     "app/views/blogs/index.xml.builder",
-     "app/views/blogs/new.html.haml",
-     "app/views/blogs/show.html.haml",
-     "app/views/galleries/_form.html.haml",
-     "app/views/galleries/_show.html.haml",
-     "app/views/galleries/edit.html.haml",
-     "app/views/galleries/index.html.haml",
-     "app/views/galleries/new.html.haml",
-     "app/views/galleries/show.html.haml",
-     "app/views/images/_form.html.haml",
-     "app/views/images/create.js.haml",
-     "app/views/images/destroy.js.haml",
-     "app/views/images/edit.html.haml",
-     "app/views/images/edit.js.haml",
-     "app/views/images/index.html.haml",
-     "app/views/images/index.js.haml",
-     "app/views/images/new.html.haml",
-     "app/views/images/new.js.haml",
-     "app/views/images/show.html.haml",
-     "app/views/images/show.js.haml",
-     "app/views/images/update.js.haml",
-     "app/views/layouts/image_dialog.html.haml",
-     "app/views/profiles/_form.html.haml",
-     "app/views/profiles/edit.html.haml",
-     "app/views/profiles/index.html.haml",
-     "app/views/profiles/new.html.haml",
-     "app/views/profiles/show.html.haml",
-     "app/views/users/index.html.haml",
-     "config/amazon_s3.yml",
-     "db/migrate/add_fields_to_users.rb",
-     "db/migrate/create_blogs.rb",
-     "db/migrate/create_galleries.rb",
-     "db/migrate/create_images.rb",
-     "db/migrate/create_profiles.rb",
-     "db/migrate/create_roles.rb",
      "init.rb",
      "lib/generators/wheels/LICENCE",
      "lib/generators/wheels/USAGE",
@@ -103,57 +52,6 @@ Gem::Specification.new do |s|
      "lib/generators/wheels/wheels_generator.rb",
      "lib/wheels.rb",
      "lib/wheels/routes.rb",
-     "public/404.html",
-     "public/422.html",
-     "public/500.html",
-     "public/favicon.ico",
-     "public/images/dreamy/Thumbs.db",
-     "public/images/dreamy/bg-ad-top.png",
-     "public/images/dreamy/bg-body.png",
-     "public/images/dreamy/bg-feed.gif",
-     "public/images/dreamy/bg-footer.jpg",
-     "public/images/dreamy/bg-header.jpg",
-     "public/images/dreamy/bg-menu-hover.png",
-     "public/images/dreamy/bg-menu.png",
-     "public/images/dreamy/bg-sidebar-bottom.gif",
-     "public/images/dreamy/button-feed.png",
-     "public/images/dreamy/icon-comment.png",
-     "public/images/growl/error.png",
-     "public/images/growl/growl_bottom.png",
-     "public/images/growl/growl_repeat.png",
-     "public/images/growl/growl_top.png",
-     "public/images/growl/info.png",
-     "public/images/menu/item-pointer-mover.gif",
-     "public/images/menu/item-pointer.gif",
-     "public/images/menu/lava.gif",
-     "public/images/menu/lava.png",
-     "public/images/menu/main-bg.png",
-     "public/images/menu/main-delimiter.png",
-     "public/javascripts/jquery.growl.js",
-     "public/javascripts/loadbehind.js",
-     "public/javascripts/menu.js",
-     "public/stylesheets/.gitkeep",
-     "public/stylesheets/dreamy.css",
-     "public/stylesheets/menu.css",
-     "public/stylesheets/sass/dreamy.sass",
-     "public/stylesheets/sass/menu.sass",
-     "public/stylesheets/scaffold.css",
-     "public/stylesheets/ui-lightness/images/ui-anim_basic_16x16.gif",
-     "public/stylesheets/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png",
-     "public/stylesheets/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png",
-     "public/stylesheets/ui-lightness/images/ui-bg_flat_10_000000_40x100.png",
-     "public/stylesheets/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png",
-     "public/stylesheets/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png",
-     "public/stylesheets/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png",
-     "public/stylesheets/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png",
-     "public/stylesheets/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png",
-     "public/stylesheets/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png",
-     "public/stylesheets/ui-lightness/images/ui-icons_222222_256x240.png",
-     "public/stylesheets/ui-lightness/images/ui-icons_228ef1_256x240.png",
-     "public/stylesheets/ui-lightness/images/ui-icons_ef8c08_256x240.png",
-     "public/stylesheets/ui-lightness/images/ui-icons_ffd27a_256x240.png",
-     "public/stylesheets/ui-lightness/images/ui-icons_ffffff_256x240.png",
-     "public/stylesheets/ui-lightness/jquery-ui-1.8.2.custom.css",
      "send_new_version",
      "test/helper.rb",
      "test/test_wheels.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wheels
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Tyler Gannon
@@ -48,57 +48,6 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- app/controllers/application_controller.rb
-- app/controllers/blogs_controller.rb
-- app/controllers/galleries_controller.rb
-- app/controllers/images_controller.rb
-- app/controllers/profiles_controller.rb
-- app/controllers/users_controller.rb
-- app/models/ability.rb
-- app/models/blog.rb
-- app/models/gallery.rb
-- app/models/image.rb
-- app/models/profile.rb
-- app/models/role.rb
-- app/models/user.rb
-- app/views/blogs/_form.html.haml
-- app/views/blogs/edit.html.haml
-- app/views/blogs/index.html.haml
-- app/views/blogs/index.xml.builder
-- app/views/blogs/new.html.haml
-- app/views/blogs/show.html.haml
-- app/views/galleries/_form.html.haml
-- app/views/galleries/_show.html.haml
-- app/views/galleries/edit.html.haml
-- app/views/galleries/index.html.haml
-- app/views/galleries/new.html.haml
-- app/views/galleries/show.html.haml
-- app/views/images/_form.html.haml
-- app/views/images/create.js.haml
-- app/views/images/destroy.js.haml
-- app/views/images/edit.html.haml
-- app/views/images/edit.js.haml
-- app/views/images/index.html.haml
-- app/views/images/index.js.haml
-- app/views/images/new.html.haml
-- app/views/images/new.js.haml
-- app/views/images/show.html.haml
-- app/views/images/show.js.haml
-- app/views/images/update.js.haml
-- app/views/layouts/image_dialog.html.haml
-- app/views/profiles/_form.html.haml
-- app/views/profiles/edit.html.haml
-- app/views/profiles/index.html.haml
-- app/views/profiles/new.html.haml
-- app/views/profiles/show.html.haml
-- app/views/users/index.html.haml
-- config/amazon_s3.yml
-- db/migrate/add_fields_to_users.rb
-- db/migrate/create_blogs.rb
-- db/migrate/create_galleries.rb
-- db/migrate/create_images.rb
-- db/migrate/create_profiles.rb
-- db/migrate/create_roles.rb
 - init.rb
 - lib/generators/wheels/LICENCE
 - lib/generators/wheels/USAGE
@@ -128,57 +77,6 @@ files:
 - lib/generators/wheels/wheels_generator.rb
 - lib/wheels.rb
 - lib/wheels/routes.rb
-- public/404.html
-- public/422.html
-- public/500.html
-- public/favicon.ico
-- public/images/dreamy/Thumbs.db
-- public/images/dreamy/bg-ad-top.png
-- public/images/dreamy/bg-body.png
-- public/images/dreamy/bg-feed.gif
-- public/images/dreamy/bg-footer.jpg
-- public/images/dreamy/bg-header.jpg
-- public/images/dreamy/bg-menu-hover.png
-- public/images/dreamy/bg-menu.png
-- public/images/dreamy/bg-sidebar-bottom.gif
-- public/images/dreamy/button-feed.png
-- public/images/dreamy/icon-comment.png
-- public/images/growl/error.png
-- public/images/growl/growl_bottom.png
-- public/images/growl/growl_repeat.png
-- public/images/growl/growl_top.png
-- public/images/growl/info.png
-- public/images/menu/item-pointer-mover.gif
-- public/images/menu/item-pointer.gif
-- public/images/menu/lava.gif
-- public/images/menu/lava.png
-- public/images/menu/main-bg.png
-- public/images/menu/main-delimiter.png
-- public/javascripts/jquery.growl.js
-- public/javascripts/loadbehind.js
-- public/javascripts/menu.js
-- public/stylesheets/.gitkeep
-- public/stylesheets/dreamy.css
-- public/stylesheets/menu.css
-- public/stylesheets/sass/dreamy.sass
-- public/stylesheets/sass/menu.sass
-- public/stylesheets/scaffold.css
-- public/stylesheets/ui-lightness/images/ui-anim_basic_16x16.gif
-- public/stylesheets/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
-- public/stylesheets/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
-- public/stylesheets/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
-- public/stylesheets/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
-- public/stylesheets/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
-- public/stylesheets/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
-- public/stylesheets/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
-- public/stylesheets/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
-- public/stylesheets/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
-- public/stylesheets/ui-lightness/images/ui-icons_222222_256x240.png
-- public/stylesheets/ui-lightness/images/ui-icons_228ef1_256x240.png
-- public/stylesheets/ui-lightness/images/ui-icons_ef8c08_256x240.png
-- public/stylesheets/ui-lightness/images/ui-icons_ffd27a_256x240.png
-- public/stylesheets/ui-lightness/images/ui-icons_ffffff_256x240.png
-- public/stylesheets/ui-lightness/jquery-ui-1.8.2.custom.css
 - send_new_version
 - test/helper.rb
 - test/test_wheels.rb

data/app/controllers/application_controller.rb

@@ -1,17 +0,0 @@
-class ApplicationController < ActionController::Base
-
-  def self.authorized
-    class_eval do
-      def resource
-        authorize_this
-        super
-      end
-    end
-  end
-
-  def authorize_this
-    authorize! resource, params[:action] unless @authorized
-    @authorized = true
-  end
-end
-

data/app/controllers/blogs_controller.rb

@@ -1,17 +0,0 @@
-class BlogsController < InheritedResources::Base
-  respond_to :html, :xml
-  belongs_to :user, :optional=>true
-  before_filter :load_current_user
-
-  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
-  end
-end
-

data/app/controllers/galleries_controller.rb

@@ -1,60 +0,0 @@
-class GalleriesController < InheritedResources::Base
-  belongs_to :user, :optional=>true
-  before_filter :load_user
-
-  def index
-    index! do |format|
-      if params[:CKEditorFuncNum]
-        format.html{
-          render :action=>:index, :layout=>"image_dialog"
-        }
-      end
-    end
-  end
-
-  def edit
-    edit! do |format|
-      if params[:CKEditorFuncNum]
-        format.html{
-          render :action=>:edit, :layout=>"image_dialog"
-        }
-      end
-    end
-  end
-
-  def show
-    show! do |format|
-      images = paginated_images_for(@gallery)
-      if params[:CKEditorFuncNum]
-        format.html{
-          render :action=>:show, :layout=>"image_dialog", :locals=>{:images=>images}
-        }
-      end
-    end
-  end
-
-  def new
-    @gallery = Gallery.create(:user=>@user)
-    new!
-  end
-
-  def create
-    create! {images_path(params.slice(:CKEditor, :CKEditorFuncNum, :langCode))}
-  end
-
-  def load_user
-    unless params[:user_id]
-      @user ||= (current_user ? User.find(current_user.id) : User.super_user)
-    end
-  end
-  helper_method :ckeditor_params, :paginated_images_for
-
-  def paginated_images_for(gallery)
-    @images ||= Image.where(:gallery_id=>gallery.id).paginate(:page => params[:page], :order => 'created_at DESC' )
-  end
-
-  def ckeditor_params
-    params.slice(:CKEditor, :CKEditorFuncNum, :langCode)
-  end
-end
-

data/app/controllers/images_controller.rb

@@ -1,30 +0,0 @@
-class ImagesController < InheritedResources::Base
-  respond_to :html, :js, :xml
-  belongs_to :gallery
-
-  def index
-    index! do |format|
-      if params[:CKEditorFuncNum]
-        format.html {render :action=>:index, :layout=>"image_dialog"}
-      end
-    end
-  end
-
-  def create
-    create! {edit_gallery_path(@gallery, params.slice(:CKEditor, :CKEditorFuncNum, :langCode))}
-  end
-
-  def show
-    show!  do |format|
-      if params[:CKEditorFuncNum]
-        format.html {render :layout=>"image_dialog"}
-      end
-    end
-  end
-
-  def collection
-    @images ||= end_of_association_chain.
-      paginate(:page => params[:page], :order => 'created_at DESC' )
-  end
-end
-

data/app/controllers/profiles_controller.rb

@@ -1,16 +0,0 @@
-class ProfilesController < InheritedResources::Base
-  respond_to :html
-  before_filter :load_current_user
-  belongs_to :user, :optional => true, :singleton=>true
-
-  def load_current_user
-    unless params[:user_id]
-      @user ||= (current_user ? User.find(current_user.id) : User.super_user)
-    end
-  end
-
-  def resource
-    @profile ||= Profile.find_by_user_id(@user.id)
-  end
-end
-

data/app/controllers/users_controller.rb

@@ -1,4 +0,0 @@
-class UsersController < InheritedResources::Base
-
-end
-

data/app/models/ability.rb

@@ -1,23 +0,0 @@
-class Ability
-  include CanCan::Ability
-
-  def initialize(user)
-    can :read, :all
-    return cannot :read, User unless user
-    user ||= User.new
-    case user.role_id
-      when Role::SUPER
-        can :manage, :all
-      when Role::ADMIN
-        can :manage, :all
-      when Role::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
-end
-

data/app/models/blog.rb

@@ -1,8 +0,0 @@
-class Blog < ActiveRecord::Base
-  belongs_to :user
-  validates_presence_of :user_id
-  has_many :images
-  cattr_reader :per_page
-  @@per_page = 5
-end
-

data/app/models/gallery.rb

@@ -1,5 +0,0 @@
-class Gallery < ActiveRecord::Base
-  belongs_to :user
-  has_many :images, :dependent=>:destroy
-end
-

data/app/models/image.rb

@@ -1,8 +0,0 @@
-class Image < ActiveRecord::Base
-  belongs_to :gallery
-  has_attached_file :image,
-      :storage => :s3,
-      :s3_credentials => "#{Rails.root}/config/amazon_s3.yml",
-      :path => "/:style/:filename"
-end
-

data/app/models/profile.rb

@@ -1,11 +0,0 @@
-class Profile < ActiveRecord::Base
-  belongs_to :user
-  validates_uniqueness_of :alias
-  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/role.rb

@@ -1,8 +0,0 @@
-class Role < ActiveRecord::Base
-  has_many :users
-
-  SUPER = 1
-  ADMIN = 2
-  USER = 3
-end
-

data/app/models/user.rb

@@ -1,43 +0,0 @@
-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
-
-  def create_profile
-    self.profile ||= Profile.create(:user => self)
-  end
-
-  def role=(role)
-    if role.kind_of? Role
-      self.role_id = role.id
-    else
-      if role.is_numeric?
-        self.role_id= role
-      else
-        self.role_id= Role.find_by_name(role).id
-      end
-    end
-  end
-
-  def confirm!
-    self.confirmed_at = DateTime::now
-    save
-  end
-
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation,
-                  :blogs, :profile, :role, :galleries
-end
-

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

@@ -1,28 +0,0 @@
-= 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);
-    });
-
-= form_for [@blog.user, @blog], :html=>{:multipart=>true} do |f|
-  -if @blog.errors.any?
-    #errorExplanation
-      %h2= "#{pluralize(@blog.errors.count, "error")} prohibited this blog from being saved:"
-      %ul
-        - @blog.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/blogs/edit.html.haml

@@ -1,8 +0,0 @@
-%h1 Editing blog
-
-= render 'form'
-
-= link_to 'Show', resource_url
-\|
-= link_to 'Back', collection_url
-

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

@@ -1,19 +0,0 @@
-%h1 Someone's Blog
-
-- @blogs.each do |blog|
-  #ad-top
-    / Insert 468x60 banner advertisement
-  .entry
-    .entry-title= link_to blog.title, resource_url(blog)
-
-    .date Posted on #{blog.created_at}
-    .blog_body!= blog.body
-    .comments
-      %a{:href => "#"} 3 comments
-
-
-- if current_user.try(:id) == @user.id
-  = link_to 'New Blog Post', new_user_blog_path(@user)
-
-= will_paginate @blogs
-

data/app/views/blogs/index.xml.builder

@@ -1,27 +0,0 @@
-xml.instruct!
-
-xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
-
-  xml.title   "Feed Name"
-  xml.link    "rel" => "self", "href" => user_blogs_path(@user, :only_path=>false, :format=>:xml)
-  # xml.link    "rel" => "alternate", "href" => url_for(:only_path => false, :controller => 'posts')
-  xml.id      user_blogs_path(@user, :only_path => false)
-  xml.updated @blogs.first.updated_at.strftime "%Y-%m-%dT%H:%M:%SZ" if @blogs.any?
-  xml.author  { xml.name @blogs.first }
-
-  @blogs.each do |post|
-    xml.entry do
-      xml.title   post.title
-      xml.link    "rel" => "alternate", "href" => user_blogs_path(@user, post, :only_path => false)
-      xml.id      user_blog_path(@user, post, :only_path => false)
-      xml.updated post.updated_at.strftime "%Y-%m-%dT%H:%M:%SZ"
-      xml.author  { xml.name post.user.email }
-      xml.summary "Post summary"
-      xml.content "type" => "html" do
-        xml.cdata! post.body
-      end
-    end
-  end
-
-end
-

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

@@ -1,6 +0,0 @@
-%h1 New blog
-
-= render 'form'
-
-= link_to 'Back', collection_url
-

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

@@ -1,10 +0,0 @@
-%p
-  %b Title:
-  = @blog.title
-%p
-  %b Body:
-  = raw @blog.body
-= link_to 'Edit', edit_resource_url
-\|
-= link_to 'Back', collection_url
-

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

@@ -1,29 +0,0 @@
-:css
-  #image_gallery li {
-    display: inline;
-    list-style: none;
-    width: 300px;
-    min-height: 300px;
-    float: left;
-    margin: 0 10px 10px 0;
-    text-align: center;
-  }
-= form_for @gallery do |f|
-  %h2 Gallery Name:
-  = f.text_field :name
-  = f.submit "Save Gallery"
-
-%ul#image_gallery
-  - paginated_images_for(@gallery).each do |image|
-    %li
-      = image_tag image.image.url(:medium)
-
-= will_paginate paginated_images_for(@gallery)
-
-#upload_form
-  = 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..."
-