Skip to content

Commit e16f037

Browse files
committed
Add sublime project, upgrade gems and other minor change.
1 parent 853e7cb commit e16f037

File tree

19 files changed

+600
-576
lines changed

19 files changed

+600
-576
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ node_modules
2323

2424
# Generated js bundles
2525
/public/webpack/*
26+
reactchat.sublime-workspace
27+
.DS_Store
28+
/public/assets/*

Gemfile

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
source 'https://rubygems.org'
22

33
git_source(:github) do |repo_name|
4-
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
4+
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
55
"https://github.com/#{repo_name}.git"
66
end
77

8-
ruby '2.4.1'
8+
ruby '~> 2.4.1'
99

1010
gem 'devise'
1111
gem 'omniauth'
1212
gem 'omniauth-github'
1313

1414
gem 'jquery-rails'
1515

16-
gem 'react_on_rails', '8.0.0'
16+
gem 'react_on_rails', '~> 8.0.6'
1717

1818
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
19-
gem 'rails', '~> 5.1.3'
19+
gem 'rails', '~> 5.1.4'
2020
# Use postgresql as the database for Active Record
21-
gem 'pg', '~> 0.18'
21+
gem 'pg'
2222
# Use Puma as the app server
23-
gem 'puma', '~> 3.7'
23+
gem 'puma'
2424
# Use SCSS for stylesheets
25-
gem 'sass-rails', '~> 5.0'
25+
gem 'sass-rails'
2626
# Use Uglifier as compressor for JavaScript assets
27-
gem 'uglifier', '>= 1.3.0'
27+
gem 'uglifier'
2828
# See https://github.com/rails/execjs#readme for more supported runtimes
2929
# gem 'therubyracer', platforms: :ruby
3030

3131
# Use CoffeeScript for .coffee assets and views
32-
gem 'coffee-rails', '~> 4.2'
32+
gem 'coffee-rails'
3333
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
34-
gem 'turbolinks', '~> 5'
34+
gem 'turbolinks'
3535
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
36-
gem 'jbuilder', '~> 2.5'
36+
gem 'jbuilder'
3737
# Use Redis adapter to run Action Cable in production
3838
# gem 'redis', '~> 3.0'
3939
# Use ActiveModel has_secure_password
@@ -46,17 +46,17 @@ group :development, :test do
4646
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
4747
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
4848
# Adds support for Capybara system testing and selenium driver
49-
gem 'capybara', '~> 2.13'
49+
gem 'capybara'
5050
gem 'selenium-webdriver'
5151
end
5252

5353
group :development do
5454
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
55-
gem 'web-console', '>= 3.3.0'
56-
gem 'listen', '>= 3.0.5', '< 3.2'
55+
gem 'web-console'
56+
gem 'listen'
5757
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
5858
gem 'spring'
59-
gem 'spring-watcher-listen', '~> 2.0.0'
59+
gem 'spring-watcher-listen'
6060
end
6161

6262
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

Lines changed: 65 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.1.3)
5-
actionpack (= 5.1.3)
4+
actioncable (5.1.4)
5+
actionpack (= 5.1.4)
66
nio4r (~> 2.0)
77
websocket-driver (~> 0.6.1)
8-
actionmailer (5.1.3)
9-
actionpack (= 5.1.3)
10-
actionview (= 5.1.3)
11-
activejob (= 5.1.3)
8+
actionmailer (5.1.4)
9+
actionpack (= 5.1.4)
10+
actionview (= 5.1.4)
11+
activejob (= 5.1.4)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.1.3)
15-
actionview (= 5.1.3)
16-
activesupport (= 5.1.3)
14+
actionpack (5.1.4)
15+
actionview (= 5.1.4)
16+
activesupport (= 5.1.4)
1717
rack (~> 2.0)
18-
rack-test (~> 0.6.3)
18+
rack-test (>= 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.1.3)
22-
activesupport (= 5.1.3)
21+
actionview (5.1.4)
22+
activesupport (= 5.1.4)
2323
builder (~> 3.1)
2424
erubi (~> 1.4)
2525
rails-dom-testing (~> 2.0)
2626
rails-html-sanitizer (~> 1.0, >= 1.0.3)
27-
activejob (5.1.3)
28-
activesupport (= 5.1.3)
27+
activejob (5.1.4)
28+
activesupport (= 5.1.4)
2929
globalid (>= 0.3.6)
30-
activemodel (5.1.3)
31-
activesupport (= 5.1.3)
32-
activerecord (5.1.3)
33-
activemodel (= 5.1.3)
34-
activesupport (= 5.1.3)
30+
activemodel (5.1.4)
31+
activesupport (= 5.1.4)
32+
activerecord (5.1.4)
33+
activemodel (= 5.1.4)
34+
activesupport (= 5.1.4)
3535
arel (~> 8.0)
36-
activesupport (5.1.3)
36+
activesupport (5.1.4)
3737
concurrent-ruby (~> 1.0, >= 1.0.2)
3838
i18n (~> 0.7)
3939
minitest (~> 5.1)
@@ -52,7 +52,7 @@ GEM
5252
rack (>= 1.0.0)
5353
rack-test (>= 0.5.4)
5454
xpath (~> 2.0)
55-
childprocess (0.7.1)
55+
childprocess (0.8.0)
5656
ffi (~> 1.0, >= 1.0.11)
5757
coffee-rails (4.2.2)
5858
coffee-script (>= 2.2.0)
@@ -63,6 +63,7 @@ GEM
6363
coffee-script-source (1.12.2)
6464
concurrent-ruby (1.0.5)
6565
connection_pool (2.2.1)
66+
crass (1.0.2)
6667
devise (4.3.0)
6768
bcrypt (~> 3.0)
6869
orm_adapter (~> 0.1)
@@ -81,42 +82,43 @@ GEM
8182
jbuilder (2.7.0)
8283
activesupport (>= 4.2.0)
8384
multi_json (>= 1.2)
84-
jquery-rails (4.1.1)
85+
jquery-rails (4.3.1)
8586
rails-dom-testing (>= 1, < 3)
8687
railties (>= 4.2.0)
8788
thor (>= 0.14, < 2.0)
8889
jwt (1.5.6)
89-
libv8 (5.9.211.38.1-x86_64-darwin-16)
90+
libv8 (5.9.211.38.1)
9091
listen (3.1.5)
9192
rb-fsevent (~> 0.9, >= 0.9.4)
9293
rb-inotify (~> 0.9, >= 0.9.7)
9394
ruby_dep (~> 1.2)
94-
loofah (2.0.3)
95+
loofah (2.1.1)
96+
crass (~> 1.0.2)
9597
nokogiri (>= 1.5.9)
9698
mail (2.6.6)
9799
mime-types (>= 1.16, < 4)
98-
method_source (0.8.2)
100+
method_source (0.9.0)
99101
mime-types (3.1)
100102
mime-types-data (~> 3.2015)
101103
mime-types-data (3.2016.0521)
102104
mini_mime (0.1.4)
103-
mini_portile2 (2.2.0)
104-
mini_racer (0.1.12)
105+
mini_portile2 (2.3.0)
106+
mini_racer (0.1.14)
105107
libv8 (~> 5.9)
106108
minitest (5.10.3)
107-
multi_json (1.12.1)
109+
multi_json (1.12.2)
108110
multi_xml (0.6.0)
109111
multipart-post (2.0.0)
110112
nio4r (2.1.0)
111-
nokogiri (1.8.0)
112-
mini_portile2 (~> 2.2.0)
113+
nokogiri (1.8.1)
114+
mini_portile2 (~> 2.3.0)
113115
oauth2 (1.4.0)
114116
faraday (>= 0.8, < 0.13)
115117
jwt (~> 1.0)
116118
multi_json (~> 1.3)
117119
multi_xml (~> 0.5)
118120
rack (>= 1.2, < 3)
119-
omniauth (1.6.1)
121+
omniauth (1.7.0)
120122
hashie (>= 3.4.6, < 3.6.0)
121123
rack (>= 1.6.2, < 3)
122124
omniauth-github (1.3.0)
@@ -130,43 +132,43 @@ GEM
130132
public_suffix (3.0.0)
131133
puma (3.10.0)
132134
rack (2.0.3)
133-
rack-test (0.6.3)
134-
rack (>= 1.0)
135-
rails (5.1.3)
136-
actioncable (= 5.1.3)
137-
actionmailer (= 5.1.3)
138-
actionpack (= 5.1.3)
139-
actionview (= 5.1.3)
140-
activejob (= 5.1.3)
141-
activemodel (= 5.1.3)
142-
activerecord (= 5.1.3)
143-
activesupport (= 5.1.3)
135+
rack-test (0.7.0)
136+
rack (>= 1.0, < 3)
137+
rails (5.1.4)
138+
actioncable (= 5.1.4)
139+
actionmailer (= 5.1.4)
140+
actionpack (= 5.1.4)
141+
actionview (= 5.1.4)
142+
activejob (= 5.1.4)
143+
activemodel (= 5.1.4)
144+
activerecord (= 5.1.4)
145+
activesupport (= 5.1.4)
144146
bundler (>= 1.3.0)
145-
railties (= 5.1.3)
147+
railties (= 5.1.4)
146148
sprockets-rails (>= 2.0.0)
147149
rails-dom-testing (2.0.3)
148150
activesupport (>= 4.2.0)
149151
nokogiri (>= 1.6)
150152
rails-html-sanitizer (1.0.3)
151153
loofah (~> 2.0)
152-
railties (5.1.3)
153-
actionpack (= 5.1.3)
154-
activesupport (= 5.1.3)
154+
railties (5.1.4)
155+
actionpack (= 5.1.4)
156+
activesupport (= 5.1.4)
155157
method_source
156158
rake (>= 0.8.7)
157159
thor (>= 0.18.1, < 2.0)
158160
rainbow (2.2.2)
159161
rake
160-
rake (12.0.0)
162+
rake (12.1.0)
161163
rb-fsevent (0.10.2)
162164
rb-inotify (0.9.10)
163165
ffi (>= 0.5.0, < 2)
164-
react_on_rails (8.0.0)
166+
react_on_rails (8.0.6)
165167
addressable
166168
connection_pool
167169
execjs (~> 2.5)
168170
rails (>= 3.2)
169-
rainbow (~> 2.1)
171+
rainbow (~> 2.2)
170172
responders (2.4.0)
171173
actionpack (>= 4.2.0, < 5.3)
172174
railties (>= 4.2.0, < 5.3)
@@ -183,7 +185,7 @@ GEM
183185
sprockets (>= 2.8, < 4.0)
184186
sprockets-rails (>= 2.0, < 4.0)
185187
tilt (>= 1.1, < 3)
186-
selenium-webdriver (3.5.1)
188+
selenium-webdriver (3.6.0)
187189
childprocess (~> 0.5)
188190
rubyzip (~> 1.0)
189191
spring (2.0.2)
@@ -230,27 +232,27 @@ PLATFORMS
230232

231233
DEPENDENCIES
232234
byebug
233-
capybara (~> 2.13)
234-
coffee-rails (~> 4.2)
235+
capybara
236+
coffee-rails
235237
devise
236-
jbuilder (~> 2.5)
238+
jbuilder
237239
jquery-rails
238-
listen (>= 3.0.5, < 3.2)
240+
listen
239241
mini_racer
240242
omniauth
241243
omniauth-github
242-
pg (~> 0.18)
243-
puma (~> 3.7)
244-
rails (~> 5.1.3)
245-
react_on_rails (= 8.0.0)
246-
sass-rails (~> 5.0)
244+
pg
245+
puma
246+
rails (~> 5.1.4)
247+
react_on_rails (~> 8.0.6)
248+
sass-rails
247249
selenium-webdriver
248250
spring
249-
spring-watcher-listen (~> 2.0.0)
250-
turbolinks (~> 5)
251+
spring-watcher-listen
252+
turbolinks
251253
tzinfo-data
252-
uglifier (>= 1.3.0)
253-
web-console (>= 3.3.0)
254+
uglifier
255+
web-console
254256
webpacker_lite
255257

256258
RUBY VERSION

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,10 @@ Authorization callback URL: `http://localhost:3000/users/auth/github/callback`
3737
Once you've set up your Github app, Github will provide you with a Client ID and secret. You need to add these to your app's environment as `GITHUB_APP_ID` and `GITHUB_APP_SECRET`.
3838

3939
For development, the easiest way is to put them in your `~/.bash_profile`, start a new terminal window and restart your Rails server.
40+
41+
## Running test
42+
43+
```bash
44+
cd client && bundle exec rake react_on_rails:locale && yarn run build:test
45+
bundle exec rake
46+
```

app/assets/javascripts/chatrooms.coffee

Lines changed: 0 additions & 3 deletions
This file was deleted.

app/assets/stylesheets/messages.scss

Lines changed: 0 additions & 3 deletions
This file was deleted.

app/helpers/application_helper.rb

Lines changed: 0 additions & 2 deletions
This file was deleted.

app/helpers/chatrooms_helper.rb

Lines changed: 0 additions & 2 deletions
This file was deleted.

client/.DS_Store

-6 KB
Binary file not shown.

client/app/.DS_Store

-6 KB
Binary file not shown.

client/app/bundles/.DS_Store

-6 KB
Binary file not shown.

client/app/bundles/Chatroom/.DS_Store

-6 KB
Binary file not shown.

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"js-yaml": "^3.8.2",
2727
"react": "^15.5.4",
2828
"react-dom": "^15.5.4",
29-
"react-on-rails": "8.0.0",
29+
"react-on-rails": "8.0.6",
3030
"webpack": "^2.3.3",
3131
"webpack-manifest-plugin": "^1.1.0"
3232
},

0 commit comments

Comments
 (0)