Skip to content

Commit

Permalink
Making site run in ruby 1.9.2
Browse files Browse the repository at this point in the history
  • Loading branch information
kelsin committed May 4, 2014
1 parent 7858f78 commit 5eea17e
Show file tree
Hide file tree
Showing 27 changed files with 1,063 additions and 1,029 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
@@ -1 +1 @@
1.8.7-p371
1.9.2-p326
6 changes: 5 additions & 1 deletion Gemfile
@@ -1,6 +1,8 @@
source "https://rubygems.org"

gem "rails", "2.3.11"
gem 'rake'
gem 'rdoc', '2.4.2'

gem "rack", "1.1.2"

Expand All @@ -14,10 +16,12 @@ gem "icalendar", "1.1.6"
gem "will_paginate", "2.3.15"
gem "httparty", "0.7.4"

gem "sshkit", "1.3.0"

gem "unicorn"

group :development do
gem "sqlite3-ruby"
gem "sqlite3"
gem 'capistrano', '3.2.1', :require => false
gem 'capistrano-rails', :require => false
gem 'capistrano-bundler', :require => false
Expand Down
17 changes: 12 additions & 5 deletions Gemfile.lock
Expand Up @@ -32,11 +32,14 @@ GEM
dbi (0.4.5)
deprecated (= 2.0.1)
deprecated (2.0.1)
hoe (3.12.0)
rake (>= 0.8, < 11.0)
httparty (0.7.4)
crack (= 0.1.8)
i18n (0.6.9)
icalendar (1.1.6)
kgio (2.9.2)
minitest (1.7.2)
mysql (2.8.1)
mysql2 (0.3.13)
net-scp (1.2.1)
Expand All @@ -52,12 +55,13 @@ GEM
rake (>= 0.8.3)
raindrops (0.13.0)
rake (10.3.1)
rdoc (2.4.2)
hoe (>= 1.11.0)
minitest (~> 1.3)
sqlite3 (1.3.9)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
sshkit (1.4.0)
sshkit (1.3.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
net-ssh
term-ansicolor
term-ansicolor (1.3.0)
tins (~> 1.0)
Expand Down Expand Up @@ -86,7 +90,10 @@ DEPENDENCIES
mysql2 (= 0.3.13)
rack (= 1.1.2)
rails (= 2.3.11)
sqlite3-ruby
rake
rdoc (= 2.4.2)
sqlite3
sshkit (= 1.3.0)
tzinfo (= 0.3.25)
unicorn
will_paginate (= 2.3.15)
2 changes: 1 addition & 1 deletion Rakefile
Expand Up @@ -5,6 +5,6 @@ require(File.join(File.dirname(__FILE__), 'config', 'boot'))

require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
require 'rdoc/task'

require 'tasks/rails'
6 changes: 6 additions & 0 deletions config.ru
@@ -0,0 +1,6 @@
# Require your environment file to bootstrap Rails
require ::File.dirname(__FILE__) + '/config/environment'

# Dispatch the request
use Rails::Rack::Static
run ActionController::Dispatcher.new
14 changes: 0 additions & 14 deletions config/config.yml.sample

This file was deleted.

18 changes: 0 additions & 18 deletions config/database.yml.sample

This file was deleted.

2 changes: 1 addition & 1 deletion config/deploy.rb
Expand Up @@ -14,7 +14,7 @@
set :linked_dirs, %w{log tmp/pids tmp/cache tmp/sockets vendor/bundle}

set :rbenv_type, :user
set :rbenv_ruby, '1.8.7-p371'
set :rbenv_ruby, '1.9.2-p326'

namespace :deploy do
desc 'Restart application'
Expand Down
25 changes: 25 additions & 0 deletions lib/tasks/jrails.rake
@@ -0,0 +1,25 @@
namespace :jrails do

namespace :js do
desc "Copies the jQuery and jRails javascripts to public/javascripts"
task :install do
puts "Copying files..."
project_dir = RAILS_ROOT + '/public/javascripts/'
scripts = Dir[File.join(File.dirname(__FILE__), '..', '/javascripts/', '*.js')]
FileUtils.cp(scripts, project_dir)
puts "files copied successfully."
end

desc 'Remove the prototype / script.aculo.us javascript files'
task :scrub do
puts "Removing files..."
files = %W[controls.js dragdrop.js effects.js prototype.js]
project_dir = File.join(RAILS_ROOT, 'public', 'javascripts')
files.each do |fname|
FileUtils.rm(File.join(project_dir, fname)) if File.exists?(File.join(project_dir, fname))
end
puts "files removed successfully."
end
end

end
144 changes: 0 additions & 144 deletions lib/tasks/rspec.rake

This file was deleted.

415 changes: 188 additions & 227 deletions public/javascripts/jquery-ui-1.7.1.custom.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/javascripts/jrails.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions vendor/plugins/jrails/CHANGELOG
@@ -1,11 +1,19 @@
SVN
0.5.0 (31 July 2009)
* Gemification
* Support for Ruby 1.9.X
* Updated to jQuery 1.3.2
* Updated to jQuery UI 1.7.2
* Created a jrails binary (runs rake tasks) because rails does not (yet?) pickup
tasks from gem plugins
* Changed default to use jQuery compatibility name (not $)
* Created a scrub task that will remove the prototype / script.aculo.us
javascript files
* better approximate scriptaculous effect names
* add support for page[:element_id].visual_effect(:effect) as well as page.visual_effect(:effect, :element_id)
* added a reset form function to jrails.js (stolen from jquery form)
* can now use jquery selectors in all functions
* added javascript_function helper to render inline rjs helpers
* better support for sortable_element
* updated to jquery-ui 1.5.1

0.4.0 (16 June 2008)
* updated to jquery-ui 1.5 & merged js into single file
Expand Down
18 changes: 18 additions & 0 deletions vendor/plugins/jrails/LICENSE
@@ -0,0 +1,18 @@
Copyright (c) 2008 Aaron Eisenberger

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

0 comments on commit 5eea17e

Please sign in to comment.