Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 5 commits
  • 13 files changed
  • 0 commit comments
  • 2 contributors
View
2  .rvmrc
@@ -1 +1 @@
-rvm ree@strangeloop-site
+rvm ruby-1.9.3-p385@strangeloop-site --create
View
23 Gemfile
@@ -12,7 +12,6 @@ gem 'dragonfly', '0.8.2'
gem 'uuidtools', '~> 2.1.2'
gem 'acts_as_commentable', '3.0.1'
-gem 'fastercsv', '1.5.4'
gem 'gravtastic'
gem 'mmcopyrights'
@@ -24,21 +23,15 @@ gem 'client_side_validations', '~> 3.0.4'
gem 'ri_cal', '~> 0.8.8'
gem 'savon', '0.9.1'
-
-gem 'require_relative', '1.0.1'
-
gem 'faraday_middleware','0.6.3'
-
-gem 'rbx-require-relative','0.0.5'
-
gem 'nokogiri', '1.5.0'
group :development, :test do
gem 'mongrel', '~> 1.2.0.pre2'
gem 'sqlite3-ruby', '~> 1.3.2', :require => 'sqlite3'
gem 'awesome_print', '~> 0.4.0'
- gem 'ruby-debug', '~> 0.10.4'
- #gem 'ruby-debug19', '~> 0.11.6'
+ #gem 'ruby-debug', '~> 0.10.4'
+ gem 'debugger', '~> 1.3'
end
group :production do
@@ -66,28 +59,16 @@ end
#And with Google Analytics _trackPageLoadTime
#And switching defaults that would otherwise say 'Company Name' to 'Strange Loop'
gem 'refinerycms', :git => "git://github.com/strangeloop/refinerycms.git", :branch => 'path_not_url_ssl_fix', :ref => 'aeaaef2078903cb9ec9f8b80f45aeb335f7acc13'
-#gem 'refinerycms', :path => "~/devl/tsl/tsl-refinerycms"
group :development, :test do
- # RSpec
gem 'rspec-rails', '~> 2.5.0'
- # Cucumber
gem 'capybara', '~> 1.1.2'
gem 'database_cleaner', '~> 0.6.0'
gem 'cucumber-rails', '~> 1.0.2'
gem 'launchy', '~> 0.3.7'
gem 'gherkin'
- gem 'spork', '>= 0.9.0.rc4' unless Bundler::WINDOWS
gem 'rack-test', '~> 0.5.6'
gem 'json_pure', '~> 1.5.1'
- # Factory Girl
- #gem 'factory_girl'
- gem "#{'j' if RUBY_PLATFORM == 'java'}ruby-prof" unless defined?(RUBY_ENGINE) and RUBY_ENGINE == 'rbx'
- gem 'ZenTest', '4.6.0'
- # Autotest
- gem 'autotest', '4.4.6'
- gem 'autotest-rails', '4.1.0'
- gem 'autotest-notification', '2.3.3'
end
# END REFINERY CMS ============================================================
View
38 Gemfile.lock
@@ -61,7 +61,6 @@ GEM
open4
Platform (0.4.0)
RedCloth (4.2.9)
- ZenTest (4.6.0)
abstract (1.0.0)
actionmailer (3.0.5)
actionpack (= 3.0.5)
@@ -96,13 +95,6 @@ GEM
addressable (2.2.8)
ajaxful_rating (3.0.0.beta7)
arel (2.0.10)
- autotest (4.4.6)
- ZenTest (>= 4.4.1)
- autotest-notification (2.3.3)
- autotest-standalone (~> 4.5)
- autotest-rails (4.1.0)
- ZenTest
- autotest-standalone (4.5.9)
awesome_print (0.4.0)
babosa (0.3.7)
bcrypt-ruby (2.1.4)
@@ -132,6 +124,13 @@ GEM
nokogiri (>= 1.5.0)
daemons (1.0.10)
database_cleaner (0.6.7)
+ debugger (1.3.1)
+ columnize (>= 0.3.1)
+ debugger-linecache (~> 1.1.1)
+ debugger-ruby_core_source (~> 1.1.8)
+ debugger-linecache (1.1.2)
+ debugger-ruby_core_source (>= 1.1.1)
+ debugger-ruby_core_source (1.1.8)
decent_exposure (1.0.2)
devise (1.2.1)
bcrypt-ruby (~> 2.1.2)
@@ -152,7 +151,6 @@ GEM
rack (>= 1.1.0, < 2)
faraday_middleware (0.6.3)
faraday (~> 0.6.0)
- fastercsv (1.5.4)
ffi (1.3.1)
formtastic (1.2.4)
actionpack (>= 2.3.7)
@@ -191,8 +189,6 @@ GEM
libwebsocket (0.1.7.1)
addressable
websocket
- linecache (0.46)
- rbx-require-relative (> 0.0.4)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
@@ -240,13 +236,11 @@ GEM
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (0.9.2.2)
- rbx-require-relative (0.0.5)
rdoc (3.12)
json (~> 1.4)
refinerycms-generators (1.0.4)
refinerycms-news (1.0.1)
refinerycms (~> 0.9.8)
- require_relative (1.0.1)
ri_cal (0.8.8)
rspec (2.5.0)
rspec-core (~> 2.5.0)
@@ -261,12 +255,6 @@ GEM
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.5.0)
- ruby-debug (0.10.4)
- columnize (>= 0.1)
- ruby-debug-base (~> 0.10.4.0)
- ruby-debug-base (0.10.4)
- linecache (>= 0.3)
- ruby-prof (0.11.2)
rubyzip (0.9.9)
savon (0.9.1)
builder (>= 2.1.2)
@@ -281,7 +269,6 @@ GEM
seo_meta (1.0.7)
refinerycms-generators (~> 1.0.1)
shoulda (2.11.3)
- spork (1.0.0rc3)
spruz (0.2.13)
sqlite3 (1.3.6)
sqlite3-ruby (1.3.3)
@@ -310,24 +297,20 @@ PLATFORMS
DEPENDENCIES
RedCloth (~> 4.2)
- ZenTest (= 4.6.0)
acts-as-taggable-on (~> 2.2.2)
acts_as_commentable (= 3.0.1)
ajaxful_rating (= 3.0.0.beta7)
- autotest (= 4.4.6)
- autotest-notification (= 2.3.3)
- autotest-rails (= 4.1.0)
awesome_print (~> 0.4.0)
capybara (~> 1.1.2)
carmen (= 0.2.4)
client_side_validations (~> 3.0.4)
cucumber-rails (~> 1.0.2)
database_cleaner (~> 0.6.0)
+ debugger (~> 1.3)
decent_exposure (~> 1.0)
dragonfly (= 0.8.2)
factory_girl_rails (~> 1.0.1)
faraday_middleware (= 0.6.3)
- fastercsv (= 1.5.4)
formtastic (~> 1.2.3)
friendly_id_globalize3 (~> 3.2.1)
gherkin
@@ -345,20 +328,15 @@ DEPENDENCIES
rack-test (~> 0.5.6)
rails (= 3.0.5)
rails3-generators (~> 0.17.2)
- rbx-require-relative (= 0.0.5)
refinerycms!
refinerycms-conference_sessions (= 1.0)!
refinerycms-news (= 1.0.1)
refinerycms-proposals (= 1.0)!
refinerycms-sponsorships (= 1.0)!
- require_relative (= 1.0.1)
ri_cal (~> 0.8.8)
rspec-rails (~> 2.5.0)
- ruby-debug (~> 0.10.4)
- ruby-prof
savon (= 0.9.1)
shoulda (~> 2.11.3)
- spork (>= 0.9.0.rc4)
sqlite3-ruby (~> 1.3.2)
unicorn (= 3.6.0)
uuidtools (~> 2.1.2)
View
3  app/controllers/application_controller.rb
@@ -20,6 +20,9 @@
# You can extend refinery with your own functions here and they will likely not get overriden in an update.
+require 'action_controller'
+require 'decent_exposure'
+
class ApplicationController < ActionController::Base
expose(:current_attendee) { Attendee.find_by_attendee_cred_id(current_attendee_cred.id) if current_attendee_cred }
View
2  app/controllers/attendees_controller.rb
@@ -1,3 +1,5 @@
+require_relative 'application_controller'
+
class AttendeesController < ApplicationController
before_filter :authenticate_attendee_cred!
respond_to :html, :ics, :only => :show
View
6 db/schema.rb
@@ -49,6 +49,7 @@
t.string "cached_slug"
t.string "company_url"
t.integer "attendee_cred_id"
+ t.text "bio"
end
add_index "attendees", ["cached_slug"], :name => "index_attendees_on_cached_slug", :unique => true
@@ -130,14 +131,13 @@
create_table "news_item_translations", :force => true do |t|
t.integer "news_item_id"
t.string "locale"
+ t.text "body"
t.string "external_url"
t.string "title"
- t.text "body"
t.datetime "created_at"
t.datetime "updated_at"
end
- add_index "news_item_translations", ["locale"], :name => "index_news_item_translations_on_locale"
add_index "news_item_translations", ["news_item_id"], :name => "index_news_item_translations_on_news_item_id"
create_table "news_items", :force => true do |t|
@@ -161,7 +161,6 @@
t.datetime "updated_at"
end
- add_index "page_part_translations", ["locale"], :name => "index_page_part_translations_on_locale"
add_index "page_part_translations", ["page_part_id"], :name => "index_page_part_translations_on_page_part_id"
create_table "page_parts", :force => true do |t|
@@ -185,7 +184,6 @@
t.datetime "updated_at"
end
- add_index "page_translations", ["locale"], :name => "index_page_translations_on_locale"
add_index "page_translations", ["page_id"], :name => "index_page_translations_on_page_id"
create_table "pages", :force => true do |t|
View
1  spec/adapters/relational_dragonfly_store_spec.rb
@@ -16,6 +16,7 @@
require 'spec_helper'
+require_relative '../../app/adapters/relational_dragonfly_store'
describe RelationalDragonflyStore do
View
1  spec/controllers/attendees_controller_spec.rb
@@ -1,4 +1,5 @@
require 'spec_helper'
+require_relative '../../app/controllers/attendees_controller'
describe AttendeesController do
let(:attendee) { Factory(:attendee) }
View
58 spec/spec_helper.rb
@@ -13,37 +13,30 @@
#- limitations under the License.
#-
+require_relative '../config/environment'
+require 'rspec/rails'
+require 'rspec/autorun'
-
+ENV["RAILS_ENV"] ||= 'test'
require 'rbconfig'
require 'factory_girl'
+require 'factory_girl_rails'
require 'warden'
require 'devise/test_helpers'
-require File.join(File.dirname(__FILE__), 'controller_macros')
-require File.join(File.dirname(__FILE__), 'custom_matchers')
-require File.join(File.dirname(__FILE__), '../vendor/engines/proposals/spec/factories')
+require_relative 'controller_macros'
+require_relative 'custom_matchers'
+require_relative '../vendor/engines/proposals/spec/factories'
def setup_environment
# This file is copied to ~/spec when you run 'rails generate rspec'
# from the project root directory.
- ENV["RAILS_ENV"] ||= 'test'
- require File.expand_path("../../config/environment", __FILE__)
- require 'rspec/rails'
require 'shoulda/integrations/rspec2'
- require 'spork/ext/ruby-debug'
# Requires supporting files with custom matchers and macros, etc,
# in ./support/ and its subdirectories.
Dir[File.expand_path('../support/**/*.rb', __FILE__)].each {|f| require f}
RSpec.configure do |config|
- # == Mock Framework
- #
- # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
- #
- # config.mock_with :mocha
- # config.mock_with :flexmock
- # config.mock_with :rr
config.mock_with :rspec
config.fixture_path = ::Rails.root.join('spec', 'fixtures').to_s
@@ -61,40 +54,7 @@ def setup_environment
end
end
-def each_run
- require 'factory_girl_rails'
-end
-
-unless RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
- require 'rubygems'
- require 'spork'
-
- Spork.prefork do
- # Loading more in this block will cause your tests to run faster. However,
- # if you change any configuration or code from libraries loaded here, you'll
- # need to restart spork for it take effect.
- setup_environment
- end
-
- Spork.each_run do
- # This code will be run each time you run your specs.
- each_run
- end
-
- # --- Instructions ---
- # - Sort through your spec_helper file. Place as much environment loading
- # code that you don't normally modify during development in the
- # Spork.prefork block.
- # - Place the rest under Spork.each_run block
- # - Any code that is left outside of the blocks will be ran during preforking
- # and during each_run!
- # - These instructions should self-destruct in 10 seconds. If they don't,
- # feel free to delete them.
- #
-else
- setup_environment
- each_run
-end
+setup_environment
def capture_stdout(&block)
original_stdout = $stdout
View
2  vendor/engines/conference_sessions/app/models/conference_session.rb
@@ -111,7 +111,7 @@ def self.by_short_session_time_and_location_for_formats(*formats)
end
def self.to_csv(year = nil)
- FasterCSV.generate({:force_quotes => true}) do |csv|
+ CSV.generate({:force_quotes => true}) do |csv|
csv << ["conf_year", "start_time", "end_time", "location", "position",
"title", "format", "talk_type", "track", "abstract", "comments", "prereqs",
"av_requirement", "video_approval", "speaker", "speaker_bio", "twitter_id", "company"]
View
4 vendor/engines/conference_sessions/spec/models/conference_session_spec.rb
@@ -125,7 +125,7 @@
it "Should generate CSV with only conference sessions in current year" do
csv = ConferenceSession.to_csv()
- arr_of_conference_sessions = FasterCSV.parse(csv)
+ arr_of_conference_sessions = CSV.parse(csv)
arr_of_conference_sessions.length.should == 3
header_row = arr_of_conference_sessions[0]
@@ -141,7 +141,7 @@
it "Should generate CSV with only conference sessions in 2010" do
csv = ConferenceSession.to_csv(2010)
- arr_of_conference_sessions = FasterCSV.parse(csv)
+ arr_of_conference_sessions = CSV.parse(csv)
arr_of_conference_sessions.length.should == 2
header_row = arr_of_conference_sessions[0]
View
2  vendor/engines/proposals/app/models/proposal.rb
@@ -85,7 +85,7 @@ def pending_count
def all_to_csv
proposals = Proposal.current.order("status ASC")
reviewers = sorted_reviewers(proposals)
- FasterCSV.generate({:force_quotes => true}) do |csv|
+ CSV.generate({:force_quotes => true}) do |csv|
csv << pending_csv_header_values(reviewers)
proposals.each do |proposal|
csv << pending_csv_data_values(proposal, reviewers)
View
2  vendor/engines/proposals/spec/models/proposal_spec.rb
@@ -256,7 +256,7 @@ def check_one_comment_list(comment_list, title, text)
it "Should generate CSV for all proposals in the current year" do
csv = Proposal.all_to_csv
- arr_of_proposals = FasterCSV.parse(csv)
+ arr_of_proposals = CSV.parse(csv)
arr_of_proposals.length.should == 4
header_row = arr_of_proposals[0]

No commit comments for this range

Something went wrong with that request. Please try again.