Skip to content

Commit

Permalink
Merge pull request #265 from QutBioacoustics/feature-allow-anon-2016
Browse files Browse the repository at this point in the history 
Allow per project access for anonymous and logged-in users
  • Loading branch information
@atruskie
atruskie committed Jul 3, 2016
2 parents e839fad + 7069de4 commit 1f59a67
Show file tree
Hide file tree
Showing 138 changed files with 5,010 additions and 4,917 deletions.
2 changes: 1 addition & 1 deletion .rspec
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
--color
--require spec_helper
--format progress
30 changes: 15 additions & 15 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ source 'https://rubygems.org'

gem 'rails', '~> 4.2.4'
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
gem 'responders', '~> 2.1.0'
gem 'responders', '~> 2.2.0'

# RAILS 3 compatibility gems
# -------------------------------------
Expand Down Expand Up @@ -49,7 +49,7 @@ gem 'haml-rails', '~> 0.9.0'

gem 'simple_form', '~> 3.2.0'
gem 'paperclip', '~> 4.3.0'
gem 'kramdown', '~> 1.10.0'
gem 'kramdown', '~> 1.11.0'

# Bootstrap UI
gem 'bootstrap-sass', '~> 3.3.4'
Expand All @@ -70,7 +70,7 @@ gem 'tzinfo-data', '~> 1.2016'
# -------------------------------------
# https://github.com/plataformatec/devise/blob/master/CHANGELOG.md
# http://joanswork.com/devise-3-1-update/
gem 'devise', '~> 3.5.1'
gem 'devise', '~> 3.5.10'
gem 'devise-i18n'
gem 'cancancan', '~> 1.15'
gem 'role_model', '~> 0.8.1'
Expand Down Expand Up @@ -111,13 +111,13 @@ gem 'newrelic_rpm', '~> 3.15'
# Documentation & UI
# -------------------------------------
# these gems are required here to serve /doc url
gem 'rspec_api_documentation', '~> 4.7.0'
gem 'rspec_api_documentation', '~> 4.8.0'
gem 'raddocs', '~> 1.0.0'

# MEDIA
# -------------------------------------
# set to a specific commit when releasing to master branch
gem 'baw-audio-tools', git: 'https://github.com/QutBioacoustics/baw-audio-tools.git', branch: :master, ref: 'f4ef9f775d'
gem 'baw-audio-tools', git: 'https://github.com/QutBioacoustics/baw-audio-tools.git', branch: :master, ref: '354d375d6a'
gem 'rack-rewrite', '~> 1.5.1'

# ASYNC JOBS
Expand All @@ -126,7 +126,7 @@ gem 'resque', '~> 1.25.2'
gem 'resque-job-stats', git: 'https://github.com/echannel/resque-job-stats.git', branch: :master, ref: '8932c036ae'
gem 'resque-status', '~> 0.5.0'
# set to a specific commit when releasing to master branch
gem 'baw-workers', git: 'https://github.com/QutBioacoustics/baw-workers.git', branch: :master, ref: '18943af4b977749b9ec58bb566a8a30861f5fabc'
gem 'baw-workers', git: 'https://github.com/QutBioacoustics/baw-workers.git', branch: :master, ref: '18943af4b'


# Gems restricted by environment and/or platform
Expand All @@ -142,9 +142,9 @@ group :development, :test do

gem 'quiet_assets'

gem 'rack-mini-profiler', '~> 0.9.2'
gem 'rack-mini-profiler', '~> 0.10.0'
gem 'i18n-tasks', '~> 0.9.0'
gem 'bullet', '~> 5.0.0'
gem 'bullet', '~> 5.1.0'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
#gem 'spring', '~> 1.4.0'
Expand All @@ -155,13 +155,13 @@ group :development, :test do
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0'

gem 'thin', '~> 1.6.3'
gem 'thin', '~> 1.7.0'

gem 'notiffany', '~> 0.0.3'
gem 'guard', '~> 2.13.0'
gem 'guard-rspec', '~> 4.6.0'
gem 'notiffany', '~> 0.1.0'
gem 'guard', '~> 2.14.0'
gem 'guard-rspec', '~> 4.7.0'
gem 'guard-yard', '~> 2.1.4', require: false
gem 'rubocop', '~> 0.39.0', require: false
gem 'rubocop', '~> 0.41.0', require: false
gem 'haml_lint', require: false

gem 'fakeredis', '~> 0.5.0', require: 'fakeredis/rspec'
Expand Down Expand Up @@ -198,10 +198,10 @@ group :development, :test do
gem 'database_cleaner', '~> 1.5.0'

gem 'coveralls', '~> 0.8.10', require: false
gem 'codeclimate-test-reporter', '~> 0.5.0', require: nil
gem 'codeclimate-test-reporter', '~> 0.6.0', require: nil
end

group :test do
gem 'webmock', '~> 1.24.0'
gem 'webmock', '~> 2.1.0'
gem 'shoulda-matchers', '< 3.0.0', require: false
end
85 changes: 42 additions & 43 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ GIT

GIT
remote: https://github.com/QutBioacoustics/baw-audio-tools.git
revision: f4ef9f775d590e7e5047c4e5c9181aa57dd1a713
ref: f4ef9f775d
revision: 354d375d6af990299b6f45d182de3067b39539a5
ref: 354d375d6a
branch: master
specs:
baw-audio-tools (0.3.0)
baw-audio-tools (0.4.0)
activesupport (>= 3.2)

GIT
remote: https://github.com/QutBioacoustics/baw-workers.git
revision: 18943af4b977749b9ec58bb566a8a30861f5fabc
ref: 18943af4b977749b9ec58bb566a8a30861f5fabc
ref: 18943af4b
branch: master
specs:
baw-workers (0.5.0)
Expand Down Expand Up @@ -97,9 +97,9 @@ GEM
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
builder (3.2.2)
bullet (5.0.0)
bullet (5.1.0)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.9.0)
uniform_notifier (~> 1.10.0)
cancancan (1.15.0)
capybara (2.7.1)
addressable
Expand All @@ -112,7 +112,7 @@ GEM
activesupport (>= 3.0)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
codeclimate-test-reporter (0.5.2)
codeclimate-test-reporter (0.6.0)
simplecov (>= 0.7.1, < 1.0.0)
coderay (1.1.1)
coffee-rails (4.1.1)
Expand Down Expand Up @@ -171,17 +171,17 @@ GEM
formatador (0.2.5)
globalid (0.3.6)
activesupport (>= 4.1.0)
guard (2.13.0)
guard (2.14.0)
formatador (>= 0.2.4)
listen (>= 2.7, <= 4.0)
listen (>= 2.7, < 4.0)
lumberjack (~> 1.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
shellany (~> 0.0)
thor (>= 0.18.1)
guard-compat (1.2.1)
guard-rspec (4.6.5)
guard-rspec (4.7.2)
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
Expand Down Expand Up @@ -235,7 +235,7 @@ GEM
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kramdown (1.10.0)
kramdown (1.11.1)
launchy (2.4.3)
addressable (~> 2.3)
libv8 (3.16.14.15)
Expand All @@ -257,13 +257,13 @@ GEM
minitest (5.9.0)
mono_logger (1.1.0)
multi_json (1.12.1)
mustache (0.99.8)
mustache (1.0.3)
nenv (0.3.0)
newrelic_rpm (3.15.2.317)
newrelic_rpm (3.16.0.318)
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
notiffany (0.0.8)
notiffany (0.1.0)
nenv (~> 0.1)
shellany (~> 0.0)
orm_adapter (0.5.0)
Expand All @@ -286,7 +286,7 @@ GEM
railties (>= 3.1, < 5.0)
rack (1.6.4)
rack-cors (0.4.0)
rack-mini-profiler (0.9.9.2)
rack-mini-profiler (0.10.1)
rack (>= 1.2.0)
rack-protection (1.5.3)
rack
Expand Down Expand Up @@ -334,7 +334,7 @@ GEM
redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4)
ref (2.0.0)
responders (2.1.2)
responders (2.2.0)
railties (>= 4.2.0, < 5.1)
resque (1.25.2)
mono_logger (~> 1.0)
Expand Down Expand Up @@ -368,13 +368,12 @@ GEM
rspec-mocks (~> 3.4.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
rspec_api_documentation (4.7.0)
rspec_api_documentation (4.8.0)
activesupport (>= 3.0.0)
json (~> 1.4, >= 1.4.6)
mustache (~> 0.99, >= 0.99.4)
rspec (>= 3.0.0)
rubocop (0.39.0)
parser (>= 2.3.0.7, < 3.0)
mustache (~> 1.0, >= 0.99.4)
rspec (~> 3.0, >= 3.0.0)
rubocop (0.41.1)
parser (>= 2.3.1.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
Expand Down Expand Up @@ -412,10 +411,10 @@ GEM
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
slop (3.6.0)
sprockets (3.6.0)
sprockets (3.6.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.4)
sprockets-rails (3.1.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
Expand All @@ -426,10 +425,10 @@ GEM
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
ref
thin (1.6.4)
thin (1.7.0)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (~> 1.0)
rack (>= 1, < 3)
thor (0.19.1)
thread (0.2.2)
thread_safe (0.3.5)
Expand All @@ -442,14 +441,14 @@ GEM
tzinfo (>= 1.0.0)
uglifier (3.0.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.0.5)
uniform_notifier (1.9.0)
unicode-display_width (1.1.0)
uniform_notifier (1.10.0)
uuidtools (2.1.5)
vegas (0.1.11)
rack (>= 1.0.0)
warden (1.2.6)
rack (>= 1.0)
webmock (1.24.6)
webmock (2.1.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
Expand All @@ -468,23 +467,23 @@ DEPENDENCIES
baw-workers!
bcrypt (~> 3.1.9)
bootstrap-sass (~> 3.3.4)
bullet (~> 5.0.0)
bullet (~> 5.1.0)
cancancan (~> 1.15)
capybara (~> 2.7.0)
codeclimate-test-reporter (~> 0.5.0)
codeclimate-test-reporter (~> 0.6.0)
coffee-rails (~> 4.1.0)
coveralls (~> 0.8.10)
database_cleaner (~> 1.5.0)
devise (~> 3.5.1)
devise (~> 3.5.10)
devise-i18n
dotiw (~> 3.1.1)
enumerize (~> 1.0)
exception_notification (~> 4.1.0)
factory_girl_rails (~> 4.7.0)
fakeredis (~> 0.5.0)
font-awesome-sass (~> 4.6.2)
guard (~> 2.13.0)
guard-rspec (~> 4.6.0)
guard (~> 2.14.0)
guard-rspec (~> 4.7.0)
guard-yard (~> 2.1.4)
haml (~> 4.0.6)
haml-rails (~> 0.9.0)
Expand All @@ -495,42 +494,42 @@ DEPENDENCIES
jquery-rails (~> 4.1.0)
json_spec (~> 1.1.4)
kaminari
kramdown (~> 1.10.0)
kramdown (~> 1.11.0)
launchy (~> 2.4.3)
newrelic_rpm (~> 3.15)
notiffany (~> 0.0.3)
notiffany (~> 0.1.0)
paperclip (~> 4.3.0)
pg (~> 0.18.1)
quiet_assets
rack-cors (~> 0.4.0)
rack-mini-profiler (~> 0.9.2)
rack-mini-profiler (~> 0.10.0)
rack-rewrite (~> 1.5.1)
raddocs (~> 1.0.0)
rails (~> 4.2.4)
recaptcha (~> 1.3.0)
responders (~> 2.1.0)
responders (~> 2.2.0)
resque (~> 1.25.2)
resque-job-stats!
resque-status (~> 0.5.0)
role_model (~> 0.8.1)
rspec (~> 3.4.0)
rspec-rails (~> 3.4.0)
rspec_api_documentation (~> 4.7.0)
rubocop (~> 0.39.0)
rspec_api_documentation (~> 4.8.0)
rubocop (~> 0.41.0)
sass-rails (~> 5.0.3)
sdoc (~> 0.4.0)
settingslogic (~> 2.0.9)
shoulda-matchers (< 3.0.0)
simple_form (~> 3.2.0)
simplecov (~> 0.11.1)
therubyracer (~> 0.12.1)
thin (~> 1.6.3)
thin (~> 1.7.0)
tzinfo (~> 1.2.2)
tzinfo-data (~> 1.2016)
uglifier (>= 1.3.0)
uuidtools (~> 2.1.5)
webmock (~> 1.24.0)
webmock (~> 2.1.0)
zonebie

BUNDLED WITH
1.12.0.rc
1.12.3
2 changes: 1 addition & 1 deletion Guardfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# More info at https://github.com/guard/guard#readme
notification :off

guard :rspec, cmd: 'bin/rspec --format progress --color' do
guard :rspec, cmd: 'bin/rspec' do
watch(%r{^spec/.+_spec\.rb$})
watch('spec/spec_helper.rb') { 'spec' }

Expand Down
Loading

0 comments on commit 1f59a67

Please sign in to comment.