wheels 0.1.28 → 0.1.30

data/VERSION

@@ -1 +1 @@
-0.1.28
+0.1.30

data/app/controllers/pages_controller.rb

@@ -3,6 +3,7 @@ class PagesController < InheritedResources::Base
   ajax_loading
   before_filter :authenticate_user!, :except=>[:show]
   before_filter :authorize_resource!, :except=>[:index, :show]
+  helper_method :resource
 
   has_scope :tagged_with, :as => :tag
 

data/app/models/attachment.rb

@@ -5,6 +5,6 @@ class Attachment < ActiveRecord::Base
   has_attached_file :file,
       :storage => :s3,
       :s3_credentials => "#{Rails.root}/config/amazon_s3.yml",
-      :path => "/attachments/:filename"
+      :path => "/users/:file_owner_id/pages/:file_page_id/attachments/:filename"
 end
 

data/app/models/image.rb

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

data/app/models/page.rb

@@ -1,7 +1,7 @@
 class Page < ActiveRecord::Base
   has_many :attachments
   has_many :sitemaps, :as=>:resource
-  has_many :access_control_entries, :as=>:resource, :dependent=>:destroy
+  has_many :access_control_entries, :as=>:resource
   alias_attribute :name, :title
   acts_as_taggable
 end

data/app/models/sitemap.rb

@@ -5,7 +5,7 @@ class Sitemap < ActiveRecord::Base
   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, :dependent=>:destroy
+  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;

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

@@ -6,6 +6,6 @@
     .fieldValue= f.text_field :name
   .field
     .fieldName Value:
-    .fieldValue.text_area= f.text_area :value, :id=>'config_value'
+    .fieldValue.text_area= f.text_area :value
   .field= f.submit "Save", :disable_with=>"Saving..."
 

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

@@ -1,3 +1,3 @@
-%h2= resource.name + ":"
-%pre.fieldValue!= resource.value
+%h2= @app_config.name + ":"
+%pre.fieldValue!= @app_config.value
 

data/app/views/app_configs/edit.js.haml

@@ -1,16 +1,3 @@
 $('##{container}').#{ajax_function}(#{raw render_js('form')});
 = render :partial => "loadbehind/edit"
 
-editAreaLoader.init({
-id: "config_value"	// id of the textarea to transform
-,start_highlight: true
-,allow_toggle: false
-,language: "en"
-,syntax: "html"
-,toolbar: "search, go_to_line, |, undo, redo, |, select_font, |, syntax_selection, |, change_smooth_selection, highlight, reset_highlight, |, help"
-,syntax_selection_allow: "css,html,js,ruby"
-,is_multi_files: false
-,EA_load_callback: "editAreaLoaded"
-,show_line_colors: true
-});
-

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

@@ -1,8 +1,8 @@
--if resource.errors.any?
+-if @attachment.errors.any?
   #errorExplanation
-    %h2= "#{pluralize(resource.errors.count, "error")} prohibited this image from being saved:"
+    %h2= "#{pluralize(@attachment.errors.count, "error")} prohibited this image from being saved:"
     %ul
-      - resource.errors.full_messages.each do |msg|
+      - @attachment.errors.full_messages.each do |msg|
         %li= msg
 
 = form_for [@page, Attachment.new(:page=>@page)], :remote=>true, :html=>{:multipart=>true, :id=>"upload_form"} do |f|

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

@@ -1,10 +1,10 @@
 
 .entry
-  .entry-title= link_to resource.title, resource_url(resource)
+  .entry-title= link_to @blog.title, resource_url(@blog)
 
-  .date Posted on #{resource.created_at}
-  .blog_body!= resource.body
-  .tags!= tag_list resource
+  .date Posted on #{@blog.created_at}
+  .blog_body!= @blog.body
+  .tags!= tag_list @blog
 
   .comments
     %a{:href => "#"} 3 comments

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

@@ -13,7 +13,6 @@
     %li= link_to 'Files', '#field-attachments'
     %li= link_to 'Stylesheet', '#field-stylesheet'
   = form_for resource, :remote=>true do |f|
-    = f.submit 'Save Changes', :disable_with=>'Please wait...'
     #field-body
       .field
         = f.label :title

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

@@ -1,4 +1,4 @@
-- if resource.show_title
-  %h1= resource.title
-.page_content!= resource.body
+- if @page.show_title
+  %h1= @page.title
+.page_content!= @page.body
 

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

@@ -1,4 +1,4 @@
-= form_for resource, :html=>{:id=>"sitemap_form"} do |f|
+= form_for @sitemap, :html=>{:id=>"sitemap_form"} do |f|
   = f.hidden_field :resource_type
   = f.hidden_field :resource_id
   = f.label :menu_text

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

@@ -1,12 +1,12 @@
 %h1 Change Password
 
 .form
-  = form_for resource do |f|
-    -if resource.errors.any?
+  = form_for @user do |f|
+    -if @user.errors.any?
       #errorExplanation
-        %h2= "#{pluralize(resource.errors.count, "error")} prohibited this change:"
+        %h2= "#{pluralize(@user.errors.count, "error")} prohibited this change:"
         %ul
-          - resource.errors.full_messages.each do |msg|
+          - @user.errors.full_messages.each do |msg|
             %li= msg
     .field
       .fieldName= label_tag "Please enter your old password for verification."

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

@@ -1,12 +1,12 @@
 %h1 Update your personal info:
 
 .form
-  = form_for resource do |f|
-    - if resource.errors.any?
+  = form_for @user do |f|
+    - if @user.errors.any?
       #errorExplanation
-        %h2= "#{pluralize(resource.errors.count, "error")} prohibited this change:"
+        %h2= "#{pluralize(@user.errors.count, "error")} prohibited this change:"
         %ul
-          - resource.errors.full_messages.each do |msg|
+          - @user.errors.full_messages.each do |msg|
             %li= msg
     .fieldGroup
       = f.fields_for :profile do |pf|

data/lib/wheels/paperclip_interpolations.rb

@@ -1,8 +1,18 @@
-Paperclip.interpolates :user_email do |attachment, style|
-  attachment.instance.gallery.user.email
+
+Paperclip.interpolates :image_owner_id do |attachment, style|
+  attachment.instance.gallery.user_id.to_s
+end
+
+Paperclip.interpolates :image_gallery_id do |attachment, style|
+  attachment.instance.gallery.id.to_s
 end
 
-Paperclip.interpolates :page_id do |attachment, style|
-  "page_#{attachment.instance.page_id}"
+Paperclip.interpolates :file_page_id do |attachment, style|
+  attachment.instance.page_id.to_s
 end
 
+Paperclip.interpolates :file_owner_id do |attachment, style|
+  attachment.instance.page.user_id.to_s
+end
+
+

data/wheels.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wheels}
-  s.version = "0.1.28"
+  s.version = "0.1.30"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Gannon"]
-  s.date = %q{2010-11-01}
+  s.date = %q{2010-11-04}
   s.description = %q{Call rails generate wheels.}
   s.email = %q{tgannon@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 28
-  version: 0.1.28
+  - 30
+  version: 0.1.30
 platform: ruby
 authors: 
 - Tyler Gannon
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 -07:00
+date: 2010-11-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency