locomotivecms_steam 1.3.0.rc2 → 1.3.0

data/spec/integration/services/content_entry_service_spec.rb

@@ -45,7 +45,7 @@ describe Locomotive::Steam::ContentEntryService 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('5829ffa087f6435971756881') }
+      let(:entry_id)  { BSON::ObjectId.from_string('5943b4dd87f6430cf23b814d') }
 
       describe '#create' do
         subject { service.create('messages', { name: 'John', email: 'john@doe.net', message: 'Hello world!' }) }

data/spec/support/helpers.rb

@@ -4,7 +4,7 @@ module Spec
   module Helpers
 
     def mongodb_site_id
-      BSON::ObjectId.from_string('5829ff6487f64359474164a1')
+      BSON::ObjectId.from_string('5943b49287f6430cadd748a3')
     end
 
     def reset!

data/spec/unit/adapters/filesystem/yaml_loaders/content_entry_spec.rb

@@ -84,7 +84,7 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::ContentEntry do
       end
 
       it 'stores the size of the file in multiple locales' do
-        expect(subject[1][:cover_size]).to eq('en' => 14768, 'fr' => 165883)
+        expect(subject[1][:cover_size]).to eq('en' => 14768, 'fr' => 165883, 'nb' => 165883)
       end
 
 

data/spec/unit/adapters/filesystem/yaml_loaders/page_spec.rb

@@ -15,14 +15,14 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::Page do
     subject { loader.load(scope).sort { |a, b| a[:_fullpath] <=> b[:_fullpath] } }
 
     it 'tests various stuff' do
-      expect(subject.size).to eq 33
+      expect(subject.size).to eq 34
       expect(subject.first[:title]).to eq(en: 'Page not found', fr: 'Page non trouvée')
-      expect(subject[22][:is_layout]).to eq true
-      expect(subject[22][:listed]).to eq false
-      expect(subject[22][:published]).to eq false
-      expect(subject[23][:slug]).to eq(en: 'music', fr: 'notre-musique')
-      expect(subject[24][:_fullpath]).to eq 'songs'
-      expect(subject[24][:template_path]).to eq(en: false)
+      expect(subject[23][:is_layout]).to eq true
+      expect(subject[23][:listed]).to eq false
+      expect(subject[23][:published]).to eq false
+      expect(subject[24][:slug]).to eq(en: 'music', fr: 'notre-musique')
+      expect(subject[25][:_fullpath]).to eq 'songs'
+      expect(subject[25][:template_path]).to eq(en: false)
     end
 
   end

data/spec/unit/adapters/filesystem/yaml_loaders/translation_spec.rb

@@ -15,7 +15,7 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::Translation do
     subject { loader.load(scope) }
 
     it 'tests various stuff' do
-      expect(subject.size).to eq 7
+      expect(subject.size).to eq 8
       expect(subject.first[:key]).to eq('powered_by')
       expect(subject.first[:values]).to eq({ 'en' => 'Powered by', 'fr' => 'Propulsé par' })
     end

data/spec/unit/entities/content_entry_spec.rb

@@ -116,6 +116,15 @@ describe Locomotive::Steam::ContentEntry do
 
     it { expect(subject['picture']['url']).to eq '/assets/foo.png' }
 
+    context 'includes a non dynamic attribute' do
+
+      it "doesn't add it to the output" do
+        content_entry['author'] = 'John Doe'
+        expect(subject['author']).to eq nil
+      end
+
+    end
+
   end
 
   describe 'dynamic attributes' do

data/spec/unit/entities/content_type_spec.rb

@@ -30,6 +30,13 @@ describe Locomotive::Steam::ContentType do
 
   end
 
+  describe '#field_label_of' do
+
+    subject { content_type.field_label_of(:title) }
+    it { is_expected.to eq 'title' }
+
+  end
+
   describe '#localized_names' do
 
     subject { content_type.localized_names }

data/spec/unit/entities/site_spec.rb

@@ -98,4 +98,19 @@ describe Locomotive::Steam::Site do
 
   end
 
+  describe '#asset_host' do
+
+    subject { site.asset_host }
+
+    it { is_expected.to eq nil }
+
+    context 'not blank' do
+
+      let(:attributes) { { asset_host: 'http://asset.dev' } }
+      it { is_expected.to eq 'http://asset.dev' }
+
+    end
+
+  end
+
 end

data/spec/unit/liquid/drops/content_entry_spec.rb

@@ -106,6 +106,45 @@ describe Locomotive::Steam::Liquid::Drops::ContentEntry do
 
   end
 
+  describe '#to_hash' do
+
+    describe 'belong_to content type' do
+
+      let(:entry)       { instance_double('Article', _id: 42, localized_attributes: {}, content_type: type, title: 'Hello world', _label: 'Hello world', _slug: 'hello-world', _translated: false, seo_title: 'seo title', meta_keywords: 'keywords', meta_description: 'description', created_at: 0, updated_at: 1, author: author) }
+      let(:type)        { instance_double('Type', fields_by_name: { title: instance_double('StringField', type: :string ), author: instance_double('Author', type: :belongs_to), picture: instance_double('FileField', type: :file), category: instance_double('SelectField', type: :select) }) }
+      let(:author)      { instance_double('Author', _slug: 'john-doe', localized_attributes: {}) }
+      let(:picture_field) { Locomotive::Steam::ContentEntry::FileField.new('foo.png', 'http://assets.dev', 0, 42) }
+
+      before do
+        allow(entry).to receive(:category).and_return('Test')
+      end
+
+      subject { drop.to_hash.stringify_keys }
+
+      context 'corresponding hash value for id is not nil' do
+
+        before do
+          allow(entry).to receive(:to_hash).and_return({ '_id' => 1, 'title' => 'Hello world', 'picture' => picture_field, 'category_id' => 42, 'author_id' => 64 })
+        end
+
+        it { is_expected.to eq('id' => 1, '_id' => 1, 'title' => 'Hello world', 'picture' => 'http://assets.dev/foo.png?42', 'picture_url' => 'http://assets.dev/foo.png?42', 'category_id' => 42, 'category' => 'Test', 'author_id' => 64, 'author' => 'john-doe') }
+
+      end
+
+      context 'corresponding hash value for id is nil' do
+
+        before do
+          allow(entry).to receive(:to_hash).and_return({ '_id' => 1, 'title' => 'Hello world', 'picture' => picture_field, 'category_id' => 42 })
+        end
+
+        it { is_expected.to eq('id' => 1, '_id' => 1, 'title' => 'Hello world', 'picture' => 'http://assets.dev/foo.png?42', 'picture_url' => 'http://assets.dev/foo.png?42', 'category_id' => 42, 'category' => 'Test') }
+
+      end
+
+    end
+
+  end
+
   describe '#as_json' do
 
     let(:entry)       { instance_double('Article', _id: 42, localized_attributes: {}, content_type: type, title: 'Hello world', _label: 'Hello world', _slug: 'hello-world', _translated: false, seo_title: 'seo title', meta_keywords: 'keywords', meta_description: 'description', created_at: 0, updated_at: 1, author: author, authors: authors) }
@@ -115,13 +154,13 @@ describe Locomotive::Steam::Liquid::Drops::ContentEntry do
     let(:picture_field) { Locomotive::Steam::ContentEntry::FileField.new('foo.png', 'http://assets.dev', 0, 42) }
 
     before do
-      allow(entry).to receive(:to_hash).and_return({ '_id' => 1, 'title' => 'Hello world', 'picture' => picture_field, 'category_id' => 42 })
+      allow(entry).to receive(:to_hash).and_return({ '_id' => 1, 'title' => 'Hello world', 'picture' => picture_field, 'category_id' => 42, 'author_id' => 64 })
       allow(entry).to receive(:category).and_return('Test')
     end
 
     subject { drop.as_json }
 
-    it { is_expected.to eq('id' => 1, '_id' => 1, 'title' => 'Hello world', 'picture' => 'http://assets.dev/foo.png?42', 'picture_url' => 'http://assets.dev/foo.png?42', 'category_id' => 42, 'category' => 'Test', 'author' => 'john-doe', 'authors' => ['john-doe']) }
+    it { is_expected.to eq('id' => 1, '_id' => 1, 'title' => 'Hello world', 'picture' => 'http://assets.dev/foo.png?42', 'picture_url' => 'http://assets.dev/foo.png?42', 'category_id' => 42, 'category' => 'Test', 'author_id' => 64, 'author' => 'john-doe', 'authors' => ['john-doe']) }
 
   end
 

data/spec/unit/liquid/drops/site_spec.rb

@@ -4,7 +4,7 @@ describe Locomotive::Steam::Liquid::Drops::Site do
 
   let(:services)  { Locomotive::Steam::Services.build_instance }
   let(:context)   { ::Liquid::Context.new({}, {}, { services: services }) }
-  let(:site)      { instance_double('Site', name: 'Locomotive', domains: ['acme.org'], seo_title: 'seo title', meta_keywords: 'keywords', meta_description: 'description', localized_attributes: {}) }
+  let(:site)      { instance_double('Site', name: 'Locomotive', domains: ['acme.org'], seo_title: 'seo title', meta_keywords: 'keywords', meta_description: 'description', localized_attributes: {}, asset_host: 'http://asset.dev') }
   let(:drop)      { described_class.new(site).tap { |d| d.context = context } }
 
   subject { drop }
@@ -15,6 +15,7 @@ describe Locomotive::Steam::Liquid::Drops::Site do
     expect(subject.meta_keywords).to eq 'keywords'
     expect(subject.meta_description).to eq 'description'
     expect(subject.domains).to eq ['acme.org']
+    expect(subject.asset_host).to eq 'http://asset.dev'
   end
 
   describe '#index' do

data/spec/unit/liquid/filters/html_spec.rb

@@ -5,7 +5,8 @@ describe Locomotive::Steam::Liquid::Filters::Html do
   include Locomotive::Steam::Liquid::Filters::Base
   include Locomotive::Steam::Liquid::Filters::Html
 
-  let(:site)          { instance_double('Site', _id: 42)}
+  let(:asset_host)    { nil }
+  let(:site)          { instance_double('Site', _id: 42, asset_host: asset_host) }
   let(:services)      { Locomotive::Steam::Services.build_instance }
   let(:context)       { instance_double('Context', registers: { services: services }) }
 
@@ -205,6 +206,10 @@ describe Locomotive::Steam::Liquid::Filters::Html do
     expect(javascript_tag('https://cdn.example.com/trash/main.js', ['defer:defer'])).to eq(result)
   end
 
+  it 'returns an image url for a given theme file without parameters' do
+    expect(theme_image_url('foo.jpg')).to eq "/sites/42/theme/images/foo.jpg"
+  end
+
   it 'returns an image tag for a given theme file without parameters' do
     expect(theme_image_tag('foo.jpg')).to eq "<img src=\"/sites/42/theme/images/foo.jpg\" >"
   end
@@ -245,6 +250,58 @@ describe Locomotive::Steam::Liquid::Filters::Html do
     }.strip)
   end
 
+  context 'asset_host' do
+    let(:asset_host)    { 'http://asset.dev' }
+
+    it 'returns an url for a stylesheet file with respect to URL-parameters' do
+      result = "http://asset.dev/sites/42/theme/stylesheets/main.css?v=42"
+      expect(stylesheet_url('main.css?v=42')).to eq(result)
+      expect(stylesheet_url('main?v=42')).to eq(result)
+    end
+
+    it 'returns a link tag for a stylesheet file' do
+      result = "<link href=\"http://asset.dev/sites/42/theme/stylesheets/main.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />"
+      expect(stylesheet_tag('main.css')).to eq(result)
+      expect(stylesheet_tag('main')).to eq(result)
+      expect(stylesheet_tag(nil)).to eq('')
+    end
+
+    it 'returns a link tag for a stylesheet file with folder' do
+      result = "<link href=\"http://asset.dev/sites/42/theme/stylesheets/trash/main.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />"
+      expect(stylesheet_tag('trash/main.css')).to eq(result)
+    end
+
+    it 'returns an url for a javascript file with respect to URL-parameters' do
+      expect(javascript_url('main.js?v=42')).to eq "http://asset.dev/sites/42/theme/javascripts/main.js?v=42"
+    end
+
+    it 'returns a script tag for a javascript file' do
+      result = %{<script src="http://asset.dev/sites/42/theme/javascripts/main.js" type="text/javascript" ></script>}
+      expect(javascript_tag('main.js')).to eq(result)
+      expect(javascript_tag('main')).to eq(result)
+      expect(javascript_tag(nil)).to eq('')
+    end
+
+    it 'returns a script tag for a javascript file with folder' do
+      result = %{<script src="http://asset.dev/sites/42/theme/javascripts/trash/main.js" type="text/javascript" ></script>}
+      expect(javascript_tag('trash/main.js')).to eq(result)
+      expect(javascript_tag('trash/main')).to eq(result)
+    end
+
+    it 'returns an image url for a given theme file without parameters' do
+      expect(theme_image_url('foo.jpg')).to eq "http://asset.dev/sites/42/theme/images/foo.jpg"
+    end
+
+    it 'returns an image tag for a given theme file without parameters' do
+      expect(theme_image_tag('foo.jpg')).to eq "<img src=\"http://asset.dev/sites/42/theme/images/foo.jpg\" >"
+    end
+
+    it 'returns an image tag for a given theme file with size' do
+      expect(theme_image_tag('foo.jpg', 'width:100', 'height:100')).to eq("<img src=\"http://asset.dev/sites/42/theme/images/foo.jpg\" height=\"100\" width=\"100\" >")
+    end
+
+  end
+
   class EngineThemeAsset < Locomotive::Steam::ThemeAssetRepository
     def url_for(path)
       ['', 'sites', site._id.to_s, 'theme', path].join('/')

data/spec/unit/models/i18n_field_spec.rb

@@ -20,6 +20,14 @@ describe Locomotive::Steam::Models::I18nField do
 
     end
 
+    context 'with a single value' do
+
+      let(:translations) { 'Hello world' }
+
+      it { is_expected.to eq false }
+
+    end
+
   end
 
   describe '#dup' do

data/spec/unit/repositories/content_entry_repository_spec.rb

@@ -39,6 +39,19 @@ describe Locomotive::Steam::ContentEntryRepository do
 
     end
 
+    describe 'including also the not visible entries' do
+
+      let(:entries) { [
+        { content_type_id: 1, _position: 0, _label: 'Update #1', title: { fr: 'Mise a jour #1' }, text: { en: 'added some free stuff', fr: 'phrase FR' }, date: '2009/05/12', category: 'General' },
+        { content_type_id: 1, _position: 1, _label: 'Update #2 [HIDDEN]', title: { fr: 'Mise a jour #1' }, text: { en: 'added some free stuff', fr: 'phrase FR' }, date: '2009/05/12', category: 'General', _visible: false }
+      ] }
+
+      let(:conditions) { { _visible: nil } }
+
+      it { expect(subject.size).to eq 2 }
+
+    end
+
   end
 
   describe '#build' do

data/spec/unit/services/asset_host_service_spec.rb

@@ -91,9 +91,9 @@ describe Locomotive::Steam::AssetHostService do
 
   describe 'the host is a block' do
 
-    let(:request)     { instance_double('Request', ssl: true) }
-    let(:site)        { instance_double('Site', cdn: true) }
-    let(:host) { ->(request, site) { site.cdn ? "http#{request.ssl ? 's' : ''}://assets.locomotivecms.com" : nil } }
+    let(:request) { instance_double('Request', ssl: true) }
+    let(:site)    { instance_double('Site', cdn: true) }
+    let(:host)    { ->(request, site) { site.cdn ? "http#{request.ssl ? 's' : ''}://assets.locomotivecms.com" : nil } }
 
     it { is_expected.to eq 'https://assets.locomotivecms.com/sites/42/assets/1/banner.png' }
 
@@ -113,4 +113,28 @@ describe Locomotive::Steam::AssetHostService do
 
   end
 
+  describe 'the site has an asset host' do
+
+    let(:site) { instance_double('Site', asset_host: 'asset.dev') }
+    let(:host) { 'http://assets.locomotivecms.com' }
+
+    it { is_expected.to eq 'https://asset.dev/sites/42/assets/1/banner.png' }
+
+    context 'with the protocol' do
+
+      let(:site) { instance_double('Site', asset_host: 'http://asset.dev') }
+      it { is_expected.to eq 'http://asset.dev/sites/42/assets/1/banner.png' }
+
+    end
+
+    context 'with an empty string' do
+
+      let(:site) { instance_double('Site', asset_host: '') }
+      it { is_expected.to eq 'http://assets.locomotivecms.com/sites/42/assets/1/banner.png' }
+
+    end
+
+
+  end
+
 end

data/spec/unit/services/auth_service_spec.rb

@@ -2,9 +2,11 @@ require 'spec_helper'
 
 describe Locomotive::Steam::AuthService do
 
-  let(:entries) { instance_double('ContentService') }
-  let(:emails)  { instance_double('EmailService') }
-  let(:service) { described_class.new(entries, emails) }
+  let(:site)            { instance_double('CurrentSite') }
+  let(:entries)         { instance_double('ContentService', locale: 'en') }
+  let(:emails)          { instance_double('EmailService') }
+  let(:service)         { described_class.new(site, entries, emails) }
+  let(:liquid_context)  { {} }
 
   let(:default_auth_options) { {
     type:               'accounts',
@@ -22,9 +24,130 @@ describe Locomotive::Steam::AuthService do
 
   let(:auth_options) { instance_double('AuthOptions', default_auth_options) }
 
+  describe '#sign_up' do
+
+    let(:errors)                { [] }
+    let(:entry_attributes)      { { fullname: 'Chris Cornell', band: 'Soundgarden', email: 'chris@soundgarden.band', password: 'easyone', password_confirmation:  'easyone' } }
+    let(:entry)                 { instance_double('Account', errors: errors) }
+    let(:email_disabled)        { false }
+    let(:default_auth_options)  { {
+      type:                   'accounts',
+      id_field:               'email',
+      id:                     'chris@soundgarden.band',
+      password_field:         'password',
+      from:                   'no-reply@acme.org',
+      subject:                'Your account has been created',
+      email_handle:           'account-created',
+      smtp:                   {},
+      disable_email:          email_disabled,
+      entry:                  entry_attributes
+    } }
+
+    subject { service.sign_up(auth_options, liquid_context) }
+
+    context 'the entry has errors' do
+
+      let(:errors) { [:invalid_password] }
+
+      it 'returns invalid_entry and the entry' do
+        expect(entries).to receive(:create).with('accounts', {
+          fullname:               'Chris Cornell',
+          band:                   'Soundgarden',
+          email:                  'chris@soundgarden.band',
+          password:               'easyone',
+          password_confirmation:  'easyone'
+        }).and_return(entry)
+        is_expected.to eq [:invalid_entry, entry]
+      end
+
+    end
+
+    it "returns both :created and the entry if it was able to create it (+ send email)" do
+      expect(entries).to receive(:create).with('accounts', {
+        fullname:               'Chris Cornell',
+        band:                   'Soundgarden',
+        email:                  'chris@soundgarden.band',
+        password:               'easyone',
+        password_confirmation:  'easyone'
+      }).and_return(entry)
+      expect(emails).to receive(:send_email).with({
+        from:         'no-reply@acme.org',
+        to:           'chris@soundgarden.band',
+        subject:      'Your account has been created',
+        page_handle:  'account-created',
+        smtp:         {} }, liquid_context)
+      is_expected.to eq [:entry_created, entry]
+    end
+
+    context 'email is disabled' do
+
+      let(:email_disabled) { true }
+
+      it "doesn't send a notification email" do
+        allow(entries).to receive(:create).and_return(entry)
+        expect(emails).to_not receive(:send_email)
+        is_expected.to eq [:entry_created, entry]
+      end
+
+    end
+
+    describe Locomotive::Steam::AuthService::ContentEntryAuth do
+
+      let(:repository)  { instance_double('FieldRepository', all: nil, required: []) }
+      let(:type)        { instance_double('ContentType', slug: 'accounts', label_field_name: :title, fields: repository, fields_by_name: {}) }
+      let(:attributes)  { { password: 'easyone', password_confirmation: 'easyone' } }
+      let(:content_entry) { Locomotive::Steam::ContentEntry.new(attributes).tap { |e| e.content_type = type } }
+
+      before { content_entry.extend(described_class) }
+
+      describe '#valid?' do
+
+        before { content_entry[:_password_field] = 'password' }
+
+        subject { content_entry.valid? }
+
+        it { is_expected.to eq true }
+
+        it 'encrypts the password since there is no error' do
+          expect(BCrypt::Password).to receive(:create).with('easyone').and_return('42a')
+          subject
+          expect(content_entry[:password_hash]).to eq '42a'
+          expect(content_entry.attributes[:password]).to eq nil
+          expect(content_entry.attributes[:password_confirmation]).to eq nil
+        end
+
+        context 'the password is less than 6 characters' do
+
+          let(:attributes) { { password: 'easy', password_confirmation: 'easy' } }
+
+          it 'returns false' do
+            is_expected.to eq false
+            expect(content_entry.errors[:password]).to eq(['is too short (minimum is 6 characters)'])
+          end
+
+        end
+
+        context "the password doesn't match the confirmation" do
+
+          let(:type)        { instance_double('ContentType', slug: 'accounts', label_field_name: :title, fields: repository, fields_by_name: {}, field_label_of: 'password') }
+          let(:attributes)  { { password: 'easyone', password_confirmation: 'oneeasy' } }
+
+          it 'returns false' do
+            is_expected.to eq false
+            expect(content_entry.errors[:password_confirmation]).to eq(["doesn't match password"])
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
   describe '#sign_in' do
 
-    subject { service.sign_in(auth_options) }
+    subject { service.sign_in(auth_options, nil) }
 
     it 'returns :wrong_credentials if no entry matches the email' do
       expect(entries).to receive(:all).with('accounts', { 'email' => 'john@doe.net' }).and_return([])
@@ -37,6 +160,13 @@ describe Locomotive::Steam::AuthService do
       is_expected.to eq :wrong_credentials
     end
 
+
+    it "returns :wrong_credentials if the password is empty" do
+      entry = instance_double('Account', password: nil)
+      expect(entries).to receive(:all).with('accounts', { 'email' => 'john@doe.net' }).and_return([entry])
+      is_expected.to eq :wrong_credentials
+    end
+
     it "returns both :signed_in and the entry if the password matches the entry's password" do
       entry = build_account('easyone')
       expect(entries).to receive(:all).with('accounts', { 'email' => 'john@doe.net' }).and_return([entry])
@@ -47,8 +177,6 @@ describe Locomotive::Steam::AuthService do
 
   describe '#forgot_password' do
 
-    let(:liquid_context) { {} }
-
     subject { service.forgot_password(auth_options, liquid_context) }
 
     it 'returns :wrong_email if no entry matches the email' do
@@ -57,7 +185,6 @@ describe Locomotive::Steam::AuthService do
     end
 
     it 'sends the instructions by email if an entry matches the email' do
-      allow(SecureRandom).to receive(:hex).and_return('42a')
       entry = build_account('easyone', '42a')
       expect(entries).to receive(:all).with('accounts', { 'email' => 'john@doe.net' }).and_return([entry])
       expect(entries).to receive(:update_decorated_entry)
@@ -77,7 +204,6 @@ describe Locomotive::Steam::AuthService do
       let(:auth_options)  { instance_double('AuthOptions', _auth_options) }
 
       it 'also sends the instructions by email with a default email template' do
-        allow(SecureRandom).to receive(:hex).and_return('42a')
         entry = build_account('easyone', '42a')
         expect(entries).to receive(:all).with('accounts', { 'email' => 'john@doe.net' }).and_return([entry])
         expect(entries).to receive(:update_decorated_entry)