Skip to content

Commit 6d82f54

Browse files
committedJan 5, 2015
Press Merge to pay respects to MongoDB
1 parent 7e5c886 commit 6d82f54

21 files changed

+7
-980
lines changed
 

‎.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
language: ruby
22
rvm:
33
- 2.1.5
4-
bundler_args: "--without development production autotest"
4+
bundler_args: "--without development production"
55
services:
6-
- mongodb
76
- redis-server
87
before_install:
98
- wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.90.13.deb

‎Gemfile

+1-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ gem 'rails', '~> 3.2'
77

88
gem 'sass', '~> 3.2.9'
99
gem 'coffee-rails', '~> 3.2.1'
10-
gem 'compass-rails'
1110
gem 'sass-rails', '~> 3.2.6'
1211
gem 'uglifier', '>= 1.0.3'
1312
# Assets
@@ -29,7 +28,6 @@ gem 'dotenv-rails', groups: [:development, :test]
2928
# Attachements
3029
gem 'carrierwave'
3130
gem 'carrierwave_backgrounder' #background processing of images
32-
gem 'carrierwave-mongoid', require: 'carrierwave/mongoid'
3331

3432
# HTML
3533
gem 'haml'
@@ -133,11 +131,7 @@ gem 'elasticsearch-model'
133131
gem 'elasticsearch-rails'
134132

135133
# DROP BEFORE RAILS 4
136-
# Mongo
137-
gem 'mongoid'
138-
gem 'mongo'
139-
gem 'mongoid_taggable'
140-
gem 'bson_ext'
134+
gem 'compass-rails'
141135
gem 'strong_parameters'
142136
gem 'postgres_ext'
143137
# ElasticSearch client

‎Gemfile.lock

-27
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,6 @@ GEM
119119
binding_of_caller (0.7.2)
120120
debug_inspector (>= 0.0.1)
121121
blankslate (3.1.3)
122-
bson (1.10.2)
123-
bson_ext (1.10.2)
124-
bson (~> 1.10.2)
125122
buftok (0.2.0)
126123
builder (3.0.4)
127124
byebug (2.7.0)
@@ -142,10 +139,6 @@ GEM
142139
activesupport (>= 3.2.0)
143140
json (>= 1.7)
144141
mime-types (>= 1.16)
145-
carrierwave-mongoid (0.7.1)
146-
carrierwave (>= 0.8.0, < 0.11.0)
147-
mongoid (>= 3.0, < 5.0)
148-
mongoid-grid_fs (>= 1.3, < 3.0)
149142
carrierwave_backgrounder (0.4.1)
150143
carrierwave (~> 0.5)
151144
celluloid (0.16.0)
@@ -406,20 +399,6 @@ GEM
406399
escape
407400
json
408401
rack
409-
mongo (1.10.2)
410-
bson (= 1.10.2)
411-
mongoid (3.1.6)
412-
activemodel (~> 3.2)
413-
moped (~> 1.4)
414-
origin (~> 1.0)
415-
tzinfo (~> 0.3.29)
416-
mongoid-grid_fs (2.1.0)
417-
mime-types (>= 1.0, < 3.0)
418-
mongoid (>= 3.0, < 5.0)
419-
mongoid_taggable (1.1.1)
420-
mongoid (>= 3)
421-
rake
422-
moped (1.5.2)
423402
multi_json (1.10.1)
424403
multi_xml (0.5.5)
425404
multipart-post (1.2.0)
@@ -466,7 +445,6 @@ GEM
466445
omniauth-twitter (0.0.18)
467446
multi_json (~> 1.3)
468447
omniauth-oauth (~> 1.0)
469-
origin (1.1.0)
470448
parser (2.1.9)
471449
ast (>= 1.1, < 3.0)
472450
slop (~> 3.4, >= 3.4.5)
@@ -766,11 +744,9 @@ DEPENDENCIES
766744
backbone-on-rails
767745
better_errors
768746
binding_of_caller
769-
bson_ext
770747
capybara
771748
capybara-screenshot
772749
carrierwave
773-
carrierwave-mongoid
774750
carrierwave_backgrounder
775751
chronic
776752
clockwork
@@ -815,9 +791,6 @@ DEPENDENCIES
815791
metamagic
816792
mini_magick
817793
mixpanel
818-
mongo
819-
mongoid
820-
mongoid_taggable
821794
multi_json
822795
never_wastes
823796
newrelic_rpm

‎Vagrantfile

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
4040
config.vm.network :private_network, ip: '192.168.237.95' # 192.168.cdr.wl
4141

4242
set_port_mapping_for(config, 'elasticsearch', 9200, custom_settings)
43-
set_port_mapping_for(config, 'mongodb', 27017, custom_settings)
4443
set_port_mapping_for(config, 'postgres', 5432, custom_settings)
4544
set_port_mapping_for(config, 'redis', 6379, custom_settings)
4645
set_port_mapping_for(config, 'rails', 3000, custom_settings, true)

‎app/models/github_profile.rb

-97
This file was deleted.

‎app/models/github_repo.rb

-208
This file was deleted.

‎app/models/github_user.rb

-32
This file was deleted.

‎config/initializers/mongoid_monkeypatch.rb

-9
This file was deleted.

‎config/initializers/omniauth.rb

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# http://rubydoc.info/gems/omniauth/OmniAuth/Strategies/Developer
33
provider :developer unless Rails.env.production?
44

5-
provider :github, GithubOld::GITHUB_CLIENT_ID, GithubOld::GITHUB_SECRET
5+
provider :github, ENV['GITHUB_CLIENT_ID'], ENV['GITHUB_SECRET']
66
provider :twitter, ENV['TWITTER_CONSUMER_KEY'], ENV['TWITTER_CONSUMER_SECRET']
7-
provider :linkedin, LinkedInStream::KEY, LinkedInStream::SECRET
7+
provider :linkedin, ENV['LINKEDIN_KEY'], ENV['LINKEDIN_SECRET']
88
end
99

1010
OmniAuth.config.on_failure do |env|
@@ -13,7 +13,6 @@
1313
strategy = env['omniauth.error.strategy']
1414

1515
Rails.logger.error("OmniAuth #{strategy.class.name}::#{error_type}: #{exception.inspect}")
16-
# Honeybadger::Rack.new(Rack::Request.new(env)).notify_honeybadger(exception, env) if Rails.env.production?
1716

1817
new_path = "#{env['SCRIPT_NAME']}#{OmniAuth.config.path_prefix}/failure?message=#{error_type}"
1918
[302, {'Location' => new_path, 'Content-Type' => 'text/html'}, []]

‎config/mongoid.yml

-55
This file was deleted.

‎public/humans.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ Location: China
127127

128128

129129
/* SITE */
130-
Last update: 2014/10/06
130+
Last update: 2014/31/12
131131
Standards: HTML5, CSS3
132-
Components: Ruby on Rails, jQuery, Sass, Backbone.js, Ember.js, PostgreSQL, ElasticSearch, MongoDB, Redis, etc.
132+
Components: Ruby on Rails, jQuery, Sass, Backbone.js, Ember.js, PostgreSQL, ElasticSearch, Redis, etc.
133133
Software: Vim, Tmux, Vagrant, Git, etc.
134134
Language: English
135135
IDE: Vim

‎script/bson2json.rb

-55
This file was deleted.

‎script/convert.sh

-12
This file was deleted.

‎script/import_team_data.rb

-132
This file was deleted.

‎spec/fabricators/github_profile_fabricator.rb

-42
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Fabricator(:pg_github_profile, from: 'users/github/profile') do
1+
Fabricator(:github_profile, from: 'users/github/profile') do
22
end

‎spec/models/github_profile_spec.rb

-115
This file was deleted.

‎spec/models/github_repo_spec.rb

-160
This file was deleted.

‎spec/models/users/github/repository_spec.rb

-9
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,4 @@
55
it { is_expected.to have_many :contributors }
66
it { is_expected.to belong_to :organization }
77
it { is_expected.to belong_to :owner }
8-
9-
let(:data) { JSON.parse(File.read(File.join(Rails.root, 'spec', 'fixtures', 'githubv3', 'user_repo.js'))).with_indifferent_access }
10-
let(:repo) do
11-
GithubRepo.for_owner_and_name('mdeiters', 'semr', nil, data)
12-
end
13-
let(:access_token) { '9432ed76b16796ec034670524d8176b3f5fee9aa' }
14-
let(:client_id) { '974695942065a0e00033' }
15-
let(:client_secret) { '7d49c0deb57b5f6c75e6264ca12d20d6a8ffcc68' }
16-
178
end

‎spec/spec_helper.rb

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
DatabaseCleaner.strategy = :transaction
3636
DatabaseCleaner.start
3737

38-
Mongoid::Sessions.default.collections.reject { |c| c.name =~ /^system/ }.each(&:drop)
3938
ActionMailer::Base.deliveries.clear
4039
end
4140

‎vagrant/coderwall-box/scripts/postinstall.sh

-10
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ export MAILGUN_SIGNATURE=NEEDS_TO_COPY_FROM_DOTENV
2727
export MAILGUN_TOKEN=NEEDS_TO_COPY_FROM_DOTENV
2828
export MIXPANEL_API_SECRET=NEEDS_TO_COPY_FROM_DOTENV
2929
export MIXPANEL_TOKEN=NEEDS_TO_COPY_FROM_DOTENV
30-
export MONGODB_DATABASE_NAME=NEEDS_TO_COPY_FROM_DOTENV
31-
export MONGO_DATABASE=NEEDS_TO_COPY_FROM_DOTENV
3230
export NEW_RELIC_PROMOTION=NEEDS_TO_COPY_FROM_DOTENV
3331
export NOTIFIER_ADMIN_EMAILS=NEEDS_TO_COPY_FROM_DOTENV
3432
export PARTY_FOUL_OAUTH_TOKEN=NEEDS_TO_COPY_FROM_DOTENV
@@ -225,12 +223,6 @@ groupadd puppet
225223
# Install Foreman
226224
/opt/ruby/bin/gem install foreman --no-ri --no-rdoc
227225

228-
# MongoDB
229-
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
230-
echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | tee /etc/apt/sources.list.d/mongodb.list
231-
apt-get -y update
232-
apt-get -y install mongodb-10gen
233-
234226
REDIS_VERSION="2.8.4"
235227
wget http://download.redis.io/releases/redis-$REDIS_VERSION.tar.gz
236228
tar xzf redis-$REDIS_VERSION.tar.gz
@@ -380,8 +372,6 @@ su - vagrant <<-'EOF'
380372
export MAILGUN_TOKEN=NEEDS_TO_COPY_FROM_DOTENV
381373
export MIXPANEL_API_SECRET=NEEDS_TO_COPY_FROM_DOTENV
382374
export MIXPANEL_TOKEN=NEEDS_TO_COPY_FROM_DOTENV
383-
export MONGODB_DATABASE_NAME=NEEDS_TO_COPY_FROM_DOTENV
384-
export MONGO_DATABASE=NEEDS_TO_COPY_FROM_DOTENV
385375
export NEW_RELIC_PROMOTION=NEEDS_TO_COPY_FROM_DOTENV
386376
export NOTIFIER_ADMIN_EMAILS=NEEDS_TO_COPY_FROM_DOTENV
387377
export PARTY_FOUL_OAUTH_TOKEN=NEEDS_TO_COPY_FROM_DOTENV

0 commit comments

Comments
 (0)
Please sign in to comment.