locomotivecms_steam 1.0.0.pre.beta.3 → 1.0.0.rc1

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

@@ -7,7 +7,7 @@ describe Locomotive::Steam::Liquid::Tags::Extends do
   let(:site)        { instance_double('Site', default_locale: :en) }
   let!(:listener)   { Liquid::SimpleEventsListener.new }
   let(:finder)      { Locomotive::Steam::ParentFinderService.new(instance_double('PageRepository', site: site, locale: :en)) }
-  let(:parser)      { Locomotive::Steam::LiquidParserService.new }
+  let(:parser)      { Locomotive::Steam::LiquidParserService.new(nil, nil) }
   let(:options)     { { parent_finder: finder, page: page, parser: parser } }
 
   before do

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

@@ -6,7 +6,8 @@ describe Locomotive::Steam::Liquid::Tags::GoogleAnalytics do
 
   subject { render_template(source) }
 
-  it { is_expected.to include "_gaq.push(['_setAccount', '42']);" }
+  it { is_expected.to include "ga('create', '42', 'auto')" }
+  it { is_expected.to include "ga('send', 'pageview')" }
 
   describe 'raises an error if the syntax is incorrect' do
     let(:source) { '{% google_analytics %}' }

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

@@ -9,7 +9,7 @@ describe Locomotive::Steam::Liquid::Tags::InheritedBlock do
 
   let!(:listener)     { Liquid::SimpleEventsListener.new }
   let(:finder)        { instance_double('Finder', find: parent) }
-  let(:options)       { { page: page, parent_finder: finder, parser: Locomotive::Steam::LiquidParserService.new } }
+  let(:options)       { { page: page, parent_finder: finder, parser: Locomotive::Steam::LiquidParserService.new(nil, nil) } }
 
   let!(:template)     { parse_template(source, options) }
 

data/spec/unit/middlewares/locale_redirection_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-require_relative '../../../lib/locomotive/steam/middlewares/threadsafe'
+require_relative '../../../lib/locomotive/steam/middlewares/thread_safe'
 require_relative '../../../lib/locomotive/steam/middlewares/helpers'
 require_relative '../../../lib/locomotive/steam/middlewares/locale_redirection'
 

data/spec/unit/middlewares/renderer_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-require_relative '../../../lib/locomotive/steam/middlewares/threadsafe'
+require_relative '../../../lib/locomotive/steam/middlewares/thread_safe'
 require_relative '../../../lib/locomotive/steam/middlewares/helpers'
 require_relative '../../../lib/locomotive/steam/middlewares/renderer'
 

data/spec/unit/middlewares/site_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-require_relative '../../../lib/locomotive/steam/middlewares/threadsafe'
+require_relative '../../../lib/locomotive/steam/middlewares/thread_safe'
 require_relative '../../../lib/locomotive/steam/middlewares/helpers'
 require_relative '../../../lib/locomotive/steam/middlewares/site'
 

data/spec/unit/models/concerns/to_json_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::Models::Concerns::ToJson do
+
+  let(:attributes) { {} }
+  let(:entity) { SimpleEntity.new(attributes) }
+
+  describe '#to_hash' do
+
+    subject { entity.to_hash }
+
+    it { expect(subject).to eq({}) }
+
+    context 'simple attributes' do
+      let(:attributes) { { title: 'Hello world', published: true, tags: ['a', 'b'] } }
+      it { expect(subject).to eq('title' => 'Hello world', 'published' => true, 'tags' => ['a', 'b']) }
+    end
+
+    context 'localized attributes' do
+      let(:i18n_field) { Locomotive::Steam::Models::I18nField.new(:title, { fr: 'Bonjour', en: 'Hi' }) }
+      let(:attributes) { { title: i18n_field} }
+      it { expect(subject).to eq('title' => i18n_field) }
+    end
+
+    context 'referenced associations' do
+      let(:attributes) { { title: 'Lorem ipsum', author: instance_double('BelongsToAssociation', repository: true) } }
+      it { expect(subject).to eq('title' => 'Lorem ipsum') }
+    end
+
+  end
+
+  describe '#as_json' do
+
+    let(:options) { nil }
+
+    subject { entity.as_json(options) }
+
+    it { expect(subject).to eq({}) }
+
+    context 'with options' do
+
+      let(:options) { { only: ['title'] } }
+      let(:attributes) { { title: 'Hello world', body: 'Lorem ipsum' } }
+
+      it { expect(subject).to eq('title' => 'Hello world') }
+
+    end
+
+  end
+
+  describe '#to_json' do
+
+    subject { entity.to_json }
+
+    it { expect(subject).to eq('{}') }
+
+    context 'with attributes' do
+
+      let(:attributes) { { title: 'Hello world', published: true } }
+
+      it { expect(subject).to eq(%{{"title":"Hello world","published":true}}) }
+
+    end
+
+    context 'with localized attributes' do
+
+      let(:attributes) { { title: Locomotive::Steam::Models::I18nField.new(:title, { fr: 'Bonjour', en: 'Hi' })} }
+
+      it { expect(subject).to eq(%{{"title":{"fr":"Bonjour","en":"Hi"}}}) }
+
+    end
+
+  end
+
+  class SimpleEntity
+    include Locomotive::Steam::Models::Concerns::ToJson
+    attr_reader :attributes
+    def initialize(attributes = {}); @attributes = attributes; end
+  end
+
+end

data/spec/unit/services/asset_host_service_spec.rb

@@ -29,6 +29,14 @@ describe Locomotive::Steam::AssetHostService do
 
     end
 
+    context 'the timestamp coming from the site' do
+
+      let(:timestamp) { nil }
+      let(:site) { instance_double('ModifiedSite', template_version: DateTime.parse('2007/06/29 00:00:00'), updated_at: DateTime.parse('2009/09/10 00:00:00')) }
+      it { is_expected.to eq '/sites/42/assets/1/banner.png?1183075200' }
+
+    end
+
   end
 
   describe 'the source is already a full url' do
@@ -50,6 +58,13 @@ describe Locomotive::Steam::AssetHostService do
     let(:host) { 'http://assets.locomotivecms.com' }
     it { is_expected.to eq 'http://assets.locomotivecms.com/sites/42/assets/1/banner.png' }
 
+    context 'without the protocol' do
+
+      let(:host) { 's3-us-east-1.amazonaws.com' }
+      it { is_expected.to eq 'https://s3-us-east-1.amazonaws.com/sites/42/assets/1/banner.png' }
+
+    end
+
   end
 
   describe 'the host is a block' do

data/spec/unit/services/entry_submission_service_spec.rb

@@ -91,7 +91,8 @@ describe Locomotive::Steam::EntrySubmissionService do
       let(:unique_fields)     { {} }
       let(:first_validation)  { false }
       let(:errors)            { [:title] }
-      let(:type)  { instance_double('Comments') }
+      let(:enabled)           { true }
+      let(:type)  { instance_double('Comments', public_submission_enabled: enabled) }
       let(:entry) { instance_double('Entry', title: 'Hello world', content_type: type, valid?: first_validation, errors: errors, attributes: { title: 'Hello world' }, localized_attributes: []) }
       let(:slug)  { 'comments' }
 
@@ -101,6 +102,13 @@ describe Locomotive::Steam::EntrySubmissionService do
         allow(entry_repository).to receive(:build).with(attributes).and_return(entry)
       end
 
+      context 'public submission disabled' do
+
+        let(:enabled) { false }
+        it { is_expected.to eq nil }
+
+      end
+
       context 'valid' do
 
         before { expect(entry_repository).to receive(:create) }

data/spec/unit/services/translator_service_spec.rb

@@ -33,7 +33,7 @@ describe Locomotive::Steam::TranslatorService do
 
       context "specifying a locale that doesn't exist" do
 
-        let(:locale) { puts 'NL'; 'nl' }
+        let(:locale) { 'nl' }
 
         it 'reverts to default locale' do
           is_expected.to eq 'example_test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.3
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,14 +103,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.5
+        version: 0.13.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.5
+        version: 0.13.6
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -159,14 +159,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.0.12
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
@@ -355,14 +355,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
 description: The LocomotiveCMS Steam is the rendering stack used by both Wagon and
   Engine
 email:
@@ -506,7 +506,7 @@ files:
 - lib/locomotive/steam/middlewares/sitemap.rb
 - lib/locomotive/steam/middlewares/stack_proxy.rb
 - lib/locomotive/steam/middlewares/templatized_page.rb
-- lib/locomotive/steam/middlewares/threadsafe.rb
+- lib/locomotive/steam/middlewares/thread_safe.rb
 - lib/locomotive/steam/middlewares/timezone.rb
 - lib/locomotive/steam/models.rb
 - lib/locomotive/steam/models/associations/belongs_to.rb
@@ -514,6 +514,7 @@ files:
 - lib/locomotive/steam/models/associations/has_many.rb
 - lib/locomotive/steam/models/associations/many_to_many.rb
 - lib/locomotive/steam/models/associations/referenced.rb
+- lib/locomotive/steam/models/concerns/to_json.rb
 - lib/locomotive/steam/models/concerns/validation.rb
 - lib/locomotive/steam/models/entity.rb
 - lib/locomotive/steam/models/i18n_field.rb
@@ -580,6 +581,7 @@ files:
 - spec/fixtures/default/app/views/pages/grunge_bands.liquid.haml
 - spec/fixtures/default/app/views/pages/index.fr.liquid.haml
 - spec/fixtures/default/app/views/pages/index.liquid.haml
+- spec/fixtures/default/app/views/pages/layouts/simple.liquid
 - spec/fixtures/default/app/views/pages/music.fr.liquid.haml
 - spec/fixtures/default/app/views/pages/music.liquid.haml
 - spec/fixtures/default/app/views/pages/songs/song-number-1.liquid.haml
@@ -626,6 +628,8 @@ files:
 - spec/fixtures/default/public/stylesheets/reboot.css
 - spec/fixtures/mongodb/locomotive_accounts.bson
 - spec/fixtures/mongodb/locomotive_accounts.metadata.json
+- spec/fixtures/mongodb/locomotive_activities.bson
+- spec/fixtures/mongodb/locomotive_activities.metadata.json
 - spec/fixtures/mongodb/locomotive_content_assets.bson
 - spec/fixtures/mongodb/locomotive_content_assets.metadata.json
 - spec/fixtures/mongodb/locomotive_content_entries.bson
@@ -642,8 +646,6 @@ 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/fixtures/mongodb/system.indexes.bson
 - spec/integration/integration_helper.rb
 - spec/integration/liquid/tags/paginate_spec.rb
@@ -743,6 +745,7 @@ files:
 - spec/unit/middlewares/renderer_spec.rb
 - spec/unit/middlewares/site_spec.rb
 - spec/unit/middlewares/stack_proxy_spec.rb
+- spec/unit/models/concerns/to_json_spec.rb
 - spec/unit/models/i18n_field_spec.rb
 - spec/unit/models/mapper_spec.rb
 - spec/unit/models/pager_spec.rb
@@ -816,6 +819,7 @@ test_files:
 - spec/fixtures/default/app/views/pages/grunge_bands.liquid.haml
 - spec/fixtures/default/app/views/pages/index.fr.liquid.haml
 - spec/fixtures/default/app/views/pages/index.liquid.haml
+- spec/fixtures/default/app/views/pages/layouts/simple.liquid
 - spec/fixtures/default/app/views/pages/music.fr.liquid.haml
 - spec/fixtures/default/app/views/pages/music.liquid.haml
 - spec/fixtures/default/app/views/pages/songs/song-number-1.liquid.haml
@@ -862,6 +866,8 @@ test_files:
 - spec/fixtures/default/public/stylesheets/reboot.css
 - spec/fixtures/mongodb/locomotive_accounts.bson
 - spec/fixtures/mongodb/locomotive_accounts.metadata.json
+- spec/fixtures/mongodb/locomotive_activities.bson
+- spec/fixtures/mongodb/locomotive_activities.metadata.json
 - spec/fixtures/mongodb/locomotive_content_assets.bson
 - spec/fixtures/mongodb/locomotive_content_assets.metadata.json
 - spec/fixtures/mongodb/locomotive_content_entries.bson
@@ -878,8 +884,6 @@ 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/fixtures/mongodb/system.indexes.bson
 - spec/integration/integration_helper.rb
 - spec/integration/liquid/tags/paginate_spec.rb
@@ -979,6 +983,7 @@ test_files:
 - spec/unit/middlewares/renderer_spec.rb
 - spec/unit/middlewares/site_spec.rb
 - spec/unit/middlewares/stack_proxy_spec.rb
+- spec/unit/models/concerns/to_json_spec.rb
 - spec/unit/models/i18n_field_spec.rb
 - spec/unit/models/mapper_spec.rb
 - spec/unit/models/pager_spec.rb

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

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