TODO app/views/layouts/theme.html.haml config/template.html @@ -6,3 +6,4 @@ doc/app coverage config/database.yml config/config.yml +config/template.html~ .gitignore @@ -1,11 +1,12 @@ class PhotosController < ApplicationController + layout 'theme' + def show - # Find the photo from id, or get the most recent one. + # Find the photo from id or get the most recent one. @photo = params[:id] ? Photo.find(params[:id]) : Photo.find(:first, :order => 'created_at DESC') respond_to do |format| format.html - format.xml { render :xml => @photo } end end end \ No newline at end of file app/controllers/photos_controller.rb @@ -10,6 +10,15 @@ class Photo < ActiveRecord::Base validates_presence_of :fullsize_source_url, :message => "can't be blank" validates_presence_of :title, :message => "can't be blank" + liquid_methods :id, + :title, + :square_source_url, + :thumb_source_url, + :medium_source_url, + :fullsize_source_url, + :previous, + :next + def update_from_flickr self.attributes = self.attributes.merge(FlickrPhoto.new(self.flickr_id).attributes) end @@ -21,7 +30,7 @@ class Photo < ActiveRecord::Base def next @next_photo ||= Photo.find(:first, :order => 'created_at ASC', :conditions => ['created_at > ?', created_at]) end - + def self.new_from_flickr(flickr_photo) Photo.new do |photo| photo.flickr_id = flickr_photo.id app/models/photo.rb @@ -2,7 +2,7 @@ class Theme include Singleton include Validatable - THEME_FILE = "#{Rails.root}/config/template.txt" + THEME_FILE = File.join(Rails.root, 'config', 'template.html') attr_accessor :template @@ -14,7 +14,7 @@ class Theme def save backup_file - File.open(THEME_FILE) do |file| + File.open(THEME_FILE, 'w+') do |file| file.write(@template) file.flush end app/models/theme.rb @@ -31,8 +31,8 @@ Rails::Initializer.run do |config| config.gem 'bj' config.gem 'validatable' config.gem 'flickraw' - config.gem 'will_paginate' config.gem 'liquid' + config.gem 'mislav-will_paginate', :version => '~> 2.2.3', :lib => 'will_paginate', :source => 'http://gems.github.com' # Only load the plugins named here, in the order given. By default, all plugins # in vendor/plugins are loaded in alphabetical order. config/environment.rb @@ -4,4 +4,5 @@ rescue LoadError require 'haml' # From gem end +# Load Haml and Sass Haml.init_rails(binding) vendor/plugins/haml/init.rb app/views/layouts/application.haml doc/TODO.taskpaper 2c177acb1ec689490d616146a9b76ed26c775640 Tim Riley tim@openmonkey.com http://github.com/timriley/flickr-portfolio/commit/c4bb1d7617aee9f2f5d9ff9625212c517a28101f c4bb1d7617aee9f2f5d9ff9625212c517a28101f 2008-12-09T04:22:57-08:00 2008-12-09T04:22:57-08:00 liquid template support for themes dcecdba69160e6b6ff4a7ed9e6c311d804a35b68 Tim Riley tim@openmonkey.com