storytime 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de30e4d74c9c996daff84bdf0f30bc1857de4857
-  data.tar.gz: e2598179b5363721fba485ce225d28e79d0484cd
+  metadata.gz: f2f36ec044f036c0eba4f1ee2b0850e96bcd3fb1
+  data.tar.gz: bc2bc47af300a2446f0ad58d2de943e662c0f4e6
 SHA512:
-  metadata.gz: a5cc56f1b3636dc23134a2b19e52febe1d4eca345d9193b767e932a2a44d010a6837c88d9a710c8df7ffb9f6cf7b35efad3da705cd8b721402fd3f961a8b119c
-  data.tar.gz: 0b9e852f404cdaa5bb8b2934b82ab3f07ed4ead09f42c8b4ae0b8dc6fb7ef0f02621c21efe5a53083fb88402315f9e8f2e1aaa4059a206300a9f7af8ca0ba279
+  metadata.gz: 6a3f1e90475d9ff05bfb8089beb157e51b659dfb86952da436920db0533073859a87732b893438cc2d015602c30030193fe88db6a3e79c7400c1f273cb715f6b
+  data.tar.gz: 296b8f2d915bde6e5104a037666a9e7deddec5576d61fb3833b9c120ad7394c98ec667f9cf9908000182931e2c46d28c7ad5b8117f6bd73d67ec156bc8e1a48d

data/Gemfile.lock

@@ -13,10 +13,10 @@ GIT
 PATH
   remote: .
   specs:
-    storytime (2.1.4)
+    storytime (2.1.5)
       acts_as_list
       bootstrap-sass (>= 3.1)
-      carrierwave (>= 0.9)
+      carrierwave (>= 1.0)
       cocoon
       codemirror-rails (>= 5.0)
       coffee-rails (>= 4.0)
@@ -112,9 +112,9 @@ GEM
     codemirror-rails (5.16.0)
       railties (>= 3.0, < 6.0)
     coderay (1.1.0)
-    coffee-rails (4.1.1)
+    coffee-rails (4.2.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.1.x)
+      railties (>= 4.0.0, < 5.2.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -213,7 +213,7 @@ GEM
       multi_json (~> 1.10)
     fog-local (0.3.1)
       fog-core (~> 1.27)
-    fog-openstack (0.1.18)
+    fog-openstack (0.1.19)
       fog-core (>= 1.40)
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
@@ -224,7 +224,7 @@ GEM
     fog-profitbricks (3.0.0)
       fog-core (~> 1.42)
       fog-json (~> 1.0)
-    fog-rackspace (0.1.2)
+    fog-rackspace (0.1.3)
       fog-core (>= 1.35)
       fog-json (>= 1.0)
       fog-xml (>= 0.1)
@@ -258,7 +258,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (1.5.2)
+    fog-vsphere (1.6.0)
       fog-core
       rbvmomi (~> 1.9)
     fog-xenserver (0.2.3)
@@ -306,7 +306,7 @@ GEM
     jbuilder (2.6.1)
       activesupport (>= 3.0.0, < 5.1)
       multi_json (~> 1.2)
-    jquery-rails (4.1.1)
+    jquery-rails (4.2.2)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -430,7 +430,7 @@ GEM
       tilt (>= 1.1, < 3)
     sexp_processor (4.7.0)
     shellany (0.0.1)
-    simple_form (3.3.1)
+    simple_form (3.4.0)
       actionpack (> 4, < 5.1)
       activemodel (> 4, < 5.1)
     slop (3.6.0)
@@ -444,17 +444,17 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    storytime-admin (0.2.2)
+    storytime-admin (0.2.3)
       bootstrap-kaminari-views
-      coffee-rails (>= 4.0, < 4.2)
-      font-awesome-sass
+      coffee-rails (>= 4.0)
+      font-awesome-sass (>= 4.0.3)
       haml-rails
-      jquery-rails (>= 3.0, < 4.2)
+      jquery-rails (>= 3.0)
       kaminari
       leather
       rails (>= 4.0, < 5.1)
-      sass-rails (>= 4.0, <= 5.0.6)
-      simple_form
+      sass-rails (>= 4.0)
+      simple_form (>= 3.0)
     thin (1.6.4)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
@@ -496,6 +496,3 @@ DEPENDENCIES
   spring-commands-rspec
   storytime!
   thin
-
-BUNDLED WITH
-   1.13.6

data/lib/storytime/engine.rb

@@ -67,16 +67,16 @@ module Storytime
     initializer "storytime.configure_carrierwave" do
       CarrierWave.configure do |config|
         if Storytime.media_storage == :s3
-          config.storage = :fog
+          config.fog_provider = 'fog/aws'
           config.fog_credentials = {
-            :provider               => 'AWS',
-            :region                 => Storytime.aws_region,
-            :aws_access_key_id      => Storytime.aws_access_key_id,
-            :aws_secret_access_key  => Storytime.aws_secret_key
+            provider:              'AWS',
+            aws_access_key_id:     Storytime.aws_access_key_id,
+            aws_secret_access_key: Storytime.aws_secret_key,
+            region:                Storytime.aws_region
           }
           config.fog_directory  = Storytime.s3_bucket
           config.fog_public     = true
-          config.fog_attributes = {'Cache-Control'=>'max-age=315576000'}  # optional, defaults to {}
+          config.fog_attributes = {'Cache-Control'=>'max-age=315576000'}
         else
           config.storage = :file
         end

data/lib/storytime/version.rb

@@ -1,3 +1,3 @@
 module Storytime
-  VERSION = "2.1.4"
+  VERSION = "2.1.5"
 end

data/storytime.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency "simple_form", ">= 3.0"
   s.add_dependency "friendly_id", ">= 5.0"
   s.add_dependency "fog", ">= 1.18"
-  s.add_dependency "carrierwave", ">= 0.9"
+  s.add_dependency "carrierwave", ">= 1.0"
   s.add_dependency "mini_magick", ">= 3.7"
   s.add_dependency "nokogiri", ">= 1.6"
   s.add_dependency "font-awesome-sass", ">= 4.0.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: storytime
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Ben Roesch, David Van Der Beek, Brandon Robins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -1048,7 +1048,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple cms and blogging engine for rails apps.