locomotivecms_wagon 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6e7813188667f8439421a837787f0ca5e85b1bf
-  data.tar.gz: d7846774d2eb77655e96b1e7b57e98393b6147c1
+  metadata.gz: d8337c60f659368556c38fcd040e21f64f63250c
+  data.tar.gz: 508e6cd9b6c55ef13ea3cfdf4df75d64bc4db220
 SHA512:
-  metadata.gz: d7e950c87f45d9a67d6512183940e5a06af167fcc4e8fe87b195f672cbceb6de795e93099c5865868b9191a6eec6f2f867531e8fef2c1fb2d39343c64f2a5f88
-  data.tar.gz: 7daa31a931589f899b29dbdd480d4324fb4e5e34e475a841b7267540a0eee64457c2907f925faba9e601fe5dcc7e86938629acc17918ddef65da127b5ffe2626
+  metadata.gz: 2d4496dd11d6731b1170dde9609d113f8db0a6411604c9cfb44682d26ea93cd64763b2a4f96bb71243b5f4aabb66633965eaf63110589ebe2dec7bb20559be6f
+  data.tar.gz: 0bd4423b848e6dd6d0fffb5b97206d1afbabf1a6f0ef32ad028df7db27bf01ae11519c4c373fa961293ffa4da7d00ee420e8554e5df9eb09ebd68b836657f974

data/Gemfile

@@ -8,7 +8,7 @@ gem 'rb-fsevent', '~> 0.9.1'
 gem 'therubyracer'
 
 # Development
-# gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'c487443', require: false
+# gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: '25e6852', require: false
 # gem 'locomotivecms_coal', github: 'locomotivecms/coal', ref: '32b2844', require: false
 # gem 'locomotivecms_common', github: 'locomotivecms/common', ref: '3046b79893', require: false
 

data/generators/blank/Gemfile.tt

@@ -17,5 +17,5 @@ end
 group :misc do
   # Add your extra gems here
   # gem 'susy', require: 'susy'
-  # gem 'redcarpet', require: 'redcarpet'
+  # gem 'bourbon', require: 'bourbon'
 end

data/generators/bootstrap3/Gemfile.tt

@@ -17,5 +17,5 @@ end
 group :misc do
   # Add your extra gems here
   # gem 'susy', require: 'susy'
-  # gem 'redcarpet', require: 'redcarpet'
-end
+  # gem 'bourbon', require: 'bourbon'
+end

data/generators/cloned/Gemfile.tt

@@ -17,5 +17,5 @@ end
 group :misc do
   # Add your extra gems here
   # gem 'susy', require: 'susy'
-  # gem 'redcarpet', require: 'redcarpet'
-end
+  # gem 'bourbon', require: 'bourbon'
+end

data/generators/foundation5/Gemfile.tt

@@ -17,5 +17,5 @@ end
 group :misc do
   # Add your extra gems here
   # gem 'susy', require: 'susy'
-  # gem 'redcarpet', require: 'redcarpet'
-end
+  # gem 'bourbon', require: 'bourbon'
+end

data/generators/line_case/Gemfile.tt

@@ -17,5 +17,5 @@ end
 group :misc do
   # Add your extra gems here
   # gem 'susy', require: 'susy'
-  # gem 'redcarpet', require: 'redcarpet'
-end
+  # gem 'bourbon', require: 'bourbon'
+end

data/lib/locomotive/wagon/commands/push_command.rb

@@ -32,6 +32,8 @@ module Locomotive::Wagon
     def push
       PushLogger.new if options[:verbose]
 
+      require_misc_gems
+
       api_client = build_api_site_client(connection_information)
 
       validate!
@@ -143,6 +145,11 @@ module Locomotive::Wagon
       @remote_site  = SiteDecorator.new(_site)
     end
 
+    def require_misc_gems
+      require 'bundler'
+      Bundler.require 'misc'
+    end
+
   end
 
 end

data/lib/locomotive/wagon/commands/push_sub_commands/push_theme_assets_command.rb

@@ -15,6 +15,8 @@ module Locomotive::Wagon
     end
 
     def persist(decorated_entity)
+      return if decorated_entity.realname.starts_with?('_')
+
       precompile(decorated_entity)
 
       if (_entity = remote_entity(decorated_entity)).nil?

data/lib/locomotive/wagon/decorators/content_type_decorator.rb

@@ -13,7 +13,9 @@ module Locomotive
       def __attributes__
         %i(name slug description label_field_name fields
           order_by order_direction group_by
-          public_submission_enabled public_submission_accounts
+          public_submission_enabled
+          public_submission_accounts
+          public_submission_title_template
           entry_template display_settings)
       end
 
@@ -52,6 +54,10 @@ module Locomotive
         self[:public_submission_accounts]
       end
 
+      def public_submission_title_template
+        self[:public_submission_title_template]
+      end
+
       def entry_template
         self[:entry_template]
       end

data/lib/locomotive/wagon/decorators/theme_asset_decorator.rb

@@ -5,6 +5,17 @@ module Locomotive
 
       include ToHashConcern
 
+      EXTENSIONS_TABLE = {
+        '.scss'       => '.css',
+        '.css.scss'   => '.css',
+        '.sass'       => '.css',
+        '.css.sass'   => '.css',
+        '.less'       => '.css',
+        '.css.less'   => '.css',
+        '.coffee'     => '.js',
+        '.js.coffee'  => '.js'
+      }.freeze
+
       def __attributes__
         %i(source folder checksum)
       end
@@ -18,13 +29,23 @@ module Locomotive
       end
 
       def stylesheet_or_javascript?
-        File.extname(realname) =~ /^(\.css|\.js)/
+        File.extname(realname) =~ /^\.(css|scss|less|js|coffee)/
       end
 
       def checksum
         Digest::MD5.hexdigest(File.read(filepath))
       end
 
+      # - memoize it because it will not change even if we change the filepath (or source)
+      # - we keep the first extension and drop the others (.coffee, .scss, ...etc)
+      def realname
+        return @realname if @realname
+
+        filename = File.basename(filepath)
+
+        @realname = _realname(filename, 2) || _realname(filename, 1) || filename
+      end
+
       def relative_url
         "#{folder.gsub('\\', '/')}/#{realname}"
       end
@@ -33,16 +54,6 @@ module Locomotive
         relative_url[/^(javascripts|stylesheets|fonts)\/(.*)$/, 2]
       end
 
-      def realname
-        # - memoize it because it will not change even if we change the filepath (or source)
-        # - we keep the first extension and drop the others (.coffee, .scss, ...etc)
-        @realname ||= if Sprockets.engine_extensions.include?(File.extname(filepath))
-          File.basename(filepath).split('.')[0..1].join('.')
-        else
-          File.basename(filepath)
-        end
-      end
-
       def filepath
         __getobj__.source
       end
@@ -51,6 +62,16 @@ module Locomotive
         __getobj__[:source] = path
       end
 
+      private
+
+      def _realname(filename, length)
+        extension = '.' + filename.split('.').last(length).join('.')
+
+        if new_extension = EXTENSIONS_TABLE[extension]
+          File.basename(filename, extension) + new_extension
+        end
+      end
+
     end
 
   end

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '2.0.0.rc1'
+    VERSION = '2.0.0.rc2'
   end
 end

data/locomotivecms_wagon.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'netrc',                 '~> 0.10.3'
 
   gem.add_dependency 'locomotivecms_coal',    '~> 1.0.0.rc1'
-  gem.add_dependency 'locomotivecms_steam',   '~> 1.0.0.rc1'
+  gem.add_dependency 'locomotivecms_steam',   '~> 1.0.0.rc2'
 
   gem.add_dependency 'listen',                '~> 2.10.0'
   gem.add_dependency 'rack-livereload',       '~> 0.3.15'

data/spec/unit/decorators/theme_asset_decorator_spec.rb

@@ -0,0 +1,79 @@
+# encoding: utf-8
+
+require 'spec_helper'
+require 'ostruct'
+
+require 'locomotive/wagon/decorators/concerns/to_hash_concern'
+require 'locomotive/wagon/decorators/theme_asset_decorator'
+
+describe Locomotive::Wagon::ThemeAssetDecorator do
+
+  let(:filepath)  { '/somewhere/mysite/public/stylesheets/application.css' }
+  let(:asset)     { instance_double('Asset', source: filepath) }
+  let(:decorator) { described_class.new(asset) }
+
+  describe '#realname' do
+
+    subject { decorator.realname }
+
+    describe 'no extension' do
+      let(:filepath) { '/somewhere/mysite/public/stylesheets/application' }
+      it { is_expected.to eq 'application' }
+    end
+
+    describe 'css' do
+
+      it { is_expected.to eq 'application.css' }
+
+      describe 'scss extension' do
+        let(:filepath) { '/somewhere/mysite/public/stylesheets/application.scss' }
+        it { is_expected.to eq 'application.css' }
+      end
+
+      describe 'css.scss extension' do
+        let(:filepath) { '/somewhere/mysite/public/stylesheets/application.css.scss' }
+        it { is_expected.to eq 'application.css' }
+      end
+
+      describe 'sass extension' do
+        let(:filepath) { '/somewhere/mysite/public/stylesheets/application.sass' }
+        it { is_expected.to eq 'application.css' }
+      end
+
+      describe 'css.sass extension' do
+        let(:filepath) { '/somewhere/mysite/public/stylesheets/application.css.sass' }
+        it { is_expected.to eq 'application.css' }
+      end
+
+      describe 'less extension' do
+        let(:filepath) { '/somewhere/mysite/public/stylesheets/application.less' }
+        it { is_expected.to eq 'application.css' }
+      end
+
+      describe 'css.less extension' do
+        let(:filepath) { '/somewhere/mysite/public/stylesheets/application.css.less' }
+        it { is_expected.to eq 'application.css' }
+      end
+
+    end
+
+    describe 'js' do
+
+      let(:filepath) { '/somewhere/mysite/public/javascripts/application.js' }
+      it { is_expected.to eq 'application.js' }
+
+      describe 'coffee extension' do
+        let(:filepath) { '/somewhere/mysite/public/javascripts/application.coffee' }
+        it { is_expected.to eq 'application.js' }
+      end
+
+      describe 'js.coffee extension' do
+        let(:filepath) { '/somewhere/mysite/public/javascripts/application.js.coffee' }
+        it { is_expected.to eq 'application.js' }
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_wagon
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -101,14 +101,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -658,6 +658,7 @@ files:
 - spec/support/vcr.rb
 - spec/unit/commands/pull_sub_commands/concerns/assets_concern_spec.rb
 - spec/unit/decorators/site_decorator_spec.rb
+- spec/unit/decorators/theme_asset_decorator_spec.rb
 homepage: http://www.locomotivecms.com
 licenses: []
 metadata: {}
@@ -783,3 +784,4 @@ test_files:
 - spec/support/vcr.rb
 - spec/unit/commands/pull_sub_commands/concerns/assets_concern_spec.rb
 - spec/unit/decorators/site_decorator_spec.rb
+- spec/unit/decorators/theme_asset_decorator_spec.rb