Skip to content

Commit 1030730

Browse files
committed
2 parents 91792c2 + 70eee3a commit 1030730

File tree

172 files changed

+2354
-1468
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+2354
-1468
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,5 @@ vcr_cassettes
5858
dump
5959
BACKUP
6060
Guardfile
61+
verification.log
62+
npm-debug.log

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ If you're running Windows, [here's a guide written by one of our members on how
4949
1. **Install VirtualBox**
5050

5151
Grab the VirtualBox installer from **[here](https://www.virtualbox.org/wiki/Download_Old_Builds_4_3)**.
52-
52+
5353
![Download the Vbox installer and extensions from here](https://www.evernote.com/shard/s13/sh/68b6a635-7a80-444b-a210-c1aa61405efc/955c950ebafc46f0f1069e27e85bb120)
5454

5555
The _required_ version is **VirtualBox 4.3.12.**

Gemfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@ gem 'sitemap_generator'
126126
gem 'tweet-button'
127127
gem 'local_time'
128128

129+
gem 'elasticsearch-model'
130+
gem 'elasticsearch-rails'
131+
129132
# DROP BEFORE RAILS 4
130133
# Mongo
131134
gem 'mongoid'
@@ -143,6 +146,7 @@ gem 'tire'
143146

144147
group :development do
145148
gem 'better_errors'
149+
gem 'binding_of_caller'
146150
gem 'flog'
147151
gem 'fukuzatsu'
148152
gem 'guard-rspec'
@@ -154,16 +158,17 @@ group :development do
154158
end
155159

156160
group :development, :test do
161+
gem 'annotate'
157162
gem 'fabrication-rails'
158163
gem 'ffaker'
159164
gem 'jazz_hands', github: 'nixme/jazz_hands', branch: 'bring-your-own-debugger'
160165
gem 'launchy'
161166
gem 'pry-byebug'
162-
gem 'pry-rescue'
167+
#gem 'pry-rescue'
168+
#gem 'pry-stack_explorer'
163169
gem 'quiet_assets'
164-
gem 'syntax'
165-
gem 'annotate'
166170
gem 'rspec-rails'
171+
gem 'syntax'
167172
end
168173

169174
group :test do
@@ -182,6 +187,7 @@ group :test do
182187
gem 'timecop'
183188
gem 'vcr'
184189
gem 'webmock', '<1.16'
190+
gem 'stripe-ruby-mock', git: 'https://github.com/rebelidealist/stripe-ruby-mock', branch: 'live-tests'
185191
end
186192

187193
gem 'airbrake'

Gemfile.lock

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@ GIT
3838
mime-types (>= 1.25, < 3.0)
3939
rest-client (~> 1.4)
4040

41+
GIT
42+
remote: https://github.com/rebelidealist/stripe-ruby-mock
43+
revision: f603978fd1a38b1c27ff67cfa7d6ac95b71abe5c
44+
branch: live-tests
45+
specs:
46+
stripe-ruby-mock (2.0.0)
47+
dante (>= 0.2.0)
48+
jimson-temp
49+
stripe (>= 1.15.0)
50+
4151
GEM
4252
remote: https://rubygems.org/
4353
remote: https://rails-assets.org/
@@ -106,6 +116,7 @@ GEM
106116
rack (>= 0.9.0)
107117
binding_of_caller (0.7.2)
108118
debug_inspector (>= 0.0.1)
119+
blankslate (3.1.3)
109120
bson (1.10.2)
110121
bson_ext (1.10.2)
111122
bson (~> 1.10.2)
@@ -176,6 +187,7 @@ GEM
176187
httparty (~> 0.10)
177188
json
178189
curb (0.8.6)
190+
dante (0.2.0)
179191
database_cleaner (1.3.0)
180192
debug_inspector (0.0.2)
181193
debugger-linecache (1.2.0)
@@ -195,6 +207,19 @@ GEM
195207
execjs
196208
eco-source (1.1.0.rc.1)
197209
ejs (1.1.1)
210+
elasticsearch (1.0.4)
211+
elasticsearch-api (= 1.0.4)
212+
elasticsearch-transport (= 1.0.4)
213+
elasticsearch-api (1.0.4)
214+
multi_json
215+
elasticsearch-model (0.1.4)
216+
activesupport (> 3)
217+
elasticsearch (> 0.4)
218+
hashie
219+
elasticsearch-rails (0.1.4)
220+
elasticsearch-transport (1.0.4)
221+
faraday
222+
multi_json
198223
em-http-request (1.1.2)
199224
addressable (>= 2.3.4)
200225
cookiejar
@@ -325,11 +350,15 @@ GEM
325350
httpauth (0.2.1)
326351
i18n (0.6.11)
327352
inflecto (0.0.2)
328-
interception (0.5)
329353
ipaddress (0.8.0)
330354
jbuilder (2.1.3)
331355
activesupport (>= 3.0.0, < 5)
332356
multi_json (~> 1.2)
357+
jimson-temp (0.9.5)
358+
blankslate (>= 3.1.2)
359+
multi_json (~> 1.0)
360+
rack (~> 1.4)
361+
rest-client (~> 1.0)
333362
journey (1.0.4)
334363
jquery-rails (2.0.3)
335364
railties (>= 3.1.0, < 5.0)
@@ -473,9 +502,6 @@ GEM
473502
pry-remote (0.1.8)
474503
pry (~> 0.9)
475504
slop (~> 3.0)
476-
pry-rescue (1.4.1)
477-
interception (>= 0.5)
478-
pry
479505
pry-stack_explorer (0.4.9.1)
480506
binding_of_caller (>= 0.7)
481507
pry (>= 0.9.11)
@@ -743,6 +769,7 @@ DEPENDENCIES
743769
awesome_print
744770
backbone-on-rails
745771
better_errors
772+
binding_of_caller
746773
bson_ext
747774
capybara
748775
capybara-screenshot
@@ -758,6 +785,8 @@ DEPENDENCIES
758785
createsend
759786
database_cleaner
760787
dotenv-rails
788+
elasticsearch-model
789+
elasticsearch-rails
761790
ember-rails!
762791
fabrication-rails
763792
faraday (~> 0.8.1)
@@ -808,7 +837,6 @@ DEPENDENCIES
808837
poltergeist
809838
postgres_ext
810839
pry-byebug
811-
pry-rescue
812840
pubnub (= 0.1.9)
813841
puma
814842
querystring
@@ -844,6 +872,7 @@ DEPENDENCIES
844872
spring-commands-rspec
845873
squeel (= 1.0.1)
846874
stripe!
875+
stripe-ruby-mock!
847876
strong_parameters
848877
syntax
849878
timecop

0 commit comments

Comments
 (0)