locomotive_cms 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ef76c00474201ef23deca934853055bec727876
-  data.tar.gz: 6812f734f165cd6029b2ffec2cf21b6c026684a9
+  metadata.gz: d79c21569c5137978e3d1c2bcb0fc979ae1ceb5c
+  data.tar.gz: 79fe09d1318424c387abb7b545a16f30598885b5
 SHA512:
-  metadata.gz: 9173992244e46b4f8c2445fc158817591ec68de92060fc0dc9f0022e17b8c7fcec535187390b0cab84f714e152591ad4d49d30885b12f96e24406d2c0ce9ddc7
-  data.tar.gz: e9863f21393ac87b1abf95c96e3ab73c9ee0450b87a1ca5271c2321fac9f65eec061d53b280b9119753a095bd1df3445a2f73f10faa6fdd4945423ab7a6296ec
+  metadata.gz: 7bf645dc0029bafcbb19028434be2653522efd1e95c0261e95eaa69b39dc905a9a7f577ab8bb081cebbb746945facf4272abb894d6afa979a1e300c3a4f68fc7
+  data.tar.gz: 7eae460e4ca873b5d60e5f4e7950a5f7e5e071a9ebafe677faa4468a7f544feb56bfb1cd2354c06a8b5ea4d540aaf730a904a0fad1c1ce0c0d5cb60c24a7f468

data/app/controllers/locomotive/api/base_controller.rb

@@ -40,10 +40,15 @@ module Locomotive
       end
 
       def set_locale
-        ::Mongoid::Fields::I18n.locale = params[:locale] || current_site.default_locale
+        locale = params[:locale] ||
+          current_site.try(:default_locale) ||
+          current_locomotive_account.try(:locale) ||
+          Locomotive.config.default_locale
+
+        ::Mongoid::Fields::I18n.locale = locale
         ::I18n.locale = ::Mongoid::Fields::I18n.locale
 
-        self.setup_i18n_fallbacks
+        self.setup_i18n_fallbacks if current_site
       end
 
       def render_access_denied(exception)

data/app/controllers/locomotive/api/tokens_controller.rb

@@ -6,7 +6,7 @@ module Locomotive
 
       def create
         begin
-          token = Account.create_api_token(current_site, params[:email], params[:password], params[:api_key])
+          token = Account.create_api_token(params[:email], params[:password], params[:api_key])
           respond_with({ token: token }, location: root_url)
         rescue Exception => e
           respond_with({ message: e.message }, status: 401, location: root_url)

data/app/models/locomotive/ability.rb

@@ -15,9 +15,9 @@ module Locomotive
         @membership = Membership.new(account: @account, role: 'admin')
       end
 
-      return false if @membership.nil?
-
-      if @membership.admin?
+      if @membership.nil?
+        setup_account_without_a_site
+      elsif @membership.admin?
         setup_admin_permissions!
       else
         setup_default_permissions!
@@ -28,6 +28,12 @@ module Locomotive
       end
     end
 
+    def setup_account_without_a_site
+      cannot :manage, :all
+
+      can :create, Site
+    end
+
     def setup_default_permissions!
       cannot :manage, :all
     end

data/app/models/locomotive/account.rb

@@ -78,14 +78,13 @@ module Locomotive
     # If an error occurs (invalid account, ...etc), this method raises an exception that has
     # to be caught somewhere.
     #
-    # @param [ Site ] site The site where the authentication request is made
     # @param [ String ] email The email of the account
     # @param [ String ] password The password of the account
     # @param [ String ] api_key The API key of the site.
     #
     # @return [ String ] The API token
     #
-    def self.create_api_token(site, email, password, api_key)
+    def self.create_api_token(email, password, api_key)
       if api_key.present?
         account = self.where(api_key: api_key).first
 

data/app/presenters/locomotive/account_presenter.rb

@@ -2,7 +2,7 @@ module Locomotive
   class AccountPresenter < BasePresenter
 
     ## properties ##
-    properties  :name, :email, :locale, :encrypted_password, :password_salt
+    properties  :name, :email, :locale, :encrypted_password, :password_salt, :api_key
     property    :admin, only_getter: true
 
     with_options only_setter: true do |presenter|

data/features/api/authorization/sites.feature

@@ -84,7 +84,6 @@ Feature: Sites
     And the JSON response at "1/memberships" should not have 0 entries
     And the JSON response at "2/memberships" should not have 0 entries
 
-
   Scenario: Creating new site as a Designer
     Given I have a "designer" API token
     When I do an API POST to sites.json with:

data/lib/locomotive/dragonfly.rb

@@ -25,7 +25,7 @@ module Locomotive
       if source.is_a?(String) || source.is_a?(Hash) # simple string or theme asset
         source = source['url'] if source.is_a?(Hash)
 
-        source.strip!
+        clean_source!(source)
 
         if source =~ /^http/
           file = self.app.fetch_url(source)
@@ -49,5 +49,15 @@ module Locomotive
       ::Dragonfly.app
     end
 
+    protected
+
+    def self.clean_source!(source)
+      # remove the leading / trailing whitespaces
+      source.strip!
+
+      # remove the query part (usually, timestamp) if local file
+      source.sub!(/(\?.*)$/, '') unless source =~ /^http/
+    end
+
   end
 end

data/lib/locomotive/render.rb

@@ -67,11 +67,8 @@ module Locomotive
 
       # Inputs which define the ETag for this response
       etag_inputs = {
-        'page'    => @page,
-        'params'  => {
-          'page_path'   => params[:page_path],
-          'locale'      => params[:locale]
-        }
+        'page'   => @page.cache_key,
+        'locale' => params[:locale]
       }
 
       if @page.with_cache?

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.5.0'
+  VERSION = '2.5.1'
 end

data/spec/lib/locomotive/liquid/filters/resize_spec.rb

@@ -2,13 +2,14 @@ require 'spec_helper'
 
 describe Locomotive::Liquid::Filters::Resize do
   before :each do
-    @site             = FactoryGirl.create(:site)
-    @theme_asset      = FactoryGirl.create(:theme_asset, source: FixturedAsset.open('5k.png'), site: @site)
-    @theme_asset_path = "/sites/#{@theme_asset.site_id}/theme/images/5k.png"
-    @asset            = FactoryGirl.create(:asset, source: FixturedAsset.open('5k.png'), site: @site)
-    @asset_url        = @asset.source.url
-    @asset_path       = "/sites/#{@asset.site_id}/assets/#{@asset.id}/5k.png"
-    @context          = Liquid::Context.new( { }, { 'asset_url' => @asset_url, 'theme_asset' => @theme_asset.to_liquid }, { site: @site })
+    @site               = FactoryGirl.create(:site)
+    @theme_asset        = FactoryGirl.create(:theme_asset, source: FixturedAsset.open('5k.png'), site: @site)
+    @theme_asset_path   = "/sites/#{@theme_asset.site_id}/theme/images/5k.png"
+    @asset              = FactoryGirl.create(:asset, source: FixturedAsset.open('5k.png'), site: @site)
+    @asset_url          = @asset.source.url
+    @asset_url_with_ts  = "#{@asset.source.url}?24e29997bcb00e97d8252cdd29d14e2d"
+    @asset_path         = "/sites/#{@asset.site_id}/assets/#{@asset.id}/5k.png"
+    @context            = Liquid::Context.new( { }, { 'asset_url' => @asset_url, 'asset_url_with_ts' => @asset_url_with_ts, 'theme_asset' => @theme_asset.to_liquid }, { site: @site })
   end
 
   describe '#resize' do
@@ -32,6 +33,16 @@ describe Locomotive::Liquid::Filters::Resize do
 
     end
 
+    context 'when an asset url with a timestamp is given' do
+
+      subject { Liquid::Template.parse('{{ asset_url_with_ts | resize: "40x30" }}').render(@context) }
+
+      it 'returns the location of the resized image' do
+        subject.should =~ /images\/dynamic\/.*\/5k.png/
+      end
+
+    end
+
     context 'when a theme asset is given' do
       before :each do
         @template = Liquid::Template.parse("{{ theme_asset | resize: '300x400' }}")
@@ -57,5 +68,6 @@ describe Locomotive::Liquid::Filters::Resize do
       end
 
     end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -436,14 +436,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: rack-cache
   requirement: !ruby/object:Gem::Requirement