app/models/Twitter/Status.rb app/views/posts/_form.html.haml db/migrate/20080514223708_honey_pot_captcha_field_for_comments.rb db/migrate/20080515004142_add_fields_for_spam_tracking.rb db/migrate/20080530145539_add_permalink_to_post.rb lib/Utils/TwitterAPI.rb lib/string.rb script/dbconsole vendor/plugins/gems/README vendor/plugins/gems/init.rb vendor/plugins/gems/tasks/gems_tasks.rake vendor/plugins/resource_controller @@ -10,4 +10,5 @@ joe *.sqlite3 .DS_Store tmp/* -*.tmproj \ No newline at end of file +*.tmproj +twitter_creds \ No newline at end of file .gitignore @@ -4,3 +4,6 @@ [submodule "vendor/rails"] path = vendor/rails url = git://github.com/rails/rails.git +[submodule "vendor/plugins/resource_controller"] + path = vendor/plugins/resource_controller + url = git://github.com/giraffesoft/resource_controller.git .gitmodules @@ -5,6 +5,10 @@ class ApplicationController < ActionController::Base helper :all # include all helpers, all the time before_filter :retrieve_user + def tweets_enabled + false + end + protected def for_admin_only unless @current_user app/controllers/application.rb @@ -1,4 +1,5 @@ class PostsController < ResourceController::Base + alias r_c_generated_object object new_action.wants.html do for_admin_only do @@ -9,6 +10,16 @@ class PostsController < ResourceController::Base index.wants.atom index.wants.html do + Twitter::Status.logger = logger + begin + if tweets_enabled + @tweets = Twitter::Status.user_timeline + end + rescue + @tweets = nil + logger.error "Error receiving recent tweets: #{$!}" + end + for_users_by_type do |type| case type when :anonymous @@ -24,6 +35,16 @@ class PostsController < ResourceController::Base end create.before { @post.author = @current_user } + create.after { logger.info "MY OBJECT: #{@post} AND IT'S ATTRIBUTES: #{@post.attributes}" } + + show.wants.html do + if params[:day] and params[:month] and params[:year] + ex = "#{params[:month]}/#{params[:day]}/#{params[:year]}" + elsif params[:year] + ex = "Year: #{params[:year]}" + end + #raise ex + end show.wants.xml { render :xml => @post } new_action.wants.xml { render :xml => @post } @@ -31,9 +52,20 @@ class PostsController < ResourceController::Base create.wants.xml { render :xml => @posts } update.wants.xml { render :xml => @post } destroy.wants.xml { head :ok } - + protected - + + def object + if params[:id] + my_object = Post.find params[:id] + elsif params[:action] != 'create' + my_object = Post.new + else + my_object = r_c_generated_object + end + my_object + end + def load_collection if params[:tag] @posts = Post.find_tagged_with params[:tag] app/controllers/posts_controller.rb @@ -4,13 +4,26 @@ class Comment :author_email => 'email', :author_url => 'url', :content => 'comment' - + def comment_type "Comment" end - def before_create - !self.spam? + def after_validation + unless self.comment_something.empty? + self.spam_type = "honeypot" + else + self.spam_type = "" + end + + if self.spam_type.empty? and self.spam? + self.spam_type = "rakismet" + else + self.spam_type = "" + end + + self.is_spam = !self.spam_type.empty? + end end \ No newline at end of file app/models/Comment.rb @@ -1,6 +1,15 @@ class Post < ActiveRecord::Base belongs_to :author, :class_name => 'User' - acts_as_commentable :order => 'created_at desc' + before_save :generate_permalink + acts_as_commentable :order => 'created_at desc', :conditions => "is_spam = 'f'" acts_as_taggable + def generate_permalink + #raise self.attributes.to_s + if self.permalink.nil? + self.permalink = self.title.sanitize_for_url + self.save + end + end + end app/models/post.rb @@ -17,7 +17,6 @@ #welcome_message = "Logged in as: " + @current_user.name = link_to 'Logout', logout_url - %img{ :src => "/images/glasses.png" }/ %h1#page-title %a{ :href => "/" } faithfulgeek.org @@ -25,34 +24,5 @@ #wrapper #page-content = yield - #modules - .twitter.module - %fieldset - %legend - twitter - %p - I just twittered all over the place - %p - I wish skittles were M&Ms - %p - You have walked the lonely walk of loneliness - .blogroll.module - %fieldset - %legend - blogroll - %p - %a{ :href => "http://www.codinggeekette.com/", :rel => "met" } - coding geekette - %p - %a{ :href => "http://www.hanselman.com/", :rel => "met" } - scott hanselman - %p - %a{ :href => "http://www.coreyhaines.com/", :rel => "met" } - corey haines - .tagcloud.module - %fieldset - %legend - tag cloud - tags #footer ©2008 Joe Fiorini - creative commons license app/views/layouts/application.html.haml @@ -1,7 +1,7 @@ .post %img{:src => "/images/icons/24-book-blue-mark.png"} - %h2#title= link_to post.title, post - %h3#tags + %h2.title= link_to post.title, post + %h3.tags on = format_date_long(post.created_at) – app/views/posts/_post.html.haml @@ -2,23 +2,7 @@ Editing Post = @post.title -= error_messages_for :post - -- form_for(@post) do |f| - %p - = title_label - = f.text_field :title - %p - = body_label - ~ f.text_area :body - %p - = tags_label - = f.text_field :tag_list - %p - = is_published_label - = f.check_box :is_published - %p - = f.submit "Update" += render_partial 'new' = link_to 'Show', @post | app/views/posts/edit.html.haml @@ -1,3 +1,12 @@ +#tweets + - if @tweets + %h2.title= link_to 'Recent Tweets', 'http://www.twitter.com/faithfulgeek' + - @tweets.each do |tweet| + .tweet + = tweet.text + Reply ID is: + = tweet.in_reply_to_status_id + #posts - @posts.each do |post| = render_partial 'post', post app/views/posts/index.html.haml @@ -2,35 +2,6 @@ <%= error_messages_for :post %> -<% form_for(@post) do |f| %> - - <%= title_label %> - <%= f.text_field :title %> - - - - <%= body_label %> - <%= f.text_area :body %> - - - - <%= tags_label %> - <%= f.text_field :tags %> - - - - <%= excerpt_label %> - <%= f.text_area :excerpt %> - - - - <%= is_published_label %> - <%= f.check_box :is_published %> - - - - <%= f.submit "Create" %> - -<% end %> +<%= render_partial 'form' %> <%= link_to 'Back', posts_path %> app/views/posts/new.html.erb @@ -21,6 +21,9 @@ - form_for([@post, Comment.new], :html => {:id => 'comment-submission'}) do |f| .comment-form %p + #comment-something + = label :comment_something, 'Do not fill this in, it is meant to be empty.' + = f.text_field :comment_something = name_label = f.text_field :name, :size => 20 = label :email, 'Email:' app/views/posts/show.html.haml @@ -24,9 +24,8 @@ module Rails File.exist?("#{RAILS_ROOT}/vendor/rails") end - # FIXME : Ruby 1.9 def preinitialize - load(preinitializer_path) if File.exists?(preinitializer_path) + load(preinitializer_path) if File.exist?(preinitializer_path) end def preinitializer_path @@ -44,6 +43,7 @@ module Rails class VendorBoot < Boot def load_initializer require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer" + Rails::Initializer.run(:install_gem_spec_stubs) end end config/boot.rb @@ -58,7 +58,10 @@ Rails::Initializer.run do |config| # config.active_record.default_timezone = :utc end -require 'lib/ActionView/base' +require "#{File.expand_path(RAILS_ROOT)}/lib/string" +require "#{File.expand_path(RAILS_ROOT)}/lib/ActionView/base" +require "#{File.expand_path(RAILS_ROOT)}/lib/Utils/TwitterAPI" +require "#{File.expand_path(RAILS_ROOT)}/app/models/Twitter/Status" require "#{File.expand_path(RAILS_ROOT)}/vendor/RedCloth-3.0.4/lib/redcloth" # Add custom date formats config/environment.rb @@ -1,19 +1,19 @@ ActionController::Routing::Routes.draw do |map| map.root :controller => 'posts' + map.posts_for_date ':year/:month/:day', :controller => 'posts', :action => 'show', :year => /\d{4}/, :month => /\d{2}/, :day => /\d{2}/ + map.posts_for_year ':year', :controller => 'posts', :action => 'show', :year => /\d{4}/ map.home 'home', :controller => 'posts' map.login 'login', :controller => 'sessions', :action => 'new' map.logout 'logout', :controller => 'sessions', :action => 'destroy' map.feed 'feed', :controller => 'posts', :action => 'index', :format => 'atom' map.comments_for_post 'posts/show/:id', :controller => 'posts', :action => 'show', :anchor => 'comments' map.tag 'posts/tags/:tag', :controller => 'posts', :action => 'index' +# map.post ':year/:month/:day/:permalink', :controller => 'posts', :action => 'show' +# map.posts_for_date 'posts/:year/:month/:day', :controller => 'posts', :action => 'show' + map.resources :posts, :has_many => :comments - - map.connect '/:month', - :controller => 'posts', - :action => 'index', - :month => /#{(DateTime::MONTHNAMES - [nil]).join('|')}/ - + map.open_id_complete 'session', :controller => "sessions", :action => "create", :requirements => { :method => :get } map.resource :session config/routes.rb @@ -1,9 +1,13 @@ class AddPostIdToComments < ActiveRecord::Migration def self.up - add_column :comments, :post_id, :integer + change_table :comments do |t| + t.integer :post_id + end end def self.down - remove_column :comments, :post_id + change_table :comments do |t| + t.remove :post_id + end end end db/migrate/003_add_post_id_to_comments.rb @@ -8,8 +8,8 @@ class CreateUsers < ActiveRecord::Migration end def self.down - drop_column :name - drop_column :openid_url + remove_column :name + remove_column :openid_url drop_table :users end end db/migrate/005_create_users.rb @@ -1,9 +1,13 @@ class AddAuthorToPost < ActiveRecord::Migration def self.up - add_column 'Posts', :author_id, :integer + change_table :posts do |t| + t.integer :author_id + end end def self.down - remove_column 'Posts', :author_id + change_table :posts do |t| + t.remove :author_id + end end end db/migrate/008_add_author_to_post.rb @@ -1,9 +1,13 @@ class AddEmailToUser < ActiveRecord::Migration def self.up - add_column 'Users', 'email', :string + change_table :users do |t| + t.string :email + end end def self.down - remove_column 'Users', 'email' + change_table :users do |t| + t.remove :email + end end end db/migrate/009_add_email_to_user.rb public/images/bg.jpg public/images/logo.jpg @@ -64,7 +64,7 @@ blockquote margin-right: 70px; } -h2#title +h2.title { font-family: georgia, 'times new roman', serif; border: 0; @@ -72,7 +72,7 @@ h2#title display: inline; } -h3#tags +h3.tags { font-size: .75em; color: #666; @@ -184,9 +184,9 @@ div.comment-form p textarea #header h1 a { - height: 89px; - width: 384px; - margin:55px 0 30px 15px; + height: 103px; + width: 484px; + margin-top:16px; background: url('/images/logo.jpg') no-repeat; display:block; text-indent: -9999px; @@ -199,6 +199,13 @@ div.comment-form p textarea top: 63px; } +/* this is the honeypot captcha to catch spam bots */ +div#comment-something +{ + position: absolute; + left: -999px; +} + .module { margin-bottom: 1em; public/stylesheets/site.css @@ -9,7 +9,7 @@ module Juixe module ClassMethods def acts_as_commentable(params={}) - has_many :comments, :as => :commentable, :dependent => :destroy, :order => (params[:order] || 'created_at ASC') + has_many :comments, :as => :commentable, :dependent => :destroy, :order => (params[:order] || 'created_at ASC'), :conditions => (params[:conditions] || '1=1') include Juixe::Acts::Commentable::InstanceMethods extend Juixe::Acts::Commentable::SingletonMethods end vendor/plugins/acts_as_commentable/lib/acts_as_commentable.rb 76191562d1188011ee75d12f07dc2166bc3e7447 Joe Fiorini joe@faithfulgeek.org http://github.com/faithfulgeek/blog-starter-kit/commit/a7d6cdc7e2273dd40774a021986f445f1030ecd9 a7d6cdc7e2273dd40774a021986f445f1030ecd9

2008-06-05T19:32:47-07:00

Upgraded to Rails 2.1 RC; other modifications to make this ready for an initial release 7494c43da82db6f8db36a22274a2c13fe6d8a765 Joe Fiorini joe@faithfulgeek.org