wheels 0.0.35 → 0.0.36

data/VERSION

@@ -1 +1 @@
-0.0.35
+0.0.36

data/app/controllers/blogs_controller.rb

@@ -1,8 +1,10 @@
 class BlogsController < InheritedResources::Base
-  respond_to :html, :xml
   before_filter :load_maybe
-  has_scope :tagged_with, :as => :tag
   belongs_to :user, :optional => true
+  has_scope :tagged_with, :as => :tag
+  helper_method :tags
+  respond_to :html, :xml
+
 
   def load_maybe
     unless params[:user_id]
@@ -10,15 +12,13 @@ class BlogsController < InheritedResources::Base
     end
   end
 
+  def tags
+    @tags ||= Blog.where(:user_id=>@user.id).tag_counts.sort{|t, u| t.count <=> u.count}
+  end
+
   def collection
     @blogs ||= Blog.where(:user_id=>@user.id).
       paginate(:page => params[:page], :order => 'created_at DESC' )
   end
-
-  protected
-    def begin_of_association_chain
-      @tags = Blog.where(:user_id=>@user.id).tag_counts.sort{|t, u| t.count <=> u.count}
-      return @user
-    end
 end
 

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

@@ -9,14 +9,14 @@
           %li= msg
 
   .field
-    = f.label :title
+    .fieldTitle Title
     = f.text_field :title
   .field
-    = f.label "tag_list"
-    .tag_list= f.text_area :tag_list
-  .field
-    = f.label :body
+    .fieldTitle Body
     = f.text_area :body, :class=>'ckeditor_textarea'
+  .field
+    .fieldTitle Tags:
+    .tag_list= f.text_field :tag_list
   .actions
     = f.submit 'Save'
 

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

@@ -1,8 +1,6 @@
-%h1 Someone's Blog
+%h1= @user.profile.blog_title
 
 - @blogs.each do |blog|
-  #ad-top
-    / Insert 468x60 banner advertisement
   .entry
     .entry-title= link_to blog.title, resource_url(blog)
 
@@ -18,6 +16,6 @@
 = will_paginate @blogs
 
 - content_for(:tags) do
-  - for tag in @tags
+  - for tag in tags
     %li= link_to tag.name, user_blogs_path(@user, :tag=>tag.name)
 

data/lib/generators/wheels/recipes/wheels.rb

@@ -8,6 +8,7 @@ gem 'inherited_resources', '1.1.2'
 gem 'paperclip'
 gem 'rails3-generators'
 gem 'RedCloth'
+gem 'will_paginate', "~> 3.0.pre2"
 
 route "root :to => \"blogs#index\""
 

data/wheels.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wheels}
-  s.version = "0.0.35"
+  s.version = "0.0.36"
 
   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: 89
+  hash: 87
   prerelease: false
   segments: 
   - 0
   - 0
-  - 35
-  version: 0.0.35
+  - 36
+  version: 0.0.36
 platform: ruby
 authors: 
 - Tyler Gannon