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.
...
  • 4 commits
  • 7 files changed
  • 0 commit comments
  • 2 contributors
View
1  .rspec
@@ -1,2 +1 @@
--color
---drb
View
20 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'
@@ -46,6 +45,14 @@ group :test do
gem 'factory_girl_rails', '~> 1.0.1'
gem 'rails3-generators', '~> 0.17.2'
gem 'jasmine'
+ gem 'rspec-rails', '~> 2.5.0'
+ 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 'rack-test', '~> 0.5.6'
+ gem 'json_pure', '~> 1.5.1'
#gem 'capybara-envjs'
end
@@ -61,17 +68,6 @@ end
#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'
-group :development, :test do
- gem 'rspec-rails', '~> 2.5.0'
- 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 'rack-test', '~> 0.5.6'
- gem 'json_pure', '~> 1.5.1'
-end
-
# END REFINERY CMS ============================================================
# USER DEFINED
View
2  Gemfile.lock
@@ -151,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)
@@ -312,7 +311,6 @@ DEPENDENCIES
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
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.