Skip to content

Commit

Permalink
Upgrade Ruby, Fix Geocoder
Browse files Browse the repository at this point in the history
* Ruby 2.1.1
* Fixes #41 for realz
  • Loading branch information
jessieay committed May 2, 2014
1 parent 0577841 commit 0c2ccdc
Show file tree
Hide file tree
Showing 5 changed files with 138 additions and 122 deletions.
2 changes: 2 additions & 0 deletions example_apps/rails/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
coverage
log/*
1 change: 1 addition & 0 deletions example_apps/rails/.ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.1.1
3 changes: 2 additions & 1 deletion example_apps/rails/Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

ruby '2.0.0'
ruby '2.1.1'

gem 'airbrake'
gem 'bourbon'
Expand Down Expand Up @@ -32,6 +32,7 @@ end
group :development, :test do
gem 'factory_girl_rails'
gem 'pry'
gem 'pry-debugger'
gem 'rspec-rails', '>= 2.14'
end

Expand Down
252 changes: 132 additions & 120 deletions example_apps/rails/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,206 +1,217 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.0.0)
actionpack (= 4.0.0)
mail (~> 2.5.3)
actionpack (4.0.0)
activesupport (= 4.0.0)
builder (~> 3.1.0)
erubis (~> 2.7.0)
actionmailer (4.1.0)
actionpack (= 4.1.0)
actionview (= 4.1.0)
mail (~> 2.5.4)
actionpack (4.1.0)
actionview (= 4.1.0)
activesupport (= 4.1.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.0)
activesupport (= 4.0.0)
builder (~> 3.1.0)
activerecord (4.0.0)
activemodel (= 4.0.0)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.0)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.0)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
actionview (4.1.0)
activesupport (= 4.1.0)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.0)
activesupport (= 4.1.0)
builder (~> 3.1)
activerecord (4.1.0)
activemodel (= 4.1.0)
activesupport (= 4.1.0)
arel (~> 5.0.0)
activesupport (4.1.0)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
addressable (2.3.5)
airbrake (3.1.14)
tzinfo (~> 1.1)
addressable (2.3.6)
airbrake (3.1.16)
builder
json
arel (4.0.0)
atomic (1.1.14)
better_errors (1.0.1)
multi_json
arel (5.0.1.20140414130214)
better_errors (1.1.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bourbon (3.1.8)
sass (>= 3.2.0)
bourbon (3.2.1)
sass (~> 3.2)
thor
builder (3.1.4)
builder (3.2.2)
capybara (2.1.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
capybara-webkit (1.0.0)
capybara (~> 2.0, >= 2.0.2)
capybara-webkit (1.1.1)
capybara (>= 2.0.2, < 2.2.0)
json
coderay (1.1.0)
coffee-rails (4.0.0)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0.beta, < 5.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.6.3)
crack (0.4.1)
safe_yaml (~> 0.9.0)
database_cleaner (1.1.1)
coffee-script-source (1.7.0)
columnize (0.8.9)
crack (0.4.2)
safe_yaml (~> 1.0.0)
database_cleaner (1.2.0)
debug_inspector (0.0.2)
delayed_job (4.0.0)
activesupport (>= 3.0, < 4.1)
delayed_job_active_record (4.0.0)
activerecord (>= 3.0, < 4.1)
debugger (1.6.6)
columnize (>= 0.3.1)
debugger-linecache (~> 1.2.0)
debugger-ruby_core_source (~> 1.3.2)
debugger-linecache (1.2.0)
debugger-ruby_core_source (1.3.2)
delayed_job (4.0.1)
activesupport (>= 3.0, < 4.2)
delayed_job_active_record (4.0.1)
activerecord (>= 3.0, < 4.2)
delayed_job (>= 3.0, < 4.1)
diff-lcs (1.2.4)
docile (1.1.2)
dotenv (0.9.0)
diff-lcs (1.2.5)
docile (1.1.3)
dotenv (0.7.0)
email_validator (1.4.0)
activemodel
erubis (2.7.0)
execjs (2.0.2)
factory_girl (4.2.0)
factory_girl (4.4.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.2.1)
factory_girl (~> 4.2.0)
factory_girl_rails (4.4.1)
factory_girl (~> 4.4.0)
railties (>= 3.0.0)
flutie (2.0.0)
foreman (0.63.0)
dotenv (>= 0.7)
thor (>= 0.13.6)
foreman (0.66.0)
dotenv (~> 0.7.0)
thor (~> 0.19.1)
geocoder (1.2.0)
high_voltage (1.2.4)
high_voltage (2.1.0)
hike (1.2.3)
i18n (0.6.5)
jbuilder (1.5.1)
activesupport (>= 3.0.0)
multi_json (>= 1.2.0)
jquery-rails (3.0.4)
i18n (0.6.9)
jbuilder (2.0.6)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.0)
kgio (2.8.1)
launchy (2.3.0)
json (1.8.1)
kgio (2.9.2)
launchy (2.4.2)
addressable (~> 2.3)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.2)
mime-types (1.25)
mini_portile (0.5.1)
minitest (4.7.5)
multi_json (1.8.4)
neat (1.4.0)
bourbon (>= 2.1)
sass (>= 3.2)
newrelic_rpm (3.6.7.159)
nokogiri (1.6.0)
mime-types (1.25.1)
mini_portile (0.5.3)
minitest (5.3.3)
multi_json (1.9.3)
neat (1.5.1)
bourbon (>= 3.1)
sass (~> 3.2.19)
newrelic_rpm (3.8.0.218)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
oj (2.1.4)
pg (0.17.0)
polyglot (0.3.3)
pry (0.9.6)
coderay (>= 0.9.8)
method_source (>= 0.6.5)
ruby_parser (>= 2.0.5)
slop (~> 2.1.0)
oj (2.9.0)
pg (0.17.1)
polyglot (0.3.4)
pry (0.9.12.6)
coderay (~> 1.0)
method_source (~> 0.8)
slop (~> 3.4)
pry-debugger (0.2.2)
debugger (~> 1.3)
pry (~> 0.9.10)
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rack-timeout (0.0.4)
rails (4.0.0)
actionmailer (= 4.0.0)
actionpack (= 4.0.0)
activerecord (= 4.0.0)
activesupport (= 4.0.0)
rails (4.1.0)
actionmailer (= 4.1.0)
actionpack (= 4.1.0)
actionview (= 4.1.0)
activemodel (= 4.1.0)
activerecord (= 4.1.0)
activesupport (= 4.1.0)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.0)
sprockets-rails (~> 2.0.0)
railties (= 4.1.0)
sprockets-rails (~> 2.0)
rails_12factor (0.0.2)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.1)
rails_stdout_logging (0.0.2)
railties (4.0.0)
actionpack (= 4.0.0)
activesupport (= 4.0.0)
rails_serve_static_assets (0.0.2)
rails_stdout_logging (0.0.3)
railties (4.1.0)
actionpack (= 4.1.0)
activesupport (= 4.1.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.12.0)
rake (10.2.2)
raindrops (0.13.0)
rake (10.3.1)
recipient_interceptor (0.1.2)
mail
rspec-core (2.14.7)
rspec-expectations (2.14.3)
rspec-core (2.14.8)
rspec-expectations (2.14.5)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.3)
rspec-rails (2.14.0)
rspec-mocks (2.14.6)
rspec-rails (2.14.2)
actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
ruby_parser (3.2.2)
sexp_processor (~> 4.1)
safe_yaml (0.9.7)
sass (3.2.11)
sass-rails (4.0.0)
railties (>= 4.0.0.beta, < 5.0)
sass (>= 3.1.10)
sprockets-rails (~> 2.0.0)
sexp_processor (4.4.0)
shoulda-matchers (2.4.0)
safe_yaml (1.0.3)
sass (3.2.19)
sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0)
shoulda-matchers (2.6.1)
activesupport (>= 3.0.0)
simple_form (3.0.0)
actionpack (>= 4.0.0, < 4.1)
activemodel (>= 4.0.0, < 4.1)
simple_form (3.0.2)
actionpack (~> 4.0)
activemodel (~> 4.0)
simplecov (0.8.2)
docile (~> 1.1.0)
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
slop (2.1.0)
sprockets (2.10.0)
slop (3.5.0)
sprockets (2.11.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.0)
sprockets-rails (2.1.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
thor (0.18.1)
thread_safe (0.1.3)
atomic
thor (0.19.1)
thread_safe (0.3.3)
tilt (1.4.1)
timecop (0.6.3)
timecop (0.7.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
uglifier (2.2.1)
tzinfo (1.1.0)
thread_safe (~> 0.1)
uglifier (2.5.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
unicorn (4.6.3)
json (>= 1.8.0)
unicorn (4.8.2)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
webmock (1.14.0)
webmock (1.17.4)
addressable (>= 2.2.7)
crack (>= 0.3.2)
xpath (2.0.0)
Expand Down Expand Up @@ -232,6 +243,7 @@ DEPENDENCIES
oj
pg
pry
pry-debugger
rack-timeout
rails (>= 4.0.0)
rails_12factor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def index
units: :km
)

if @events.any?
if @events.count(:all) > 0
render
else
render json: { message: 'No Events Found' }, status: 200
Expand Down

0 comments on commit 0c2ccdc

Please sign in to comment.