Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
438 commits
Select commit Hold shift + click to select a range
028bfde
fleshed out get_posts_from_API method
a-lmx Aug 10, 2015
adcd0a8
Troubleshot posts seeds and datetimes. WIP: sorting posts.
brittinator Aug 10, 2015
1e4ff76
Adds refresh view for troubleshooting.
brittinator Aug 10, 2015
9698b97
WIP; working on get_new_posts method
a-lmx Aug 10, 2015
5f35f8f
functioning partial for newsfeed and first rspec test
knguyen0710 Aug 10, 2015
cab1585
native_ids need to be strings because they're so long. Removed migrat…
lo-k Aug 10, 2015
c4ec910
Removed the method we were temp working on here. Didn't need a separa…
lo-k Aug 10, 2015
5c39e9d
get_new_posts method will now find new posts from the Twitter API sin…
lo-k Aug 10, 2015
d52b853
Changes refresh method from patch post to get.
brittinator Aug 11, 2015
fc70ae3
WIP for refresh newsfeed method and associated tests and routes.
brittinator Aug 11, 2015
f4de114
added helper method to convert instagram created_time to Time object
a-lmx Aug 11, 2015
3bc3346
added display logic for debugging newsfeed
a-lmx Aug 11, 2015
1d79678
added newline into create method for conforming to style guide
a-lmx Aug 11, 2015
df053de
fixed instagram portion of get_new_posts
a-lmx Aug 11, 2015
b1f8d09
updated get_new_posts route to root_path
a-lmx Aug 11, 2015
ceec053
updated link to UpdateFeed to be post button
a-lmx Aug 11, 2015
983efb9
added logic to prevent trying to reset last_post_id if no new posts w…
a-lmx Aug 11, 2015
bede8bb
removed unused code
a-lmx Aug 11, 2015
6fc53c7
removed unused views
a-lmx Aug 11, 2015
641734e
WIP
brittinator Aug 11, 2015
428032b
added logic for if there are no new posts; WIP; still not pulling new…
a-lmx Aug 11, 2015
fceed93
removed unnecessary example spec
a-lmx Aug 11, 2015
40a9fc5
Merge pull request #25 from brittinator/ka/posts_controller
arhx Aug 11, 2015
a7cf366
Deleted find_user method that is now obsolete.
brittinator Aug 11, 2015
5269ea6
Attempts to DRY up code relating to current_user.
brittinator Aug 11, 2015
c858c6c
Merge pull request #26 from brittinator/refactor_controllers
brittinator Aug 11, 2015
9b31817
Merging
brittinator Aug 11, 2015
698b1c3
fixed bug in which instagram pulled the latest post again each time
a-lmx Aug 11, 2015
8b79a7c
changed if source == 'twitter' to case statements
a-lmx Aug 11, 2015
b16f0b9
gets up to speed with create posts method.
brittinator Aug 11, 2015
bdc1638
moved TWITTER and INSTAGRAM constants to application controller
a-lmx Aug 11, 2015
b73194f
changed if/elsif statement to case logic
a-lmx Aug 11, 2015
04865b2
Adds find functionality for subsciption create method. Adds rspec tes…
brittinator Aug 11, 2015
dc61da8
Merge pull request #27 from brittinator/create_subscription
brittinator Aug 11, 2015
7e3e06a
refactored get_posts_from_API to take fewer parameters
a-lmx Aug 11, 2015
678a0ce
fixing merge conflict in USER_COUNT constant
a-lmx Aug 11, 2015
876cabf
Merge pull request #28 from brittinator/ka/posts_controller
arhx Aug 11, 2015
ee330c9
refactored :require_signin to be called from ApplicationController
a-lmx Aug 11, 2015
8eb80b1
removed :require_signin from SessionsController; added logged-in user…
a-lmx Aug 11, 2015
b74d6a4
Merge pull request #29 from brittinator/bugs-refactor/ar
arhx Aug 11, 2015
f83f902
added code to #unsubscribe to get it to pass specs
a-lmx Aug 11, 2015
3a423b4
fixed spec for #unsubscribe; added spec for #index template rendering
a-lmx Aug 11, 2015
f117c3e
added test for assignment of @subscriptions variable on #index
a-lmx Aug 11, 2015
fdce313
added tests for DELETE #destroy
a-lmx Aug 11, 2015
9ec1533
added current_user to specs
a-lmx Aug 11, 2015
59209cb
marked possibly unused actions for deletion
a-lmx Aug 11, 2015
2de4f0c
fixing merge conflict
a-lmx Aug 11, 2015
4cb1ca0
added @current_user to POST #unsubscribe
a-lmx Aug 11, 2015
7557d0b
styling
knguyen0710 Aug 11, 2015
b8dbac5
merge conflicts
knguyen0710 Aug 11, 2015
faab569
WIP: stylings
knguyen0710 Aug 11, 2015
b72280b
picture
knguyen0710 Aug 11, 2015
2ea0ad7
removed commented out code (unused methods)
a-lmx Aug 11, 2015
463f84f
changed unsubscribe method to a PUT method
a-lmx Aug 11, 2015
5752ad6
removed blank line
a-lmx Aug 11, 2015
5ecbeee
Merge pull request #30 from brittinator/rspec/ar
arhx Aug 11, 2015
02aa443
added vcr gem for api testing
a-lmx Aug 11, 2015
6393beb
added factory data for real twitter user
a-lmx Aug 11, 2015
9a44bda
added first test for #get_new_posts
a-lmx Aug 11, 2015
0a5b977
created new VCR cassette for get_new_posts; commented out extra VCR c…
a-lmx Aug 11, 2015
84c619f
WIP: pulling user posts, troubleshooting start time and other users
knguyen0710 Aug 11, 2015
c17d3e4
Updated home controller spec for #get_new_posts to include testing th…
lo-k Aug 11, 2015
83f2ae8
Merging
brittinator Aug 11, 2015
f7d6f21
Added guard to only remove the last Insta post if there is already a …
lo-k Aug 11, 2015
e0b0c5a
Adds update functionality to newsfeed action. Also adds flash message…
brittinator Aug 11, 2015
f7a69ca
WIP: newsfeed rspecs.
brittinator Aug 11, 2015
3861a5f
Deleted old VCR cassette.
lo-k Aug 11, 2015
a43d52d
Wrote test for when last_post_id is present in twitter and instagram …
lo-k Aug 11, 2015
ce823f6
Moved VCR to be before_each for testing twitter and instagram post cr…
lo-k Aug 11, 2015
487f803
refactored twitter_users_redirect to use VCR
a-lmx Aug 11, 2015
8742819
refactored search_results spec to use VCR
a-lmx Aug 11, 2015
92201c7
added spec for displaying instagram search results
a-lmx Aug 11, 2015
eba2725
removed unused VCR cassettes from user_redirect specs
a-lmx Aug 11, 2015
a43de7e
Merge pull request #31 from brittinator/ka/rspec
arhx Aug 11, 2015
8a96fca
passed our first newsfeed spec
knguyen0710 Aug 11, 2015
baee0a3
Merge branch 'FeedMe' of https://github.com/brittinator/C3Projects--S…
knguyen0710 Aug 11, 2015
9c4ecf3
merge conflicts
knguyen0710 Aug 11, 2015
a7480aa
fixed rspec conflicts
knguyen0710 Aug 11, 2015
2dac9bf
Merge pull request #32 from brittinator/subscripts/khn
knguyen0710 Aug 11, 2015
7f32070
moved webmock to test block
a-lmx Aug 11, 2015
8bc0c26
deleted unnecessary method
knguyen0710 Aug 11, 2015
22533e7
Merge branch 'FeedMe' into subscripts/khn
knguyen0710 Aug 11, 2015
f694e69
fixed newsfeed display glitch
knguyen0710 Aug 11, 2015
a17ea04
Merge pull request #33 from brittinator/subscripts/khn
knguyen0710 Aug 11, 2015
74b41a1
removed pseudocode notes
a-lmx Aug 11, 2015
ddf7177
fixed ordering of posts by native_created_at
knguyen0710 Aug 11, 2015
277449e
added InstagramApi class to handle calls to the API
a-lmx Aug 12, 2015
3310e28
Created helper_method to figure out if a followee is a private user o…
lo-k Aug 12, 2015
ebe7450
making get_embed_html method for InstagramApi; WIP
a-lmx Aug 12, 2015
fffc1fd
add vcr_cassettes directory to .gitignore
a-lmx Aug 12, 2015
a7207ef
removed vcr_cassettes from git tracking
a-lmx Aug 12, 2015
8210ad2
WIP: index subscription page and controller action.
brittinator Aug 12, 2015
ddbb921
Merge branch 'FeedMe' of github.com:brittinator/C3Projects--SeeMore i…
brittinator Aug 12, 2015
4a489a3
Adds #index action for subscription controller. WIP: tests.
brittinator Aug 12, 2015
bafbe1b
added get_posts method
a-lmx Aug 12, 2015
5b8dacd
Adds tests for index subscription controller action.
brittinator Aug 12, 2015
5378ada
refactored get_posts_from_API to use InstagramApi method
a-lmx Aug 12, 2015
23ffb62
Adds tests for subscription index page.
brittinator Aug 12, 2015
0effbcf
Deletes excess code no longer using and related obsolete tests.
brittinator Aug 12, 2015
0e9ced1
more refactoring on InstagramApi methods; made each method modular
a-lmx Aug 12, 2015
00928af
renamed TwitterClient class to TwitterApi
a-lmx Aug 12, 2015
7989983
removed unused instagram API endpoints from HomeController
a-lmx Aug 12, 2015
02b634e
updated name of get_embed_html to embed_html_with_js
a-lmx Aug 12, 2015
e60bb74
removed unused user_timeline method; added #embed_html_without_js
a-lmx Aug 12, 2015
09468b8
changed #twitter_client to #twitter_api and commented out during debu…
a-lmx Aug 12, 2015
b4baf89
updated #user_search to use TwitterApi.new instead of @twitter_api
a-lmx Aug 12, 2015
ad71ec3
refactoring methods to use TwitterApi.new instead of @twitter_client
a-lmx Aug 12, 2015
33eaede
updated name of class to TwitterApi
a-lmx Aug 12, 2015
74bdf61
added #timeline_options method; refactored #get_posts; added FIRST_PO…
a-lmx Aug 12, 2015
17e49ce
refactored #get_new_posts to call TwitterApi class
a-lmx Aug 12, 2015
a6815e2
moved user search logic from FolloweesController to Followee model
a-lmx Aug 12, 2015
ba9a369
moved .convert_instagram_time to InstagramApi class
a-lmx Aug 12, 2015
7c21f8b
moved find_twitter_params and find_instagram_params from controller t…
a-lmx Aug 12, 2015
621d13d
moved #get_posts_from_API from HomeController to Post model
a-lmx Aug 12, 2015
90bb190
removed commented-out old method
a-lmx Aug 12, 2015
5987569
moved logic to create new posts from HomeController to Post model
a-lmx Aug 12, 2015
fe33648
moved update_last_post_id to Followee model
a-lmx Aug 12, 2015
0c93ee6
refactored #get_new_posts to call model methods
a-lmx Aug 12, 2015
3745408
moved logic for processing new posts from controller to Post model
a-lmx Aug 12, 2015
c2fea16
refactored Post.process_new_posts so it acts on subscriptions collection
a-lmx Aug 12, 2015
ed5b54d
Merge branch 'FeedMe' of github.com:brittinator/C3Projects--SeeMore i…
a-lmx Aug 12, 2015
29421d9
commented broken test -- hardcoded last_post_id is out of date
a-lmx Aug 12, 2015
88c9b63
renamed twitter_client_spec to twitter_api_spec
a-lmx Aug 12, 2015
853840d
removed twitter_api method and references to it
a-lmx Aug 12, 2015
eeea09d
Merge pull request #34 from brittinator/subscrip_index
brittinator Aug 12, 2015
8783997
Merge branch 'FeedMe' into blw/twitterclient_DRY
brittinator Aug 12, 2015
2250677
Merge pull request #35 from brittinator/blw/twitterclient_DRY
brittinator Aug 12, 2015
472fb2b
styling search page and more
knguyen0710 Aug 12, 2015
3e5110e
Merge branch 'FeedMe' into subscripts/khn
knguyen0710 Aug 12, 2015
176fc15
Moved Update Feed button to top of Newsfeed view.
lo-k Aug 12, 2015
17095e7
Merge branch 'FeedMe' of github.com:brittinator/C3Projects--SeeMore i…
lo-k Aug 12, 2015
a6a7fb9
Adds heroku-style for background images.
brittinator Aug 12, 2015
7436ba5
Moves sqlite3 gem into development group and adds pg gem into product…
brittinator Aug 12, 2015
817f80f
New bundle
brittinator Aug 12, 2015
e87a737
Created helper method to check to see if the current user already fol…
lo-k Aug 12, 2015
58823da
Added conditionals to render an 'unsubscribe' button if the user alre…
lo-k Aug 12, 2015
fd35c89
Merge branch 'FeedMe' of github.com:brittinator/C3Projects--SeeMore i…
lo-k Aug 12, 2015
3c6ccb4
completed unsubscribe from subscription index, WIP: flash notice afte…
knguyen0710 Aug 12, 2015
22eaaf8
merge conflicts
knguyen0710 Aug 12, 2015
bdcc15f
Merge pull request #36 from brittinator/subscripts/khn
knguyen0710 Aug 12, 2015
c221529
Adds functionality for re-subscribing to an old subscription which ha…
brittinator Aug 12, 2015
2a5abfe
Added conditional display to twitter search results. Displays subscri…
lo-k Aug 12, 2015
5878202
Fixed merge conflicts.
lo-k Aug 12, 2015
2b6ba03
Merge pull request #37 from brittinator/ka/follow-buttons
lo-k Aug 12, 2015
3910d77
WIP: minor styling and header logic
knguyen0710 Aug 12, 2015
f263b8e
Refactoring create subscrition method and tests.
brittinator Aug 12, 2015
fb4472b
Merge pull request #38 from brittinator/blw-sub/unsub
brittinator Aug 12, 2015
8b92fb0
added comments to guide 2nd layer of refactoring
a-lmx Aug 12, 2015
1906d18
fixing merge conflicts
a-lmx Aug 12, 2015
ef1119c
Merge pull request #39 from brittinator/bugs-refactor/ar
arhx Aug 12, 2015
2370b34
Merge branch 'FeedMe' into subscripts/khn
knguyen0710 Aug 12, 2015
73bdc47
Creates and requires new classes for directing to APIs and mapping AP…
brittinator Aug 12, 2015
9a9486a
fixed rspec tests for new unsubscribe method
knguyen0710 Aug 12, 2015
d7c7ebb
Refactors last_post_id to be determined in the update_last_post_id me…
brittinator Aug 12, 2015
4bf3d04
Extracts user_search method from followee model into new ApiHelper cl…
brittinator Aug 12, 2015
5c8a2d3
Moved private_user? from followees_controller into instagram_api clas…
brittinator Aug 12, 2015
25ac678
moved #already_following? to followees_helper; removed unused code
a-lmx Aug 12, 2015
b84ee5a
updated FIRST_POSTS number to 1
a-lmx Aug 12, 2015
b8ba684
removed unnecessary local variable from #get_posts
a-lmx Aug 12, 2015
2d6b519
created TwitterMapper class
a-lmx Aug 12, 2015
959f821
moved #timeline_options to private section of class
a-lmx Aug 12, 2015
a4b7e22
fixed test to reflect pulling 1 post if no last_post_id
a-lmx Aug 12, 2015
ab051f0
calling InstgramMapper in #get_posts instead of InstagramApi
a-lmx Aug 12, 2015
a0057c5
moved #remove_duplicate_post logic to InstagramMapper; deleted unnece…
a-lmx Aug 12, 2015
a82d180
Moves .instagram_params method into instagram_mapper class, and renam…
brittinator Aug 12, 2015
54c8a5d
Moves .twitter_params from post model to TwitterMapper class. Also re…
brittinator Aug 12, 2015
2c200fe
Moves processing of posts methods that don't hit database from Post m…
brittinator Aug 12, 2015
dfc7ce9
Removes FIRST_POST_NUMBER constant because it was unused.
brittinator Aug 12, 2015
28d7d2c
populates newsfeed when subscribed, WIP: styling
knguyen0710 Aug 12, 2015
8fcdb2c
removed spec for deprecated chron_sort scope
a-lmx Aug 12, 2015
7e17648
removed unnecessary comments and clarified remaining comments
a-lmx Aug 12, 2015
4125a06
removed unused chron_sort scope
a-lmx Aug 12, 2015
743e227
refactored validations to be on one line; removed old comments
a-lmx Aug 12, 2015
cf4897f
improved comments
a-lmx Aug 12, 2015
49b5494
removed before_action for deprecated :find method; deleted old comments
a-lmx Aug 12, 2015
13bbf2a
updated syntax in before_actions to new syntax
a-lmx Aug 12, 2015
8d62a69
removed unused #new and comment
a-lmx Aug 12, 2015
1898c07
Created subscription scope to find subscriptions for a certain follow…
lo-k Aug 12, 2015
d6048fe
Added ability to unsubscribe from instagram search results.
lo-k Aug 12, 2015
fec804d
Renamed and corrected currently_following? method to only care about …
lo-k Aug 12, 2015
0696802
changed buttons for consistency
knguyen0710 Aug 12, 2015
7c15997
Changed it to redirect to :back after unsubscribing so that you remai…
lo-k Aug 12, 2015
f30bb9b
For unsubscribe button, added parameter to find the exact subscriptio…
lo-k Aug 12, 2015
9071f7e
removed unused posts_controller
a-lmx Aug 12, 2015
d490ed2
Merge pull request #40 from brittinator/b-a/refactor2
arhx Aug 12, 2015
dcb20c1
Enabled unsubcribe button for twitter search results.
lo-k Aug 12, 2015
2886ddd
Fixed merge conflicts.
lo-k Aug 13, 2015
133ed57
Merge pull request #41 from brittinator/ka/unsubscribe_from_search
lo-k Aug 13, 2015
3b8c1d4
Adds image-url to stylesheet for deployment onto heroku.
brittinator Aug 13, 2015
6246602
Merge branch 'FeedMe' of github.com:brittinator/C3Projects--SeeMore i…
brittinator Aug 13, 2015
7ab215a
WIP: finalize newsfeed method
knguyen0710 Aug 13, 2015
a8415d9
merge conflicts
knguyen0710 Aug 13, 2015
d21a2e1
Merge pull request #42 from brittinator/subscripts/khn
knguyen0710 Aug 13, 2015
e35e6e9
Deletes USER_COUNT duplicate constant.
brittinator Aug 13, 2015
5894a1b
Adds rescue clause for redirect_to(:back). Deletes post_controller_sp…
brittinator Aug 13, 2015
98842a4
Fixes merge conflicts.
brittinator Aug 13, 2015
fbbd53e
Adds rescue clause if redirect_to :back doesn't exist in #create and …
brittinator Aug 13, 2015
1cb0144
Fixes tests about redirect_to for #unsubscribe to root_path.
brittinator Aug 13, 2015
8348bfe
created TwitterApi spec, wrote spec for #user_search
a-lmx Aug 13, 2015
b73be7c
added test for #embed_html_without_js
a-lmx Aug 13, 2015
3c42dff
updated followee factory to have last_post_id
a-lmx Aug 13, 2015
e05dbdf
refactored specs to use local variables instead of instance; working …
a-lmx Aug 13, 2015
dadbc6d
Changes background images to image-url for heroku deployment.
brittinator Aug 13, 2015
04dad4a
Merge pull request #43 from brittinator/blw-heroku
brittinator Aug 13, 2015
a6853a0
Checks off completed items from our README.
brittinator Aug 13, 2015
0a98890
added last_post_id: nil to test for new followee
a-lmx Aug 13, 2015
1605c91
created instagram_api_spec
a-lmx Aug 13, 2015
4ce2245
updated #user_search to match <= USER_COUNT
a-lmx Aug 13, 2015
24bc414
added working test for #user_search; test breaks if different search …
a-lmx Aug 13, 2015
734e2c5
added true & false tests for #private_user?
a-lmx Aug 13, 2015
5889fc9
refactored InstagramApi.embed_html_with_js to take link as parameter …
a-lmx Aug 13, 2015
9081cc8
added tests for #embed_html_with_js
a-lmx Aug 13, 2015
04f4f0e
added test for #embed_html_without_js not returning a script
a-lmx Aug 13, 2015
bd05a01
pulled out instagram_link variable into let line
a-lmx Aug 13, 2015
ea4a535
changed syntax in #get_posts spec; spec still broken
a-lmx Aug 13, 2015
c817118
added tests for #query_API_for_posts
a-lmx Aug 13, 2015
f10be78
Merge branch 'FeedMe' of github.com:brittinator/C3Projects--SeeMore i…
a-lmx Aug 13, 2015
009c999
WIP: fixing vcr specs for changed home controller methods
knguyen0710 Aug 13, 2015
e80427a
Merge pull request #44 from brittinator/rspec/ar
arhx Aug 13, 2015
1703fd5
fixed home controller specs for newsfeed method update
knguyen0710 Aug 13, 2015
c81118a
Merge branch 'FeedMe' into subscripts/khn
knguyen0710 Aug 13, 2015
a093fe2
Merge pull request #45 from brittinator/subscripts/khn
knguyen0710 Aug 13, 2015
5fdb114
added traceroute gem
a-lmx Aug 13, 2015
f4ad807
removed unused routes; commented groups of routes
a-lmx Aug 13, 2015
bca54b2
Merge pull request #46 from brittinator/routes/ar
arhx Aug 13, 2015
cd19f0b
Moved two view helper methods from the followees controller into the …
lo-k Aug 13, 2015
0ce8d5f
Merge branch 'FeedMe' of github.com:brittinator/C3Projects--SeeMore i…
lo-k Aug 13, 2015
200b682
Merge pull request #47 from brittinator/ka/followee_controller_refactor
lo-k Aug 13, 2015
ad58e58
added omniauth-github to Gemfile
a-lmx Aug 13, 2015
f2f3447
added github provider strategy to omniauth initialize
a-lmx Aug 13, 2015
9f0810f
added github mock_auth to spec_helper
a-lmx Aug 13, 2015
d661917
added button for sign-in with GitHub
a-lmx Aug 13, 2015
c96beb1
Merge branch 'FeedMe' of github.com:brittinator/C3Projects--SeeMore i…
a-lmx Aug 13, 2015
572430d
Merge pull request #48 from brittinator/github-auth/ar
arhx Aug 13, 2015
3e0b66c
Adds not production wrapper for developers authorization strategy.
brittinator Aug 13, 2015
fb50f90
Merge branch 'FeedMe' of github.com:brittinator/C3Projects--SeeMore i…
brittinator Aug 13, 2015
6b775ac
Comments out tracefile gem.
brittinator Aug 13, 2015
80a409c
added route and view for unauthorized use of dev strategy
a-lmx Aug 13, 2015
f5e045c
added button styling to 'back to FeedMe sign-in' link
a-lmx Aug 13, 2015
2f431c9
added logic to not display dev-strategy login button in production env
a-lmx Aug 13, 2015
648db2e
Merge pull request #49 from brittinator/dev-stat-production-gif/ar
arhx Aug 13, 2015
a98eedd
fixed newsfeed method to incorporate model method and fixed rspec cas…
knguyen0710 Aug 13, 2015
7a08b1c
added htmlify() method to fix space in string; trying to fix heroku bug
a-lmx Aug 13, 2015
8f884af
removed htmlify() attempted bug fix
a-lmx Aug 13, 2015
d8ab22c
final newsfeed method and added flash error for no users matching sea…
knguyen0710 Aug 13, 2015
4005da9
added #sanitize method to remove octothorpes from user_search query i…
a-lmx Aug 13, 2015
748dfa0
merge conflicts
knguyen0710 Aug 13, 2015
54c834e
Merge pull request #50 from brittinator/subscripts/khn
knguyen0710 Aug 13, 2015
126accf
added :fire to skip require_signin
a-lmx Aug 13, 2015
a292a57
added space handling to #sanitize
a-lmx Aug 13, 2015
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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,9 @@
!/log/.keep
/tmp
/coverage

# Ignore .env always
.env

# Ignore all VCR cassettes
/spec/support/vcr_cassettes
30 changes: 19 additions & 11 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@ source 'https://rubygems.org'
gem 'dotenv-rails', :groups => [:development, :test]
# Auth
gem 'omniauth'

gem 'omniauth-instagram'
gem "omniauth-github"
# reading APIs
gem 'httparty'

# Twitter API
gem 'twitter'
# Instagram API
gem 'instagram'
# styling
gem 'bootstrap-sass'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.3'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.1.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use jquery as the JavaScript library
gem 'jquery-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
Expand All @@ -30,7 +30,6 @@ gem 'turbolinks'
gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc

# Use ActiveModel has_secure_password
gem 'bcrypt'

Expand All @@ -40,10 +39,9 @@ gem 'bcrypt'
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# group :production do
# gem "pg"
# end

group :test do
gem 'webmock'
end

group :development, :test do
# troubleshooting
Expand All @@ -55,6 +53,7 @@ group :development, :test do
gem 'rspec-rails'
gem 'simplecov', require: false
gem 'factory_girl_rails', "~> 4.0"
gem 'vcr'

# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'
Expand All @@ -64,4 +63,13 @@ group :development, :test do

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'

# Use sqlite3 as the database for Active Record
gem 'sqlite3'
# for inspecting route usage
# gem 'traceroute'
end

group :production do
gem 'pg'
end
62 changes: 62 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.3.8)
arel (6.0.2)
autoprefixer-rails (5.2.1.1)
execjs
Expand All @@ -50,6 +51,7 @@ GEM
bootstrap-sass (3.3.5.1)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.3.0)
buftok (0.2.0)
builder (3.2.2)
byebug (5.0.0)
columnize (= 0.9.0)
Expand All @@ -62,27 +64,42 @@ GEM
execjs
coffee-script-source (1.9.1.1)
columnize (0.9.0)
crack (0.4.2)
safe_yaml (~> 1.0.0)
debug_inspector (0.0.2)
diff-lcs (1.2.5)
docile (1.1.5)
dotenv (2.0.2)
dotenv-rails (2.0.2)
dotenv (= 2.0.2)
railties (~> 4.0)
equalizer (0.0.11)
erubis (2.7.0)
execjs (2.5.2)
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.1)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.9.2)
faraday (>= 0.7.4, < 0.10)
globalid (0.3.5)
activesupport (>= 4.1.0)
hashie (3.4.2)
http (0.6.4)
http_parser.rb (~> 0.6.0)
http_parser.rb (0.6.0)
httparty (0.13.5)
json (~> 1.8)
multi_xml (>= 0.5.2)
i18n (0.7.0)
instagram (1.1.5)
faraday (>= 0.7, < 0.10)
faraday_middleware (>= 0.8, < 0.10)
hashie (>= 0.4.0)
multi_json (~> 1.0, >= 1.0.3)
jbuilder (2.3.1)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
Expand All @@ -91,21 +108,42 @@ GEM
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
jwt (1.5.1)
loofah (2.0.2)
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.6.1)
mini_portile (0.6.2)
minitest (5.7.0)
multi_json (1.11.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
naught (1.0.0)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
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.2.2)
hashie (>= 1.2, < 4)
rack (~> 1.0)
omniauth-github (1.1.2)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-instagram (1.0.1)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.0)
omniauth-oauth2 (1.3.1)
oauth2 (~> 1.0)
omniauth (~> 1.2)
pg (0.18.2)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
Expand Down Expand Up @@ -158,6 +196,7 @@ GEM
rspec-mocks (~> 3.3.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
safe_yaml (1.0.4)
sass (3.4.16)
sass-rails (5.0.3)
railties (>= 4.0.0, < 5.0)
Expand All @@ -168,6 +207,7 @@ GEM
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
simple_oauth (0.3.1)
simplecov (0.10.0)
docile (~> 1.1.0)
json (~> 1.8)
Expand All @@ -187,16 +227,31 @@ GEM
tilt (1.4.1)
turbolinks (2.5.3)
coffee-rails
twitter (5.14.0)
addressable (~> 2.3)
buftok (~> 0.2.0)
equalizer (~> 0.0.9)
faraday (~> 0.9.0)
http (~> 0.6.0)
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.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
vcr (2.9.3)
web-console (2.2.1)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
webmock (1.21.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)

PLATFORMS
ruby
Expand All @@ -211,9 +266,13 @@ DEPENDENCIES
dotenv-rails
factory_girl_rails (~> 4.0)
httparty
instagram
jbuilder (~> 2.0)
jquery-rails
omniauth
omniauth-github
omniauth-instagram
pg
pry-rails
rails (= 4.2.3)
rspec-rails
Expand All @@ -223,8 +282,11 @@ DEPENDENCIES
spring
sqlite3
turbolinks
twitter
uglifier (>= 1.3.0)
vcr
web-console (~> 2.0)
webmock

BUNDLED WITH
1.10.6
30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,25 +62,25 @@ You and your team will build a feed aggregator service that allows users to logi
### User Stories

# As a logged out user
- I can sign up
x I can sign up
- with OAuth developer
- with instagram
- I can log in
x with instagram
x I can log in
- API CALL (OAuth)

# As a logged in user
- I can sign out
x I can sign out

- I can see a chronological feed of posts from users you choose to follow
- Instagram
- Twitter
x I can see a chronological feed of posts from users you choose to follow
x Instagram
x Twitter

- I can search Instagram users
- and see list of results
- and follow a user
- I can search Twitter users
- and see list of results
- and follow a user
x I can search Instagram users
x and see list of results
x and follow a user
x I can search Twitter users
x and see list of results
x and follow a user

### Notes on structure

Expand All @@ -105,8 +105,8 @@ My Subscriptions
Added Fun (Nice to Have)

- live stream updating
- be able to unsubscribe
- from that point on, no new posts
x be able to unsubscribe
x from that point on, no new posts
- Feed
- be able to select which source to see
- pagination?
Binary file added app/assets/.DS_Store
Binary file not shown.
Binary file added app/assets/images/.DS_Store
Binary file not shown.
Binary file added app/assets/images/Coffee.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Newspaper.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/arnold.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/coffee_table.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/gosling.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/insta.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/tweet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/will-i-am.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/javascripts/followees.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/home.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/posts.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/subscriptions.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
Loading