locomotivecms_steam 1.0.0.pre.alpha → 1.0.0.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bcee64feba62d7a3092101a2f6ae961bae0dd49
-  data.tar.gz: 21df89d07e53243b3128cf4f0611c5a917a8a68a
+  metadata.gz: 4defa074871fdae0481e4f65d6e33dfea1fede03
+  data.tar.gz: 3beda891d09f56d5883e284d958f42288be36c40
 SHA512:
-  metadata.gz: 2c7d463827ef099ed2f1da6e74b0936ab62eedfd8934daa807fa348486fd532d0835ad70d0f2b7605343bf6abe9ca35730d62b5cf00c45f1824d0a9470e19357
-  data.tar.gz: 9127cc36e81dc3f377624030c33dfa1bdb0ef1b4b539f98b98ec0e416c4677b969916c9da130c9fa275bdc482a4eecb6d0b7cea97b4f8a04580829362d215683
+  metadata.gz: 91b5751d14bdf87d35ab308399a222983bc91edbfe5cd9f7cca1c8a0036a12327930d3fe5196494ed4160ff6159db430df6ec7a4beb7a02374e81954472c1341
+  data.tar.gz: c7b56474a51cd689f9c0229d89c0630b376a699aa253909bdcaf1cdb8fc4dc70bc18f9986e20e32b84fd1d6f417fa460e7a97098812317d19f4ad82b0bc2b00f

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  # gem 'locomotivecms_common', '~> 0.0.2', path: '../common'
+  # gem 'locomotivecms_common', '~> 0.0.3', path: '../common'
   # gem 'locomotivecms_models', '~> 0.0.1', path: '../models'
   # gem 'locomotivecms_models', '0.0.1.pre.alpha'
   # gem 'locomotivecms-liquid', path: '/Users/didier/Documents/LocomotiveCMS/gems/liquid'

data/Gemfile.lock

@@ -1,29 +1,28 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.0.0.pre.alpha)
+    locomotivecms_steam (1.0.0.pre.alpha.1)
       RedCloth (~> 4.2.9)
-      activesupport (~> 4.2.1)
       chronic (~> 0.10.2)
-      coffee-script (~> 2.3.0)
+      coffee-script (~> 2.4.1)
       compass (~> 1.0.3)
-      dragonfly (~> 1.0.7)
+      dragonfly (~> 1.0.9)
       haml (~> 4.0.6)
       httparty (~> 0.13.3)
-      kramdown (~> 1.6.0)
+      kramdown (~> 1.7.0)
       locomotivecms-solid (~> 4.0.0.alpha2)
-      locomotivecms_common (~> 0.0.2)
-      mime-types (~> 2.4.3)
+      locomotivecms_common (~> 0.0.4)
+      mime-types (~> 2.5.0)
       mimetype-fu (~> 0.1.2)
       moneta (~> 0.8.0)
       morphine (~> 0.1.1)
       rack-cache (~> 1.2)
       rack-rewrite (~> 1.5.1)
       rack_csrf (~> 2.5.0)
-      sanitize (~> 3.1.2)
+      sanitize (~> 4.0.0)
       sprockets (~> 2.12.3)
+      sprockets-less (~> 0.6.1)
       sprockets-sass (~> 1.3.1)
-      stringex (~> 2.5.2)
 
 GEM
   remote: https://rubygems.org/
@@ -35,21 +34,22 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.7)
+    addressable (2.3.8)
     bson (2.3.0)
-    byebug (4.0.3)
+    byebug (4.0.5)
       columnize (= 0.9.0)
     chronic (0.10.2)
     chunky_png (1.3.4)
     codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1)
-    colorize (0.7.5)
+    coffee-script-source (1.9.1.1)
+    colorize (0.7.7)
     columnize (0.9.0)
+    commonjs (0.2.7)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -62,27 +62,31 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    connection_pool (2.1.1)
+    connection_pool (2.2.0)
     coveralls (0.7.12)
       multi_json (~> 1.10)
       rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.9.1)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-    crass (1.0.1)
-    daemons (1.1.9)
+    crass (1.0.2)
+    daemons (1.2.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    dragonfly (1.0.7)
+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)
+    dragonfly (1.0.9)
       addressable (~> 2.3)
       multi_json (~> 1.0)
       rack
-    eventmachine (1.0.4)
-    execjs (2.4.0)
+    eventmachine (1.0.7)
+    execjs (2.5.2)
     ffi (1.9.8)
     haml (4.0.6)
       tilt
     hike (1.2.3)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
     httparty (0.13.3)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
@@ -95,29 +99,33 @@ GEM
     json_spec (1.1.4)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    kramdown (1.6.0)
+    kramdown (1.7.0)
+    less (2.6.0)
+      commonjs (~> 0.2.7)
     locomotivecms-liquid (4.0.0.alpha2)
     locomotivecms-solid (4.0.0.alpha2)
       locomotivecms-liquid (~> 4.0.0.alpha2)
-    locomotivecms_common (0.0.2)
+    locomotivecms_common (0.0.4)
+      activesupport (~> 4.2.1)
       colorize
+      stringex (~> 2.5.2)
     method_source (0.8.2)
-    mime-types (2.4.3)
+    mime-types (2.5)
     mimetype-fu (0.1.2)
     mini_portile (0.6.2)
-    minitest (5.5.1)
+    minitest (5.6.1)
     moneta (0.8.0)
     moped (2.0.4)
       bson (~> 2.2)
       connection_pool (~> 2.0)
       optionable (~> 0.2.0)
     morphine (0.1.1)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
     multi_xml (0.5.5)
     netrc (0.10.3)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    nokogumbo (1.2.0)
+    nokogumbo (1.4.1)
       nokogiri
     optionable (0.2.0)
     origin (2.1.1)
@@ -128,7 +136,7 @@ GEM
     pry-byebug (3.1.0)
       byebug (~> 4.0)
       pry (~> 0.10)
-    rack (1.6.0)
+    rack (1.6.1)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-rewrite (1.5.1)
@@ -140,26 +148,27 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rest-client (1.7.3)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     rspec (3.2.0)
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
       rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.1)
+    rspec-core (3.2.3)
       rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
+    rspec-expectations (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-mocks (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
-    sanitize (3.1.2)
-      crass (~> 1.0.1)
+    sanitize (4.0.0)
+      crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
-      nokogumbo (= 1.2.0)
+      nokogumbo (= 1.4.1)
     sass (3.4.13)
     simplecov (0.9.2)
       docile (~> 1.1.0)
@@ -172,6 +181,9 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-less (0.6.1)
+      less (~> 2.4)
+      tilt (~> 1.1)
     sprockets-sass (1.3.1)
       sprockets (~> 2.0)
       tilt (~> 1.1)
@@ -186,9 +198,12 @@ GEM
     thread_safe (0.3.5)
     tilt (1.4.1)
     timecop (0.7.3)
-    tins (1.3.5)
+    tins (1.5.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
     yui-compressor (0.12.0)
 
 PLATFORMS

data/bin/steam.rb

@@ -22,7 +22,7 @@ OptionParser.new do |opts|
   opts.banner = 'Usage: steam.rb [options]'
 
   # Filesystem adapter
-  opts.on('-p', '--path PATH', 'Serve a Wagon site from a path in your filesystem') do |path|
+  opts.on('--path PATH', 'Serve a Wagon site from a path in your filesystem') do |path|
     options[:adapter][:path] = File.expand_path(path)
     options[:asset_path] = File.expand_path(File.join(path, 'public'))
     options[:database] = options[:hosts] = nil

data/lib/locomotive/steam.rb

@@ -1,11 +1,5 @@
 require 'locomotive/common'
 
-require 'active_support'
-require 'active_support/concern'
-require 'active_support/deprecation'
-require 'active_support/core_ext'
-
-require_relative      'steam/core_ext'
 require_relative      'steam/configuration'
 require_relative_all  'steam/decorators'
 require_relative      'steam/liquid'
@@ -24,6 +18,8 @@ module Locomotive
 
     CONTENT_ENTRY_ENGINE_CLASS_NAME = /^Locomotive::ContentEntry(.*)$/o
 
+    IsHTTP = /^https?:\/\//o
+
     class << self
       attr_writer :configuration
     end
@@ -42,6 +38,12 @@ module Locomotive
       require_relative 'steam/initializers'
     end
 
+    # Shortcut to build the Rack stack
+    def self.to_app
+      require_relative 'steam/server'
+      Server.to_app
+    end
+
     # FIXME: not sure it will ever be needed
     # class << self
     #   def method_missing(name, *args, &block)

data/lib/locomotive/steam/adapters/filesystem/simple_cache_store.rb

@@ -26,6 +26,10 @@ module Locomotive::Steam
           @@store.clear
         end
 
+        def delete(name)
+          @@store.delete(name)
+        end
+
         #:nocov:
         def _store
           @@store

data/lib/locomotive/steam/adapters/filesystem/yaml_loaders/content_type.rb

@@ -34,7 +34,7 @@ module Locomotive
             def build_field(name, attributes)
               attributes.tap do |attributes|
                 attributes[:name] = name.to_s
-                attributes[:type] = attributes[:type].try(:to_s)
+                attributes[:type] = (attributes[:type] || 'string').to_s.downcase
 
                 if attributes[:label].blank?
                   attributes[:label] = name.to_s.humanize

data/lib/locomotive/steam/adapters/filesystem/yaml_loaders/page.rb

@@ -21,7 +21,7 @@ module Locomotive
 
             def load_tree
               {}.tap do |hash|
-                each_file do |filepath, relative_path, fullpath, locale|
+                each_file do |filepath, fullpath, locale|
 
                   if leaf = hash[fullpath]
                     update(leaf, filepath, fullpath, locale)
@@ -31,6 +31,10 @@ module Locomotive
 
                   hash[fullpath] = leaf
                 end
+
+                each_directory do |filepath, fullpath, locale|
+                  hash[fullpath] ||= build(filepath, fullpath, locale)
+                end
               end.values
             end
 
@@ -40,7 +44,7 @@ module Locomotive
 
               {
                 title:              { locale => attributes.delete(:title) || (default_locale == locale ? slug.humanize : nil) },
-                slug:               { locale => attributes.delete(:slug) || slug },
+                slug:               { locale => attributes.delete(:slug) || slug.dasherize },
                 template_path:      { locale => template_path(filepath, attributes, locale) },
                 redirect_url:       { locale => attributes.delete(:redirect_url) },
                 editable_elements:  build_editable_elements(attributes.delete(:editable_elements), locale),
@@ -53,7 +57,7 @@ module Locomotive
               attributes  = get_attributes(filepath, fullpath)
 
               leaf[:title][locale]              = attributes.delete(:title) || slug.humanize
-              leaf[:slug][locale]               = attributes.delete(:slug) || slug
+              leaf[:slug][locale]               = attributes.delete(:slug) || slug.dasherize
               leaf[:template_path][locale]      = template_path(filepath, attributes, locale)
               leaf[:redirect_url][locale]       = attributes.delete(:redirect_url)
 
@@ -63,12 +67,20 @@ module Locomotive
             end
 
             def get_attributes(filepath, fullpath)
-              _load(filepath, true) do |attributes, template|
-                # make sure index/404 are the slugs of the index/404 pages
-                attributes.delete(:slug) if %w(index 404).include?(fullpath)
+              if File.directory?(filepath)
+                {
+                  title:          File.basename(filepath).humanize,
+                  listed:         false,
+                  published:      false
+                }
+              else
+                _load(filepath, true) do |attributes, template|
+                  # make sure index/404 are the slugs of the index/404 pages
+                  attributes.delete(:slug) if %w(index 404).include?(fullpath)
 
-                # trick to use the template of the default locale (if available)
-                attributes[:template_path] = false if template.blank?
+                  # trick to use the template of the default locale (if available)
+                  attributes[:template_path] = false if template.blank?
+                end
               end
             end
 
@@ -82,7 +94,17 @@ module Locomotive
 
                 locale = template_extensions.include?(extension_or_locale) ? default_locale : extension_or_locale
 
-                yield(filepath, relative_path, fullpath, locale.to_sym)
+                yield(filepath, fullpath, locale.to_sym)
+              end
+            end
+
+            def each_directory(&block)
+              Dir.glob(File.join(path, '**', '*')).each do |filepath|
+                next unless File.directory?(filepath)
+
+                fullpath = get_relative_path(filepath)
+
+                yield(filepath, fullpath, default_locale.to_sym)
               end
             end
 
@@ -91,7 +113,7 @@ module Locomotive
             end
 
             def template_path(filepath, attributes, locale)
-              if attributes.delete(:template_path) == false && locale != default_locale
+              if File.directory?(filepath) || (attributes.delete(:template_path) == false && locale != default_locale)
                 false
               else
                 filepath

data/lib/locomotive/steam/adapters/filesystem/yaml_loaders/theme_asset.rb

@@ -9,7 +9,37 @@ module Locomotive
             include Adapters::Filesystem::YAMLLoader
 
             def load(scope)
-              []
+              super
+              [].tap do |list|
+                each_file do |filepath, folder|
+                  list << { source: filepath, folder: folder }
+                end
+              end
+            end
+
+            private
+
+            def each_file(&block)
+              # Follows symlinks and makes sure subdirectories are handled
+              pattern = ['**', '*', '**', '*']
+
+              Dir.glob(File.join(path, *pattern)).each do |file|
+                next if exclude?(file)
+
+                folder = File.dirname(file.gsub(File.join(path, ''), ''))
+
+                yield(file, folder)
+              end
+            end
+
+            def exclude?(file)
+              File.directory?(file) ||
+              file.starts_with?(File.join(path, 'samples')) ||
+              File.basename(file).starts_with?('_')
+            end
+
+            def path
+              @path ||= File.join(site_path, 'public')
             end
 
           end

data/lib/locomotive/steam/decorators/i18n_decorator.rb

@@ -65,7 +65,7 @@ module Locomotive
 
         def __get_localized_value__(name)
           field = __getobj__.public_send(name.to_sym)
-          field[__locale__] || field[__default_locale__]
+          field ? field[__locale__] || field[__default_locale__] : nil
         end
 
         def __set_localized_value__(name, value)

data/lib/locomotive/steam/decorators/template_decorator.rb

@@ -1,3 +1,4 @@
+require 'haml'
 require_relative 'i18n_decorator'
 
 module Locomotive

data/lib/locomotive/steam/entities/content_entry.rb

@@ -61,6 +61,14 @@ module Locomotive::Steam
       self[content_type.label_field_name]
     end
 
+    def localized_attributes
+      @localized_attributes.tap do |hash|
+        if hash && hash.has_key?(content_type.label_field_name.to_sym)
+          hash[:_label] = true
+        end
+      end
+    end
+
     def to_liquid
       Locomotive::Steam::Liquid::Drops::ContentEntry.new(self)
     end
@@ -137,7 +145,7 @@ module Locomotive::Steam
     class FileField < Struct.new(:filename, :base, :updated_at)
 
       def url
-        "#{base}/#{filename}"
+        base.blank? ? filename : "#{base}/#{filename}"
       end
 
       def to_liquid