locomotivecms_wagon 2.0.0.rc3 → 2.0.0.rc4

data/spec/unit/commands/pull_sub_commands/concerns/assets_concern_spec.rb

@@ -2,27 +2,47 @@
 
 require 'spec_helper'
 
+require 'active_support'
+require 'active_support/core_ext'
 require 'locomotive/wagon/commands/pull_sub_commands/concerns/assets_concern'
 
 describe Locomotive::Wagon::AssetsConcern do
+
+  let(:concern) { Class.new { include Locomotive::Wagon::AssetsConcern; def path; 'tmp'; end; } }
+
   describe "calling replace_asset_urls" do
 
-    let(:assets_concern) { Class.new { include Locomotive::Wagon::AssetsConcern } }
     it "identifies the assets which should be downloaded when pulling" do
-
       input = <<-INPUT
         <td><img src="https://somedomain.com/sites/51277e8fc0864503db000007/assets/534d2a28e6439a92180009a6/UPPERCASE.CH.FILE.jpg"/></td>
         <td><img src="https://somedomain.com/sites/51277e8fc0864503db000007/assets/532a8eeacf7727c1bb00012e/lowercase.ch.file.jpg" /></td>
         <td><img src="https://somedomain.com/sites/51277e8fc0864503db000007/assets/532a8eeac086452e35000169/some_name.jpg" /></td>
         <td><img src="https://somedomain.com/sites/51277e8fc0864503db000007/assets/532a8eeac086452e35000169/some_name.JPG" /></td>
+        <td><img src="https://somedomain.com/sites/51277e8fc0864503db000007/pages/532a8eeac086452e35000169/header.JPG?42" /></td>
       INPUT
 
       parsed_urls = []
-      input.force_encoding('utf-8').gsub(assets_concern::REGEX) do |url|
+      input.force_encoding('utf-8').gsub(concern::REGEX) do |url|
         parsed_urls.push url
       end
 
-      expect(parsed_urls.count).to eq(4)
+      expect(parsed_urls.count).to eq(5)
+    end
+  end
+
+
+  describe '#replace_asset_urls' do
+
+    let(:content)   { %(<td><img src="https://somedomain.com/sites/51277e8fc0864503db000007/assets/532a8eeac086452e35000169/some_name.JPG?42" /></td>) }
+    let(:instance)  { concern.new }
+
+    subject { instance.replace_asset_urls(content) }
+
+    it 'removes the query string' do
+      expect(instance).to receive(:write_asset).with("https://somedomain.com/sites/51277e8fc0864503db000007/assets/532a8eeac086452e35000169/some_name.JPG?42", "tmp/public/samples/assets/some_name.JPG").and_return('some_name.JPG')
+      is_expected.to eq %(<td><img src="/samples/assets/some_name.JPG" /></td>)
     end
+
   end
+
 end

data/spec/unit/commands/push_sub_commands/push_theme_assets_command_spec.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+require 'locomotive/wagon/commands/push_sub_commands/push_base_command'
+require 'locomotive/wagon/commands/push_sub_commands/push_theme_assets_command'
+
+describe Locomotive::Wagon::PushThemeAssetsCommand do
+
+  let(:command)   { described_class.new(nil, nil, nil, nil) }
+
+  describe '#replace_assets' do
+
+    let(:content) { "body{background-image:url(/images/body.png)}" }
+    let(:urls)    { { 'images/body.png' => 'http://cdn/images/body.png?42' } }
+
+    before { command.instance_variable_set(:@remote_urls, urls) }
+
+    subject { command.send(:replace_assets!, content) }
+
+    it { is_expected.to eq "body{background-image:url(http://cdn/images/body.png?42)}" }
+
+    context 'font' do
+
+      let(:content) { "@font-face{src: url(\"/fonts/external/myfont.woff?first\");}" }
+      let(:urls)  { { 'fonts/external/myfont.woff' => 'http://cdn/fonts/external/myfont.woff?42' } }
+
+      it { is_expected.to eq "@font-face{src: url(\"http://cdn/fonts/external/myfont.woff?42\");}" }
+
+    end
+
+    context 'no correct reference to an image' do
+
+      let(:content) { "body{background-image:url(/somewhere/body.png)}" }
+
+      it { is_expected.to eq nil }
+
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_wagon
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc3
+  version: 2.0.0.rc4
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -81,34 +81,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.3
+- !ruby/object:Gem::Dependency
+  name: locomotivecms_common
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: locomotivecms_coal
   requirement: !ruby/object:Gem::Requirement
     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: locomotivecms_steam
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc6
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -129,14 +143,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.15
+        version: 0.3.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.15
+        version: 0.3.16
 - !ruby/object:Gem::Dependency
   name: yui-compressor
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +198,7 @@ files:
 - TODO
 - bin/wagon
 - generators/blank/Gemfile.tt
+- generators/blank/Guardfile
 - generators/blank/app/content_types/.empty_directory
 - generators/blank/app/views/pages/404.liquid
 - generators/blank/app/views/pages/404.liquid.haml
@@ -200,6 +215,7 @@ files:
 - generators/blank/public/samples/.empty_directory
 - generators/blank/public/stylesheets/.empty_directory
 - generators/bootstrap/Gemfile.tt
+- generators/bootstrap/Guardfile
 - generators/bootstrap/app/content_types/.empty_directory
 - generators/bootstrap/app/views/pages/404.liquid
 - generators/bootstrap/app/views/pages/404.liquid.haml
@@ -314,6 +330,7 @@ files:
 - generators/bootstrap/public/stylesheets/bootstrap/mixins/_text-overflow.scss
 - generators/bootstrap/public/stylesheets/bootstrap/mixins/_vendor-prefixes.scss
 - generators/cloned/Gemfile.tt
+- generators/cloned/Guardfile
 - generators/cloned/app/content_types/.empty_directory
 - generators/cloned/app/views/pages/.empty_directory
 - generators/cloned/app/views/snippets/.empty_directory
@@ -327,6 +344,7 @@ files:
 - generators/content_type/app/content_types/%slug%.yml.tt
 - generators/content_type/data/%slug%.yml.tt
 - generators/foundation5/Gemfile.tt
+- generators/foundation5/Guardfile
 - generators/foundation5/app/content_types/.empty_directory
 - generators/foundation5/app/views/pages/404.liquid
 - generators/foundation5/app/views/pages/404.liquid.haml
@@ -336,7 +354,6 @@ files:
 - generators/foundation5/config/site.yml.tt
 - generators/foundation5/config/translations.yml
 - generators/foundation5/data/.empty_directory
-- generators/foundation5/favicon.ico
 - generators/foundation5/icon.png
 - generators/foundation5/public/fonts/.empty_directory
 - generators/foundation5/public/images/.empty_directory
@@ -421,95 +438,6 @@ files:
 - generators/foundation5/public/stylesheets/foundation/components/_visibility.scss
 - generators/foundation5/public/stylesheets/normalize.css
 - generators/foundation5/public/stylesheets/normalize.css.scss
-- generators/line_case/Gemfile.tt
-- generators/line_case/app/content_types/categories.yml
-- generators/line_case/app/content_types/emails.yml
-- generators/line_case/app/content_types/projects.yml
-- generators/line_case/app/views/pages/404.liquid.haml
-- generators/line_case/app/views/pages/email-registered.liquid.haml
-- generators/line_case/app/views/pages/index.liquid.haml
-- generators/line_case/app/views/pages/projects/content_type_template.liquid.haml
-- generators/line_case/app/views/snippets/newsletter_form.liquid.haml
-- generators/line_case/app/views/snippets/projects.liquid.haml
-- generators/line_case/app/views/snippets/social_links.liquid.haml
-- generators/line_case/config/deploy.yml
-- generators/line_case/config/site.yml.tt
-- generators/line_case/config/translations.yml
-- generators/line_case/data/categories.yml
-- generators/line_case/data/emails.yml
-- generators/line_case/data/projects.yml
-- generators/line_case/icon.png
-- generators/line_case/public/images/banner-header.png
-- generators/line_case/public/javascripts/foundation.min.js
-- generators/line_case/public/javascripts/foundation/foundation.abide.js
-- generators/line_case/public/javascripts/foundation/foundation.alerts.js
-- generators/line_case/public/javascripts/foundation/foundation.clearing.js
-- generators/line_case/public/javascripts/foundation/foundation.cookie.js
-- generators/line_case/public/javascripts/foundation/foundation.dropdown.js
-- generators/line_case/public/javascripts/foundation/foundation.forms.js
-- generators/line_case/public/javascripts/foundation/foundation.interchange.js
-- generators/line_case/public/javascripts/foundation/foundation.joyride.js
-- generators/line_case/public/javascripts/foundation/foundation.js
-- generators/line_case/public/javascripts/foundation/foundation.magellan.js
-- generators/line_case/public/javascripts/foundation/foundation.orbit.js
-- generators/line_case/public/javascripts/foundation/foundation.placeholder.js
-- generators/line_case/public/javascripts/foundation/foundation.reveal.js
-- generators/line_case/public/javascripts/foundation/foundation.section.js
-- generators/line_case/public/javascripts/foundation/foundation.tooltips.js
-- generators/line_case/public/javascripts/foundation/foundation.topbar.js
-- generators/line_case/public/javascripts/vendor/custom.modernizr.js
-- generators/line_case/public/javascripts/vendor/jquery.js
-- generators/line_case/public/javascripts/vendor/zepto.js
-- generators/line_case/public/samples/projects/sample.jpeg
-- generators/line_case/public/samples/projects/sample2.jpeg
-- generators/line_case/public/samples/projects/sample3.jpeg
-- generators/line_case/public/samples/projects/sample4.jpeg
-- generators/line_case/public/samples/projects/sample5.jpeg
-- generators/line_case/public/samples/projects/sample6.jpeg
-- generators/line_case/public/samples/projects/sample7.jpeg
-- generators/line_case/public/samples/projects/sample8.jpeg
-- generators/line_case/public/stylesheets/_variables.css.sass
-- generators/line_case/public/stylesheets/foundation.css.scss
-- generators/line_case/public/stylesheets/foundation.min.css
-- generators/line_case/public/stylesheets/foundation/_variables.scss
-- generators/line_case/public/stylesheets/foundation/components/_alert-boxes.scss
-- generators/line_case/public/stylesheets/foundation/components/_block-grid.scss
-- generators/line_case/public/stylesheets/foundation/components/_breadcrumbs.scss
-- generators/line_case/public/stylesheets/foundation/components/_button-groups.scss
-- generators/line_case/public/stylesheets/foundation/components/_buttons.scss
-- generators/line_case/public/stylesheets/foundation/components/_clearing.scss
-- generators/line_case/public/stylesheets/foundation/components/_custom-forms.scss
-- generators/line_case/public/stylesheets/foundation/components/_dropdown-buttons.scss
-- generators/line_case/public/stylesheets/foundation/components/_dropdown.scss
-- generators/line_case/public/stylesheets/foundation/components/_flex-video.scss
-- generators/line_case/public/stylesheets/foundation/components/_forms.scss
-- generators/line_case/public/stylesheets/foundation/components/_global.scss
-- generators/line_case/public/stylesheets/foundation/components/_grid-5.scss
-- generators/line_case/public/stylesheets/foundation/components/_grid.scss
-- generators/line_case/public/stylesheets/foundation/components/_inline-lists.scss
-- generators/line_case/public/stylesheets/foundation/components/_joyride.scss
-- generators/line_case/public/stylesheets/foundation/components/_keystrokes.scss
-- generators/line_case/public/stylesheets/foundation/components/_labels.scss
-- generators/line_case/public/stylesheets/foundation/components/_magellan.scss
-- generators/line_case/public/stylesheets/foundation/components/_orbit.scss
-- generators/line_case/public/stylesheets/foundation/components/_pagination.scss
-- generators/line_case/public/stylesheets/foundation/components/_panels.scss
-- generators/line_case/public/stylesheets/foundation/components/_pricing-tables.scss
-- generators/line_case/public/stylesheets/foundation/components/_progress-bars.scss
-- generators/line_case/public/stylesheets/foundation/components/_reveal.scss
-- generators/line_case/public/stylesheets/foundation/components/_section.scss
-- generators/line_case/public/stylesheets/foundation/components/_side-nav.scss
-- generators/line_case/public/stylesheets/foundation/components/_split-buttons.scss
-- generators/line_case/public/stylesheets/foundation/components/_sub-nav.scss
-- generators/line_case/public/stylesheets/foundation/components/_switch.scss
-- generators/line_case/public/stylesheets/foundation/components/_tables.scss
-- generators/line_case/public/stylesheets/foundation/components/_thumbs.scss
-- generators/line_case/public/stylesheets/foundation/components/_tooltips.scss
-- generators/line_case/public/stylesheets/foundation/components/_top-bar.scss
-- generators/line_case/public/stylesheets/foundation/components/_type.scss
-- generators/line_case/public/stylesheets/foundation/components/_visibility.scss
-- generators/line_case/public/stylesheets/normalize.css.scss
-- generators/line_case/public/stylesheets/pages.css.sass
 - generators/page/template.liquid.haml.tt
 - generators/page/template.liquid.tt
 - generators/snippet/template.liquid.haml.tt
@@ -586,7 +514,6 @@ files:
 - lib/locomotive/wagon/generators/snippet.rb
 - lib/locomotive/wagon/middlewares/error_page.rb
 - lib/locomotive/wagon/tools/listen.rb
-- lib/locomotive/wagon/tools/livereload.rb
 - lib/locomotive/wagon/tools/styled_yaml.rb
 - lib/locomotive/wagon/tools/tcp_port.rb
 - lib/locomotive/wagon/tools/thor.rb
@@ -690,6 +617,7 @@ files:
 - spec/support/thor.rb
 - spec/support/vcr.rb
 - spec/unit/commands/pull_sub_commands/concerns/assets_concern_spec.rb
+- spec/unit/commands/push_sub_commands/push_theme_assets_command_spec.rb
 - spec/unit/decorators/site_decorator_spec.rb
 - spec/unit/decorators/theme_asset_decorator_spec.rb
 homepage: http://www.locomotivecms.com
@@ -817,5 +745,6 @@ test_files:
 - spec/support/thor.rb
 - spec/support/vcr.rb
 - spec/unit/commands/pull_sub_commands/concerns/assets_concern_spec.rb
+- spec/unit/commands/push_sub_commands/push_theme_assets_command_spec.rb
 - spec/unit/decorators/site_decorator_spec.rb
 - spec/unit/decorators/theme_asset_decorator_spec.rb

data/generators/line_case/Gemfile.tt

@@ -1,21 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'locomotivecms_wagon', '<%= config[:version] -%>'
-
-group :development do
-  # Mac OS X
-  gem 'rb-fsevent', '~> 0.9.1', require: RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
-
-  # Unix
-  gem 'therubyracer', require: 'v8', platforms: :ruby unless RUBY_PLATFORM.include?('darwin')
-  gem 'rb-inotify', '~> 0.9', require: RUBY_PLATFORM.include?('linux') && 'rb-inotify'
-
-  # Windows
-  gem 'wdm', '>= 0.1.0', require: RUBY_PLATFORM =~ /mswin|mingw/i && 'wdm'
-end
-
-group :misc do
-  # Add your extra gems here
-  # gem 'susy', require: 'susy'
-  # gem 'bourbon', require: 'bourbon'
-end

data/generators/line_case/app/content_types/categories.yml

@@ -1,56 +0,0 @@
-# Public name of this content type
-name: Categories
-
-# TODO: explain
-slug: categories
-
-# Explanation for the backoffice
-description: Category of a project
-
-# Default field (e.g title)
-label_field_name: name
-
-# Order of entries
-order_by: manually # default: manually, also available: created_at or any field slug
-
-# Order direction
-# order_direction: asc # default: asc, also available: desc
-
-# Display entries grouped by <field> in the backoffice
-# group_by: <your field>
-
-# Activate public 'create' API (e.g for a contact form)
-# public_submission_enabled: false
-
-# Emails to be notified on new entries using the public API
-# public_submission_accounts: ['john@acme.net']
-
-# Describe each field. The name shoud always be an underscored string
-fields:
-- name: # Name of the field
-    label: Name
-    type: string
-    required: true
-    hint: A description of the field for the editors
-    localized: false
-
-- description: # Name of the field
-    label: Description
-    type: text
-    required: false
-    hint: A description of the field for the editors
-    localized: false
-    text_formatting: html
-
-- projects: # Name of the field
-    label: Projects
-    type: has_many
-    required: false
-    hint: A description of the field for the editors
-    localized: false    # Define the slug of the target content type (eg. comments)
-    class_name: projects
-    # Define the name of the field referring to Categories in the target content type (eg. post)
-    inverse_of: category
-    # If you want to manage the entries of the relationship directly from the source entry
-    ui_enabled: true
-

data/generators/line_case/app/content_types/emails.yml

@@ -1,35 +0,0 @@
-# Public name of this content type
-name: Emails
-
-# TODO: explain
-slug: emails
-
-# Explanation for the backoffice
-description: Emails collected for the newsletter
-
-# Default field (e.g title)
-label_field_name: email
-
-# Order of entries
-order_by: created_at # default: manually, also available: created_at or any field slug
-
-# Order direction
-# order_direction: asc # default: asc, also available: desc
-
-# Display entries grouped by <field> in the backoffice
-# group_by: <your field>
-
-# Activate public 'create' API (e.g for a contact form)
-public_submission_enabled: true
-
-# Emails to be notified on new entries using the public API
-# public_submission_accounts: ['john@acme.net']
-
-# Describe each field. The name shoud always be an underscored string
-fields:
-- email: # Name of the field
-    label: Email
-    type: email
-    required: true
-    hint: An email address submitted from the index page
-    localized: false