comfortable_mexican_sofa 1.1.2 → 1.2.0

data/Gemfile

@@ -1,12 +1,8 @@
 source 'http://rubygems.org'
 
-gem 'rails',          '>=3.0.3'
-gem 'active_link_to', '>=0.0.6'
+gem 'rails',          '>=3.0.0'
+gem 'active_link_to', '>=0.0.7'
 gem 'paperclip',      '>=2.3.8'
-gem 'mime-types',     :require => 'mime/types'
-
-# If you wish to use sqlite in production
-# gem 'sqlite3'
 
 group :development do
   gem 'sqlite3'

data/Gemfile.lock

@@ -15,7 +15,7 @@ GEM
       rack-mount (~> 0.6.13)
       rack-test (~> 0.5.6)
       tzinfo (~> 0.3.23)
-    active_link_to (0.0.6)
+    active_link_to (0.0.7)
     activemodel (3.0.3)
       activesupport (= 3.0.3)
       builder (~> 2.1.2)
@@ -78,9 +78,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  active_link_to (>= 0.0.6)
+  active_link_to (>= 0.0.7)
   jeweler (>= 1.4.0)
-  mime-types
   paperclip (>= 2.3.8)
-  rails (>= 3.0.3)
+  rails (>= 3.0.0)
   sqlite3

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/app/controllers/cms_admin/base_controller.rb

@@ -1,4 +1,4 @@
-class CmsAdmin::BaseController < ActionController::Base
+class CmsAdmin::BaseController < ApplicationController
   
   protect_from_forgery
   

data/app/controllers/cms_admin/layouts_controller.rb

@@ -19,7 +19,7 @@ class CmsAdmin::LayoutsController < CmsAdmin::BaseController
   def create
     @cms_layout.save!
     flash[:notice] = 'Layout created'
-    redirect_to (params[:commit] ? {:action => :index} : {:action => :edit, :id => @cms_layout})
+    redirect_to :action => :edit, :id => @cms_layout
   rescue ActiveRecord::RecordInvalid
     flash.now[:error] = 'Failed to create layout'
     render :action => :new
@@ -28,7 +28,7 @@ class CmsAdmin::LayoutsController < CmsAdmin::BaseController
   def update
     @cms_layout.update_attributes!(params[:cms_layout])
     flash[:notice] = 'Layout updated'
-    redirect_to (params[:commit] ? {:action => :index} : {:action => :edit, :id => @cms_layout})
+    redirect_to :action => :edit, :id => @cms_layout
   rescue ActiveRecord::RecordInvalid
     flash.now[:error] = 'Failed to update layout'
     render :action => :edit

data/app/controllers/cms_admin/pages_controller.rb

@@ -22,7 +22,7 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
   def create
     @cms_page.save!
     flash[:notice] = 'Page saved'
-    redirect_to (params[:commit] ? {:action => :index} : {:action => :edit, :id => @cms_page})
+    redirect_to :action => :edit, :id => @cms_page
   rescue ActiveRecord::RecordInvalid
     flash.now[:error] = 'Failed to create page'
     render :action => :new
@@ -31,7 +31,7 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
   def update
     @cms_page.save!
     flash[:notice] = 'Page updated'
-    redirect_to (params[:commit] ? {:action => :index} : {:action => :edit, :id => @cms_page})
+    redirect_to :action => :edit, :id => @cms_page
   rescue ActiveRecord::RecordInvalid
     flash.now[:error] = 'Failed to update page'
     render :action => :edit

data/app/controllers/cms_admin/revisions_controller.rb

@@ -0,0 +1,57 @@
+class CmsAdmin::RevisionsController < CmsAdmin::BaseController
+  
+  before_filter :load_record
+  before_filter :load_revision, :except => :index
+  
+  def index
+    redirect_to :action => :show, :id => @record.revisions.first.try(:id) || 0
+  end
+  
+  def show
+    case @record
+    when Cms::Page
+      @current_content    = @record.blocks.inject({}){|c, b| c[b.label] = b.content; c }
+      @versioned_content  = @record.blocks.inject({}){|c, b| c[b.label] = @revision.data['blocks_attributes'].detect{|r| r[:label] == b.label}.try(:[], :content); c }
+    else
+      @current_content    = @record.revision_fields.inject({}){|c, f| c[f] = @record.send(f); c }
+      @versioned_content  = @record.revision_fields.inject({}){|c, f| c[f] = @revision.data[f]; c }
+    end
+  end
+  
+  def revert
+    @record.restore_from_revision(@revision)
+    flash[:notice] = 'Content Reverted'
+    redirect_to_record
+  end
+  
+protected
+  
+  def load_record
+    @record = if params[:layout_id]
+      Cms::Layout.find(params[:layout_id])
+    elsif params[:page_id]
+      Cms::Page.find(params[:page_id])
+    elsif params[:snippet_id]
+      Cms::Snippet.find(params[:snippet_id])
+    end
+  rescue ActiveRecord::RecordNotFound
+    flash[:error] = 'Record Not Found'
+    redirect_to cms_admin_path
+  end
+  
+  def load_revision
+    @revision = @record.revisions.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    flash[:error] = 'Revision Not Found'
+    redirect_to_record
+  end
+  
+  def redirect_to_record
+    redirect_to case @record
+      when Cms::Layout  then edit_cms_admin_layout_path(@record)
+      when Cms::Page    then edit_cms_admin_page_path(@record)
+      when Cms::Snippet then edit_cms_admin_snippet_path(@record)
+    end
+  end
+  
+end

data/app/controllers/cms_admin/sites_controller.rb

@@ -21,7 +21,7 @@ class CmsAdmin::SitesController < CmsAdmin::BaseController
   def create
     @cms_site.save!
     flash[:notice] = 'Site created'
-    redirect_to (params[:commit] ? {:action => :index} : {:action => :edit, :id => @cms_site})
+    redirect_to :action => :edit, :id => @cms_site
   rescue ActiveRecord::RecordInvalid
     flash.now[:error] = 'Failed to create site'
     render :action => :new
@@ -30,7 +30,7 @@ class CmsAdmin::SitesController < CmsAdmin::BaseController
   def update
     @cms_site.update_attributes!(params[:cms_site])
     flash[:notice] = 'Site updated'
-    redirect_to (params[:commit] ? {:action => :index} : {:action => :edit, :id => @cms_site})
+    redirect_to :action => :edit, :id => @cms_site
   rescue ActiveRecord::RecordInvalid
     flash.now[:error] = 'Failed to update site'
     render :action => :edit

data/app/controllers/cms_admin/snippets_controller.rb

@@ -19,7 +19,7 @@ class CmsAdmin::SnippetsController < CmsAdmin::BaseController
   def create
     @cms_snippet.save!
     flash[:notice] = 'Snippet created'
-    redirect_to (params[:commit] ? {:action => :index} : {:action => :edit, :id => @cms_snippet})
+    redirect_to :action => :edit, :id => @cms_snippet
   rescue ActiveRecord::RecordInvalid
     flash.now[:error] = 'Failed to create snippet'
     render :action => :new
@@ -28,7 +28,7 @@ class CmsAdmin::SnippetsController < CmsAdmin::BaseController
   def update
     @cms_snippet.update_attributes!(params[:cms_snippet])
     flash[:notice] = 'Snippet updated'
-    redirect_to (params[:commit] ? {:action => :index} : {:action => :edit, :id => @cms_snippet})
+    redirect_to :action => :edit, :id => @cms_snippet
   rescue ActiveRecord::RecordInvalid
     flash.now[:error] = 'Failed to update snippet'
     render :action => :edit

data/app/models/cms/layout.rb

@@ -4,6 +4,8 @@ class Cms::Layout < ActiveRecord::Base
   
   acts_as_tree
   
+  has_revisions_for :content, :css, :js
+  
   # -- Relationships --------------------------------------------------------
   belongs_to :site
   has_many :pages, :dependent => :nullify

data/app/models/cms/page.rb

@@ -2,10 +2,12 @@ class Cms::Page < ActiveRecord::Base
   
   set_table_name :cms_pages
   
-  # -- AR Extensions --------------------------------------------------------
   acts_as_tree :counter_cache => :children_count
   
-  attr_accessor :tags
+  has_revisions_for :blocks_attributes
+  
+  attr_accessor :tags,
+                :blocks_attributes_changed
   
   # -- Relationships --------------------------------------------------------
   belongs_to :site
@@ -13,8 +15,8 @@ class Cms::Page < ActiveRecord::Base
   belongs_to :target_page,
     :class_name => 'Cms::Page'
   has_many :blocks,
-    :dependent  => :destroy
-  accepts_nested_attributes_for :blocks
+    :dependent  => :destroy,
+    :autosave   => true
   
   # -- Callbacks ------------------------------------------------------------
   before_validation :assign_parent,
@@ -64,13 +66,26 @@ class Cms::Page < ActiveRecord::Base
   
   # Transforms existing cms_block information into a hash that can be used
   # during form processing. That's the only way to modify cms_blocks.
-  def blocks_attributes
-    self.blocks.inject([]) do |arr, block|
+  def blocks_attributes(was = false)
+    self.blocks.collect do |block|
       block_attr = {}
       block_attr[:label]    = block.label
-      block_attr[:content]  = block.content
-      block_attr[:id]       = block.id
-      arr << block_attr
+      block_attr[:content]  = was ? block.content_was : block.content
+      block_attr
+    end
+  end
+  
+  # Array of block hashes in the following format:
+  #   [
+  #     { :label => 'block_1', :content => 'block content' },
+  #     { :label => 'block_2', :content => 'block content' }
+  #   ]
+  def blocks_attributes=(block_hashes = [])
+    block_hashes.each do |block_hash|
+      block_hash.symbolize_keys! unless block_hash.is_a?(HashWithIndifferentAccess)
+      block = self.blocks.detect{|b| b.label == block_hash[:label]} || self.blocks.build(:label => block_hash[:label])
+      block.content = block_hash[:content]
+      self.blocks_attributes_changed = self.blocks_attributes_changed || block.content_changed?
     end
   end
   
@@ -97,6 +112,11 @@ class Cms::Page < ActiveRecord::Base
     "http://#{self.site.hostname}#{self.full_path}"
   end
   
+  # Method to collect prevous state of blocks for revisions
+  def blocks_attributes_was
+    blocks_attributes(true)
+  end
+  
 protected
   
   def assign_parent

data/app/models/cms/revision.rb

@@ -0,0 +1,13 @@
+class Cms::Revision < ActiveRecord::Base
+  
+  set_table_name :cms_revisions
+  
+  serialize :data
+  
+  # -- Relationships --------------------------------------------------------
+  belongs_to :record, :polymorphic => true
+  
+  # -- Scopes ---------------------------------------------------------------
+  default_scope order('created_at DESC')
+  
+end

data/app/models/cms/snippet.rb

@@ -2,6 +2,8 @@ class Cms::Snippet < ActiveRecord::Base
   
   set_table_name :cms_snippets
   
+  has_revisions_for :content
+  
   # -- Relationships --------------------------------------------------------
   belongs_to :site
   
@@ -18,11 +20,6 @@ class Cms::Snippet < ActiveRecord::Base
     :presence   => true,
     :uniqueness => { :scope => :site_id },
     :format     => { :with => /^\w[a-z0-9_-]*$/i }
-    
-  # -- Class Methods --------------------------------------------------------
-  def self.content_for(slug)
-    (s = find_by_slug(slug)) ? s.content : ''
-  end
   
 protected
   

data/app/views/cms_admin/layouts/_form.html.erb

@@ -16,6 +16,5 @@
 <%= form.text_area :js, :class => 'code_js' %>
 
 <%= form.simple_field nil, nil, :class => 'submit_element' do %>
-  <%= form.submit 'and continue', :id => nil, :name => 'save', :disable_builder => true %>
   <%= form.submit @cms_layout.new_record?? 'Create Layout' : 'Update Layout', :disable_builder => true %>
 <% end %>

data/app/views/cms_admin/layouts/edit.html.erb

@@ -1,3 +1,4 @@
+<%= link_to span_tag(pluralize(@cms_layout.revisions.count, 'revision')), cms_admin_layout_revisions_path(@cms_layout), :class => 'big button' %>
 <h1> Editing Layout </h1>
 
 <%= cms_form_for @cms_layout, :url => {:action => :update} do |form| %>

data/app/views/cms_admin/pages/_form.html.erb

@@ -33,6 +33,5 @@
   <%= form.check_box :is_published, :disable_builder => true %>
   <%= form.label_for :is_published, :label => 'Published' %>
   <%= form.submit 'Preview', :name => 'preview', :id => nil, :disable_builder => true %>
-  <%= form.submit 'and continue', :id => nil, :name => 'save', :disable_builder => true %>
   <%= form.submit @cms_page.new_record? ? 'Create Page' : 'Update Page', :disable_builder => true %>
 <% end %>

data/app/views/cms_admin/pages/edit.html.erb

@@ -1,3 +1,4 @@
+<%= link_to span_tag(pluralize(@cms_page.revisions.count, 'revision')), cms_admin_page_revisions_path(@cms_page), :class => 'big button' %>
 <h1> Editing Page </h1>
 
 <%= cms_form_for @cms_page, :url => {:action => :update} do |form| %>

data/app/views/cms_admin/revisions/show.html.erb

@@ -0,0 +1,36 @@
+<h1> Revisions for <%= @record.class.to_s.demodulize %></h1>
+<h2> <%= @record.is_a?(Cms::Page) ? "Full Path: #{@record.full_path}" : "Slug: #{@record.slug}" %> </h2>
+
+<% content_for :right_column do %>
+  <h2><%= pluralize(@record.revisions.count, 'Revision') %></h2>
+  <div class='revisions box'>
+    <% @record.revisions.each do |revision| %>
+      <%= active_link_to revision.created_at, :id => revision.id %>
+    <% end %>
+  </div>
+<% end %>
+
+<%= cms_form_for @revision, :url => {:action => :revert} do |form| %>
+  <%= form.simple_field do %>
+    <div class='current'>
+      <div class='title'>Current</div>
+    </div>
+    <div class='versioned'>
+      <div class='title'><%= @revision.created_at %></div>
+    </div>
+  <% end %>
+  
+  <% @current_content.each do |label, content| %>
+  
+    <%= form.simple_field label do %>
+      <div class='current'>
+        <div class='content'><%= content %></div>
+      </div>
+      <div class='versioned'>
+        <div class='content'><%= @versioned_content[label] %></div>
+      </div>
+    <% end %>
+  <% end %>
+  
+  <%= form.submit 'Update to this Revision' %>
+<% end %>

data/app/views/cms_admin/sites/_form.html.erb

@@ -2,6 +2,5 @@
 <%= form.text_field :hostname %>
 
 <%= form.simple_field nil, nil, :class => 'submit_element' do %>
-  <%= form.submit 'and continue', :id => nil, :name => 'save', :disable_builder => true %>
   <%= form.submit @cms_site.new_record?? 'Create Site' : 'Update Site', :disable_builder => true %>
 <% end %>

data/app/views/cms_admin/snippets/_form.html.erb

@@ -7,6 +7,5 @@
 <%= form.text_area :content, :class => 'code' %>
 
 <%= form.simple_field nil, nil, :class => 'submit_element' do %>
-  <%= form.submit 'and continue', :id => nil, :name => 'save', :disable_builder => true %>
   <%= form.submit @cms_snippet.new_record?? 'Create Snippet' : 'Update Snippet', :disable_builder => true %>
 <% end %>

data/app/views/cms_admin/snippets/edit.html.erb

@@ -1,3 +1,4 @@
+<%= link_to span_tag(pluralize(@cms_snippet.revisions.count, 'revision')), cms_admin_snippet_revisions_path(@cms_snippet), :class => 'big button' %>
 <h1> Editing Snippet </h1>
 
 <%= cms_form_for @cms_snippet, :url => {:action => :update} do |form| %>

data/app/views/layouts/cms_admin/_body.html.erb

@@ -12,6 +12,10 @@
     </div>
     <div class='center_column'>
       <%= render :partial => 'layouts/cms_admin/center' %>
+      <div class='sofa'>
+        <a href='http://comfortablemexicansofa.twg.ca' target='_blank'>ComfortableMexicanSofa</a>
+        <span class='version'><%= ComfortableMexicanSofa::VERSION %></span>
+      </div>
     </div>
   </div>
 </body>

data/app/views/layouts/cms_admin/_left.html.erb

@@ -1,7 +1,9 @@
-<% if ComfortableMexicanSofa.config.enable_multiple_sites %>
-  <%= active_link_to 'Sites', cms_admin_sites_path %>
-<% end %>
-<%= active_link_to 'Layouts', cms_admin_layouts_path %>
-<%= active_link_to 'Pages', cms_admin_pages_path %>
-<%= active_link_to 'Snippets', cms_admin_snippets_path %>
-<%= cms_hook :navigation %>
+<ul class='nav'>
+  <% if ComfortableMexicanSofa.config.enable_multiple_sites %>
+    <li><%= active_link_to 'Sites', cms_admin_sites_path %></li>
+  <% end %>
+  <li><%= active_link_to 'Layouts', cms_admin_layouts_path %></li>
+  <li><%= active_link_to 'Pages', cms_admin_pages_path %></li>
+  <li><%= active_link_to 'Snippets', cms_admin_snippets_path %></li>
+  <%= cms_hook :navigation %>
+</ul>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
-  s.date = %q{2011-05-05}
+  s.date = %q{2011-05-10}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "app/controllers/cms_admin/base_controller.rb",
     "app/controllers/cms_admin/layouts_controller.rb",
     "app/controllers/cms_admin/pages_controller.rb",
+    "app/controllers/cms_admin/revisions_controller.rb",
     "app/controllers/cms_admin/sites_controller.rb",
     "app/controllers/cms_admin/snippets_controller.rb",
     "app/controllers/cms_admin/uploads_controller.rb",
@@ -35,6 +36,7 @@ Gem::Specification.new do |s|
     "app/models/cms/block.rb",
     "app/models/cms/layout.rb",
     "app/models/cms/page.rb",
+    "app/models/cms/revision.rb",
     "app/models/cms/site.rb",
     "app/models/cms/snippet.rb",
     "app/models/cms/upload.rb",
@@ -51,6 +53,7 @@ Gem::Specification.new do |s|
     "app/views/cms_admin/pages/index.html.erb",
     "app/views/cms_admin/pages/new.html.erb",
     "app/views/cms_admin/pages/toggle_branch.js.erb",
+    "app/views/cms_admin/revisions/show.html.erb",
     "app/views/cms_admin/sites/_form.html.erb",
     "app/views/cms_admin/sites/edit.html.erb",
     "app/views/cms_admin/sites/index.html.erb",
@@ -78,7 +81,6 @@ Gem::Specification.new do |s|
     "config/environments/production.rb",
     "config/environments/test.rb",
     "config/initializers/comfortable_mexican_sofa.rb",
-    "config/initializers/mime_types.rb",
     "config/initializers/paperclip.rb",
     "config/locales/en.yml",
     "config/routes.rb",
@@ -99,6 +101,7 @@ Gem::Specification.new do |s|
     "db/cms_fixtures/example.com/snippets/default/content.html",
     "db/migrate/01_create_cms.rb",
     "db/migrate/upgrades/02_upgrade_to_1_1_0.rb",
+    "db/migrate/upgrades/03_upgrade_to_1_2_0.rb",
     "db/seeds.rb",
     "doc/page_editing.png",
     "doc/sofa.png",
@@ -109,6 +112,7 @@ Gem::Specification.new do |s|
     "lib/comfortable_mexican_sofa/engine.rb",
     "lib/comfortable_mexican_sofa/fixtures.rb",
     "lib/comfortable_mexican_sofa/form_builder.rb",
+    "lib/comfortable_mexican_sofa/has_revisions.rb",
     "lib/comfortable_mexican_sofa/http_auth.rb",
     "lib/comfortable_mexican_sofa/rails_extensions.rb",
     "lib/comfortable_mexican_sofa/tag.rb",
@@ -124,6 +128,7 @@ Gem::Specification.new do |s|
     "lib/comfortable_mexican_sofa/tags/page_text.rb",
     "lib/comfortable_mexican_sofa/tags/partial.rb",
     "lib/comfortable_mexican_sofa/tags/snippet.rb",
+    "lib/comfortable_mexican_sofa/version.rb",
     "lib/comfortable_mexican_sofa/view_hooks.rb",
     "lib/comfortable_mexican_sofa/view_methods.rb",
     "lib/generators/README",
@@ -209,6 +214,7 @@ Gem::Specification.new do |s|
     "test/fixtures/cms/blocks.yml",
     "test/fixtures/cms/layouts.yml",
     "test/fixtures/cms/pages.yml",
+    "test/fixtures/cms/revisions.yml",
     "test/fixtures/cms/sites.yml",
     "test/fixtures/cms/snippets.yml",
     "test/fixtures/cms/uploads.yml",
@@ -218,6 +224,7 @@ Gem::Specification.new do |s|
     "test/fixtures/views/_nav_hook_2.html.erb",
     "test/functional/cms_admin/layouts_controller_test.rb",
     "test/functional/cms_admin/pages_controller_test.rb",
+    "test/functional/cms_admin/revisions_controller_test.rb",
     "test/functional/cms_admin/sites_controller_test.rb",
     "test/functional/cms_admin/snippets_controller_test.rb",
     "test/functional/cms_admin/uploads_controller_test.rb",
@@ -237,6 +244,7 @@ Gem::Specification.new do |s|
     "test/unit/models/site_test.rb",
     "test/unit/models/snippet_test.rb",
     "test/unit/models/upload_test.rb",
+    "test/unit/revisions_test.rb",
     "test/unit/tag_test.rb",
     "test/unit/tags/field_datetime_test.rb",
     "test/unit/tags/field_integer_test.rb",
@@ -259,6 +267,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/functional/cms_admin/layouts_controller_test.rb",
     "test/functional/cms_admin/pages_controller_test.rb",
+    "test/functional/cms_admin/revisions_controller_test.rb",
     "test/functional/cms_admin/sites_controller_test.rb",
     "test/functional/cms_admin/snippets_controller_test.rb",
     "test/functional/cms_admin/uploads_controller_test.rb",
@@ -278,6 +287,7 @@ Gem::Specification.new do |s|
     "test/unit/models/site_test.rb",
     "test/unit/models/snippet_test.rb",
     "test/unit/models/upload_test.rb",
+    "test/unit/revisions_test.rb",
     "test/unit/tag_test.rb",
     "test/unit/tags/field_datetime_test.rb",
     "test/unit/tags/field_integer_test.rb",
@@ -298,23 +308,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.3"])
-      s.add_runtime_dependency(%q<active_link_to>, [">= 0.0.6"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<active_link_to>, [">= 0.0.7"])
       s.add_runtime_dependency(%q<paperclip>, [">= 2.3.8"])
-      s.add_runtime_dependency(%q<mime-types>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.0.3"])
-      s.add_dependency(%q<active_link_to>, [">= 0.0.6"])
+      s.add_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_dependency(%q<active_link_to>, [">= 0.0.7"])
       s.add_dependency(%q<paperclip>, [">= 2.3.8"])
-      s.add_dependency(%q<mime-types>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.0.3"])
-    s.add_dependency(%q<active_link_to>, [">= 0.0.6"])
+    s.add_dependency(%q<rails>, [">= 3.0.0"])
+    s.add_dependency(%q<active_link_to>, [">= 0.0.7"])
     s.add_dependency(%q<paperclip>, [">= 2.3.8"])
-    s.add_dependency(%q<mime-types>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
   end
 end