Permalink
Browse files

working through smallish rails 3 issues en route to big ones

  • Loading branch information...
1 parent e9e1704 commit 39ac980c8f1ed3605843d497f5450b38c97a3e93 @ethn ethn committed Oct 5, 2011
View
26 Gemfile
@@ -9,7 +9,7 @@ source 'http://rubygems.org'
gem 'rails', '>=3'
#gem 'rack', '>=1.1.0'
-gem 'rake'#, '>=0.8.7'
+#gem 'rake'#, '>=0.8.7'
gem 'htmlentities'#, '~>4.2.1'
gem 'macaddr'#, '~>1.0.0'
@@ -90,4 +90,28 @@ group :test do
# gem 'ruby-snarl', :platforms => ['mingw', 'mswin']
end
+
+group :assets do
+ gem 'sass-rails', " ~> 3.1.0"
+ gem 'coffee-rails', "~> 3.1.0"
+ gem 'uglifier'
+end
+
+gem 'jquery-rails'
+
+# Use unicorn as the web server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'ruby-debug19', :require => 'ruby-debug'
+
+group :test do
+ # Pretty printed test output
+ gem 'turn', :require => false
+end
+
+
# original list http://groups.google.com/group/wagn-dev/browse_thread/thread/79ff17d0bd1145e0/d822516dc749db89#d822516dc749db89
View
@@ -30,6 +30,7 @@ GEM
activesupport (= 3.1.0)
activesupport (3.1.0)
multi_json (~> 1.0)
+ ansi (1.3.0)
archive-tar-minitar (0.5.2)
arel (2.2.1)
assert2 (0.5.5)
@@ -39,6 +40,13 @@ GEM
xml-simple
bcrypt-ruby (3.0.1)
builder (3.0.0)
+ coffee-rails (3.1.1)
+ coffee-script (>= 2.2.0)
+ railties (~> 3.1.0)
+ coffee-script (2.2.0)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.1.2)
columnize (0.3.4)
cucumber (1.0.2)
builder (>= 2.1.2)
@@ -53,13 +61,18 @@ GEM
email_spec (0.6.6)
rspec
erubis (2.7.0)
+ execjs (1.2.9)
+ multi_json (~> 1.0)
gherkin (2.4.21)
json (>= 1.4.6)
hike (1.2.1)
hoe (2.12.3)
rake (~> 0.8)
htmlentities (4.2.4)
i18n (0.6.0)
+ jquery-rails (1.0.14)
+ railties (~> 3.0)
+ thor (~> 0.14)
json (1.4.6)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
@@ -113,6 +126,13 @@ GEM
ruby-openid (2.1.8)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
+ sass (3.1.8)
+ sass-rails (3.1.4)
+ actionpack (~> 3.1.0)
+ railties (~> 3.1.0)
+ sass (>= 3.1.4)
+ sprockets (~> 2.0.0)
+ tilt (~> 1.3.2)
spork (0.8.5)
sprockets (2.0.2)
hike (~> 1.2)
@@ -127,7 +147,12 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
+ turn (0.8.2)
+ ansi (>= 1.2.2)
tzinfo (0.3.30)
+ uglifier (1.0.3)
+ execjs (>= 0.3.0)
+ multi_json (>= 1.0.2)
uuid (2.2.0)
macaddr (~> 1.0)
xml-simple (1.1.0)
@@ -138,28 +163,32 @@ PLATFORMS
DEPENDENCIES
assert2
aws-s3 (>= 0.6.2)
+ coffee-rails (~> 3.1.0)
cucumber
cucumber-rails
database_cleaner
email_spec
gherkin
htmlentities
+ jquery-rails
json
macaddr
mysql (~> 2.8.1)
newrelic_rpm (>= 2.14.1)
nokogiri
pg (~> 0.7)
rails (>= 3)
- rake
rdoc
rspec
ruby-debug19
ruby-openid
+ sass-rails (~> 3.1.0)
spork
term-ansicolor
test-unit
timecop
+ turn
+ uglifier
uuid
win32-process (= 0.6.5)
win32console (= 1.3.0)
View
@@ -4,4 +4,4 @@
require File.expand_path('../config/application', __FILE__)
-Main::Application.load_tasks
+Wagn::Application.load_tasks
View
@@ -1,4 +1,4 @@
# This file is used by Rack-based servers to start the application.
require ::File.expand_path('../config/environment', __FILE__)
-run Main::Application
+run Wagn::Application
@@ -1,3 +1,4 @@
+=begin
module ActiveRecord
module ConnectionAdapters
class AbstractAdapter
@@ -41,3 +42,4 @@ def match(string)
end
end
end
+=end
@@ -4,4 +4,4 @@
# If you change this key, all old signed cookies will become invalid!
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
-Main::Application.config.secret_token = '65632e048d6c80d1e63c911e1a40a51072413543f3182e0261b52e3812b2c9f0ee81828fa5688a34c13a78e438a4b56f497135dc079a4e4460733d555968a2f8'
+Wagn::Application.config.secret_token = '65632e048d6c80d1e63c911e1a40a51072413543f3182e0261b52e3812b2c9f0ee81828fa5688a34c13a78e438a4b56f497135dc079a4e4460733d555968a2f8'
@@ -1,8 +1,8 @@
# Be sure to restart your server when you modify this file.
-Main::Application.config.session_store :cookie_store, key: '_main_session'
+Wagn::Application.config.session_store :cookie_store, key: '_wagn_session'
# Use the database for sessions instead of the cookie-based default,
# which shouldn't be used to store highly confidential information
# (create the session table with "rails generate session_migration")
-# Main::Application.config.session_store :active_record_store
+# Wagn::Application.config.session_store :active_record_store
@@ -3,7 +3,7 @@
require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
# Load Rails testing infrastructure
-require 'test_help'
+require 'rails/test_help'
# Now we can load test_helper since we've already loaded the
# profile RAILS environment.

0 comments on commit 39ac980

Please sign in to comment.