wheels 0.0.39 → 0.0.40

data/VERSION

@@ -1 +1 @@
-0.0.39
+0.0.40

data/app/controllers/blogs_controller.rb

@@ -12,12 +12,16 @@ class BlogsController < InheritedResources::Base
     end
   end
 
+  def parent
+    @user ||= User.find(params[:user_id])
+  end
+
   def tags
-    @tags ||= Blog.where(:user_id=>@user.id).tag_counts.sort{|t, u| t.count <=> u.count}
+    @tags ||= Blog.where(:user_id=>parent.id).tag_counts.sort{|t, u| t.count <=> u.count}
   end
 
   def collection
-    @blogs ||= Blog.where(:user_id=>@user.id).
+    @blogs ||= Blog.where(:user_id=>parent.id).
       paginate(:page => params[:page], :order => 'created_at DESC' )
   end
 

data/app/models/blog.rb

@@ -2,6 +2,8 @@ class Blog < ActiveRecord::Base
   acts_as_taggable
   belongs_to :user
   validates_presence_of :user_id, :title
+  acts_as_linkable :parent=>:user, :name=>:title
+
   has_many :images
   cattr_reader :per_page
   @@per_page = 5

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

@@ -1,9 +1,25 @@
-%h1= @blog.title
-.tag_list!= tag_list @blog
-%p
-  %b Body:
-  != raw @blog.body
-= link_to 'Edit', edit_resource_url
-\|
+
+.entry
+  .entry-title= link_to resource.title, resource_url(resource)
+
+  .date Posted on #{resource.created_at}
+  .blog_body!= resource.body
+  .tags!= tag_list resource
+
+  .comments
+    %a{:href => "#"} 3 comments
+
+
+
+= will_paginate collection
+
+- content_for(:tags) do
+  - for tag in tags
+    %li= link_to tag.name, user_blogs_path(parent, :tag=>tag.name)
+
+
 = link_to 'Back', collection_url
+= link_to '| Edit', edit_resource_url if can? :edit, resource
+- if current_user.try(:id) == parent.id
+  = link_to '| New Blog Post', new_user_blog_path(parent)
 

data/wheels.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wheels}
-  s.version = "0.0.39"
+  s.version = "0.0.40"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Gannon"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wheels
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 79
   prerelease: false
   segments: 
   - 0
   - 0
-  - 39
-  version: 0.0.39
+  - 40
+  version: 0.0.40
 platform: ruby
 authors: 
 - Tyler Gannon