Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Snailwhale: PR 1 #6

Open
wants to merge 317 commits into
base: snailwhale
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
317 commits
Select commit Hold shift + click to select a range
6daabf6
update gemfile
jbuechs Jan 8, 2016
f2de2ea
added config data and gem for twitter api
CShekta Jan 8, 2016
1fcccbe
have twitter search for a users name
CShekta Jan 8, 2016
c3316b3
bugfix developer mode login
jbuechs Jan 8, 2016
edd4317
add some stuff to vimeo search
jbuechs Jan 8, 2016
1fc7fd3
Merge branch 'vimeo-search' into snailwhale
jbuechs Jan 8, 2016
7258043
added twitter search functionality with a test search.html.erb file
CShekta Jan 8, 2016
6b10051
Change edit link name to Feed Manager
dezshino Jan 8, 2016
0e7112d
Created Creator model
CShekta Jan 8, 2016
8ea7d96
Add Content Model
dezshino Jan 8, 2016
b25289a
migrated
CShekta Jan 8, 2016
cdca8af
fixed schema merge
CShekta Jan 8, 2016
85b2952
fixed merge conflicts with twittersearch
CShekta Jan 8, 2016
6a23af1
create relationship between creator and content models
jbuechs Jan 8, 2016
ba243ae
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
jbuechs Jan 8, 2016
8eee255
add presence validations to creator model
jbuechs Jan 8, 2016
50b8ab2
create tests for validations on creator model
jbuechs Jan 8, 2016
e1c83aa
remove extraneous binding
jbuechs Jan 8, 2016
23cd59d
Change wording to illuminate
dezshino Jan 8, 2016
b9ae1e7
add validations to content model
jbuechs Jan 8, 2016
6063aa7
add validation tests for content model
jbuechs Jan 8, 2016
2bdf980
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
jbuechs Jan 8, 2016
3653589
added illimineye image and made visual changes do the navbar with boo…
Jan 11, 2016
395ec6c
add twitter oembed javascript
Jan 11, 2016
64b770f
add test data for embed tweet
Jan 11, 2016
f03c4a7
complete vimeo_search method
jbuechs Jan 11, 2016
ad04d80
searching for tweets method
CShekta Jan 11, 2016
3b2e8cc
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
CShekta Jan 11, 2016
5eb75e5
making .new creator objects after twitter search
CShekta Jan 11, 2016
36c16ed
display username and avatar url for users
dezshino Jan 11, 2016
b05ba47
Add has_image method to creator model
dezshino Jan 11, 2016
b02d6d0
Set default image if none
dezshino Jan 11, 2016
67a5c4a
add users updates route
dezshino Jan 11, 2016
23c5da8
creators and users has and belongs to many of each other
dezshino Jan 11, 2016
66b15c4
added comments for twitter method
CShekta Jan 11, 2016
f0532b0
starting method and button to follow a creator
dezshino Jan 11, 2016
af43d1c
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
dezshino Jan 11, 2016
728b7ca
add back creators instance variable
dezshino Jan 11, 2016
d164d49
re add jennies code for vimeo_search
dezshino Jan 11, 2016
08d8d01
fix indentation on creators controller
jbuechs Jan 11, 2016
a49c49b
updated user search method to include tweeters
CShekta Jan 11, 2016
1dce778
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
CShekta Jan 11, 2016
712c8dd
javascript for embedding tweets
Jan 11, 2016
d074a2a
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
Jan 11, 2016
e5c83dc
changes to bootrap css & navbar layout
Jan 11, 2016
e72831c
create join table for has_and_belongs_to_many
jbuechs Jan 11, 2016
e9278e7
create update method to add creator to user's list
jbuechs Jan 11, 2016
afe113a
remove update from creators controller
jbuechs Jan 11, 2016
2b93534
add hidden field tags to search view
jbuechs Jan 11, 2016
ae29702
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
jbuechs Jan 11, 2016
e4d79b6
complete update method in users controller
jbuechs Jan 11, 2016
c3e60cd
dryed out twitter method, started trying to implement embed javascript
CShekta Jan 11, 2016
08f2974
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
CShekta Jan 11, 2016
b3936f4
take out raise
dezshino Jan 11, 2016
8c205b5
fixed logo spelling error, got videos in feed
Jan 11, 2016
507c9b9
update update method in user controller
jbuechs Jan 11, 2016
b25c656
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
jbuechs Jan 11, 2016
5001b84
create stubs for loading content for a new creator
jbuechs Jan 11, 2016
5d29162
working on javascript for feed
CShekta Jan 11, 2016
0a50ce3
create test for session destroy
jbuechs Jan 11, 2016
71e4610
create factories file
jbuechs Jan 11, 2016
a08734b
create test for creator.has_image? method
jbuechs Jan 11, 2016
ef91e4f
add factorygirl to spec_helper
jbuechs Jan 11, 2016
92b998a
change factorygirl from create to build
jbuechs Jan 11, 2016
7b4f6d9
create twitter and vimeo creator in factories file
jbuechs Jan 11, 2016
66c6a75
remove redundant file for content spec
jbuechs Jan 11, 2016
ebcff4c
remove redundant files for creator spec
jbuechs Jan 11, 2016
a1f2f0a
add error for invalid provider in creator.get_content
jbuechs Jan 11, 2016
ec733da
move model specs directory
jbuechs Jan 11, 2016
687af38
more changes to the javascript for showing tweets
Jan 11, 2016
7721b3d
working on saving tweet methods
CShekta Jan 11, 2016
4241f2d
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
CShekta Jan 11, 2016
268e7e0
fixed merge conflicts
Jan 11, 2016
ed4de40
remove confliting code from feed view
Jan 11, 2016
486ff80
fixing merge conflicts
CShekta Jan 11, 2016
eda2cc1
but really fixing merge conflicts now
CShekta Jan 11, 2016
2d1ab09
fix syntax error in feed page
jbuechs Jan 11, 2016
7346a55
fix merge conflict in feed page
jbuechs Jan 11, 2016
7f7086b
bugfix of update method and stub delete_creator method
jbuechs Jan 11, 2016
5437bb5
remove delete method from creators controller
jbuechs Jan 11, 2016
0f923e7
minor changes to feed view
Jan 11, 2016
ec19d66
fix merge conflicts
Jan 11, 2016
9418ebc
Format search results page
dezshino Jan 11, 2016
30c6aa9
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
dezshino Jan 11, 2016
fb3875e
remove noimage file
Jan 11, 2016
7916a79
javascript embeded tweets ARE WORKING
Jan 11, 2016
b6872e3
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
Jan 11, 2016
35f7438
More tinkering with search styling
dezshino Jan 11, 2016
aff56e6
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
dezshino Jan 11, 2016
8bd1f9d
minor css style changes to feed page
Jan 11, 2016
e8db368
creating get_videos method; still not saving to database
CShekta Jan 11, 2016
4c83814
fixed merge conflicts in feed.html
CShekta Jan 11, 2016
bb04b8b
minor stuff
Jan 12, 2016
f8c9237
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
Jan 12, 2016
70707a7
Re-add noimage image
dezshino Jan 12, 2016
2a6b9e0
Style search page
dezshino Jan 12, 2016
af4c440
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
dezshino Jan 12, 2016
40b7d76
minor css change to video margin
Jan 12, 2016
c449ba5
logic for pulling content id's and assigning to feed written
Jan 12, 2016
b7c3dba
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
Jan 12, 2016
1cc9c98
finished get_videos method
CShekta Jan 12, 2016
30758f2
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
CShekta Jan 12, 2016
63044ca
Style search page
dezshino Jan 12, 2016
489a63b
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
dezshino Jan 12, 2016
214c2cf
Center login links
dezshino Jan 12, 2016
b11adaf
Add cog icon to Feed Manager link
dezshino Jan 12, 2016
e526140
Fix indent
dezshino Jan 12, 2016
1e686eb
changed content id in contents table form integer to string via migra…
CShekta Jan 12, 2016
4046674
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
CShekta Jan 12, 2016
3f35487
Style template for Feed Manager
dezshino Jan 12, 2016
41af30a
left a stray raise
CShekta Jan 12, 2016
5a88d10
Add icon for twitter and vimeo to creators in feed manager
dezshino Jan 12, 2016
fd300b6
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
dezshino Jan 12, 2016
733db62
Display message if no creators returned from search
dezshino Jan 12, 2016
cf6d714
Change feed manager format
dezshino Jan 12, 2016
330d0c0
Display a message in feed manager if not following any feeds
dezshino Jan 12, 2016
5847859
add flash notices to website
jbuechs Jan 12, 2016
5b97d41
started making the logic in feed.html.erb and users controller to dis…
CShekta Jan 12, 2016
aaab06e
Merge branch 'feedsandbox' into snailwhale
CShekta Jan 12, 2016
41438bf
refactor to create following method in user model
jbuechs Jan 12, 2016
294acbc
fixed twitter avatar url
CShekta Jan 12, 2016
ecec678
change button on search page if user is already following a creator
jbuechs Jan 12, 2016
81a3f23
Merge branch 'master' into snailwhale
jbuechs Jan 12, 2016
843a5b2
bugfix in update method in users controller
jbuechs Jan 12, 2016
aceb700
created has many :through relationship and working on feed view in us…
CShekta Jan 12, 2016
fa97f19
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
CShekta Jan 12, 2016
7db70ee
add validations for embed_code and favorites to content model
jbuechs Jan 12, 2016
d509030
feed works for twitter but not vimeo
CShekta Jan 12, 2016
cb83175
bugfix in method to check if a user is following a creator
jbuechs Jan 12, 2016
fdbce03
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
jbuechs Jan 12, 2016
0b5e512
add user to factories file
jbuechs Jan 12, 2016
99fbdd0
add tests for user model
jbuechs Jan 12, 2016
a8c5671
complete search method with flash error
jbuechs Jan 12, 2016
2fd9361
bugfix creators controller search with no text
jbuechs Jan 12, 2016
0991a6d
bugfix search view all users following
jbuechs Jan 12, 2016
2a90852
fixed get_videos method so feed shows embedded tweets and videos
CShekta Jan 12, 2016
4107638
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
CShekta Jan 12, 2016
bef9040
Fix issue to show models in coverage report
dezshino Jan 12, 2016
423a8ce
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
dezshino Jan 12, 2016
fd33258
messy code for feed. need to refactor but can display tweets and vide…
CShekta Jan 12, 2016
03115e6
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
CShekta Jan 12, 2016
707362a
create test for show method
jbuechs Jan 12, 2016
3c01bc7
comment out create method in creators controller
jbuechs Jan 12, 2016
3ee2b58
start spec
jbuechs Jan 12, 2016
c63d841
feed displays tweets and videos but calls api
CShekta Jan 12, 2016
f575318
begin feed spec
jbuechs Jan 12, 2016
a73f9bd
update controllers
jbuechs Jan 12, 2016
296edb7
update feed method to pass rspec test
jbuechs Jan 12, 2016
85c36f8
fix merge conflicts
jbuechs Jan 12, 2016
8268f3a
fix merge conflicts
jbuechs Jan 12, 2016
53d01f9
create test for invalid search params
jbuechs Jan 12, 2016
cf9cef1
complete tests for creators controller
jbuechs Jan 12, 2016
b57560a
Merge branch 'creators-controller-spec' into snailwhale
jbuechs Jan 12, 2016
d0ef150
Add a route to delete a creator from a user
dezshino Jan 13, 2016
b06abdf
add correct path to dissociate creator from user
dezshino Jan 13, 2016
5ef2a63
Delete_creator method
dezshino Jan 13, 2016
d20ff7c
updating get_saved_content method and the usercontroller to not call …
CShekta Jan 13, 2016
ace4eca
added twitter and vimeo methods to creator.rb
CShekta Jan 13, 2016
67d3068
created methods to check if a contents exists inthe database and disp…
CShekta Jan 13, 2016
f57fbeb
fixed merge conflicts
Jan 13, 2016
d7ca117
Fix creator search cards height issue with mediaquery height
dezshino Jan 13, 2016
08c8c63
refactor feed method
jbuechs Jan 13, 2016
6cfd12f
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
jbuechs Jan 13, 2016
24a4590
change creator p_id field from integer to string
jbuechs Jan 13, 2016
5b5b88b
remove turbolinks from js file to fix tweet display bug
jbuechs Jan 13, 2016
1505113
merge conflict
CShekta Jan 13, 2016
b7e05c6
Separating row-centered styling for feed manager and c-search
dezshino Jan 13, 2016
4348e41
fixed feed method and update dateparse for videos
CShekta Jan 13, 2016
58b4917
fixed merge conflict with feedwork
CShekta Jan 13, 2016
83bada9
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
CShekta Jan 13, 2016
dcb3710
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
jbuechs Jan 13, 2016
2e42c15
datetime fix
CShekta Jan 13, 2016
f982645
Require login method
dezshino Jan 13, 2016
ae02a1d
Require login before action and filters
dezshino Jan 13, 2016
87ec2fb
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
dezshino Jan 13, 2016
47c58b5
Improve feed manager margin spacing
dezshino Jan 13, 2016
da2553a
update navbar to use radio buttons
jbuechs Jan 13, 2016
484fb98
Merge branch 'navbar-refactor' into snailwhale
jbuechs Jan 13, 2016
9eb6698
refactor navbar to have separate header
jbuechs Jan 13, 2016
9df6d96
fixing creators controller spec
CShekta Jan 13, 2016
6986142
add hamburger button for collapse on mobile
jbuechs Jan 13, 2016
f43ab7c
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
CShekta Jan 13, 2016
e0f02ad
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
CShekta Jan 13, 2016
050e510
partial of users controler update spec
Jan 14, 2016
3b58740
add last_updated field in creator model
jbuechs Jan 14, 2016
a367206
fix navbar black space
jbuechs Jan 14, 2016
2c447d2
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
jbuechs Jan 14, 2016
eecdfad
add vimeo creator contet to has_image spec
dezshino Jan 14, 2016
2abbb8a
remove binding.pry in creators_controller_spec
jbuechs Jan 14, 2016
7578db3
fixed content spec
CShekta Jan 14, 2016
fd67c67
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
CShekta Jan 14, 2016
7d089f7
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
dezshino Jan 14, 2016
b2cd70a
write out empty specs
dezshino Jan 14, 2016
7d66aa5
fix update method error
jbuechs Jan 14, 2016
4d1a259
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
jbuechs Jan 14, 2016
31d3ea7
fix creators controller spec
jbuechs Jan 14, 2016
3883b1d
fix sessions controller test
jbuechs Jan 14, 2016
7fe5dec
incomplete creator spec
dezshino Jan 14, 2016
5cdb2a4
users controller rspec coverage
Jan 14, 2016
7081aa0
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
Jan 14, 2016
fcc2a23
take out require_login from feed bc it already redirects
dezshino Jan 14, 2016
4b7d932
move brand image slightly up so the bottom doesn't show on login page
dezshino Jan 14, 2016
a03127d
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
dezshino Jan 14, 2016
aec98ef
add last_updated field to creator model
jbuechs Jan 14, 2016
44f1f0d
Merge branch 'last-updated' into snailwhale
jbuechs Jan 14, 2016
1677c24
add last_update to creator model
jbuechs Jan 14, 2016
cce665b
cleaned up comments
CShekta Jan 14, 2016
c02f69e
fix PATCH #update in users_controller_spec
jbuechs Jan 14, 2016
36b543e
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
jbuechs Jan 14, 2016
30fed6e
small illuminapEYE
Jan 14, 2016
200a26c
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
Jan 14, 2016
a5af32d
favicon
Jan 14, 2016
ac93f5e
fix slow loading time
jbuechs Jan 14, 2016
9290b1b
Merge branch 'bullet' into snailwhale
jbuechs Jan 14, 2016
a60349a
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
jbuechs Jan 14, 2016
21cc2bf
hide feed until ready
jbuechs Jan 14, 2016
be409eb
Remove require pry in files for heroku deployment
dezshino Jan 14, 2016
34ee12d
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
dezshino Jan 14, 2016
d492598
add waiting spinner while feed loading
jbuechs Jan 14, 2016
8d25ba6
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
jbuechs Jan 14, 2016
2882cfa
fix logout spacing on navbar
jbuechs Jan 14, 2016
0a548c6
creators model specs complete
CShekta Jan 14, 2016
4581f5d
Default message on feed page if not following any accounts
dezshino Jan 14, 2016
3c44869
Text align center
dezshino Jan 14, 2016
feee5f8
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
dezshino Jan 14, 2016
98a066a
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
CShekta Jan 14, 2016
5746f29
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
CShekta Jan 14, 2016
ffa7759
Change page header
dezshino Jan 14, 2016
3fed68b
Configure favicon
dezshino Jan 14, 2016
c7493ec
cleaning up spacing
CShekta Jan 14, 2016
52fba57
added single line methods
CShekta Jan 14, 2016
c79df9f
Add google font to message prompts
dezshino Jan 14, 2016
f245f7b
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
dezshino Jan 14, 2016
270e0c0
create sticky navbar
jbuechs Jan 15, 2016
721dc49
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
jbuechs Jan 15, 2016
8421c3b
style h3 messages
dezshino Jan 15, 2016
f67c4a9
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
jbuechs Jan 15, 2016
3cbb152
add night sky background
dezshino Jan 15, 2016
28d5e76
strip non word characters from query in search method
jbuechs Jan 15, 2016
a8943c0
Delete unused view files
dezshino Jan 15, 2016
e597a81
moved methods and made them (more) single responsibility. rspec at 98.2
CShekta Jan 15, 2016
aae91b1
changing focus color with css
Jan 15, 2016
8a6b3c7
merge conflicts from css
Jan 15, 2016
2cf3bc2
merge conflicts from css
Jan 15, 2016
a81b586
fix the thing I broke in the header
Jan 15, 2016
352d88d
fix jumbotron spacing in header
jbuechs Jan 15, 2016
6c2771e
add opacity to navbar on scroll
jbuechs Jan 15, 2016
e51fcd4
fix sizing and spacing of video
jbuechs Jan 15, 2016
20b79f2
added pagination
CShekta Jan 15, 2016
73f5e8f
Merge branch 'snailwhale' of github.com:jbuechs/seemore into snailwhale
CShekta Jan 15, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add .DS_Store to your .gitignore or if you find you are constantly forgetting to do that add it to a global gitignore. Also add images, .keep files and make sure any files with secret keys are also added.

# Ignore bundler config.
/.bundle

# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal

# Ignore all logfiles and tempfiles.
/log/*
!/log/.keep
/tmp

coverage/*
.env
2 changes: 2 additions & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--color
--require spec_helper
1 change: 1 addition & 0 deletions .ruby-gemset
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
seemore
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.2.3
55 changes: 55 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
source 'https://rubygems.org'


gem 'rails', '4.2.5'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.1.0'
gem 'jquery-rails'
gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc

# bootstrap for styling
gem 'bootstrap-sass'

# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

gem 'omniauth'
gem 'omniauth-oauth2', '~> 1.3.1'
gem "omniauth-vimeo"
gem 'omniauth-twitter'

gem 'httparty'
gem 'twitter'
gem 'will_paginate', '~> 3.0.5'

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hadn't seen this gem before, very neat!


group :development, :test do
gem 'byebug'
gem 'dotenv-rails'
gem 'sqlite3'
gem 'pry'
gem 'simplecov'
end

group :production do
gem 'pg'
gem 'rails_12factor'
end

group :test do
gem 'shoulda-matchers', '~> 3.0'
gem "factory_girl_rails", "~> 4.0"
end

group :development do
gem 'httplog'
gem 'web-console', '~> 2.0'
gem 'spring'
gem 'better_errors'
gem 'binding_of_caller'
gem 'rspec-rails'
end

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nicely organized and easy to read but comments about what the gems do can be helpful to someone who is unfamiliar with a particular gem. I checked out 'shoulda-matchers' and it seems very cool.

300 changes: 300 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,300 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.5)
actionpack (= 4.2.5)
actionview (= 4.2.5)
activejob (= 4.2.5)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.5)
actionview (= 4.2.5)
activesupport (= 4.2.5)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.5)
activesupport (= 4.2.5)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.5)
activesupport (= 4.2.5)
globalid (>= 0.3.0)
activemodel (4.2.5)
activesupport (= 4.2.5)
builder (~> 3.1)
activerecord (4.2.5)
activemodel (= 4.2.5)
activesupport (= 4.2.5)
arel (~> 6.0)
activesupport (4.2.5)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.4.0)
arel (6.0.3)
autoprefixer-rails (6.2.3)
execjs
json
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.6)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
buftok (0.2.0)
builder (3.2.2)
byebug (8.2.1)
coderay (1.1.0)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.0)
debug_inspector (0.0.2)
diff-lcs (1.2.5)
docile (1.1.5)
domain_name (0.5.25)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.0.2)
dotenv-rails (2.0.2)
dotenv (= 2.0.2)
railties (~> 4.0)
equalizer (0.0.10)
erubis (2.7.0)
execjs (2.6.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.5.0)
factory_girl (~> 4.5.0)
railties (>= 3.0.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
globalid (0.3.6)
activesupport (>= 4.1.0)
hashie (3.4.3)
http (0.9.8)
addressable (~> 2.3)
http-cookie (~> 1.0)
http-form_data (~> 1.0.1)
http_parser.rb (~> 0.6.0)
http-cookie (1.0.2)
domain_name (~> 0.5)
http-form_data (1.0.1)
http_parser.rb (0.6.0)
httparty (0.13.7)
json (~> 1.8)
multi_xml (>= 0.5.2)
httplog (0.2.13)
i18n (0.7.0)
jbuilder (2.4.0)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jquery-rails (4.0.5)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
jwt (1.5.2)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.8.2)
mime-types (2.99)
mini_portile2 (2.0.0)
minitest (5.8.3)
multi_json (1.11.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
naught (1.1.0)
nokogiri (1.6.7.1)
mini_portile2 (~> 2.0.0.rc2)
oauth (0.4.7)
oauth2 (1.0.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
omniauth (1.3.1)
hashie (>= 1.2, < 4)
rack (>= 1.0, < 3)
omniauth-oauth (1.1.0)
oauth
omniauth (~> 1.0)
omniauth-oauth2 (1.3.1)
oauth2 (~> 1.0)
omniauth (~> 1.2)
omniauth-twitter (1.2.1)
json (~> 1.3)
omniauth-oauth (~> 1.1)
omniauth-vimeo (2.0.0)
omniauth-oauth2
pg (0.18.4)
pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.5)
actionmailer (= 4.2.5)
actionpack (= 4.2.5)
actionview (= 4.2.5)
activejob (= 4.2.5)
activemodel (= 4.2.5)
activerecord (= 4.2.5)
activesupport (= 4.2.5)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.5)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.4)
rails_stdout_logging (0.0.4)
railties (4.2.5)
actionpack (= 4.2.5)
activesupport (= 4.2.5)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rdoc (4.2.1)
json (~> 1.4)
rspec-core (3.4.1)
rspec-support (~> 3.4.0)
rspec-expectations (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-mocks (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-rails (3.4.0)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
sass (3.4.20)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
shoulda-matchers (3.0.1)
activesupport (>= 4.0.0)
simple_oauth (0.3.1)
simplecov (0.11.1)
docile (~> 1.1.0)
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
spring (1.6.1)
sprockets (3.5.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.11)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.2)
turbolinks (2.5.3)
coffee-rails
twitter (5.15.0)
addressable (~> 2.3)
buftok (~> 0.2.0)
equalizer (= 0.0.10)
faraday (~> 0.9.0)
http (>= 0.4, < 0.10)
http_parser.rb (~> 0.6.0)
json (~> 1.8)
memoizable (~> 0.4.0)
naught (~> 1.0)
simple_oauth (~> 0.3.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.1)
web-console (2.2.1)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
will_paginate (3.0.7)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
bootstrap-sass
byebug
coffee-rails (~> 4.1.0)
dotenv-rails
factory_girl_rails (~> 4.0)
httparty
httplog
jbuilder (~> 2.0)
jquery-rails
omniauth
omniauth-oauth2 (~> 1.3.1)
omniauth-twitter
omniauth-vimeo
pg
pry
rails (= 4.2.5)
rails_12factor
rspec-rails
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
shoulda-matchers (~> 3.0)
simplecov
spring
sqlite3
turbolinks
twitter
uglifier (>= 1.3.0)
web-console (~> 2.0)
will_paginate (~> 3.0.5)

BUNDLED WITH
1.11.2
Loading