locomotivecms_steam 1.2.1 → 1.3.0.rc1

data/spec/unit/services/external_api_service_spec.rb

@@ -85,6 +85,28 @@ describe Locomotive::Steam::ExternalAPIService do
       end
     end
 
+    describe 'calls an API' do
+
+      let(:url)     { 'https://api.stripe.com/v1/charges' }
+      let(:options) {
+        {
+          method:   'POST',
+          data:     { email: 'John Doe', source: '1234567', plan: 'monthly' },
+          username: 'abcdefghijkl'
+        }
+      }
+
+      it do
+        expect(service.class).to receive(:post).with('/v1/charges', {
+          base_uri: 'https://api.stripe.com',
+          body: { email: 'John Doe', source: '1234567', plan: 'monthly' },
+          basic_auth: { username: 'abcdefghijkl', password: nil }
+        }).and_return(response)
+        subject
+      end
+
+    end
+
   end
 
 end

data/spec/unit/services/page_redirection_service_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::PageRedirectionService do
+
+  let(:page_finder)   { instance_double('PageFinder') }
+  let(:url_builder)   { instance_double('UrlBuilder') }
+  let(:service)       { described_class.new(page_finder, url_builder) }
+
+  describe '#redirect_to' do
+
+    let(:page) { instance_double('Page') }
+
+    subject { service.redirect_to('about-us') }
+
+    context 'the page exists' do
+
+      before { expect(page_finder).to receive(:by_handle).with('about-us').and_return(page) }
+
+      it 'raises an PageRedirectionException that will caught the appropriate middleware' do
+        expect(url_builder).to receive(:url_for).with(page, nil).and_return('/about-us')
+        expect { subject }.to raise_exception(Locomotive::Steam::RedirectionException, 'Redirect to /about-us')
+      end
+
+      context 'passing a locale' do
+
+        subject { service.redirect_to('about-us', 'fr') }
+
+        it 'raises an PageRedirectionException that will caught the appropriate middleware' do
+          expect(url_builder).to receive(:url_for).with(page, 'fr').and_return('/a-notre-sujet')
+          expect { subject }.to raise_exception(Locomotive::Steam::RedirectionException, 'Redirect to /a-notre-sujet')
+        end
+
+      end
+
+    end
+
+    context "the page doesn't exist" do
+
+      before { expect(page_finder).to receive(:by_handle).with('about-us').and_return(nil) }
+
+      it "returns false and doesn't raise a redirection exception" do
+        is_expected.to eq false
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0.rc1
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -47,56 +47,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.7
+        version: 2.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.7
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: origin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: 1.7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: 1.7.0.1
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: morphine
   requirement: !ruby/object:Gem::Requirement
@@ -117,14 +117,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.6
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.6
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +139,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.2
+- !ruby/object:Gem::Dependency
+  name: bcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.11
 - !ruby/object:Gem::Dependency
   name: rack-rewrite
   requirement: !ruby/object:Gem::Requirement
@@ -159,84 +173,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: dragonfly
+  name: rack_csrf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.12
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.12
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
-  name: moneta
+  name: dragonfly
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
-  name: rack_csrf
+  name: moneta
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: 3.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: 3.7.1
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.21
+        version: 3.4.23
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.23
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.21
+        version: 3.1.6
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -271,28 +299,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.3.3.1
+        version: 6.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.3.3.1
+        version: 6.7.2
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.13.2
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -327,28 +355,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: duktape
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0.6
+        version: 1.6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0.6
+        version: 1.6.1.0
 - !ruby/object:Gem::Dependency
   name: pony
   requirement: !ruby/object:Gem::Requirement
@@ -405,7 +433,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
-- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -495,6 +522,7 @@ files:
 - lib/locomotive/steam/liquid/filters/translate.rb
 - lib/locomotive/steam/liquid/patches.rb
 - lib/locomotive/steam/liquid/tags/action.rb
+- lib/locomotive/steam/liquid/tags/authorize.rb
 - lib/locomotive/steam/liquid/tags/concerns/i18n_page.rb
 - lib/locomotive/steam/liquid/tags/concerns/path.rb
 - lib/locomotive/steam/liquid/tags/consume.rb
@@ -523,6 +551,7 @@ files:
 - lib/locomotive/steam/liquid/tags/with_scope.rb
 - lib/locomotive/steam/liquid/template.rb
 - lib/locomotive/steam/middlewares.rb
+- lib/locomotive/steam/middlewares/auth.rb
 - lib/locomotive/steam/middlewares/default_env.rb
 - lib/locomotive/steam/middlewares/dynamic_assets.rb
 - lib/locomotive/steam/middlewares/entry_submission.rb
@@ -534,6 +563,7 @@ files:
 - lib/locomotive/steam/middlewares/page.rb
 - lib/locomotive/steam/middlewares/path.rb
 - lib/locomotive/steam/middlewares/private_access.rb
+- lib/locomotive/steam/middlewares/redirection.rb
 - lib/locomotive/steam/middlewares/renderer.rb
 - lib/locomotive/steam/middlewares/robots.rb
 - lib/locomotive/steam/middlewares/site.rb
@@ -572,6 +602,7 @@ files:
 - lib/locomotive/steam/services.rb
 - lib/locomotive/steam/services/action_service.rb
 - lib/locomotive/steam/services/asset_host_service.rb
+- lib/locomotive/steam/services/auth_service.rb
 - lib/locomotive/steam/services/concerns/decorator.rb
 - lib/locomotive/steam/services/content_entry_service.rb
 - lib/locomotive/steam/services/csrf_protection_service.rb
@@ -584,6 +615,7 @@ files:
 - lib/locomotive/steam/services/markdown_service.rb
 - lib/locomotive/steam/services/no_cache_service.rb
 - lib/locomotive/steam/services/page_finder_service.rb
+- lib/locomotive/steam/services/page_redirection_service.rb
 - lib/locomotive/steam/services/parent_finder_service.rb
 - lib/locomotive/steam/services/site_finder_service.rb
 - lib/locomotive/steam/services/snippet_finder_service.rb
@@ -595,6 +627,7 @@ files:
 - locomotivecms_steam.gemspec
 - script/ci/before_build.sh
 - spec/fixtures/default/README
+- spec/fixtures/default/app/content_types/accounts.yml
 - spec/fixtures/default/app/content_types/bands.yml
 - spec/fixtures/default/app/content_types/events.yml
 - spec/fixtures/default/app/content_types/messages.yml
@@ -608,12 +641,17 @@ files:
 - spec/fixtures/default/app/views/pages/about_us/jane_doe.liquid.haml
 - spec/fixtures/default/app/views/pages/about_us/john_doe.fr.liquid.haml
 - spec/fixtures/default/app/views/pages/about_us/john_doe.liquid.haml
+- spec/fixtures/default/app/views/pages/account/forgot_password.liquid
+- spec/fixtures/default/app/views/pages/account/me.liquid
+- spec/fixtures/default/app/views/pages/account/reset_password.liquid
+- spec/fixtures/default/app/views/pages/account/sign_in.liquid
 - spec/fixtures/default/app/views/pages/all.liquid.haml
 - spec/fixtures/default/app/views/pages/archives.liquid.haml
 - spec/fixtures/default/app/views/pages/archives/news.liquid.haml
 - spec/fixtures/default/app/views/pages/basic.liquid.haml
 - spec/fixtures/default/app/views/pages/contact.liquid.haml
 - spec/fixtures/default/app/views/pages/contest.liquid.haml
+- spec/fixtures/default/app/views/pages/emails/reset_password.liquid
 - spec/fixtures/default/app/views/pages/events.fr.liquid
 - spec/fixtures/default/app/views/pages/events.liquid.haml
 - spec/fixtures/default/app/views/pages/filtered.liquid.haml
@@ -643,6 +681,7 @@ files:
 - spec/fixtures/default/config/metafields_schema.yml
 - spec/fixtures/default/config/site.yml
 - spec/fixtures/default/config/translations.yml
+- spec/fixtures/default/data/accounts.yml
 - spec/fixtures/default/data/bands.yml
 - spec/fixtures/default/data/events.yml
 - spec/fixtures/default/data/messages.yml
@@ -687,7 +726,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/system.indexes.bson
 - spec/integration/adapters/mongodb_spec.rb
 - spec/integration/integration_helper.rb
 - spec/integration/liquid/drops/page_spec.rb
@@ -701,6 +739,7 @@ files:
 - spec/integration/repositories/theme_asset_repository_spec.rb
 - spec/integration/repositories/translation_repository_spec.rb
 - spec/integration/server/assets_spec.rb
+- spec/integration/server/auth_spec.rb
 - spec/integration/server/basic_spec.rb
 - spec/integration/server/contact_form_spec.rb
 - spec/integration/server/liquid_spec.rb
@@ -773,6 +812,7 @@ files:
 - spec/unit/liquid/filters/translate_spec.rb
 - spec/unit/liquid/patches_spec.rb
 - spec/unit/liquid/tags/action_spec.rb
+- spec/unit/liquid/tags/authorize_spec.rb
 - spec/unit/liquid/tags/consume_spec.rb
 - spec/unit/liquid/tags/csrf_spec.rb
 - spec/unit/liquid/tags/editable/control_spec.rb
@@ -793,6 +833,7 @@ files:
 - spec/unit/liquid/tags/session_assign_spec.rb
 - spec/unit/liquid/tags/snippet_spec.rb
 - spec/unit/liquid/tags/with_scope_spec.rb
+- spec/unit/middlewares/auth_spec.rb
 - spec/unit/middlewares/dynamic_assets_spec.rb
 - spec/unit/middlewares/entry_submission_spec.rb
 - spec/unit/middlewares/helpers_spec.rb
@@ -800,6 +841,7 @@ files:
 - spec/unit/middlewares/locale_spec.rb
 - spec/unit/middlewares/page_spec.rb
 - spec/unit/middlewares/private_access_spec.rb
+- spec/unit/middlewares/redirection_spec.rb
 - spec/unit/middlewares/renderer_spec.rb
 - spec/unit/middlewares/site_spec.rb
 - spec/unit/middlewares/sitemap_spec.rb
@@ -821,12 +863,14 @@ files:
 - spec/unit/repositories/translation_repository_spec.rb
 - spec/unit/services/action_service_spec.rb
 - spec/unit/services/asset_host_service_spec.rb
+- spec/unit/services/auth_service_spec.rb
 - spec/unit/services/content_entry_service_spec.rb
 - spec/unit/services/email_service_spec.rb
 - spec/unit/services/entry_submission_service_spec.rb
 - spec/unit/services/external_api_service_spec.rb
 - spec/unit/services/image_resizer_service_spec.rb
 - spec/unit/services/markdown_service_spec.rb
+- spec/unit/services/page_redirection_service_spec.rb
 - spec/unit/services/parent_finder_service_spec.rb
 - spec/unit/services/textile_service_spec.rb
 - spec/unit/services/translator_service_spec.rb
@@ -847,17 +891,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: The LocomotiveCMS Steam is the rendering stack used by both Wagon and Engine
 test_files:
 - spec/fixtures/default/README
+- spec/fixtures/default/app/content_types/accounts.yml
 - spec/fixtures/default/app/content_types/bands.yml
 - spec/fixtures/default/app/content_types/events.yml
 - spec/fixtures/default/app/content_types/messages.yml
@@ -871,12 +916,17 @@ test_files:
 - spec/fixtures/default/app/views/pages/about_us/jane_doe.liquid.haml
 - spec/fixtures/default/app/views/pages/about_us/john_doe.fr.liquid.haml
 - spec/fixtures/default/app/views/pages/about_us/john_doe.liquid.haml
+- spec/fixtures/default/app/views/pages/account/forgot_password.liquid
+- spec/fixtures/default/app/views/pages/account/me.liquid
+- spec/fixtures/default/app/views/pages/account/reset_password.liquid
+- spec/fixtures/default/app/views/pages/account/sign_in.liquid
 - spec/fixtures/default/app/views/pages/all.liquid.haml
 - spec/fixtures/default/app/views/pages/archives.liquid.haml
 - spec/fixtures/default/app/views/pages/archives/news.liquid.haml
 - spec/fixtures/default/app/views/pages/basic.liquid.haml
 - spec/fixtures/default/app/views/pages/contact.liquid.haml
 - spec/fixtures/default/app/views/pages/contest.liquid.haml
+- spec/fixtures/default/app/views/pages/emails/reset_password.liquid
 - spec/fixtures/default/app/views/pages/events.fr.liquid
 - spec/fixtures/default/app/views/pages/events.liquid.haml
 - spec/fixtures/default/app/views/pages/filtered.liquid.haml
@@ -906,6 +956,7 @@ test_files:
 - spec/fixtures/default/config/metafields_schema.yml
 - spec/fixtures/default/config/site.yml
 - spec/fixtures/default/config/translations.yml
+- spec/fixtures/default/data/accounts.yml
 - spec/fixtures/default/data/bands.yml
 - spec/fixtures/default/data/events.yml
 - spec/fixtures/default/data/messages.yml
@@ -950,7 +1001,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/system.indexes.bson
 - spec/integration/adapters/mongodb_spec.rb
 - spec/integration/integration_helper.rb
 - spec/integration/liquid/drops/page_spec.rb
@@ -964,6 +1014,7 @@ test_files:
 - spec/integration/repositories/theme_asset_repository_spec.rb
 - spec/integration/repositories/translation_repository_spec.rb
 - spec/integration/server/assets_spec.rb
+- spec/integration/server/auth_spec.rb
 - spec/integration/server/basic_spec.rb
 - spec/integration/server/contact_form_spec.rb
 - spec/integration/server/liquid_spec.rb
@@ -1036,6 +1087,7 @@ test_files:
 - spec/unit/liquid/filters/translate_spec.rb
 - spec/unit/liquid/patches_spec.rb
 - spec/unit/liquid/tags/action_spec.rb
+- spec/unit/liquid/tags/authorize_spec.rb
 - spec/unit/liquid/tags/consume_spec.rb
 - spec/unit/liquid/tags/csrf_spec.rb
 - spec/unit/liquid/tags/editable/control_spec.rb
@@ -1056,6 +1108,7 @@ test_files:
 - spec/unit/liquid/tags/session_assign_spec.rb
 - spec/unit/liquid/tags/snippet_spec.rb
 - spec/unit/liquid/tags/with_scope_spec.rb
+- spec/unit/middlewares/auth_spec.rb
 - spec/unit/middlewares/dynamic_assets_spec.rb
 - spec/unit/middlewares/entry_submission_spec.rb
 - spec/unit/middlewares/helpers_spec.rb
@@ -1063,6 +1116,7 @@ test_files:
 - spec/unit/middlewares/locale_spec.rb
 - spec/unit/middlewares/page_spec.rb
 - spec/unit/middlewares/private_access_spec.rb
+- spec/unit/middlewares/redirection_spec.rb
 - spec/unit/middlewares/renderer_spec.rb
 - spec/unit/middlewares/site_spec.rb
 - spec/unit/middlewares/sitemap_spec.rb
@@ -1084,12 +1138,14 @@ test_files:
 - spec/unit/repositories/translation_repository_spec.rb
 - spec/unit/services/action_service_spec.rb
 - spec/unit/services/asset_host_service_spec.rb
+- spec/unit/services/auth_service_spec.rb
 - spec/unit/services/content_entry_service_spec.rb
 - spec/unit/services/email_service_spec.rb
 - spec/unit/services/entry_submission_service_spec.rb
 - spec/unit/services/external_api_service_spec.rb
 - spec/unit/services/image_resizer_service_spec.rb
 - spec/unit/services/markdown_service_spec.rb
+- spec/unit/services/page_redirection_service_spec.rb
 - spec/unit/services/parent_finder_service_spec.rb
 - spec/unit/services/textile_service_spec.rb
 - spec/unit/services/translator_service_spec.rb