storytime 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab6d67b4b074344b9f8aa068b1a38cebbc38d236
-  data.tar.gz: a8e31e84311b252c24a2a6e57cd59e8f6f34d5d7
+  metadata.gz: ee027e1c81f504c22cf953d36a3a16f90d2958f1
+  data.tar.gz: 964e746735d689ccc5fd53c77969de52831c3e09
 SHA512:
-  metadata.gz: 2c68446977151ccf31988dfd8b3d9ed165ad7284e193a253c0ee0b692125f224eb5d0f86c56d29fa321318ad94aa5ba32ba9f502f55e0b8123717337ea6a5f32
-  data.tar.gz: 5c8fe5a44f069cdc18c3ddb044c8bf06cce045be0892662e63002700da878e7bec3c584da355f4378761fbf339dd120d1d390664c5318484152e697668c13bd6
+  metadata.gz: ac0c312c33a145300a1a6cfbdb6aca353a59b4832d0f48a5b3d45f75c6cd0ea391512cf2cc9fcf318ff507ead95b5491bb07d2daaaf36a8fab1bf6e811ba2944
+  data.tar.gz: 4f59731bcb9c47b35bc29b65a9e68b88d5314c2d2f064c224ee95b849740dac78a3f1939507666d64e30acacefcbe466022e1f343daf678a8d833429484b95cd

data/Gemfile

@@ -13,4 +13,5 @@ gemspec
 # To use debugger
 # gem 'debugger'
 
-gem 'storytime-admin', github: 'flyoverworks/storytime-admin', branch: 'dev'
+# gem 'storytime-admin', github: 'flyoverworks/storytime-admin', branch: 'dev'
+gem 'leather', github: 'CultivateLabs/leather', branch: 'master'

data/Gemfile.lock

@@ -1,24 +1,19 @@
 GIT
-  remote: git://github.com/flyoverworks/storytime-admin.git
-  revision: 324c2beb02ccb4db8ccdf86a835885fcc3d9eaed
-  branch: dev
+  remote: git://github.com/CultivateLabs/leather.git
+  revision: 184652b03b02d6691c1538e770624c634499a554
+  branch: master
   specs:
-    storytime-admin (0.2.0)
-      bootstrap-kaminari-views
-      coffee-rails (>= 4.0)
-      font-awesome-sass
+    leather (3.5.2)
+      bootstrap-sass (~> 3.3.7)
+      devise
       haml-rails
-      jquery-rails (>= 3.0)
-      kaminari
-      leather
-      rails (~> 4.0)
-      sass-rails (>= 4.0)
-      simple_form
+      high_voltage
+      rails (>= 4.0, < 5.1)
 
 PATH
   remote: .
   specs:
-    storytime (2.1.1)
+    storytime (2.1.2)
       acts_as_list
       bootstrap-sass (>= 3.1)
       carrierwave (>= 0.9)
@@ -40,13 +35,13 @@ PATH
       rails (>= 4.0)
       sass-rails (>= 4.0)
       simple_form (>= 3.0)
-      storytime-admin (~> 0.2.0)
+      storytime-admin (= 0.2.2)
       thor (~> 0.19.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.2)
+    CFPropertyList (2.3.4)
     actionmailer (4.2.6)
       actionpack (= 4.2.6)
       actionview (= 4.2.6)
@@ -82,11 +77,11 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    acts_as_list (0.7.6)
+    acts_as_list (0.8.2)
       activerecord (>= 3.0)
     addressable (2.3.8)
     arel (6.0.3)
-    autoprefixer-rails (6.3.7)
+    autoprefixer-rails (6.6.0)
       execjs
     bcrypt (3.1.11)
     better_errors (2.1.1)
@@ -98,7 +93,7 @@ GEM
     bootstrap-kaminari-views (0.0.5)
       kaminari (>= 0.13)
       rails (>= 3.1)
-    bootstrap-sass (3.3.6)
+    bootstrap-sass (3.3.7)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
     builder (3.2.2)
@@ -108,24 +103,22 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    carrierwave (0.11.2)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      json (>= 1.7)
+    carrierwave (1.0.0)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-      mimemagic (>= 0.3.0)
     cliver (0.3.2)
     cocoon (1.2.9)
     codemirror-rails (4.13)
       railties (>= 3.0, < 5)
     coderay (1.1.0)
-    coffee-rails (4.1.0)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0, < 5.1.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
+    coffee-script-source (1.12.2)
     concurrent-ruby (1.0.2)
     daemons (1.2.3)
     database_cleaner (1.5.1)
@@ -139,7 +132,7 @@ GEM
     diff-lcs (1.2.5)
     erubis (2.7.0)
     eventmachine (1.0.8)
-    excon (0.50.1)
+    excon (0.54.0)
     execjs (2.7.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
@@ -186,7 +179,7 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (0.9.4)
+    fog-aws (1.1.0)
       fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
@@ -200,7 +193,7 @@ GEM
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (1.42.0)
+    fog-core (1.43.0)
       builder
       excon (~> 0.49)
       formatador (~> 0.2)
@@ -218,9 +211,9 @@ GEM
     fog-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
-    fog-local (0.3.0)
+    fog-local (0.3.1)
       fog-core (~> 1.27)
-    fog-openstack (0.1.7)
+    fog-openstack (0.1.18)
       fog-core (>= 1.40)
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
@@ -228,11 +221,10 @@ GEM
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
-    fog-profitbricks (0.0.5)
-      fog-core
-      fog-xml
-      nokogiri
-    fog-rackspace (0.1.1)
+    fog-profitbricks (3.0.0)
+      fog-core (~> 1.42)
+      fog-json (~> 1.0)
+    fog-rackspace (0.1.2)
       fog-core (>= 1.35)
       fog-json (>= 1.0)
       fog-xml (>= 0.1)
@@ -251,7 +243,7 @@ GEM
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (1.1.2)
+    fog-softlayer (1.1.4)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -266,19 +258,19 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (0.8.0)
+    fog-vsphere (1.5.2)
       fog-core
-      rbvmomi (~> 1.8)
+      rbvmomi (~> 1.9)
     fog-xenserver (0.2.3)
       fog-core
       fog-xml
     fog-xml (0.1.2)
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
-    font-awesome-sass (4.4.0)
+    font-awesome-sass (4.7.0)
       sass (>= 3.2)
     formatador (0.2.5)
-    friendly_id (5.1.0)
+    friendly_id (5.2.0)
       activerecord (>= 4.0.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
@@ -311,27 +303,21 @@ GEM
     i18n (0.7.0)
     inflecto (0.0.2)
     ipaddress (0.8.3)
-    jbuilder (2.5.0)
+    jbuilder (2.6.1)
       activesupport (>= 3.0.0, < 5.1)
       multi_json (~> 1.2)
-    jquery-rails (4.0.5)
-      rails-dom-testing (~> 1.0)
+    jquery-rails (4.1.1)
+      rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
     json (1.8.3)
-    kaminari (0.16.3)
+    kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    leather (3.5.1)
-      bootstrap-sass (~> 3.3.5)
-      devise
-      haml-rails
-      high_voltage
-      rails (>= 4.0)
     listen (3.0.4)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -344,8 +330,7 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mimemagic (0.3.1)
-    mini_magick (4.5.1)
+    mini_magick (4.6.0)
     mini_portile2 (2.1.0)
     minitest (5.9.0)
     multi_json (1.12.1)
@@ -406,10 +391,11 @@ GEM
     rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rbvmomi (1.8.2)
-      builder
-      nokogiri (>= 1.4.1)
-      trollop
+    rbvmomi (1.9.4)
+      builder (~> 3.2)
+      json (>= 1.8)
+      nokogiri (~> 1.5)
+      trollop (~> 2.1)
     responders (2.2.0)
       railties (>= 4.2.0, < 5.1)
     rspec (3.3.0)
@@ -435,18 +421,18 @@ GEM
     rspec-support (3.3.0)
     ruby_parser (3.8.2)
       sexp_processor (~> 4.1)
-    sass (3.4.22)
-    sass-rails (5.0.4)
-      railties (>= 4.0.0, < 5.0)
+    sass (3.4.23)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
     sexp_processor (4.7.0)
     shellany (0.0.1)
-    simple_form (3.2.0)
-      actionpack (~> 4.0)
-      activemodel (~> 4.0)
+    simple_form (3.3.1)
+      actionpack (> 4, < 5.1)
+      activemodel (> 4, < 5.1)
     slop (3.6.0)
     spring (1.1.3)
     spring-commands-rspec (1.0.4)
@@ -458,6 +444,17 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    storytime-admin (0.2.2)
+      bootstrap-kaminari-views
+      coffee-rails (>= 4.0, < 4.2)
+      font-awesome-sass
+      haml-rails
+      jquery-rails (>= 3.0, < 4.2)
+      kaminari
+      leather
+      rails (>= 4.0, < 5.1)
+      sass-rails (>= 4.0, <= 5.0.6)
+      simple_form
     thin (1.6.4)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
@@ -488,6 +485,7 @@ DEPENDENCIES
   factory_girl_rails
   guard-rspec (~> 4.2.8)
   launchy
+  leather!
   pg
   poltergeist (~> 1.5)
   pry-nav
@@ -497,5 +495,4 @@ DEPENDENCIES
   spring (= 1.1.3)
   spring-commands-rspec
   storytime!
-  storytime-admin!
   thin

data/config/initializers/url_for_patch.rb

@@ -2,16 +2,9 @@ module ActionDispatch
   module Routing
     class RouteSet
 
-      if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR == 2
-        def url_for_with_storytime(options = {})
-          Storytime::PostUrlHandler.handle_url(options)
-          url_for_without_storytime(options)
-        end
-      else
-        def url_for_with_storytime(options, route_name = nil, url_strategy = UNKNOWN)
-          Storytime::PostUrlHandler.handle_url(options)
-          url_for_without_storytime(options, route_name, url_strategy)
-        end
+      def url_for_with_storytime(options, route_name = nil, url_strategy = UNKNOWN)
+        Storytime::PostUrlHandler.handle_url(options)
+        url_for_without_storytime(options, route_name, url_strategy)
       end
 
       alias_method_chain :url_for, :storytime

data/lib/storytime/engine.rb

@@ -1,7 +1,7 @@
 require 'active_record'
 require 'bootstrap-sass'
 require 'carrierwave'
-require 'fog/aws/storage'
+require 'fog/aws'
 require 'font-awesome-sass'
 require 'friendly_id'
 require 'jbuilder'
@@ -35,6 +35,8 @@ module Storytime
   class Engine < ::Rails::Engine
     isolate_namespace Storytime
 
+    config.assets.precompile += %w( storytime/storytime-logo-nav.png )
+
     initializer "storytime.view_helpers" do
       ActiveSupport.on_load(:action_view) do
         include Storytime::ApplicationHelper

data/lib/storytime/version.rb

@@ -1,3 +1,3 @@
 module Storytime
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/spec/features/dashboard/snippets_spec.rb

@@ -18,21 +18,23 @@ describe "In the dashboard, Snippets", type: :feature do
     end
   end
 
-  it "creates a snippet", js: true do
-    visit storytime.dashboard_url
-    find("#snippets-link").trigger('click')
-    click_link "new-snippet-link"
-
-    within "#storytime-modal" do
-      fill_in "snippet_name", with: "jumbotron-text"
-      find("#medium-editor-snippet").set("Hooray Writing!")
-      click_button "Save"
-    end
-
-    within "#storytime-modal" do
-      expect(page).to have_content "jumbotron-text"
-    end
-  end
+  # it "creates a snippet", js: true, focus: true do
+  #   visit storytime.dashboard_url
+  #   find("#snippets-link").trigger('click')
+  #   click_link "new-snippet-link"
+  #
+  #   within "#storytime-modal" do
+  #     fill_in "snippet_name", with: "jumbotron-text"
+  #     find("#snippet_content", visible: false).set("Hooray Writing!")
+  #     click_button "Save"
+  #   end
+  #
+  #   within "#storytime-modal" do
+  #     require "pry"
+  #     binding.pry
+  #     expect(page).to have_content "jumbotron-text"
+  #   end
+  # end
 
   it "updates a snippet", js: true do
     snippet = FactoryGirl.create(:snippet, site: @current_site, content: "Test")

data/storytime.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_dependency "thor", "~> 0.19.1"
   s.add_dependency "leather", ">= 3.5"
   s.add_dependency "codemirror-rails", "~> 4.8"
-  s.add_dependency "storytime-admin", "~> 0.2.0"
+  s.add_dependency "storytime-admin", "0.2.2"
   s.add_dependency "devise", ">= 3.2"
   s.add_dependency "cocoon"
   s.add_dependency "acts_as_list"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storytime
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Ben Roesch, David Van Der Beek, Brandon Robins
@@ -280,16 +280,16 @@ dependencies:
   name: storytime-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement