Skip to content

Commit

Permalink
now on Ruby2.1.0 Rails4.1.0, tests need work
Browse files Browse the repository at this point in the history
  • Loading branch information
kathyonu committed Apr 13, 2015
1 parent a51a166 commit 8666883
Show file tree
Hide file tree
Showing 21 changed files with 131 additions and 97 deletions.
2 changes: 1 addition & 1 deletion .ruby-gemset
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Rails4.0_prelaunch
Rails4.1_prelaunch
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0
2.1.0
7 changes: 4 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
ruby '2.0.0'
gem 'rails', '4.0.0'
ruby '2.1.0'
gem 'rails', '4.1.0'
gem 'rubyzip', '< 1.0.0'
gem 'sqlite3'
group :development, :test do
Expand All @@ -19,6 +19,7 @@ end
group :development do
gem 'quiet_assets', '>= 1.0.2'
gem 'better_errors', '>= 0.7.2'
gem 'spring', '~> 1.3.4'
end
gem 'bootstrap-sass', '~> 3.3.4.1'
gem 'cancan', '>= 1.6.9'
Expand All @@ -27,7 +28,7 @@ gem 'devise', '>= 2.2.3'
gem 'gibbon', git: 'git://github.com/amro/gibbon.git'
gem 'jquery-rails'
gem 'protected_attributes'
gem 'railties', '~> 4.0.0'
gem 'railties', '~> 4.1.0'
gem 'rolify', '>= 3.2.0'
gem 'rubygems-update', '~> 2.4.6'
gem 'sass-rails', '~> 4.0.0'
Expand Down
93 changes: 50 additions & 43 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,33 +9,35 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.0.0)
actionpack (= 4.0.0)
mail (~> 2.5.3)
actionpack (4.0.0)
activesupport (= 4.0.0)
builder (~> 3.1.0)
erubis (~> 2.7.0)
actionmailer (4.1.0)
actionpack (= 4.1.0)
actionview (= 4.1.0)
mail (~> 2.5.4)
actionpack (4.1.0)
actionview (= 4.1.0)
activesupport (= 4.1.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.0)
activesupport (= 4.0.0)
builder (~> 3.1.0)
activerecord (4.0.0)
activemodel (= 4.0.0)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.0)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.4)
activesupport (4.0.0)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
actionview (4.1.0)
activesupport (= 4.1.0)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.0)
activesupport (= 4.1.0)
builder (~> 3.1)
activerecord (4.1.0)
activemodel (= 4.1.0)
activesupport (= 4.1.0)
arel (~> 5.0.0)
activesupport (4.1.0)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
tzinfo (~> 1.1)
addressable (2.3.8)
arel (4.0.2)
autoprefixer-rails (5.1.8.1)
arel (5.0.1.20140414130214)
autoprefixer-rails (5.1.9)
execjs
json
bcrypt (3.1.10)
Expand All @@ -48,7 +50,7 @@ GEM
bootstrap-sass (3.3.4.1)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.2.19)
builder (3.1.4)
builder (3.2.2)
cancan (1.6.10)
capybara (2.4.4)
mime-types (>= 1.16)
Expand All @@ -65,7 +67,7 @@ GEM
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.9.1)
coffee-script-source (1.9.1.1)
cucumber (1.3.19)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
Expand Down Expand Up @@ -118,16 +120,16 @@ GEM
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.6.2)
minitest (4.7.5)
minitest (5.5.1)
multi_json (1.11.0)
multi_test (0.1.2)
multi_xml (0.5.5)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
orm_adapter (0.5.0)
polyglot (0.3.5)
protected_attributes (1.0.3)
activemodel (>= 4.0.0, < 5.0)
protected_attributes (1.0.9)
activemodel (>= 4.0.1, < 5.0)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
Expand All @@ -137,17 +139,19 @@ GEM
rack (1.5.2)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.0.0)
actionmailer (= 4.0.0)
actionpack (= 4.0.0)
activerecord (= 4.0.0)
activesupport (= 4.0.0)
rails (4.1.0)
actionmailer (= 4.1.0)
actionpack (= 4.1.0)
actionview (= 4.1.0)
activemodel (= 4.1.0)
activerecord (= 4.1.0)
activesupport (= 4.1.0)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.0)
sprockets-rails (~> 2.0.0)
railties (4.0.0)
actionpack (= 4.0.0)
activesupport (= 4.0.0)
railties (= 4.1.0)
sprockets-rails (~> 2.0)
railties (4.1.0)
actionpack (= 4.1.0)
activesupport (= 4.1.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
Expand Down Expand Up @@ -188,23 +192,25 @@ GEM
actionpack (~> 4.0)
activemodel (~> 4.0)
slop (3.6.0)
spring (1.3.4)
sprockets (2.12.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.1)
sprockets-rails (2.2.4)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.10)
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.43)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.0.1)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
Expand Down Expand Up @@ -235,14 +241,15 @@ DEPENDENCIES
protected_attributes
pry
quiet_assets (>= 1.0.2)
rails (= 4.0.0)
railties (~> 4.0.0)
rails (= 4.1.0)
railties (~> 4.1.0)
rolify (>= 3.2.0)
rspec-rails (>= 2.12.2)
rubygems-update (~> 2.4.6)
rubyzip (< 1.0.0)
sass-rails (~> 4.0.0)
selenium-webdriver (~> 2.32.1)
simple_form (>= 2.1.0)
spring (~> 1.3.4)
sqlite3
uglifier (~> 2.0.0)
4 changes: 4 additions & 0 deletions bin/rails
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#!/usr/bin/env ruby
begin
load File.expand_path("../spring", __FILE__)
rescue LoadError
end
APP_PATH = File.expand_path('../../config/application', __FILE__)
require_relative '../config/boot'
require 'rails/commands'
4 changes: 4 additions & 0 deletions bin/rake
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#!/usr/bin/env ruby
begin
load File.expand_path("../spring", __FILE__)
rescue LoadError
end
require_relative '../config/boot'
require 'rake'
Rake.application.run
15 changes: 15 additions & 0 deletions bin/spring
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/usr/bin/env ruby

# This file loads spring without using Bundler, in order to be fast.
# It gets overwritten when you run the `spring binstub` command.

unless defined?(Spring)
require "rubygems"
require "bundler"

if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m)
Gem.paths = { "GEM_PATH" => [Bundler.bundle_path.to_s, *Gem.path].uniq }
gem "spring", match[1]
require "spring/binstub"
end
end
2 changes: 1 addition & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Require the gems listed in Gemfile, including any gems
# you've limited to :test, :development, or :production.
Bundler.require(:default, Rails.env)
Bundler.require(*Rails.groups)

module RailsPrelaunchSignup
class Application < Rails::Application
Expand Down
6 changes: 3 additions & 3 deletions config/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ MANDRILL_API_KEY: Your_Mandrill_API_Key
MANDRILL_USERNAME: Your_Manrill_UserName
MAILCHIMP_API_KEY: Your_MailChimp_API_Key
MAILCHIMP_LIST_ID: My_List_ID
ROLES: ['admin', 'user']
ROLES: [admin, user]
# in transition from Rails3.2 to 4.0, showing all keys
SECRET_KEY: 1279ab267148f5ff7472cddc1177dcf4dda3b3873bbcf98024fe24bd95c51d008966513cec0f544f515777da013546415f83884a3883a258f98e8a9d47ef53ae
SECRET_TOKEN: 1ba85dd1130cb8eed4b810a598d953d218b51c7a05503474fe24eac65df0f9d9f828a59dcc5adbf1183fba51dcadda34832e04bbd31b44854de0dd3f8cabf45a
#SECRET_KEY: 1279ab267148f5ff7472cddc1177dcf4dda3b3873bbcf98024fe24bd95c51d008966513cec0f544f515777da013546415f83884a3883a258f98e8a9d47ef53ae
#SECRET_TOKEN: 1ba85dd1130cb8eed4b810a598d953d218b51c7a05503474fe24eac65df0f9d9f828a59dcc5adbf1183fba51dcadda34832e04bbd31b44854de0dd3f8cabf45a
SECRET_KEY_BASE: ba410eb94c87c28d417e790a1e887e144a88474502170a7c58441cdb273eb61e856c4ab38160f4f4fcc752a11331c7fd7f021eb51f4d2a6499b41d3e7af52104
2 changes: 1 addition & 1 deletion config/boot.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Set up gems listed in the Gemfile.
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)

require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
2 changes: 1 addition & 1 deletion config/environment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
require File.expand_path('../application', __FILE__)

# Initialize the Rails application.
RailsPrelaunchSignup::Application.initialize!
Rails.application.initialize!
15 changes: 9 additions & 6 deletions config/environments/development.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RailsPrelaunchSignup::Application.configure do
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.

# In the development environment your application's code is reloaded on
Expand All @@ -19,7 +19,7 @@
# Print deprecation notices to the Rails logger.
config.active_support.deprecation = :log

# Raise an error on page load if there are pending migrations
# Raise an error on page load if there are pending migrations.
config.active_record.migration_error = :page_load

# Do not compress assets in development.
Expand All @@ -30,15 +30,18 @@
# number of complex assets.
config.assets.debug = true

# ActionMailer Config
config.action_mailer.default_url_options = { :host => 'example.com' }
# Adds additional error checking when serving assets at runtime.
# Checks for improperly declared sprockets dependencies.
# Raises helpful error messages.
config.assets.raise_runtime_errors = true

config.action_mailer.delivery_method = :smtp
# ActionMailer Config
# change to true to allow email to be sent during development
config.action_mailer.perform_deliveries = false
config.action_mailer.raise_delivery_errors = true
config.action_mailer.default :charset => "utf-8"

config.action_mailer.default_url_options = { :host => 'example.com' }
config.action_mailer.delivery_method = :smtp
config.action_mailer.smtp_settings = {
:address => "smtp.mandrillapp.com",
:port => 25,
Expand Down
13 changes: 7 additions & 6 deletions config/environments/production.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
RailsPrelaunchSignup::Application.configure do
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.

# Code is not reloaded between requests.
config.cache_classes = true

# Eager load code on boot. This eager loads most of Rails and
# your application in memory, allowing both thread web servers
# your application in memory, allowing both threaded web servers
# and those relying on copy on write to perform better.
# Rake tasks automatically ignore this option for performance.
config.eager_load = true
Expand Down Expand Up @@ -66,7 +66,7 @@
# config.action_mailer.raise_delivery_errors = false

# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
# the I18n.default_locale when a translation can not be found).
# the I18n.default_locale when a translation cannot be found).
config.i18n.fallbacks = true

# Send deprecation notices to registered listeners.
Expand All @@ -78,15 +78,16 @@
# Use default logging formatter so that PID and timestamp are not suppressed.
config.log_formatter = ::Logger::Formatter.new

config.action_mailer.default_url_options = { :host => 'example.com' }
# Do not dump schema after migrations.
config.active_record.dump_schema_after_migration = false

# ActionMailer Config
# Setup for production - deliveries, no errors raised
config.action_mailer.default :charset => "utf-8"
config.action_mailer.default_url_options = { :host => 'example.com' }
config.action_mailer.delivery_method = :smtp
config.action_mailer.perform_deliveries = true
config.action_mailer.raise_delivery_errors = false
config.action_mailer.default :charset => "utf-8"

config.action_mailer.smtp_settings = {
:address => "smtp.mandrillapp.com",
:port => 25,
Expand Down
6 changes: 4 additions & 2 deletions config/environments/test.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RailsPrelaunchSignup::Application.configure do
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.

# The test environment is used exclusively to run your application's
Expand All @@ -14,7 +14,7 @@

# Configure static asset server for tests with Cache-Control for performance.
config.serve_static_assets = true
config.static_cache_control = "public, max-age=3600"
config.static_cache_control = 'public, max-age=3600'

# Show full error reports and disable caching.
config.consider_all_requests_local = true
Expand All @@ -35,5 +35,7 @@
config.active_support.deprecation = :stderr

# ActionMailer Config
# Raises error for missing translations
# config.action_view.raise_on_missing_translations = true
config.action_mailer.default_url_options = { :host => 'example.com' }
end
3 changes: 3 additions & 0 deletions config/initializers/cookies_serializer.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Be sure to restart your server when you modify this file.

Rails.application.config.action_dispatch.cookies_serializer = :json
2 changes: 1 addition & 1 deletion config/initializers/mime_types.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

# Add new mime types for use in respond_to blocks:
# Mime::Type.register "text/richtext", :rtf
# Mime::Type.register_alias "text/html", :iphone
# Mime::Type.register_alias "text/html", :iphone # 20150413 $ rake rails:update removes this line
11 changes: 0 additions & 11 deletions config/initializers/secret_token.rb

This file was deleted.

Loading

0 comments on commit 8666883

Please sign in to comment.