storytime 2.0.0 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (127) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -2
  3. data/Gemfile.lock +238 -185
  4. data/README.md +21 -21
  5. data/app/assets/javascripts/storytime/application.js +5 -3
  6. data/app/assets/javascripts/storytime/base.js.coffee +5 -4
  7. data/app/assets/javascripts/storytime/media.js.coffee +7 -2
  8. data/app/assets/javascripts/storytime/{users.js.coffee → memberships.js.coffee} +3 -4
  9. data/app/assets/javascripts/storytime/navigations.js.coffee +7 -0
  10. data/app/assets/javascripts/storytime/wysiwyg.js.coffee +23 -11
  11. data/app/assets/stylesheets/storytime/application.scss +2 -1
  12. data/app/assets/stylesheets/storytime/dashboard_overrides.scss +4 -0
  13. data/app/assets/stylesheets/storytime/media.scss +2 -0
  14. data/app/assets/stylesheets/storytime/navigation.scss +7 -0
  15. data/app/assets/stylesheets/storytime/posts.scss +70 -61
  16. data/app/controllers/storytime/application_controller.rb +8 -7
  17. data/app/controllers/storytime/blogs_controller.rb +10 -5
  18. data/app/controllers/storytime/dashboard/blogs_controller.rb +0 -1
  19. data/app/controllers/storytime/dashboard/custom_posts_controller.rb +1 -1
  20. data/app/controllers/storytime/dashboard/links_controller.rb +16 -0
  21. data/app/controllers/storytime/dashboard/memberships_controller.rb +56 -6
  22. data/app/controllers/storytime/dashboard/navigations_controller.rb +66 -0
  23. data/app/controllers/storytime/dashboard/pages_controller.rb +7 -3
  24. data/app/controllers/storytime/dashboard/posts_controller.rb +7 -5
  25. data/app/controllers/storytime/dashboard/sites_controller.rb +1 -1
  26. data/app/controllers/storytime/dashboard_controller.rb +3 -3
  27. data/app/controllers/storytime/pages_controller.rb +3 -3
  28. data/app/helpers/storytime/application_helper.rb +9 -1
  29. data/app/models/concerns/storytime/scoped_to_site.rb +5 -3
  30. data/app/models/storytime/blog.rb +0 -1
  31. data/app/models/storytime/link.rb +22 -0
  32. data/app/models/storytime/membership.rb +2 -0
  33. data/app/models/storytime/navigation.rb +19 -0
  34. data/app/models/storytime/post.rb +8 -4
  35. data/app/models/storytime/site.rb +3 -2
  36. data/app/policies/storytime/membership_policy.rb +13 -1
  37. data/app/policies/storytime/snippet_policy.rb +5 -1
  38. data/app/views/layouts/storytime/dashboard.html.erb +2 -1
  39. data/app/views/storytime/application/storytime/_header.html.erb +1 -0
  40. data/app/views/storytime/blogs/_tags.html.erb +1 -1
  41. data/app/views/storytime/blogs/show.html.erb +1 -1
  42. data/app/views/storytime/dashboard/_navigation.html.erb +12 -8
  43. data/app/views/storytime/dashboard/_settings_tabs.html.erb +1 -1
  44. data/app/views/storytime/dashboard/blog_posts/edit.html.erb +1 -1
  45. data/app/views/storytime/dashboard/blog_posts/new.html.erb +1 -1
  46. data/app/views/storytime/dashboard/blogs/_blog.html.erb +1 -1
  47. data/app/views/storytime/dashboard/media/_gallery.html.erb +12 -11
  48. data/app/views/storytime/dashboard/{users → memberships}/_edit.html.erb +6 -7
  49. data/app/views/storytime/dashboard/memberships/_index.html.erb +1 -1
  50. data/app/views/storytime/dashboard/memberships/_membership.html.erb +1 -1
  51. data/app/views/storytime/dashboard/{users → memberships}/_new.html.erb +3 -3
  52. data/app/views/storytime/dashboard/memberships/edit.json.jbuilder +2 -0
  53. data/app/views/storytime/dashboard/memberships/new.json.jbuilder +2 -0
  54. data/app/views/storytime/dashboard/memberships/save.json.jbuilder +1 -1
  55. data/app/views/storytime/dashboard/navigations/_blog_link_fields.html.erb +8 -0
  56. data/app/views/storytime/dashboard/navigations/_external_link_fields.html.erb +7 -0
  57. data/app/views/storytime/dashboard/navigations/_form.html.erb +58 -0
  58. data/app/views/storytime/dashboard/navigations/_navigation.html.erb +25 -0
  59. data/app/views/storytime/dashboard/navigations/_page_link_fields.html.erb +8 -0
  60. data/app/views/storytime/dashboard/navigations/edit.html.erb +1 -0
  61. data/app/views/storytime/dashboard/navigations/index.html.erb +15 -0
  62. data/app/views/storytime/dashboard/navigations/new.html.erb +1 -0
  63. data/app/views/storytime/dashboard/pages/edit.html.erb +1 -1
  64. data/app/views/storytime/dashboard/pages/new.html.erb +1 -1
  65. data/app/views/storytime/dashboard/posts/_image_toolbar.html.erb +4 -1
  66. data/app/views/storytime/dashboard/posts/_list.html.erb +10 -8
  67. data/app/views/storytime/dashboard/posts/edit.html.erb +1 -1
  68. data/app/views/storytime/dashboard/posts/index.html.erb +16 -5
  69. data/app/views/storytime/dashboard/posts/new.html.erb +1 -1
  70. data/app/views/storytime/navigations/_navigation.html.erb +3 -0
  71. data/app/views/storytime/posts/_post.html.erb +1 -1
  72. data/app/views/storytime/posts/_tags.html.erb +1 -1
  73. data/app/views/storytime/sites/_google_analytics_code.html.erb +4 -3
  74. data/app/views/storytime/snippets/_snippet.html.erb +1 -1
  75. data/config/initializers/assets.rb +1 -1
  76. data/config/initializers/storytime_admin.rb +2 -0
  77. data/config/initializers/url_for_patch.rb +6 -6
  78. data/config/locales/en.yml +18 -0
  79. data/config/routes.rb +11 -10
  80. data/db/migrate/20141021073356_create_storytime_snippets.rb +1 -1
  81. data/db/migrate/20150520181115_create_storytime_navigations.rb +12 -0
  82. data/db/migrate/20150520185227_create_storytime_links.rb +11 -0
  83. data/db/migrate/20150520190700_add_position_to_storytime_links.rb +6 -0
  84. data/db/migrate/20150529192058_add_url_to_storytime_links.rb +5 -0
  85. data/lib/generators/storytime/views_generator.rb +2 -3
  86. data/lib/generators/templates/storytime.rb +22 -15
  87. data/lib/storytime/concerns/current_site.rb +1 -1
  88. data/lib/storytime/concerns/has_versions.rb +8 -8
  89. data/lib/storytime/constraints/page_constraint.rb +2 -2
  90. data/lib/storytime/engine.rb +2 -0
  91. data/lib/storytime/storytime_helpers.rb +7 -5
  92. data/lib/storytime/version.rb +1 -1
  93. data/lib/storytime.rb +29 -11
  94. data/spec/controllers/dashboard_controller_spec.rb +4 -4
  95. data/spec/dummy/config/environments/test.rb +1 -1
  96. data/spec/dummy/db/schema.rb +61 -35
  97. data/spec/factories/navigation_factories.rb +6 -0
  98. data/spec/features/blogs_spec.rb +2 -2
  99. data/spec/features/comments_spec.rb +4 -4
  100. data/spec/features/dashboard/media_spec.rb +7 -7
  101. data/spec/features/dashboard/memberships_spec.rb +62 -4
  102. data/spec/features/dashboard/navigations_spec.rb +33 -0
  103. data/spec/features/dashboard/pages_spec.rb +26 -16
  104. data/spec/features/dashboard/posts_spec.rb +65 -15
  105. data/spec/features/dashboard/sites_spec.rb +5 -5
  106. data/spec/features/dashboard/snippets_spec.rb +5 -5
  107. data/spec/features/dashboard/subscription_spec.rb +5 -5
  108. data/spec/features/pages_spec.rb +3 -3
  109. data/spec/features/posts_spec.rb +1 -1
  110. data/spec/features/subscription_spec.rb +2 -2
  111. data/spec/lib/storytime_helpers_spec.rb +37 -0
  112. data/spec/models/navigation_spec.rb +21 -0
  113. data/spec/requests/routings_spec.rb +8 -8
  114. data/spec/spec_helper.rb +5 -5
  115. data/spec/support/feature_macros.rb +1 -1
  116. data/storytime.gemspec +6 -4
  117. metadata +69 -23
  118. data/app/views/storytime/dashboard/users/edit.json.jbuilder +0 -2
  119. data/app/views/storytime/dashboard/users/new.json.jbuilder +0 -2
  120. data/screenshots/admin.png +0 -0
  121. data/screenshots/media.png +0 -0
  122. data/screenshots/page-list.png +0 -0
  123. data/screenshots/post-editor.png +0 -0
  124. data/screenshots/site-settings.png +0 -0
  125. data/screenshots/text-snippets.png +0 -0
  126. data/screenshots/user-management.png +0 -0
  127. data/spec/features/dashboard/users_spec.rb +0 -66
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ec2aec2be59fbd8cd2d335a05247a435e7cfdaa1
4
- data.tar.gz: 22b6263486819b91f04018bb356ec8fe4261db0c
3
+ metadata.gz: 0b3ba180f9abf744b26458944e4eb0aecd9c4b26
4
+ data.tar.gz: 182ccae2c3be4d9fdd63995aaa00d6c11d8462ad
5
5
  SHA512:
6
- metadata.gz: 627f896a83fc4e81a535e804417c48ea1b15c7f82f4463b17d770b67be97ce62be45478c013f9e27a6765f841890fbe181f6f463afd5dd16a5a17e3c2f56e6e2
7
- data.tar.gz: 3f1a4a0b03f2bc80e39546a1a0a8fd1e4ac70e2c2bb603f37b89ea2ba4931461fc3606433001bfe6c0760f35ec1e1f5880b2a66efeb2efd839ab786bc2968225
6
+ metadata.gz: 4a559e0ff79f4ff8e576976c938ec62b89a2f32b0bf461882546de256226453637573b515fa1206ebf442c69b287019f5dbc2b9217e3b8e244a01f34189efff4
7
+ data.tar.gz: cd1cafd897cff2018749fa96b8ccbc96f81b44358b69383a48e8fcbc7e92689480625382dae7d6dd9ff056f9b429b265411d1a8485849ef78d7cc7837987399d
data/Gemfile CHANGED
@@ -13,5 +13,4 @@ gemspec
13
13
  # To use debugger
14
14
  # gem 'debugger'
15
15
 
16
- gem 'devise'
17
- gem "storytime-admin", github: "flyoverworks/storytime-admin", branch: "master"
16
+ gem 'storytime-admin', github: 'flyoverworks/storytime-admin', branch: 'dev'
data/Gemfile.lock CHANGED
@@ -1,9 +1,9 @@
1
1
  GIT
2
2
  remote: git://github.com/flyoverworks/storytime-admin.git
3
- revision: 0cf165b4e5f7ba19a07ad6ae4ffe2253be9230ed
4
- branch: master
3
+ revision: 324c2beb02ccb4db8ccdf86a835885fcc3d9eaed
4
+ branch: dev
5
5
  specs:
6
- storytime-admin (0.1.0)
6
+ storytime-admin (0.2.0)
7
7
  bootstrap-kaminari-views
8
8
  coffee-rails (>= 4.0)
9
9
  font-awesome-sass
@@ -18,9 +18,11 @@ GIT
18
18
  PATH
19
19
  remote: .
20
20
  specs:
21
- storytime (2.0.0)
21
+ storytime (2.1.0)
22
+ acts_as_list
22
23
  bootstrap-sass (>= 3.1)
23
24
  carrierwave (>= 0.9)
25
+ cocoon
24
26
  codemirror-rails (~> 4.8)
25
27
  coffee-rails (>= 4.0)
26
28
  devise (>= 3.2)
@@ -31,133 +33,138 @@ PATH
31
33
  jquery-rails (>= 3.0)
32
34
  jquery-ui-rails (~> 5.0)
33
35
  kaminari (>= 0.15)
34
- leather (~> 3.3.3.2)
36
+ leather (>= 3.5)
35
37
  mini_magick (>= 3.7)
36
38
  nokogiri (>= 1.6)
37
39
  pundit (>= 0.2)
38
40
  rails (>= 4.0)
39
41
  sass-rails (>= 4.0)
40
42
  simple_form (>= 3.0)
41
- storytime-admin (~> 0.1.0)
43
+ storytime-admin (~> 0.2.0)
42
44
  thor (~> 0.19.1)
43
45
 
44
46
  GEM
45
47
  remote: https://rubygems.org/
46
48
  specs:
47
- CFPropertyList (2.3.1)
48
- actionmailer (4.2.0)
49
- actionpack (= 4.2.0)
50
- actionview (= 4.2.0)
51
- activejob (= 4.2.0)
49
+ CFPropertyList (2.3.2)
50
+ actionmailer (4.2.6)
51
+ actionpack (= 4.2.6)
52
+ actionview (= 4.2.6)
53
+ activejob (= 4.2.6)
52
54
  mail (~> 2.5, >= 2.5.4)
53
55
  rails-dom-testing (~> 1.0, >= 1.0.5)
54
- actionpack (4.2.0)
55
- actionview (= 4.2.0)
56
- activesupport (= 4.2.0)
57
- rack (~> 1.6.0)
56
+ actionpack (4.2.6)
57
+ actionview (= 4.2.6)
58
+ activesupport (= 4.2.6)
59
+ rack (~> 1.6)
58
60
  rack-test (~> 0.6.2)
59
61
  rails-dom-testing (~> 1.0, >= 1.0.5)
60
- rails-html-sanitizer (~> 1.0, >= 1.0.1)
61
- actionview (4.2.0)
62
- activesupport (= 4.2.0)
62
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
63
+ actionview (4.2.6)
64
+ activesupport (= 4.2.6)
63
65
  builder (~> 3.1)
64
66
  erubis (~> 2.7.0)
65
67
  rails-dom-testing (~> 1.0, >= 1.0.5)
66
- rails-html-sanitizer (~> 1.0, >= 1.0.1)
67
- activejob (4.2.0)
68
- activesupport (= 4.2.0)
68
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
69
+ activejob (4.2.6)
70
+ activesupport (= 4.2.6)
69
71
  globalid (>= 0.3.0)
70
- activemodel (4.2.0)
71
- activesupport (= 4.2.0)
72
+ activemodel (4.2.6)
73
+ activesupport (= 4.2.6)
72
74
  builder (~> 3.1)
73
- activerecord (4.2.0)
74
- activemodel (= 4.2.0)
75
- activesupport (= 4.2.0)
75
+ activerecord (4.2.6)
76
+ activemodel (= 4.2.6)
77
+ activesupport (= 4.2.6)
76
78
  arel (~> 6.0)
77
- activesupport (4.2.0)
79
+ activesupport (4.2.6)
78
80
  i18n (~> 0.7)
79
81
  json (~> 1.7, >= 1.7.7)
80
82
  minitest (~> 5.1)
81
83
  thread_safe (~> 0.3, >= 0.3.4)
82
84
  tzinfo (~> 1.1)
83
- addressable (2.3.6)
84
- arel (6.0.0)
85
- autoprefixer-rails (5.1.8)
85
+ acts_as_list (0.7.5)
86
+ activerecord (>= 3.0)
87
+ addressable (2.3.8)
88
+ arel (6.0.3)
89
+ autoprefixer-rails (6.3.7)
86
90
  execjs
87
- json
88
- bcrypt (3.1.10)
89
- better_errors (1.1.0)
91
+ bcrypt (3.1.11)
92
+ better_errors (2.1.1)
90
93
  coderay (>= 1.0.0)
91
94
  erubis (>= 2.6.6)
95
+ rack (>= 0.9.0)
92
96
  binding_of_caller (0.7.2)
93
97
  debug_inspector (>= 0.0.1)
94
98
  bootstrap-kaminari-views (0.0.5)
95
99
  kaminari (>= 0.13)
96
100
  rails (>= 3.1)
97
- bootstrap-sass (3.3.4.1)
98
- autoprefixer-rails (>= 5.0.0.1)
99
- sass (>= 3.2.19)
101
+ bootstrap-sass (3.3.6)
102
+ autoprefixer-rails (>= 5.2.1)
103
+ sass (>= 3.3.4)
100
104
  builder (3.2.2)
101
- capybara (2.4.1)
105
+ capybara (2.5.0)
102
106
  mime-types (>= 1.16)
103
107
  nokogiri (>= 1.3.3)
104
108
  rack (>= 1.0.0)
105
109
  rack-test (>= 0.5.4)
106
110
  xpath (~> 2.0)
107
- carrierwave (0.10.0)
111
+ carrierwave (0.11.2)
108
112
  activemodel (>= 3.2.0)
109
113
  activesupport (>= 3.2.0)
110
114
  json (>= 1.7)
111
115
  mime-types (>= 1.16)
112
- celluloid (0.15.2)
113
- timers (~> 1.1.0)
114
- celluloid-io (0.15.0)
115
- celluloid (>= 0.15.0)
116
- nio4r (>= 0.5.0)
116
+ mimemagic (>= 0.3.0)
117
117
  cliver (0.3.2)
118
+ cocoon (1.2.9)
118
119
  codemirror-rails (4.13)
119
120
  railties (>= 3.0, < 5)
120
121
  coderay (1.1.0)
121
122
  coffee-rails (4.1.0)
122
123
  coffee-script (>= 2.2.0)
123
124
  railties (>= 4.0.0, < 5.0)
124
- coffee-script (2.3.0)
125
+ coffee-script (2.4.1)
125
126
  coffee-script-source
126
127
  execjs
127
- coffee-script-source (1.9.1)
128
- daemons (1.1.9)
129
- database_cleaner (1.3.0)
128
+ coffee-script-source (1.9.1.1)
129
+ concurrent-ruby (1.0.2)
130
+ daemons (1.2.3)
131
+ database_cleaner (1.5.1)
130
132
  debug_inspector (0.0.2)
131
- devise (3.4.1)
133
+ devise (4.2.0)
132
134
  bcrypt (~> 3.0)
133
135
  orm_adapter (~> 0.1)
134
- railties (>= 3.2.6, < 5)
136
+ railties (>= 4.1.0, < 5.1)
135
137
  responders
136
- thread_safe (~> 0.1)
137
138
  warden (~> 1.2.3)
138
139
  diff-lcs (1.2.5)
139
140
  erubis (2.7.0)
140
- eventmachine (1.0.4)
141
- excon (0.45.1)
142
- execjs (2.4.0)
143
- factory_girl (4.4.0)
141
+ eventmachine (1.0.8)
142
+ excon (0.50.1)
143
+ execjs (2.7.0)
144
+ factory_girl (4.5.0)
144
145
  activesupport (>= 3.0.0)
145
- factory_girl_rails (4.4.1)
146
- factory_girl (~> 4.4.0)
146
+ factory_girl_rails (4.5.0)
147
+ factory_girl (~> 4.5.0)
147
148
  railties (>= 3.0.0)
148
- ffi (1.9.3)
149
+ ffi (1.9.10)
149
150
  fission (0.5.0)
150
151
  CFPropertyList (~> 2.2)
151
- fog (1.29.0)
152
+ fog (1.38.0)
153
+ fog-aliyun (>= 0.1.0)
152
154
  fog-atmos
153
- fog-aws (~> 0.0)
155
+ fog-aws (>= 0.6.0)
154
156
  fog-brightbox (~> 0.4)
155
- fog-core (~> 1.27, >= 1.27.4)
156
- fog-ecloud
157
+ fog-cloudatcost (~> 0.1.0)
158
+ fog-core (~> 1.32)
159
+ fog-dynect (~> 0.0.2)
160
+ fog-ecloud (~> 0.1)
161
+ fog-google (<= 0.1.0)
157
162
  fog-json
158
163
  fog-local
164
+ fog-openstack
159
165
  fog-powerdns (>= 0.1.1)
160
166
  fog-profitbricks
167
+ fog-rackspace
161
168
  fog-radosgw (>= 0.0.2)
162
169
  fog-riakcs
163
170
  fog-sakuracloud (>= 0.0.4)
@@ -167,45 +174,70 @@ GEM
167
174
  fog-terremark
168
175
  fog-vmfusion
169
176
  fog-voxel
177
+ fog-vsphere (>= 0.4.0)
178
+ fog-xenserver
170
179
  fog-xml (~> 0.1.1)
171
180
  ipaddress (~> 0.5)
172
- nokogiri (~> 1.5, >= 1.5.11)
181
+ fog-aliyun (0.1.0)
182
+ fog-core (~> 1.27)
183
+ fog-json (~> 1.0)
184
+ ipaddress (~> 0.8)
185
+ xml-simple (~> 1.1)
173
186
  fog-atmos (0.1.0)
174
187
  fog-core
175
188
  fog-xml
176
- fog-aws (0.1.2)
177
- fog-core (~> 1.27)
189
+ fog-aws (0.9.4)
190
+ fog-core (~> 1.38)
178
191
  fog-json (~> 1.0)
179
192
  fog-xml (~> 0.1)
180
193
  ipaddress (~> 0.8)
181
- fog-brightbox (0.7.1)
194
+ fog-brightbox (0.11.0)
182
195
  fog-core (~> 1.22)
183
196
  fog-json
184
197
  inflecto (~> 0.0.2)
185
- fog-core (1.30.0)
198
+ fog-cloudatcost (0.1.2)
199
+ fog-core (~> 1.36)
200
+ fog-json (~> 1.0)
201
+ fog-xml (~> 0.1)
202
+ ipaddress (~> 0.8)
203
+ fog-core (1.42.0)
186
204
  builder
187
- excon (~> 0.45)
205
+ excon (~> 0.49)
188
206
  formatador (~> 0.2)
189
- mime-types
190
- net-scp (~> 1.1)
191
- net-ssh (>= 2.1.3)
192
- fog-ecloud (0.1.1)
207
+ fog-dynect (0.0.3)
208
+ fog-core
209
+ fog-json
210
+ fog-xml
211
+ fog-ecloud (0.3.0)
193
212
  fog-core
194
213
  fog-xml
195
- fog-json (1.0.1)
214
+ fog-google (0.1.0)
215
+ fog-core
216
+ fog-json
217
+ fog-xml
218
+ fog-json (1.0.2)
196
219
  fog-core (~> 1.0)
197
- multi_json (~> 1.0)
198
- fog-local (0.2.0)
220
+ multi_json (~> 1.10)
221
+ fog-local (0.3.0)
199
222
  fog-core (~> 1.27)
223
+ fog-openstack (0.1.7)
224
+ fog-core (>= 1.40)
225
+ fog-json (>= 1.0)
226
+ ipaddress (>= 0.8)
200
227
  fog-powerdns (0.1.1)
201
228
  fog-core (~> 1.27)
202
229
  fog-json (~> 1.0)
203
230
  fog-xml (~> 0.1)
204
- fog-profitbricks (0.0.2)
231
+ fog-profitbricks (0.0.5)
205
232
  fog-core
206
233
  fog-xml
207
234
  nokogiri
208
- fog-radosgw (0.0.4)
235
+ fog-rackspace (0.1.1)
236
+ fog-core (>= 1.35)
237
+ fog-json (>= 1.0)
238
+ fog-xml (>= 0.1)
239
+ ipaddress (>= 0.8)
240
+ fog-radosgw (0.0.5)
209
241
  fog-core (>= 1.21.0)
210
242
  fog-json
211
243
  fog-xml (>= 0.0.1)
@@ -213,13 +245,13 @@ GEM
213
245
  fog-core
214
246
  fog-json
215
247
  fog-xml
216
- fog-sakuracloud (1.0.1)
248
+ fog-sakuracloud (1.7.5)
217
249
  fog-core
218
250
  fog-json
219
251
  fog-serverlove (0.1.2)
220
252
  fog-core
221
253
  fog-json
222
- fog-softlayer (0.4.2)
254
+ fog-softlayer (1.1.2)
223
255
  fog-core
224
256
  fog-json
225
257
  fog-storm_on_demand (0.1.1)
@@ -234,26 +266,35 @@ GEM
234
266
  fog-voxel (0.1.0)
235
267
  fog-core
236
268
  fog-xml
269
+ fog-vsphere (0.8.0)
270
+ fog-core
271
+ rbvmomi (~> 1.8)
272
+ fog-xenserver (0.2.3)
273
+ fog-core
274
+ fog-xml
237
275
  fog-xml (0.1.2)
238
276
  fog-core
239
277
  nokogiri (~> 1.5, >= 1.5.11)
240
- font-awesome-sass (4.3.2.1)
241
- sass (~> 3.2)
242
- formatador (0.2.4)
278
+ font-awesome-sass (4.4.0)
279
+ sass (>= 3.2)
280
+ formatador (0.2.5)
243
281
  friendly_id (5.1.0)
244
282
  activerecord (>= 4.0.0)
245
- globalid (0.3.3)
283
+ globalid (0.3.6)
246
284
  activesupport (>= 4.1.0)
247
- guard (2.6.0)
285
+ guard (2.13.0)
248
286
  formatador (>= 0.2.4)
249
- listen (~> 2.7)
287
+ listen (>= 2.7, <= 4.0)
250
288
  lumberjack (~> 1.0)
289
+ nenv (~> 0.1)
290
+ notiffany (~> 0.0)
251
291
  pry (>= 0.9.12)
292
+ shellany (~> 0.0)
252
293
  thor (>= 0.18.1)
253
- guard-rspec (4.2.8)
294
+ guard-rspec (4.2.10)
254
295
  guard (~> 2.1)
255
296
  rspec (>= 2.14, < 4.0)
256
- haml (4.0.6)
297
+ haml (4.0.7)
257
298
  tilt
258
299
  haml-rails (0.9.0)
259
300
  actionpack (>= 4.0.1)
@@ -261,8 +302,7 @@ GEM
261
302
  haml (>= 4.0.6, < 5.0)
262
303
  html2haml (>= 1.0.1)
263
304
  railties (>= 4.0.1)
264
- high_voltage (2.2.1)
265
- hike (1.2.3)
305
+ high_voltage (3.0.0)
266
306
  html2haml (2.0.0)
267
307
  erubis (~> 2.7.0)
268
308
  haml (~> 4.0.0)
@@ -270,156 +310,170 @@ GEM
270
310
  ruby_parser (~> 3.5)
271
311
  i18n (0.7.0)
272
312
  inflecto (0.0.2)
273
- ipaddress (0.8.0)
274
- jbuilder (2.2.12)
275
- activesupport (>= 3.0.0, < 5)
313
+ ipaddress (0.8.3)
314
+ jbuilder (2.5.0)
315
+ activesupport (>= 3.0.0, < 5.1)
276
316
  multi_json (~> 1.2)
277
- jquery-rails (4.0.3)
317
+ jquery-rails (4.0.5)
278
318
  rails-dom-testing (~> 1.0)
279
319
  railties (>= 4.2.0)
280
320
  thor (>= 0.14, < 2.0)
281
- jquery-ui-rails (5.0.3)
321
+ jquery-ui-rails (5.0.5)
282
322
  railties (>= 3.2.16)
283
- json (1.8.2)
323
+ json (1.8.3)
284
324
  kaminari (0.16.3)
285
325
  actionpack (>= 3.0.0)
286
326
  activesupport (>= 3.0.0)
287
- launchy (2.4.2)
327
+ launchy (2.4.3)
288
328
  addressable (~> 2.3)
289
- leather (3.3.3.3)
290
- bootstrap-sass (~> 3.3.3)
329
+ leather (3.5.1)
330
+ bootstrap-sass (~> 3.3.5)
291
331
  devise
292
332
  haml-rails
293
333
  high_voltage
294
334
  rails (>= 4.0)
295
- listen (2.7.3)
296
- celluloid (>= 0.15.2)
297
- celluloid-io (>= 0.15.0)
335
+ listen (3.0.4)
298
336
  rb-fsevent (>= 0.9.3)
299
337
  rb-inotify (>= 0.9)
300
- loofah (2.0.1)
338
+ loofah (2.0.3)
301
339
  nokogiri (>= 1.5.9)
302
- lumberjack (1.0.5)
303
- mail (2.6.3)
304
- mime-types (>= 1.16, < 3)
340
+ lumberjack (1.0.9)
341
+ mail (2.6.4)
342
+ mime-types (>= 1.16, < 4)
305
343
  method_source (0.8.2)
306
- mime-types (2.4.3)
307
- mini_magick (4.2.1)
308
- mini_portile (0.6.2)
309
- minitest (5.5.1)
310
- multi_json (1.11.0)
311
- net-scp (1.2.1)
312
- net-ssh (>= 2.6.5)
313
- net-ssh (2.9.2)
314
- nio4r (1.0.0)
315
- nokogiri (1.6.6.2)
316
- mini_portile (~> 0.6.0)
344
+ mime-types (3.1)
345
+ mime-types-data (~> 3.2015)
346
+ mime-types-data (3.2016.0521)
347
+ mimemagic (0.3.1)
348
+ mini_magick (4.5.1)
349
+ mini_portile2 (2.1.0)
350
+ minitest (5.9.0)
351
+ multi_json (1.12.1)
352
+ nenv (0.2.0)
353
+ nokogiri (1.6.8)
354
+ mini_portile2 (~> 2.1.0)
355
+ pkg-config (~> 1.1.7)
356
+ notiffany (0.0.8)
357
+ nenv (~> 0.1)
358
+ shellany (~> 0.0)
317
359
  orm_adapter (0.5.0)
318
- pg (0.18.1)
319
- poltergeist (1.5.1)
360
+ pg (0.18.3)
361
+ pkg-config (1.1.7)
362
+ poltergeist (1.7.0)
320
363
  capybara (~> 2.1)
321
364
  cliver (~> 0.3.1)
322
365
  multi_json (~> 1.0)
323
366
  websocket-driver (>= 0.2.0)
324
- pry (0.9.12.6)
325
- coderay (~> 1.0)
326
- method_source (~> 0.8)
367
+ pry (0.10.3)
368
+ coderay (~> 1.1.0)
369
+ method_source (~> 0.8.1)
327
370
  slop (~> 3.4)
328
- pry-nav (0.2.3)
329
- pry (~> 0.9.10)
330
- pry-stack_explorer (0.4.9.1)
371
+ pry-nav (0.2.4)
372
+ pry (>= 0.9.10, < 0.11.0)
373
+ pry-stack_explorer (0.4.9.2)
331
374
  binding_of_caller (>= 0.7)
332
375
  pry (>= 0.9.11)
333
- pundit (0.3.0)
376
+ pundit (1.1.0)
334
377
  activesupport (>= 3.0.0)
335
- rack (1.6.0)
378
+ rack (1.6.4)
336
379
  rack-test (0.6.3)
337
380
  rack (>= 1.0)
338
- rails (4.2.0)
339
- actionmailer (= 4.2.0)
340
- actionpack (= 4.2.0)
341
- actionview (= 4.2.0)
342
- activejob (= 4.2.0)
343
- activemodel (= 4.2.0)
344
- activerecord (= 4.2.0)
345
- activesupport (= 4.2.0)
381
+ rails (4.2.6)
382
+ actionmailer (= 4.2.6)
383
+ actionpack (= 4.2.6)
384
+ actionview (= 4.2.6)
385
+ activejob (= 4.2.6)
386
+ activemodel (= 4.2.6)
387
+ activerecord (= 4.2.6)
388
+ activesupport (= 4.2.6)
346
389
  bundler (>= 1.3.0, < 2.0)
347
- railties (= 4.2.0)
390
+ railties (= 4.2.6)
348
391
  sprockets-rails
349
392
  rails-deprecated_sanitizer (1.0.3)
350
393
  activesupport (>= 4.2.0.alpha)
351
- rails-dom-testing (1.0.5)
394
+ rails-dom-testing (1.0.7)
352
395
  activesupport (>= 4.2.0.beta, < 5.0)
353
396
  nokogiri (~> 1.6.0)
354
397
  rails-deprecated_sanitizer (>= 1.0.1)
355
- rails-html-sanitizer (1.0.1)
398
+ rails-html-sanitizer (1.0.3)
356
399
  loofah (~> 2.0)
357
- railties (4.2.0)
358
- actionpack (= 4.2.0)
359
- activesupport (= 4.2.0)
400
+ railties (4.2.6)
401
+ actionpack (= 4.2.6)
402
+ activesupport (= 4.2.6)
360
403
  rake (>= 0.8.7)
361
404
  thor (>= 0.18.1, < 2.0)
362
- rake (10.4.2)
363
- rb-fsevent (0.9.4)
364
- rb-inotify (0.9.4)
405
+ rake (11.2.2)
406
+ rb-fsevent (0.9.6)
407
+ rb-inotify (0.9.5)
365
408
  ffi (>= 0.5.0)
366
- responders (2.1.0)
367
- railties (>= 4.2.0, < 5)
368
- rspec (2.14.1)
369
- rspec-core (~> 2.14.0)
370
- rspec-expectations (~> 2.14.0)
371
- rspec-mocks (~> 2.14.0)
372
- rspec-core (2.14.8)
373
- rspec-expectations (2.14.5)
374
- diff-lcs (>= 1.1.3, < 2.0)
375
- rspec-mocks (2.14.6)
376
- rspec-rails (2.14.2)
377
- actionpack (>= 3.0)
378
- activemodel (>= 3.0)
379
- activesupport (>= 3.0)
380
- railties (>= 3.0)
381
- rspec-core (~> 2.14.0)
382
- rspec-expectations (~> 2.14.0)
383
- rspec-mocks (~> 2.14.0)
384
- ruby_parser (3.6.5)
409
+ rbvmomi (1.8.2)
410
+ builder
411
+ nokogiri (>= 1.4.1)
412
+ trollop
413
+ responders (2.2.0)
414
+ railties (>= 4.2.0, < 5.1)
415
+ rspec (3.3.0)
416
+ rspec-core (~> 3.3.0)
417
+ rspec-expectations (~> 3.3.0)
418
+ rspec-mocks (~> 3.3.0)
419
+ rspec-core (3.3.2)
420
+ rspec-support (~> 3.3.0)
421
+ rspec-expectations (3.3.1)
422
+ diff-lcs (>= 1.2.0, < 2.0)
423
+ rspec-support (~> 3.3.0)
424
+ rspec-mocks (3.3.2)
425
+ diff-lcs (>= 1.2.0, < 2.0)
426
+ rspec-support (~> 3.3.0)
427
+ rspec-rails (3.3.3)
428
+ actionpack (>= 3.0, < 4.3)
429
+ activesupport (>= 3.0, < 4.3)
430
+ railties (>= 3.0, < 4.3)
431
+ rspec-core (~> 3.3.0)
432
+ rspec-expectations (~> 3.3.0)
433
+ rspec-mocks (~> 3.3.0)
434
+ rspec-support (~> 3.3.0)
435
+ rspec-support (3.3.0)
436
+ ruby_parser (3.8.2)
385
437
  sexp_processor (~> 4.1)
386
- sass (3.4.13)
387
- sass-rails (5.0.3)
438
+ sass (3.4.22)
439
+ sass-rails (5.0.4)
388
440
  railties (>= 4.0.0, < 5.0)
389
441
  sass (~> 3.1)
390
442
  sprockets (>= 2.8, < 4.0)
391
443
  sprockets-rails (>= 2.0, < 4.0)
392
- tilt (~> 1.1)
393
- sexp_processor (4.5.0)
394
- simple_form (3.1.0)
444
+ tilt (>= 1.1, < 3)
445
+ sexp_processor (4.7.0)
446
+ shellany (0.0.1)
447
+ simple_form (3.2.0)
395
448
  actionpack (~> 4.0)
396
449
  activemodel (~> 4.0)
397
- slop (3.5.0)
450
+ slop (3.6.0)
398
451
  spring (1.1.3)
399
- spring-commands-rspec (1.0.2)
452
+ spring-commands-rspec (1.0.4)
400
453
  spring (>= 0.9.1)
401
- sprockets (2.12.3)
402
- hike (~> 1.2)
403
- multi_json (~> 1.0)
404
- rack (~> 1.0)
405
- tilt (~> 1.1, != 1.3.0)
406
- sprockets-rails (2.2.4)
407
- actionpack (>= 3.0)
408
- activesupport (>= 3.0)
409
- sprockets (>= 2.8, < 4.0)
410
- thin (1.6.3)
454
+ sprockets (3.6.3)
455
+ concurrent-ruby (~> 1.0)
456
+ rack (> 1, < 3)
457
+ sprockets-rails (3.1.1)
458
+ actionpack (>= 4.0)
459
+ activesupport (>= 4.0)
460
+ sprockets (>= 3.0.0)
461
+ thin (1.6.4)
411
462
  daemons (~> 1.0, >= 1.0.9)
412
- eventmachine (~> 1.0)
463
+ eventmachine (~> 1.0, >= 1.0.4)
413
464
  rack (~> 1.0)
414
465
  thor (0.19.1)
415
- thread_safe (0.3.4)
416
- tilt (1.4.1)
417
- timers (1.1.0)
466
+ thread_safe (0.3.5)
467
+ tilt (2.0.5)
468
+ trollop (2.1.2)
418
469
  tzinfo (1.2.2)
419
470
  thread_safe (~> 0.1)
420
- warden (1.2.3)
471
+ warden (1.2.6)
421
472
  rack (>= 1.0)
422
- websocket-driver (0.3.4)
473
+ websocket-driver (0.6.2)
474
+ websocket-extensions (>= 0.1.0)
475
+ websocket-extensions (0.1.2)
476
+ xml-simple (1.1.5)
423
477
  xpath (2.0.0)
424
478
  nokogiri (~> 1.3)
425
479
 
@@ -431,7 +485,6 @@ DEPENDENCIES
431
485
  binding_of_caller
432
486
  capybara
433
487
  database_cleaner
434
- devise
435
488
  factory_girl_rails
436
489
  guard-rspec (~> 4.2.8)
437
490
  launchy