Merge pull request #144 from openstax/create-data

Fix missing data on vocabulary create action

Author: Dantemss

Gemfile

@@ -65,7 +65,7 @@ gem 'doorkeeper'
 
 # API versioning and documentation
 gem 'representable', '~> 2.2.3'
-gem 'openstax_api', '~> 6.1.0'
+gem 'openstax_api', '~> 6.1.5'
 gem 'apipie-rails'
 gem 'maruku'
 

Gemfile.lock

@@ -23,9 +23,9 @@ GEM
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    active_attr (0.8.5)
-      activemodel (>= 3.0.2, < 5.0)
-      activesupport (>= 3.0.2, < 5.0)
+    active_attr (0.9.0)
+      activemodel (>= 3.0.2, < 5.1)
+      activesupport (>= 3.0.2, < 5.1)
     activejob (4.2.4)
       activesupport (= 4.2.4)
       globalid (>= 0.3.0)
@@ -114,6 +114,7 @@ GEM
       compass (~> 1.0.0)
       sass-rails (<= 5.0.1)
       sprockets (< 2.13)
+    concurrent-ruby (1.0.2)
     coveralls (0.7.12)
       multi_json (~> 1.10)
       rest-client (>= 1.6.8, < 2)
@@ -126,11 +127,11 @@ GEM
     deep_cloneable (2.1.1)
       activerecord (>= 3.1.0, < 5.0.0)
     diff-lcs (1.2.5)
-    diffy (3.0.7)
+    diffy (3.1.0)
     docile (1.1.5)
     domain_name (0.5.23)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (2.2.1)
+    doorkeeper (3.1.0)
       railties (>= 3.2)
     eco (1.0.0)
       coffee-script
@@ -140,9 +141,9 @@ GEM
     ejs (1.1.1)
     erubis (2.7.0)
     eventmachine (1.0.7)
-    exception_notification (4.1.1)
-      actionmailer (>= 3.0.4)
-      activesupport (>= 3.0.4)
+    exception_notification (4.1.4)
+      actionmailer (~> 4.0)
+      activesupport (~> 4.0)
     excon (0.45.3)
     execjs (2.4.0)
     factory_girl (4.5.0)
@@ -266,7 +267,7 @@ GEM
       activesupport (>= 4.1.0)
     haml (4.0.6)
       tilt
-    hashie (3.4.3)
+    hashie (3.4.4)
     highline (1.6.21)
     hike (1.2.3)
     http-cookie (1.0.2)
@@ -307,15 +308,15 @@ GEM
       railties (>= 3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     maruku (0.7.2)
     mime-types (2.99.1)
     mimemagic (0.3.1)
     mini_magick (4.2.0)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
-    multi_json (1.11.2)
+    multi_json (1.12.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     nested_form (0.3.2)
@@ -354,13 +355,13 @@ GEM
       representable (>= 2.0)
       roar (>= 1.0)
       squeel (>= 0.5.0)
-    openstax_api (6.1.0)
+    openstax_api (6.1.5)
       doorkeeper (>= 2.0)
       exception_notification (>= 4.0)
       lev (>= 1.0.0)
       openstax_utilities (>= 4.2.0)
       rails (>= 3.1)
-      representable (>= 2.0)
+      representable (>= 2.0, < 2.3)
       responders
       roar (>= 1.0)
       roar-rails (>= 1.0)
@@ -409,7 +410,7 @@ GEM
       activesupport (>= 3.2)
       choice (~> 0.1.6)
       ruby-graphviz (~> 1.0.4)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails_admin (0.6.7)
       builder (~> 3.1)
@@ -431,7 +432,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
-    rake (10.5.0)
+    rake (11.1.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
@@ -441,15 +442,15 @@ GEM
       multi_json
       nokogiri
       uber (~> 0.0.7)
-    responders (2.1.0)
-      railties (>= 4.2.0, < 5)
+    responders (2.2.0)
+      railties (>= 4.2.0, < 5.1)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     rinku (1.7.3)
-    roar (1.0.3)
-      representable (>= 2.0.1, <= 3.0.0)
+    roar (1.0.4)
+      representable (>= 2.0.1, < 2.4.0)
     roar-rails (1.0.1)
       actionpack
       railties (>= 3.0.0)
@@ -621,7 +622,7 @@ DEPENDENCIES
   nifty-generators
   omniauth-oauth2 (~> 1.3.1)
   openstax_accounts (~> 6.1.7)
-  openstax_api (~> 6.1.0)
+  openstax_api (~> 6.1.5)
   openstax_rescue_from (~> 1.5.0)
   openstax_utilities
   parallel_tests

app/views/layouts/webview.html.erb

@@ -4,9 +4,9 @@
   <title>OpenStax Exercises</title>
   <link rel='stylesheet' href='<%= Rails.application.secrets[:css_url]%>' />
   <script src="//cdn.mathjax.org/mathjax/2.6-latest/MathJax.js?config=TeX-MML-AM_HTMLorMML-full&amp;delayStartupUntil=configured" async=""></script>
+  <script id="exercises-boostrap-data" type="application/json"><%=raw json_escape client_bootstrap_data.to_json %></script>
   <script type='text/javascript' src='<%= Rails.application.secrets[:js_url]%>' defer></script>
   <%= csrf_meta_tags %>
-  <script id="exercises-boostrap-data" type="application/json"><%=raw json_escape client_bootstrap_data.to_json %></script>
 </head>
 <body>
   <%= yield %>