use last version of Steam (1.1.0) + bump version to 3.1.0

Author: did

Gemfile

@@ -25,7 +25,7 @@ group :development do
   # gem 'locomotivecms_common', github: 'locomotivecms/common', ref: '257047b', require: false
 
   # gem 'locomotivecms_steam', path: '../gems/steam', require: false
-  gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'fe7403ce999a62', require: false
+  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'fe7403ce999a62', require: false
 
   # gem 'locomotive_liquid', path: '../gems/liquid' # for Developers
   # gem 'locomotivecms_solid', path: '../gems/solid' # for Developers

Gemfile.lock

@@ -4,39 +4,10 @@ GIT
   specs:
     database_cleaner (1.5.1)
 
-GIT
-  remote: git://github.com/locomotivecms/steam.git
-  revision: fe7403ce999a62700bc512b1c0be52ca3658bc53
-  ref: fe7403ce999a62
-  specs:
-    locomotivecms_steam (1.1.0.rc3)
-      RedCloth (~> 4.2.9)
-      autoprefixer-rails (~> 6.3.3.1)
-      chronic (~> 0.10.2)
-      coffee-script (~> 2.4.1)
-      compass (~> 1.0.3)
-      dragonfly (~> 1.0.12)
-      haml (~> 4.0.6)
-      httparty (~> 0.13.6)
-      kramdown (~> 1.10.0)
-      locomotivecms-solid (~> 4.0.1)
-      locomotivecms_common (~> 0.1.0)
-      mime-types (~> 2.6.1)
-      mimetype-fu (~> 0.1.2)
-      moneta (~> 0.8.0)
-      morphine (~> 0.1.1)
-      nokogiri (~> 1.6.7.2)
-      rack-cache (~> 1.6.1)
-      rack-rewrite (~> 1.5.1)
-      rack_csrf (~> 2.5.0)
-      sanitize (~> 4.0.1)
-      sass (~> 3.4.21)
-      sprockets (~> 3.5.2)
-
 PATH
   remote: .
   specs:
-    locomotivecms (3.1.0.rc3)
+    locomotivecms (3.1.0)
       actionmailer-with-request (~> 0.4.0)
       autoprefixer-rails (~> 6.3.3.1)
       bazaar (~> 0.0.2)
@@ -57,11 +28,11 @@ PATH
       jquery-ui-rails (~> 5.0.3)
       json-schema (~> 2.6.1)
       kaminari (~> 0.16.3)
-      locomotivecms_steam (~> 1.1.0.rc3)
+      locomotivecms_steam (~> 1.1.0)
       mime-types (~> 2.6.2)
       mimetype-fu (~> 0.1.2)
       mongo_session_store-rails4 (~> 6.0.0)
-      mongoid (~> 5.1.1)
+      mongoid (~> 5.1.3)
       mongoid-tree (~> 2.0.1)
       multi_json (~> 1.11.0)
       net-ssh (~> 3.0.2)
@@ -140,7 +111,7 @@ GEM
     bootstrap-sass (3.3.6)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
-    bson (4.0.4)
+    bson (4.1.0)
     builder (3.2.2)
     byebug (8.2.2)
     capybara (2.7.0)
@@ -216,7 +187,7 @@ GEM
     debug_inspector (0.0.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (3.5.6)
+    devise (3.5.7)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -323,6 +294,29 @@ GEM
       attr_extras (~> 4.4.0)
       colorize
       stringex (~> 2.6.0)
+    locomotivecms_steam (1.1.0)
+      RedCloth (~> 4.2.9)
+      autoprefixer-rails (~> 6.3.3.1)
+      chronic (~> 0.10.2)
+      coffee-script (~> 2.4.1)
+      compass (~> 1.0.3)
+      dragonfly (~> 1.0.12)
+      haml (~> 4.0.6)
+      httparty (~> 0.13.6)
+      kramdown (~> 1.10.0)
+      locomotivecms-solid (~> 4.0.1)
+      locomotivecms_common (~> 0.1.0)
+      mime-types (~> 2.6.1)
+      mimetype-fu (~> 0.1.2)
+      moneta (~> 0.8.0)
+      morphine (~> 0.1.1)
+      nokogiri (~> 1.6.7.2)
+      rack-cache (~> 1.6.1)
+      rack-rewrite (~> 1.5.1)
+      rack_csrf (~> 2.5.0)
+      sanitize (~> 4.0.1)
+      sass (~> 3.4.21)
+      sprockets (~> 3.5.2)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
@@ -342,7 +336,7 @@ GEM
       bson (~> 4.0)
     mongo_session_store-rails4 (6.0.0)
       actionpack (>= 3.1)
-    mongoid (5.1.1)
+    mongoid (5.1.3)
       activemodel (~> 4.0)
       mongo (~> 2.1)
       origin (~> 2.2)
@@ -536,7 +530,6 @@ DEPENDENCIES
   i18n-tasks (~> 0.8.7)
   json_spec (~> 1.1.4)
   locomotivecms!
-  locomotivecms_steam!
   pickle
   pry
   pry-byebug

lib/locomotive/version.rb

@@ -2,5 +2,5 @@
 # MAJOR.MINOR.PATCH format.
 # 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
 module Locomotive #:nodoc
-  VERSION = '3.1.0.rc3'
+  VERSION = '3.1.0'
 end

locomotive_cms.gemspec

@@ -28,12 +28,12 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'pundit',                          '~> 1.1.0'
 
-  s.add_dependency 'mongoid',                         '~> 5.1.1'
+  s.add_dependency 'mongoid',                         '~> 5.1.3'
   s.add_dependency 'mongoid-tree',                    '~> 2.0.1'
   s.add_dependency 'mongo_session_store-rails4',      '~> 6.0.0'
 
   s.add_dependency 'custom_fields',                   '~> 2.7.0.rc1'
-  s.add_dependency 'locomotivecms_steam',             '~> 1.1.0.rc3'
+  s.add_dependency 'locomotivecms_steam',             '~> 1.1.0'
 
   s.add_dependency 'slim',                            '~> 3.0.6'
   s.add_dependency 'simple_form',                     '~> 3.2.0'

spec/requests/locomotive/steam/cache_spec.rb

@@ -39,7 +39,7 @@
 
     subject { middleware.send(:cache_key, steam_env) }
 
-    it { expect(subject).to eq '76ecaab214311e09f51d2f2673d13a2b' }
+    it { expect(subject).to eq 'ba8dbdb0cc3df6d3ca052a174411124b' }
 
   end