Migrated to rails 3.1 dummy application

puffer · Jul 28, 2011 · 93bf0ae · 93bf0ae
1 parent 63323b3
commit 93bf0ae
Show file tree

Hide file tree

Showing 103 changed files with 589,379 additions and 186 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,21 +1,25 @@
 source "http://rubygems.org"
 
-gem 'rails'
+gem 'rails', '>= 3.1.0.rc4'
 gem 'liquid', :git => 'git://github.com/puffer/liquid.git'
 gem 'nested_set', :git => 'git://github.com/skyeagle/nested_set.git'
-gem 'puffer', '>= 0.0.19'
+gem 'puffer', :git => 'git://github.com/puffer/puffer.git'
 
 group :development, :test, :pg_test do
-  gem "capybara", ">= 0.4.0"
   gem "sqlite3-ruby", :require => "sqlite3"
   gem "pg"
   gem "mysql"
 
   gem "rspec-rails"
-  gem "autotest"
+  gem "capybara", ">= 0.4.0"
+  gem 'database_cleaner'
+
+  gem 'guard'
+  gem 'libnotify'
+  gem 'guard-rspec'
+
   gem 'forgery'
-  gem 'fabrication', '0.9.2'
+  gem 'fabrication'
   gem "jeweler"
-  gem "mongrel"
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,168 +1,189 @@
 GIT
   remote: git://github.com/puffer/liquid.git
-  revision: 18ddffc9c4be25dadf9ec55dc5664a454ae3d072
+  revision: 3885290fefa0e6f92cfd812455a7cbd8eee9871b
   specs:
     liquid (2.2.2)
 
+GIT
+  remote: git://github.com/puffer/puffer.git
+  revision: a7407fcc2cb225bf5467e3c56a795a0bc64929f2
+  specs:
+    puffer (0.0.20)
+      apotomo
+      kaminari
+      rails (>= 3.1.0.rc4)
+
 GIT
   remote: git://github.com/skyeagle/nested_set.git
-  revision: d12b3333902b964a6b09f382a10e903cc4eeb579
+  revision: 71f5f86bd00b393c41b787d59c84e1d485e7e225
   specs:
-    nested_set (1.6.4)
+    nested_set (1.6.7)
       activerecord (>= 3.0.0)
       railties (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.5.0)
-    abstract (1.0.0)
-    actionmailer (3.0.5)
-      actionpack (= 3.0.5)
-      mail (~> 2.2.15)
-    actionpack (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-    activesupport (3.0.5)
-    arel (2.0.9)
-    autotest (4.4.6)
-      ZenTest (>= 4.4.1)
-    builder (2.1.2)
-    capybara (0.4.1.2)
-      celerity (>= 0.7.9)
-      culerity (>= 0.2.4)
+    actionmailer (3.1.0.rc5)
+      actionpack (= 3.1.0.rc5)
+      mail (~> 2.3.0)
+    actionpack (3.1.0.rc5)
+      activemodel (= 3.1.0.rc5)
+      activesupport (= 3.1.0.rc5)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.1)
+      rack-cache (~> 1.0.2)
+      rack-mount (~> 0.8.1)
+      rack-test (~> 0.6.0)
+      sprockets (~> 2.0.0.beta.12)
+    activemodel (3.1.0.rc5)
+      activesupport (= 3.1.0.rc5)
+      bcrypt-ruby (~> 2.1.4)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0.rc5)
+      activemodel (= 3.1.0.rc5)
+      activesupport (= 3.1.0.rc5)
+      arel (~> 2.1.4)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.0.rc5)
+      activemodel (= 3.1.0.rc5)
+      activesupport (= 3.1.0.rc5)
+    activesupport (3.1.0.rc5)
+      multi_json (~> 1.0)
+    apotomo (1.1.2)
+      cells (>= 3.5.6)
+      hooks (~> 0.1.3)
+      onfire (~> 0.2.0)
+    arel (2.1.4)
+    bcrypt-ruby (2.1.4)
+    builder (3.0.0)
+    capybara (1.0.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.3)
-    celerity (0.8.8)
-    cells (3.4.4)
-    cgi_multipart_eof_fix (2.5.0)
-    childprocess (0.1.7)
-      ffi (~> 0.6.3)
-    culerity (0.2.15)
-    daemons (1.1.0)
+      selenium-webdriver (~> 0.2.0)
+      xpath (~> 0.1.4)
+    cells (3.6.4)
+      actionpack (~> 3.0)
+      railties (~> 3.0)
+    childprocess (0.2.0)
+      ffi (~> 1.0.6)
+    database_cleaner (0.6.7)
     diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    fabrication (0.9.2)
-    fastthread (1.0.7)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
-    forgery (0.3.7)
+    erubis (2.7.0)
+    fabrication (1.0.1)
+    ffi (1.0.9)
+    forgery (0.3.12)
       nokogiri (~> 1.4)
-    gem_plugin (0.2.3)
     git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    guard (0.5.1)
+      thor (~> 0.14.6)
+    guard-rspec (0.4.0)
+      guard (>= 0.4.0)
+    hike (1.2.0)
+    hooks (0.1.4)
+    i18n (0.6.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json_pure (1.5.1)
-    mail (2.2.15)
-      activesupport (>= 2.3.6)
+    json_pure (1.5.3)
+    kaminari (0.12.4)
+      rails (>= 3.0.0)
+    libnotify (0.5.7)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    mongrel (1.1.5)
-      cgi_multipart_eof_fix (>= 2.4)
-      daemons (>= 1.0.3)
-      fastthread (>= 1.0.1)
-      gem_plugin (>= 0.2.3)
+    multi_json (1.0.3)
     mysql (2.8.1)
-    nokogiri (1.4.4)
-    pg (0.10.1)
-    polyglot (0.3.1)
-    puffer (0.0.19)
-      cells (~> 3.4.4)
-      rails (~> 3.0.4)
-      will_paginate (~> 3.0.pre2)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    nokogiri (1.5.0)
+    onfire (0.2.0)
+    pg (0.11.0)
+    polyglot (0.3.2)
+    rack (1.3.2)
+    rack-cache (1.0.2)
+      rack (>= 0.4)
+    rack-mount (0.8.1)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.0)
       rack (>= 1.0)
-    rails (3.0.5)
-      actionmailer (= 3.0.5)
-      actionpack (= 3.0.5)
-      activerecord (= 3.0.5)
-      activeresource (= 3.0.5)
-      activesupport (= 3.0.5)
+    rails (3.1.0.rc5)
+      actionmailer (= 3.1.0.rc5)
+      actionpack (= 3.1.0.rc5)
+      activerecord (= 3.1.0.rc5)
+      activeresource (= 3.1.0.rc5)
+      activesupport (= 3.1.0.rc5)
       bundler (~> 1.0)
-      railties (= 3.0.5)
-    railties (3.0.5)
-      actionpack (= 3.0.5)
-      activesupport (= 3.0.5)
+      railties (= 3.1.0.rc5)
+    railties (3.1.0.rc5)
+      actionpack (= 3.1.0.rc5)
+      activesupport (= 3.1.0.rc5)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2)
+    rdoc (3.8)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rspec-rails (2.5.0)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.5.0)
+      rspec (~> 2.6.0)
     rubyzip (0.9.4)
-    selenium-webdriver (0.1.3)
-      childprocess (~> 0.1.5)
-      ffi (~> 0.6.3)
+    selenium-webdriver (0.2.2)
+      childprocess (>= 0.1.9)
+      ffi (>= 1.0.7)
       json_pure
       rubyzip
-    sqlite3 (1.3.3)
+    sprockets (2.0.0.beta.12)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.4)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     thor (0.14.6)
-    treetop (1.4.9)
+    tilt (1.3.2)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
-    will_paginate (3.0.pre2)
-    xpath (0.1.3)
+    tzinfo (0.3.29)
+    xpath (0.1.4)
       nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  autotest
   capybara (>= 0.4.0)
-  fabrication (= 0.9.2)
+  database_cleaner
+  fabrication
   forgery
+  guard
+  guard-rspec
   jeweler
+  libnotify
   liquid!
-  mongrel
   mysql
   nested_set!
   pg
-  puffer (>= 0.0.19)
-  rails
+  puffer!
+  rails (>= 3.1.0.rc4)
   rspec-rails
   sqlite3-ruby
diff --git a/Guardfile b/Guardfile
@@ -0,0 +1,20 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('spec/spec_helper.rb')                        { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  # Capybara request specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
+end
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
@@ -9,8 +9,8 @@ def index
 
   def drops
     {
-      :self => PufferPages::Liquid::PageDrop.new(@page, @page, request),
-      :root => PufferPages::Liquid::PageDrop.new(@page.root, @page, request)
+      :self => PufferPages::Liquid::PageDrop.new(@page, @page, self),
+      :root => PufferPages::Liquid::PageDrop.new(@page.root, @page, self)
     }.stringify_keys
   end
 

diff --git a/app/controllers/puffer_pages/pages_controller.rb b/app/controllers/puffer_pages/pages_controller.rb
@@ -1,7 +1,6 @@
 class PufferPages::PagesController < Puffer::TreeBase
   unloadable
 
-  view_paths_fallbacks_prepend :puffer_pages
   helper :puffer_pages
 
   setup do

diff --git a/autotest/discover.rb b/autotest/discover.rb
diff --git a/lib/puffer/tree_base.rb b/lib/puffer/tree_base.rb
@@ -2,12 +2,11 @@ module Puffer
   class TreeBase < Puffer::Base
     unloadable
 
-    view_paths_fallbacks_prepend :puffer_tree
     helper :puffer_tree
 
     define_fields :tree
 
-    def self.tree_fields
+    def self.tree_fi elds
       _tree_fields.presence || index_fields
     end
 

diff --git a/lib/puffer_pages.rb b/lib/puffer_pages.rb
@@ -22,8 +22,3 @@ def self.setup
 #require 'puffer_pages/liquid/tags/yield'
 require 'puffer_pages/liquid/tags/stylesheets'
 require 'puffer_pages/liquid/tags/javascripts'
-
-Puffer.setup do |config|
-  config.javascripts += %w(right-dialog right-tabs codemirror puffer_pages)
-  config.stylesheets += %w(puffer_pages puffer_tree)
-end