locomotivecms_steam 1.0.0.pre.beta.3 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afc4338f5582de4d66788ef18ebb8d1d8d3d024d
-  data.tar.gz: 457d04823de496fc46c507f64d3b1e1313c7a6dd
+  metadata.gz: c15327d7b834e6a45dc9c631bf3f7aca7320d2e0
+  data.tar.gz: 7480937c0e40dee146c4b10684671f0da1bb638c
 SHA512:
-  metadata.gz: 38071d83a98a7e53dd81591d58f7a3b035ac244b563e2077b115ba939cddbb4b55a54ee77e60f361dde5352fe5fd14cf8547229a95116416b43189999cb9619d
-  data.tar.gz: 7378ea6a8eeda23d69bac0991d430dcaa4abed935598aca30294ba5f6a60097058b7e8f0e20a727f18c61814447a47f426278b68c249c0525e20b3c71cb204e1
+  metadata.gz: cf0538f565ffd72f18d96ae008189df3256639ba5124c260a76cdf24e5654968525acfeee2cb57c190a80b6edd3abb99b3a58928b5de9231e1f7b695958b1d57
+  data.tar.gz: d60744e27708a5af594454722bcbe13da873de4fd3c2f61624259529620710c830ae16449eb70a5f4b5c5fba7974531fb490bb3d2d17ee03fb309e38a3668f7b

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 services: mongodb
 before_script: ./script/ci/before_build.sh
 rvm:
-  - 2.2.0
+  - 2.2.2
 env:
   - CODECLIMATE_REPO_TOKEN=3fa74f2ade25037fccd7261090acbdeae232639c3a83aafb80ee428ec16b8cf9
 addons:

data/Gemfile

@@ -34,5 +34,5 @@ group :test do
 end
 
 platform :ruby do
-  ruby '2.2.0'
+  ruby '2.2.2'
 end

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.0.0.pre.beta.3)
+    locomotivecms_steam (1.0.0.rc1)
       RedCloth (~> 4.2.9)
       chronic (~> 0.10.2)
       coffee-script (~> 2.4.1)
       compass (~> 1.0.3)
-      dragonfly (~> 1.0.10)
+      dragonfly (~> 1.0.12)
       haml (~> 4.0.6)
-      httparty (~> 0.13.5)
+      httparty (~> 0.13.6)
       kramdown (~> 1.8.0)
       locomotivecms-solid (~> 4.0.0.alpha2)
-      locomotivecms_common (~> 0.0.4)
+      locomotivecms_common (~> 0.0.5)
       mime-types (~> 2.6.1)
       mimetype-fu (~> 0.1.2)
       moneta (~> 0.8.0)
@@ -35,6 +35,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.8)
+    attr_extras (4.4.0)
     bson (3.1.0)
     byebug (4.0.5)
       columnize (= 0.9.0)
@@ -74,7 +75,7 @@ GEM
     docile (1.1.5)
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
-    dragonfly (1.0.10)
+    dragonfly (1.0.12)
       addressable (~> 2.3)
       multi_json (~> 1.0)
       rack (>= 1.3.0)
@@ -90,7 +91,7 @@ GEM
     hike (1.2.3)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    httparty (0.13.5)
+    httparty (0.13.7)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     i18n (0.7.0)
@@ -108,8 +109,9 @@ GEM
     locomotivecms-liquid (4.0.0.alpha2)
     locomotivecms-solid (4.0.0.alpha2)
       locomotivecms-liquid (~> 4.0.0.alpha2)
-    locomotivecms_common (0.0.4)
+    locomotivecms_common (0.0.5)
       activesupport (~> 4.2.1)
+      attr_extras (~> 4.4.0)
       colorize
       stringex (~> 2.5.2)
     memory_profiler (0.9.4)
@@ -117,7 +119,7 @@ GEM
     mime-types (2.6.1)
     mimetype-fu (0.1.2)
     mini_portile (0.6.2)
-    minitest (5.8.0)
+    minitest (5.8.1)
     moneta (0.8.0)
     moped (2.0.6)
       bson (~> 3.0)
@@ -142,7 +144,7 @@ GEM
       pry (~> 0.10)
     puma (2.12.3)
     rack (1.6.1)
-    rack-cache (1.2)
+    rack-cache (1.5.0)
       rack (>= 0.4)
     rack-mini-profiler (0.9.7)
       rack (>= 1.1.3)
@@ -154,7 +156,7 @@ GEM
     rake (10.4.2)
     rake-compiler (0.9.5)
       rake
-    rb-fsevent (0.9.5)
+    rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rest-client (1.8.0)
@@ -178,7 +180,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.4.1)
-    sass (3.4.18)
+    sass (3.4.19)
     simplecov (0.10.0)
       docile (~> 1.1.0)
       json (~> 1.8)
@@ -235,3 +237,6 @@ DEPENDENCIES
   stackprof
   timecop (~> 0.7.4)
   yui-compressor (~> 0.12.0)
+
+BUNDLED WITH
+   1.10.6

data/Rakefile

@@ -17,9 +17,21 @@ namespace :mongodb do
   namespace :test do
     desc 'Seed the MongoDB database with the dump of the Sample website'
     task :seed do
-      path = File.join(File.expand_path(File.dirname(__FILE__)), 'spec', 'fixtures', 'mongodb')
+      root_path = File.expand_path(File.dirname(__FILE__))
+      db_path   = File.join(root_path, 'spec', 'fixtures', 'mongodb')
+
+      if database = ENV['DATABASE']
+        dump_path = File.join(root_path, 'dump', database)
+
+        `rm -rf #{db_path}`
+        `mongodump --db #{database}`
+        `mv #{dump_path} #{db_path}`
+      end
+
       `mongo steam_test --eval "db.dropDatabase()"`
-      `mongorestore -d steam_test #{path}`
+      `mongorestore -d steam_test #{db_path}`
+
+      puts "Done! Update now the spec/support/helpers.rb file by setting the new id of the site returned by the mongodb_site_id method"
     end
   end
 end

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

@@ -27,15 +27,25 @@ module Locomotive::Steam
               yaml, template = match[:yaml], match[:template]
             end
 
-            HashConverter.to_sym(YAML.load(yaml)).tap do |attributes|
-              block.call(attributes, template) if block_given?
-            end
+            safe_yaml_load(yaml, template, path, &block)
           else
             Locomotive::Common::Logger.error "No #{path} file found"
             {}
           end
         end
 
+        def safe_yaml_load(yaml, template, path, &block)
+          return {} if yaml.blank?
+
+          begin
+            HashConverter.to_sym(YAML.load(yaml)).tap do |attributes|
+              block.call(attributes, template) if block_given?
+            end
+          rescue Exception => e
+            raise "Malformed YAML in this file #{path}, error: #{e.message}"
+          end
+        end
+
         def template_extensions
           @extensions ||= %w(liquid haml)
         end

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

@@ -26,20 +26,25 @@ module Locomotive
             end
 
             def build_fields(list)
-              list.map do |attributes|
-                build_field(attributes.keys.first, attributes.values.first)
+              list.each_with_index.map do |attributes, index|
+                build_field(attributes.keys.first, attributes.values.first, index)
               end
             end
 
-            def build_field(name, attributes)
+            def build_field(name, attributes, position)
               attributes.tap do |attributes|
-                attributes[:name] = name.to_s
-                attributes[:type] = (attributes[:type] || 'string').to_s.downcase
+                attributes[:name]     = name.to_s
+                attributes[:type]     = (attributes[:type] || 'string').to_s.downcase
+                attributes[:position] ||= position
 
                 if attributes[:label].blank?
                   attributes[:label] = name.to_s.humanize
                 end
 
+                if %w(belongs_to has_many many_to_many).include?(attributes[:type])
+                  attributes[:localized] = false
+                end
+
                 if select_options = attributes.delete(:select_options)
                   attributes[:select_options] = build_select_options(select_options)
                 end

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

@@ -80,6 +80,9 @@ module Locomotive
 
                   # trick to use the template of the default locale (if available)
                   attributes[:template_path] = false if template.blank?
+
+                  # page under layouts/ should be treated differently
+                  set_layout_attributes(attributes) if fullpath.split('/').first == 'layouts'
                 end
               end
             end
@@ -158,6 +161,12 @@ module Locomotive
               { block: block, slug: slug, content: { locale => content } }
             end
 
+            def set_layout_attributes(attributes)
+              attributes[:is_layout]  = true if attributes[:is_layout].nil?
+              attributes[:listed]     = false
+              attributes[:published]  = false
+            end
+
           end
 
         end

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

@@ -10,11 +10,13 @@ require_relative_all 'filesystem/sanitizers'
 
 module Locomotive::Steam
 
-  class FilesystemAdapter < Struct.new(:options)
+  class FilesystemAdapter
 
     include Morphine
     include Locomotive::Steam::Adapters::Concerns::Key
 
+    attr_accessor_initialize :options
+
     register :cache do
       Locomotive::Steam::Adapters::Filesystem::SimpleCacheStore.new
     end

data/lib/locomotive/steam/adapters/memory.rb

@@ -6,7 +6,12 @@ require_relative 'memory/dataset'
 
 module Locomotive::Steam
 
-  class MemoryAdapter < Struct.new(:collection)
+  module Memory
+  end
+
+  class MemoryAdapter
+
+    attr_accessor_initialize :collection
 
     include Locomotive::Steam::Adapters::Concerns::Key
 

data/lib/locomotive/steam/adapters/mongodb.rb

@@ -8,7 +8,9 @@ require_relative 'mongodb/command'
 
 module Locomotive::Steam
 
-  class MongoDBAdapter < Struct.new(:options)
+  class MongoDBAdapter
+
+    attr_accessor_initialize :options
 
     def all(mapper, query)
       dataset(mapper, query)

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

@@ -84,6 +84,22 @@ module Locomotive
           end
         end
 
+        def to_hash
+          __getobj__.to_hash.tap do |hash|
+            @__localized_attributes__.keys.each do |name|
+              hash[name.to_s] = __get_localized_value__(name)
+            end
+          end
+        end
+
+        def as_json(options = nil)
+          to_hash.as_json(options)
+        end
+
+        def to_json
+          as_json.to_json
+        end
+
         #:nocov:
         def inspect
           "[Decorated #{__getobj__.class.name}][I18n] attributes exist? " +

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

@@ -17,6 +17,8 @@ module Locomotive::Steam
       }.merge(attributes))
     end
 
+    def _id; self[:_id] || self[:id]; end
+
     def _visible?; !!self[:_visible]; end
     alias :visible? :_visible?
 
@@ -73,6 +75,19 @@ module Locomotive::Steam
       super.merge(content_type_id: content_type_id)
     end
 
+    def to_hash
+      # default attributes
+      _attributes = %i(_id _slug _label _visible _position content_type_slug created_at updated_at)
+
+      # dynamic attributes
+      _attributes += content_type.persisted_field_names
+
+      _attributes.inject({}) do |hash, name|
+        hash[name.to_s] = send(name)
+        hash
+      end
+    end
+
     def to_liquid
       Locomotive::Steam::Liquid::Drops::ContentEntry.new(self)
     end
@@ -112,7 +127,7 @@ module Locomotive::Steam
 
     def _cast_file(field)
       _cast_convertor(field.name) do |value|
-        FileField.new(value, base_url, self.updated_at)
+        value.respond_to?(:url) ? value : FileField.new(value, self.base_url, self.updated_at)
       end
     end
 
@@ -146,13 +161,19 @@ module Locomotive::Steam
     end
 
     # Represent a file
-    class FileField < Struct.new(:filename, :base, :updated_at)
+    class FileField
+
+      attr_accessor_initialize :filename, :base, :updated_at
 
       def url
         return if filename.blank?
         base.blank? ? filename : "#{base}/#{filename}"
       end
 
+      def to_json
+        url
+      end
+
       def to_liquid
         Locomotive::Steam::Liquid::Drops::UploadedFile.new(self)
       end

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

@@ -31,6 +31,15 @@ module Locomotive::Steam
       fields.localized_names + select_fields.map(&:name)
     end
 
+    def persisted_field_names
+      [].tap do |names|
+        fields_by_name.each do |name, field|
+          _name = field.persisted_name
+          names << _name if _name
+        end
+      end
+    end
+
     def label_field_name
       (self[:label_field_name] || fields.first.name).to_sym
     end

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

@@ -59,6 +59,15 @@ module Locomotive::Steam
       %i(belongs_to has_many many_to_many).include?(self.type)
     end
 
+    def persisted_name
+      case type
+      when :belongs_to, :select then "#{name}_id"
+      when :many_to_many        then "#{name.singularize}_ids"
+      when :has_many            then nil
+      else name
+      end
+    end
+
     class SelectOption
 
       include Locomotive::Steam::Models::Entity

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

@@ -8,8 +8,8 @@ module Locomotive::Steam
 
     def initialize(attributes = {})
       super({
-        content: nil,
-        source: nil,
+        content:        nil,
+        source:         nil,
         inline_editing: true
       }.merge(attributes))
     end
@@ -18,6 +18,10 @@ module Locomotive::Steam
       self[:source].blank? ? self.content : self[:source]
     end
 
+    def format
+      self[:format] || 'html' # only editable_text elements
+    end
+
     def default_content?
       self.content.blank?
     end

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

@@ -12,13 +12,16 @@ module Locomotive::Steam
         listed:             false,
         published:          true,
         templatized:        false,
+        cache_enabled:      true,
         fullpath:           {},
+        response_type:      nil,
         content_type:       nil,
         target_klass_name:  nil,
         position:           99,
         raw_template:       nil,
         source:             nil,
         editable_elements:  {},
+        redirect:           false,
         redirect_url:       {},
         redirect_type:      nil,
         parent_id:          nil,
@@ -30,6 +33,7 @@ module Locomotive::Steam
     def listed?; !!listed; end
     def published?; !!published; end
     def templatized?; !!templatized; end
+    def redirect?; redirect.nil? ? redirect_url.present? : redirect; end
 
     def content_type_id
       self.target_klass_name =~ Locomotive::Steam::CONTENT_ENTRY_ENGINE_CLASS_NAME

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

@@ -6,7 +6,11 @@ module Locomotive::Steam
 
     def initialize(attributes = {})
       super({
-        prefix_default_locale: false
+        cache_enabled:          false,
+        prefix_default_locale:  false,
+        updated_at:             nil,
+        content_version:        nil,
+        template_version:       nil
       }.merge(attributes))
     end
 
@@ -15,11 +19,11 @@ module Locomotive::Steam
     end
 
     def default_locale
-      locales.try(:first) || :en
+      locales.first || :en
     end
 
     def locales
-      self[:locales].map(&:to_sym)
+      (self[:locales] || [:en]).map(&:to_sym)
     end
 
     def timezone_name
@@ -30,6 +34,10 @@ module Locomotive::Steam
       @timezone ||= ActiveSupport::TimeZone.new(timezone_name)
     end
 
+    def last_modified_at
+      [self.content_version, self.template_version].compact.sort.last || self.updated_at
+    end
+
     def to_liquid
       Locomotive::Steam::Liquid::Drops::Site.new(self)
     end

data/lib/locomotive/steam/liquid/drops/base.rb

@@ -28,6 +28,10 @@ module Locomotive
             records
           end
 
+          def as_json(options = nil)
+            @_source.as_json(options)
+          end
+
           protected
 
           def liquify(*records, &block)

data/lib/locomotive/steam/liquid/drops/content_entry.rb

@@ -56,8 +56,31 @@ module Locomotive
             end
           end
 
+          def to_hash
+            @_source.to_hash.tap do |hash|
+              hash['id'] = hash['_id']
+
+              @_source.content_type.fields_by_name.each do |name, field|
+                case field.type
+                when :file
+                  hash[name] = hash["#{name}_url"] = file_field_to_url(hash[name.to_s]) if hash[name.to_s].present?
+                when :select
+                  hash[name] = @_source.send(name) if hash["#{name}_id"].present?
+                end
+              end
+            end
+          end
+
+          def as_json(options = nil)
+            self.to_hash.as_json(options)
+          end
+
           protected
 
+          def file_field_to_url(field)
+            field.to_liquid.tap { |drop| drop.context = @context }.url
+          end
+
           def repository(entry)
             repository = @context.registers[:services].repositories.content_entry
             repository.with(entry.content_type)

data/lib/locomotive/steam/liquid/drops/content_entry_collection.rb

@@ -13,7 +13,13 @@ module Locomotive
           end
 
           def all
-            collection
+            collection.map do |entry|
+              entry.to_liquid.tap do |drop|
+                if drop && drop.respond_to?(:context=)
+                  drop.context = @context
+                end
+              end
+            end
           end
 
           def count

data/lib/locomotive/steam/liquid/drops/content_types.rb

@@ -5,7 +5,11 @@ module Locomotive
         class ContentTypes < ::Liquid::Drop
 
           def before_method(meth)
-            fetch_content_type(meth.to_s)
+            if content_type = fetch_content_type(meth.to_s)
+              ContentEntryCollection.new(content_type)
+            else
+              nil
+            end
           end
 
           private
@@ -18,20 +22,12 @@ module Locomotive
             @content_type_map ||= {}
 
             if !@content_type_map.include?(slug)
-              @content_type_map[slug] = _fetch_content_type(slug)
+              @content_type_map[slug] = repository.by_slug(slug)
             end
 
             @content_type_map[slug]
           end
 
-          def _fetch_content_type(slug)
-            if content_type = repository.by_slug(slug)
-              ContentEntryCollection.new(content_type)
-            else
-              nil
-            end
-          end
-
         end
 
       end

data/lib/locomotive/steam/liquid/filters/json.rb

@@ -4,32 +4,39 @@ module Locomotive
       module Filters
         module Json
 
-          def json(input, fields = nil)
+          def json(input, fields = [])
             if fields && fields.is_a?(String)
               fields = fields.split(',').map(&:strip)
             end
 
-            if fields.blank?
-              input.to_json
-            elsif input.respond_to?(:each)
-              if fields.size == 1
-                input.map { |object| object[fields.first].to_json }.join(',')
-              else
-                input.map { |object| "{" + object_to_json(object, fields) + "}" }.join(',')
-              end
+            if input.respond_to?(:each)
+              '[' + input.map do |object|
+                fields.size == 1 ? object[fields.first].to_json : object_to_json(object, fields)
+              end.join(',') + ']'
             else
               object_to_json(input, fields)
             end
           end
 
+          # without the leading and trailing braces/brackets
+          # useful to add a prperty to an object or an element to an array
+          def open_json(input)
+            if input =~ /\A[\{\[](.*)[\}\]]\Z/m
+              $1
+            else
+              input
+            end
+          end
+
           protected
 
           def object_to_json(input, fields)
-            [].tap do |output|
-              fields.each do |field|
-                output << %("#{field}":#{input[field].to_json})
-              end
-            end.join(',')
+            if input.respond_to?(:as_json)
+              options = fields.blank? ? {} : { only: fields }
+              input.as_json(options).to_json
+            else
+              input.to_json
+            end
           end
 
         end

data/lib/locomotive/steam/liquid/tags/editable/base.rb

@@ -11,6 +11,7 @@ module Locomotive
 
             def initialize(tag_name, markup, options)
               if markup =~ Syntax
+                @page_fullpath    = options[:page].fullpath
                 @slug             = $1.gsub(/[\"\']/, '')
                 @element_options  = { fixed: false, inline_editing: true }
                 markup.scan(::Liquid::TagAttributes) { |key, value| @element_options[key.to_sym] = value.gsub(/^[\"\']/, '').gsub(/[\"\']$/, '') }
@@ -31,19 +32,30 @@ module Locomotive
 
             def render(context)
               service   = context.registers[:services].editable_element
-              page      = context.registers[:page]
+              page      = fetch_page(context)
               block     = @element_options[:block] || context['block'].try(:name)
 
               if element = service.find(page, block, @slug)
                 render_element(context, element)
               else
-                # Locomotive::Common::Logger.error "[#{page.fullpath}] missing #{@tag_name} \"#{@slug}\" (#{context['block'].try(:name) || 'default'})"
+                Locomotive::Common::Logger.error "[#{page.fullpath}] missing #{@tag_name} \"#{@slug}\" (#{context['block'].try(:name) || 'default'})"
                 super
               end
             end
 
             protected
 
+            def fetch_page(context)
+              page = context.registers[:page]
+
+              return page if !@element_options[:fixed] || page.fullpath == @page_fullpath
+
+              pages   = context.registers[:pages] ||= {}
+              service = context.registers[:services].page_finder
+
+              pages[@page_fullpath] ||= service.find(@page_fullpath)
+            end
+
             def default_element_attributes
               {
                 block:          self.current_inherited_block_name,