locomotivecms_steam 1.4.0.rc1 → 1.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb8a22d0765f55dd4d090a85cde55ea00f10ec2bd2543d439fcd4a4d857e603a
-  data.tar.gz: adef78314e677f9486b13d2a9d65bbea3b78f61c0550d6d4cf77b0a38fa00c01
+  metadata.gz: c449da4bdd9dbb3aff106e8559b14d668a8ab5bea684e250673d07fef9fc8778
+  data.tar.gz: afb9c2b211dff1c79dcbc44b307e69c86b82ec4b363454bc93bef28a869419a8
 SHA512:
-  metadata.gz: 45e779b7e6c79c11db92f80b2cdfddb7968fd3f94a5af6a185be0e2ec0de50111cf961e813f23f438ce68f82b59ba1498812cf41cdf59fb677fd0c6036db6866
-  data.tar.gz: a310c5925a8d859c4864bae1387545fe8a8fd281798ccfc3e7f1f2d0d95d20f509f307ec5ca74bdedaa6dd0f0d5a7c42592b22c9347d0f1869f7be7acd24514f
+  metadata.gz: 65c84944ce32f47836c455b81b51823a0095dde95eefe4d4f1762a11de79ffacddcfb5149286642136201aa7cb69d50a5050be08d63215e2057477e40a73b9a8
+  data.tar.gz: 1c8ffe885fa13483009f12ee5e415f2ea6d2f5e0129475a1985690a172760e1f531873aeab69535c46703159e2ac5948301cfe7d3c6b95bb9447886319193302

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.4.0.rc1)
+    locomotivecms_steam (1.4.0.rc2)
       RedCloth (~> 4.3.2)
       autoprefixer-rails (~> 8.0.0)
       bcrypt (~> 3.1.11)
@@ -23,7 +23,7 @@ PATH
       rack-cache (~> 1.7.0)
       rack-rewrite (~> 1.5.1)
       rack_csrf (~> 2.6.0)
-      sanitize (~> 4.6.0)
+      sanitize (~> 4.6.4)
       sass (~> 3.4.25)
       sprockets (~> 3.7.1)
       uglifier (~> 4.1.3)
@@ -32,9 +32,9 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    activesupport (5.1.5)
+    activesupport (5.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.2)
@@ -72,10 +72,10 @@ GEM
       term-ansicolor (~> 1.3)
       thor (~> 0.19.4)
       tins (~> 1.6)
-    crass (1.0.3)
+    crass (1.0.4)
     diff-lcs (1.3)
     docile (1.1.5)
-    dragonfly (1.1.4)
+    dragonfly (1.1.5)
       addressable (~> 2.3)
       multi_json (~> 1.0)
       rack (>= 1.3)
@@ -86,7 +86,7 @@ GEM
     haml (5.0.4)
       temple (>= 0.8.0)
       tilt
-    httparty (0.16.0)
+    httparty (0.16.2)
       multi_xml (>= 0.5.2)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -159,7 +159,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    sanitize (4.6.0)
+    sanitize (4.6.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4)
@@ -173,7 +173,7 @@ GEM
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     stackprof (0.2.11)
-    stringex (2.8.2)
+    stringex (2.8.4)
     temple (0.8.0)
     term-ansicolor (1.6.0)
       tins (~> 1.0)
@@ -184,7 +184,7 @@ GEM
     tins (1.16.3)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.6)
+    uglifier (4.1.10)
       execjs (>= 0.3.0, < 3)
 
 PLATFORMS

data/Rakefile

@@ -5,12 +5,6 @@ require 'bundler/gem_tasks'
 require 'rake'
 require 'rspec'
 
-# === Gems install tasks ===
-Bundler::GemHelper.install_tasks
-
-# require 'coveralls/rake/task'
-# Coveralls::RakeTask.new
-
 require_relative 'lib/locomotive/steam'
 
 namespace :mongodb do
@@ -28,8 +22,8 @@ namespace :mongodb do
         `mv #{dump_path} #{db_path}`
       end
 
-      `mongo steam_test --eval "db.dropDatabase()"`
-      `mongorestore -d steam_test #{db_path}`
+      `mongo steam_test_1_4_x --eval "db.dropDatabase()"`
+      `mongorestore -d steam_test_1_4_x #{db_path}`
 
       puts "Done! Update now the spec/support/helpers.rb file by setting the new id of the site returned by the mongodb_site_id method"
     end

data/lib/locomotive/steam/liquid/tags/google_analytics.rb

@@ -18,13 +18,14 @@ module Locomotive
 
           def ga_snippet(account_id)
             %{
-              <script type="text/javascript">
-                (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-                m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-                })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-                ga('create', '#{account_id}', 'auto');
-                ga('send', 'pageview');
+              <!-- Global Site Tag (gtag.js) - Google Analytics -->
+              <script async src="https://www.googletagmanager.com/gtag/js?id=#{account_id}"></script>
+              <script>
+                window.dataLayer = window.dataLayer || [];
+                function gtag(){dataLayer.push(arguments);}
+                gtag('js', new Date());
+
+                gtag('config', '#{account_id}');
               </script>
             }
           end

data/lib/locomotive/steam/version.rb

@@ -3,6 +3,6 @@
 # 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
   module Steam
-    VERSION = '1.4.0.rc1'
+    VERSION = '1.4.0.rc2'
   end
 end

data/locomotivecms_steam.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'origin',     '~> 2.3.1'
 
   spec.add_dependency 'nokogiri',               '~> 1.8.2'
-  spec.add_dependency 'sanitize',               '~> 4.6.0'
+  spec.add_dependency 'sanitize',               '~> 4.6.4'
   spec.add_dependency 'morphine',               '~> 0.1.1'
   spec.add_dependency 'httparty',               '~> 0.16.0'
   spec.add_dependency 'chronic',                '~> 0.10.2'

data/spec/fixtures/default/app/content_types/songs.yml

@@ -15,7 +15,7 @@ fields:
     label: Cover
     type: file
     required: false
-    #localized: true # required when pushing the site with Wagon
+    # localized: true # required when pushing the site with Wagon
 - short_description:
     type: text
     text_formatting: html

data/spec/fixtures/mongodb/locomotive_accounts.metadata.json

@@ -1 +1 @@
-{"options":{},"indexes":[{"v":1,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_wagon_dev.locomotive_accounts"}]}
+{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_test.locomotive_accounts"}]}

data/spec/fixtures/mongodb/locomotive_activities.metadata.json

@@ -1 +1 @@
-{"options":{},"indexes":[{"v":1,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_wagon_dev.locomotive_activities"}]}
+{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_test.locomotive_activities"}]}

data/spec/fixtures/mongodb/locomotive_content_assets.metadata.json

@@ -1 +1 @@
-{"options":{},"indexes":[{"v":1,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_wagon_dev.locomotive_content_assets"}]}
+{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_test.locomotive_content_assets"}]}

data/spec/fixtures/mongodb/locomotive_content_entries.metadata.json

@@ -1 +1 @@
-{"options":{},"indexes":[{"v":1,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_wagon_dev.locomotive_content_entries"}]}
+{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_test.locomotive_content_entries"}]}

data/spec/fixtures/mongodb/locomotive_content_types.metadata.json

@@ -1 +1 @@
-{"options":{},"indexes":[{"v":1,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_wagon_dev.locomotive_content_types"}]}
+{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_test.locomotive_content_types"}]}

data/spec/fixtures/mongodb/locomotive_pages.metadata.json

@@ -1 +1 @@
-{"options":{},"indexes":[{"v":1,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_wagon_dev.locomotive_pages"}]}
+{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_test.locomotive_pages"}]}

data/spec/fixtures/mongodb/locomotive_sites.metadata.json

@@ -1 +1 @@
-{"options":{},"indexes":[{"v":1,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_wagon_dev.locomotive_sites"}]}
+{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_test.locomotive_sites"}]}

data/spec/fixtures/mongodb/locomotive_snippets.metadata.json

@@ -1 +1 @@
-{"options":{},"indexes":[{"v":1,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_wagon_dev.locomotive_snippets"}]}
+{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_test.locomotive_snippets"}]}

data/spec/fixtures/mongodb/locomotive_theme_assets.metadata.json

@@ -1 +1 @@
-{"options":{},"indexes":[{"v":1,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_wagon_dev.locomotive_theme_assets"}]}
+{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_test.locomotive_theme_assets"}]}

data/spec/fixtures/mongodb/locomotive_translations.metadata.json

@@ -1 +1 @@
-{"options":{},"indexes":[{"v":1,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_wagon_dev.locomotive_translations"}]}
+{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_test.locomotive_translations"}]}

data/spec/fixtures/mongodb/sessions.metadata.json

@@ -0,0 +1 @@
+{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_test.sessions"}]}

data/spec/integration/adapters/mongodb_spec.rb

@@ -4,7 +4,7 @@ require_relative '../../../lib/locomotive/steam/adapters/mongodb.rb'
 
 describe Locomotive::Steam::MongoDBAdapter do
 
-  let(:adapter) { Locomotive::Steam::MongoDBAdapter.new(database: 'steam_test', hosts: ['127.0.0.1:27017'], min_pool_size: 2, max_pool_size: 5) }
+  let(:adapter) { Locomotive::Steam::MongoDBAdapter.new(database: mongodb_database, hosts: ['127.0.0.1:27017'], min_pool_size: 2, max_pool_size: 5) }
 
   before(:all) do
     described_class.disconnect_session

data/spec/integration/liquid/tags/paginate_spec.rb

@@ -70,7 +70,7 @@ EOF
     it_should_behave_like 'pagination' do
 
       let(:site_id)   { mongodb_site_id }
-      let(:adapter)   { Locomotive::Steam::MongoDBAdapter.new(database: 'steam_test', hosts: ['127.0.0.1:27017']) }
+      let(:adapter)   { Locomotive::Steam::MongoDBAdapter.new(database: mongodb_database, hosts: ['127.0.0.1:27017']) }
 
     end
 

data/spec/integration/repositories/content_entry_repository_spec.rb

@@ -115,8 +115,8 @@ describe Locomotive::Steam::ContentEntryRepository do
     it_should_behave_like 'a repository' do
 
       let(:site_id)   { mongodb_site_id }
-      let(:adapter)   { Locomotive::Steam::MongoDBAdapter.new(database: 'steam_test', hosts: ['127.0.0.1:27017']) }
-      let(:entry_id)  { BSON::ObjectId.from_string('5943b4dd87f6430cf23b814d') }
+      let(:adapter)   { Locomotive::Steam::MongoDBAdapter.new(database: mongodb_database, hosts: ['127.0.0.1:27017']) }
+      let(:entry_id)  { BSON::ObjectId.from_string('5ae73458e051bb4f5525c92f') }
 
     end
 

data/spec/integration/repositories/content_type_repository_spec.rb

@@ -47,7 +47,7 @@ describe Locomotive::Steam::ContentTypeRepository do
     it_should_behave_like 'a repository' do
 
       let(:site_id) { mongodb_site_id }
-      let(:adapter) { Locomotive::Steam::MongoDBAdapter.new(database: 'steam_test', hosts: ['127.0.0.1:27017']) }
+      let(:adapter) { Locomotive::Steam::MongoDBAdapter.new(database: mongodb_database, hosts: ['127.0.0.1:27017']) }
 
     end
 

data/spec/integration/repositories/page_repository_spec.rb

@@ -94,7 +94,7 @@ describe Locomotive::Steam::PageRepository do
     it_should_behave_like 'a repository' do
 
       let(:site_id)       { mongodb_site_id }
-      let(:adapter)       { Locomotive::Steam::MongoDBAdapter.new(database: 'steam_test', hosts: ['127.0.0.1:27017']) }
+      let(:adapter)       { Locomotive::Steam::MongoDBAdapter.new(database: mongodb_database, hosts: ['127.0.0.1:27017']) }
 
     end
 

data/spec/integration/repositories/site_repository_spec.rb

@@ -9,11 +9,6 @@ describe Locomotive::Steam::SiteRepository do
 
   shared_examples_for 'a repository' do
 
-    describe '#all' do
-      subject { repository.all }
-      it { expect(subject.size).to eq 1 }
-    end
-
     describe '#query' do
       subject { repository.query { where(handle: 'sample') }.first }
       it { expect(subject.name).to eq 'Sample site' }
@@ -28,10 +23,15 @@ describe Locomotive::Steam::SiteRepository do
 
   context 'MongoDB' do
 
-    let(:adapter) { Locomotive::Steam::MongoDBAdapter.new(database: 'steam_test', hosts: ['127.0.0.1:27017']) }
+    let(:adapter) { Locomotive::Steam::MongoDBAdapter.new(database: mongodb_database, hosts: ['127.0.0.1:27017']) }
 
     it_behaves_like 'a repository'
 
+    describe '#all' do
+      subject { repository.all }
+      it { expect(subject.size).to eq 2 }
+    end
+
   end
 
   context 'Filesystem' do
@@ -40,6 +40,11 @@ describe Locomotive::Steam::SiteRepository do
 
     it_behaves_like 'a repository'
 
+    describe '#all' do
+      subject { repository.all }
+      it { expect(subject.size).to eq 1 }
+    end
+
   end
 
 end

data/spec/integration/repositories/snippet_repository_spec.rb

@@ -28,7 +28,7 @@ describe Locomotive::Steam::SnippetRepository do
     it_should_behave_like 'a repository' do
 
       let(:site_id) { mongodb_site_id }
-      let(:adapter) { Locomotive::Steam::MongoDBAdapter.new(database: 'steam_test', hosts: ['127.0.0.1:27017']) }
+      let(:adapter) { Locomotive::Steam::MongoDBAdapter.new(database: mongodb_database, hosts: ['127.0.0.1:27017']) }
 
     end
 

data/spec/integration/repositories/theme_asset_repository_spec.rb

@@ -11,7 +11,7 @@ describe Locomotive::Steam::ThemeAssetRepository do
   context 'MongoDB' do
 
     let(:site_id) { mongodb_site_id }
-    let(:adapter) { Locomotive::Steam::MongoDBAdapter.new(database: 'steam_test', hosts: ['127.0.0.1:27017']) }
+    let(:adapter) { Locomotive::Steam::MongoDBAdapter.new(database: mongodb_database, hosts: ['127.0.0.1:27017']) }
 
     describe '#all' do
       subject { repository.all }
@@ -26,7 +26,7 @@ describe Locomotive::Steam::ThemeAssetRepository do
     describe '#checksums' do
       subject { repository.checksums }
       it { expect(subject.size).to eq 16 }
-      it { expect(subject['stylesheets/application.css']).to eq 'f06835e254f0d1b8363aae754525c723' }
+      it { expect(subject['stylesheets/application.css']).to eq '15161ceeb93a9d26027a8a38862be47b' }
     end
 
   end

data/spec/integration/repositories/translation_repository_spec.rb

@@ -28,7 +28,7 @@ describe Locomotive::Steam::TranslationRepository do
     it_should_behave_like 'a repository' do
 
       let(:site_id) { mongodb_site_id }
-      let(:adapter) { Locomotive::Steam::MongoDBAdapter.new(database: 'steam_test', hosts: ['127.0.0.1:27017']) }
+      let(:adapter) { Locomotive::Steam::MongoDBAdapter.new(database: mongodb_database, hosts: ['127.0.0.1:27017']) }
 
     end
 

data/spec/integration/services/content_entry_service_spec.rb

@@ -44,8 +44,8 @@ describe Locomotive::Steam::ContentEntryService do
     it_should_behave_like 'a content entry service' do
 
       let(:site_id)   { mongodb_site_id }
-      let(:adapter)   { Locomotive::Steam::MongoDBAdapter.new(database: 'steam_test', hosts: ['127.0.0.1:27017']) }
-      let(:entry_id)  { BSON::ObjectId.from_string('5943b4dd87f6430cf23b814d') }
+      let(:adapter)   { Locomotive::Steam::MongoDBAdapter.new(database: mongodb_database, hosts: ['127.0.0.1:27017']) }
+      let(:entry_id)  { BSON::ObjectId.from_string('5ae73458e051bb4f5525c92f') }
 
       describe '#create' do
         subject { service.create('messages', { name: 'John', email: 'john@doe.net', message: 'Hello world!' }) }

data/spec/support/helpers.rb

@@ -3,8 +3,12 @@ require 'locomotive/common'
 module Spec
   module Helpers
 
+    def mongodb_database
+      'steam_test_1_4_x'
+    end
+
     def mongodb_site_id
-      BSON::ObjectId.from_string('5943b49287f6430cadd748a3')
+      BSON::ObjectId.from_string('5ae73303e051bb4f2bcbeefa')
     end
 
     def reset!

data/spec/unit/liquid/tags/google_analytics_spec.rb

@@ -6,8 +6,8 @@ describe Locomotive::Steam::Liquid::Tags::GoogleAnalytics do
 
   subject { render_template(source) }
 
-  it { is_expected.to include "ga('create', '42', 'auto')" }
-  it { is_expected.to include "ga('send', 'pageview')" }
+  it { is_expected.to include %{<script async src="https://www.googletagmanager.com/gtag/js?id=42"></script>} }
+  it { is_expected.to include "gtag('config', '42');" }
 
   describe 'raises an error if the syntax is incorrect' do
     let(:source) { '{% google_analytics %}' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc1
+  version: 1.4.0.rc2
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,14 +89,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.6.4
 - !ruby/object:Gem::Dependency
   name: morphine
   requirement: !ruby/object:Gem::Requirement
@@ -728,6 +728,8 @@ files:
 - spec/fixtures/mongodb/locomotive_theme_assets.metadata.json
 - spec/fixtures/mongodb/locomotive_translations.bson
 - spec/fixtures/mongodb/locomotive_translations.metadata.json
+- spec/fixtures/mongodb/sessions.bson
+- spec/fixtures/mongodb/sessions.metadata.json
 - spec/integration/adapters/mongodb_spec.rb
 - spec/integration/integration_helper.rb
 - spec/integration/liquid/drops/page_spec.rb
@@ -1004,6 +1006,8 @@ test_files:
 - spec/fixtures/mongodb/locomotive_theme_assets.metadata.json
 - spec/fixtures/mongodb/locomotive_translations.bson
 - spec/fixtures/mongodb/locomotive_translations.metadata.json
+- spec/fixtures/mongodb/sessions.bson
+- spec/fixtures/mongodb/sessions.metadata.json
 - spec/integration/adapters/mongodb_spec.rb
 - spec/integration/integration_helper.rb
 - spec/integration/liquid/drops/page_spec.rb