locomotivecms_wagon 3.0.0.beta2 → 3.0.0.rc0

data/spec/unit/decorators/content_entry_decorator_spec.rb

@@ -47,7 +47,7 @@ describe Locomotive::Wagon::ContentEntryDecorator do
       let(:field)         { instance_double('Field', name: 'body', type: 'text') }
       let(:fields)        { instance_double('Fields', by_name: field, no_associations: [field]) }
       let(:attributes)    { { body: 'Hello world ! http://domain.tld/samples/foo.png ! <img src="/samples/bar.png" /> <div style="background: url(/samples/42.png);"/>' } }
-      let(:asset_pusher)  { SimpleAssetPusher.new}
+      let(:asset_pusher)  { SimpleAssetPusher.new }
 
       before { allow(decorator).to receive(:__content_assets_pusher__).and_return(asset_pusher) }
 

data/spec/unit/decorators/site_decorator_spec.rb

@@ -4,6 +4,7 @@ require 'spec_helper'
 require 'ostruct'
 
 require 'locomotive/wagon/decorators/concerns/to_hash_concern'
+require 'locomotive/wagon/decorators/concerns/persist_assets_concern'
 require 'locomotive/wagon/decorators/site_decorator'
 
 describe Locomotive::Wagon::SiteDecorator do
@@ -23,14 +24,38 @@ describe Locomotive::Wagon::SiteDecorator do
 
   describe '#to_hash' do
 
-    let(:seo_title) { instance_double('I18nField', translations: { en: 'Hi', fr: 'Bonjour' }) }
-    let(:attributes) { { name: 'Acme', handle: nil, seo_title: seo_title, locales: nil } }
-    let(:site) { OpenStruct.new(attributes) }
+    let(:seo_title)   { instance_double('I18nField', translations: { en: 'Hi', fr: 'Bonjour' }) }
+    let(:attributes)  { { name: 'Acme', handle: nil, seo_title: seo_title, locales: nil } }
+    let(:site)        { OpenStruct.new(attributes) }
 
     subject { decorator.to_hash }
 
     it { is_expected.to eq(name: 'Acme', seo_title: { en: 'Hi', fr: 'Bonjour' }) }
 
+    context 'with image metafields' do
+
+      let(:metafields)    { { some: 'Acme', img: '/samples/42.png', img2: '/samples/bar.png' } }
+      let(:schema)        { { some: { label: 'Some', type: 'string' }, img: { label: 'img', type: 'image' }, img2: { label: 'img2', type: 'image' } } }
+      let(:attributes)    { { name: 'Acme', handle: nil, seo_title: seo_title, locales: nil, metafields: metafields, metafields_schema: schema } }
+      let(:asset_pusher)  { SimpleAssetPusher.new }
+
+      before { allow(decorator).to receive(:__content_assets_pusher__).and_return(asset_pusher) }
+
+      it 'only replaces assets wrapped by a double quotes' do
+        expect(decorator.metafields).to eq(metafields.to_json)
+        is_expected.to eq(name: 'Acme', seo_title: { en: 'Hi', fr: 'Bonjour' },
+                          metafields:         metafields.to_json,
+                          metafields_schema:  schema.to_json)
+        expect(asset_pusher.assets).to eq(['/samples/42.png', '/samples/bar.png'])
+      end
+
+    end
+
+  end
+
+  class SimpleAssetPusher
+    attr_reader :assets
+    def persist(asset); (@assets ||= []).push(asset); 'done'; end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_wagon
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta2
+  version: 3.0.0.rc0
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0.beta3
+        version: 1.5.0.rc0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0.beta3
+        version: 1.5.0.rc0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -151,20 +151,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.5
-- !ruby/object:Gem::Dependency
-  name: rack-livereload
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.16
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.16
 - !ruby/object:Gem::Dependency
   name: neatjson
   requirement: !ruby/object:Gem::Requirement
@@ -211,14 +197,13 @@ files:
 - Rakefile
 - TODO
 - bin/wagon
+- generators/blank/.gitignore
 - generators/blank/Gemfile.tt
-- generators/blank/Guardfile
 - generators/blank/app/assets/.babelrc
 - generators/blank/app/assets/fonts/.empty_directory
 - generators/blank/app/assets/javascripts/app.js
 - generators/blank/app/assets/javascripts/sections/_manager.js
 - generators/blank/app/assets/javascripts/sections/index.js
-- generators/blank/app/assets/package.json.tt
 - generators/blank/app/assets/postcss.config.js
 - generators/blank/app/assets/stylesheets/app.scss
 - generators/blank/app/assets/webpack.common.js
@@ -235,13 +220,13 @@ files:
 - generators/blank/config/site.yml.tt
 - generators/blank/config/translations.yml
 - generators/blank/data/.empty_directory
+- generators/blank/package.json.tt
 - generators/blank/public/fonts/.empty_directory
 - generators/blank/public/images/.empty_directory
 - generators/blank/public/javascripts/.empty_directory
 - generators/blank/public/samples/.empty_directory
 - generators/blank/public/stylesheets/.empty_directory
 - 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
@@ -255,10 +240,23 @@ files:
 - generators/content_type/app/content_types/%slug%.yml.tt
 - generators/content_type/data/%slug%.yml.tt
 - generators/page/template.liquid.tt
+- generators/public_form/content_type.yml.tt
+- generators/public_form/page.liquid.tt
 - generators/section/%type%.js.tt
 - generators/section/template.liquid.tt
 - generators/site_metafields/schema.yml.tt
 - generators/snippet/template.liquid.tt
+- generators/webpack/app/assets/.babelrc
+- generators/webpack/app/assets/fonts/.empty_directory
+- generators/webpack/app/assets/javascripts/app.js
+- generators/webpack/app/assets/javascripts/sections/_manager.js
+- generators/webpack/app/assets/javascripts/sections/index.js
+- generators/webpack/app/assets/postcss.config.js
+- generators/webpack/app/assets/stylesheets/app.scss
+- generators/webpack/app/assets/webpack.common.js
+- generators/webpack/app/assets/webpack.dev.js
+- generators/webpack/app/assets/webpack.prod.js
+- generators/webpack/package.json.tt
 - lib/locomotive/wagon.rb
 - lib/locomotive/wagon/cli.rb
 - lib/locomotive/wagon/commands/authenticate_command.rb
@@ -321,15 +319,16 @@ files:
 - lib/locomotive/wagon/exceptions.rb
 - lib/locomotive/wagon/generators/content_type.rb
 - lib/locomotive/wagon/generators/page.rb
+- lib/locomotive/wagon/generators/public_form.rb
 - lib/locomotive/wagon/generators/relationship.rb
 - lib/locomotive/wagon/generators/section.rb
 - lib/locomotive/wagon/generators/site.rb
 - lib/locomotive/wagon/generators/site/base.rb
 - lib/locomotive/wagon/generators/site/blank.rb
 - lib/locomotive/wagon/generators/site/cloned.rb
-- lib/locomotive/wagon/generators/site/unzip.rb
 - lib/locomotive/wagon/generators/site_metafields.rb
 - lib/locomotive/wagon/generators/snippet.rb
+- lib/locomotive/wagon/generators/webpack.rb
 - lib/locomotive/wagon/middlewares/error_page.rb
 - lib/locomotive/wagon/tools/glob.rb
 - lib/locomotive/wagon/tools/listen.rb

data/generators/blank/Guardfile

@@ -1,22 +0,0 @@
-# LiveReload installation
-#
-# 1. Add the guard-livereload gem to your Gemfile OR uncomment the line:
-#
-#   gem 'guard-livereload'
-#
-# 2. Install the gem on your machine
-#
-#   bundle install
-#
-# 3. Launch Guard
-#
-#   bundle exec guard
-#
-
-guard 'livereload', host: '0.0.0.0', port: ENV['WAGON_LIVERELOAD_PORT'] || 35729, grace_period: 0.5 do
-  watch(%r{app/content_types/.+\.yml$})
-  watch(%r{app/views/.+\.liquid})
-  watch(%r{config/.+\.yml$})
-  watch(%r{data/.+\.yml$})
-  watch(%r{public/((stylesheets|javascripts)/(.+\.(css|js))).*}) { |m| "/#{m[1]}" }
-end

data/generators/cloned/Guardfile

@@ -1,22 +0,0 @@
-# LiveReload installation
-#
-# 1. Add the guard-livereload gem to your Gemfile OR uncomment the line:
-#
-#   gem 'guard-livereload'
-#
-# 2. Install the gem on your machine
-#
-#   bundle install
-#
-# 3. Launch Guard
-#
-#   bundle exec guard
-#
-
-guard 'livereload', host: '0.0.0.0', port: ENV['WAGON_LIVERELOAD_PORT'] || 35729, grace_period: 0.5 do
-  watch(%r{app/content_types/.+\.yml$})
-  watch(%r{app/views/.+\.liquid})
-  watch(%r{config/.+\.yml$})
-  watch(%r{data/.+\.yml$})
-  watch(%r{public/((stylesheets|javascripts)/(.+\.(css|js))).*}) { |m| "/#{m[1]}" }
-end

data/lib/locomotive/wagon/generators/site/unzip.rb

@@ -1,89 +0,0 @@
-require 'open-uri'
-require 'zip'
-
-module Locomotive
-  module Wagon
-    module Generators
-      module Site
-
-        class Unzip < Base
-
-          class_option :location, type: :string, default: nil, required: false, desc: 'Location of the zip file'
-
-          @@source_root = nil
-
-          def prepare
-            remove_file join('tmp')
-            empty_directory join('tmp')
-          end
-
-          def ask_for_location
-            @location = options[:location] || ask('What is the location (on the filesystem or url) of the zip file ?')
-            raise GeneratorException.new('Please enter a location') if @location.blank?
-          end
-
-          def download_or_copy
-            @template_path = join('tmp', File.basename(@location))
-
-            if @location =~ /^https?:\/\//
-              say "downloading...#{@location}"
-              create_file @template_path, open(@location).read
-            else
-              say "copying...#{@location}"
-              create_file @template_path, open(@location, 'rb') { |io| io.read }
-            end
-          end
-
-          def unzip
-            say "unzipping...#{@template_path}"
-
-            begin
-              Zip::ZipFile.open(@template_path) do |zipfile|
-                zipfile.each do |file|
-                  next if file.name =~ /^__MACOSX/
-                  zipfile.extract(file, join('tmp', file.name))
-
-                  @path = $1 if file.name =~ /(.*)\/config\/site.yml$/
-                end
-              end
-            rescue Exception => e
-              raise GeneratorException.new("Unable to unzip the archive")
-            end
-
-            raise GeneratorException.new('Not a valid LocomotiveCMS site') if @path.blank?
-          end
-
-          def copy_sources
-            self.class.source_root = File.expand_path(join('tmp', @path, '/'))
-            say "copying files from #{self.class.source_root} / #{self.destination}"
-            directory('.', self.destination, { recursive: true })
-          end
-
-          def bundle_install
-            super
-          end
-
-          def self.source_root
-            # only way to change the source root from the instance
-            @@source_root
-          end
-
-          def self.source_root=(value)
-            @@source_root = value
-          end
-
-          protected
-
-          def join(*args)
-            File.join(self.destination, *args)
-          end
-
-        end
-
-        Locomotive::Wagon::Generators::Site.register(:unzip, Unzip, %{
-          Unzip a local or remote (http, https, ftp) zipped site.
-        })
-      end
-    end
-  end
-end