locomotivecms_steam 1.0.1 → 1.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40ab1d48128f72e386a5703b9d7b8714e518a601
-  data.tar.gz: 9831bdde9c497e76449501f7311f0aec76d15da6
+  metadata.gz: 400e04e9a4062cfc7e0102c922c2fe95cca51ce1
+  data.tar.gz: 2336e61a9aa71e12270250a0b5c9fe9954ed979f
 SHA512:
-  metadata.gz: 011f9a7993651c5d525bc6ee9485007aa271d1c5a7742e2fa9f12f090d617d3fe64f75159d35293e7e1412eabf69e95b3223d5e60ecb8a62b2848b290c8fba64
-  data.tar.gz: e18402953d1bbad33d9325a2eb1ed9afbcc2dce76f32116bbc6d3761fefeffa12aa8f98d99b2166dd8e75c821ff5ce531139ff07ef5bdf282f89f97e44a6f530
+  metadata.gz: 93d703f38bc555e0eb23ff1aa5d212a5c26bd15d6e6c849a4f7a585093a3c952c45eafc11bb925e75548ebe0c3c0ad079c517391cb5adc9cc97b861910e8921a
+  data.tar.gz: 2cde9a62ba99ffcf7d731354af3faffbe01eaa2a76bb0f39a209f019df5cccf63b3ee08848a39ed9d70a96b8ab1ac3488997a5908355e17105acaf2aa66acbae

data/Gemfile

@@ -3,7 +3,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  # gem 'locomotivecms_common', '~> 0.0.3', path: '../common'
+  # gem 'locomotivecms_common', github: 'locomotivecms/common', ref: '257047b'
+  # gem 'locomotivecms_common', 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,24 +1,24 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.0.1)
+    locomotivecms_steam (1.1.0.rc1)
       RedCloth (~> 4.2.9)
-      autoprefixer-rails (~> 6.2.3)
+      autoprefixer-rails (~> 6.3.3.1)
       chronic (~> 0.10.2)
       coffee-script (~> 2.4.1)
       compass (~> 1.0.3)
       dragonfly (~> 1.0.12)
       haml (~> 4.0.6)
       httparty (~> 0.13.6)
-      kramdown (~> 1.9.0)
+      kramdown (~> 1.10.0)
       locomotivecms-solid (~> 4.0.1)
-      locomotivecms_common (~> 0.0.5)
+      locomotivecms_common (~> 0.1.0)
       mime-types (~> 2.6.1)
       mimetype-fu (~> 0.1.2)
       moneta (~> 0.8.0)
       morphine (~> 0.1.1)
       nokogiri (~> 1.6.7.2)
-      rack-cache (~> 1.2)
+      rack-cache (~> 1.6.1)
       rack-rewrite (~> 1.5.1)
       rack_csrf (~> 2.5.0)
       sanitize (~> 4.0.1)
@@ -29,7 +29,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activesupport (4.2.5.1)
+    activesupport (4.2.5.2)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -37,10 +37,9 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.4.0)
     attr_extras (4.4.0)
-    autoprefixer-rails (6.2.3)
+    autoprefixer-rails (6.3.3.1)
       execjs
-      json
-    bson (4.0.0)
+    bson (4.0.2)
     byebug (8.2.1)
     chronic (0.10.2)
     chunky_png (1.3.5)
@@ -64,7 +63,7 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    concurrent-ruby (1.0.0)
+    concurrent-ruby (1.0.1)
     coveralls (0.8.10)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
@@ -104,15 +103,15 @@ GEM
     json_spec (1.1.4)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    kramdown (1.9.0)
+    kramdown (1.10.0)
     locomotivecms-liquid (4.0.0)
     locomotivecms-solid (4.0.1)
       locomotivecms-liquid (~> 4.0.0)
-    locomotivecms_common (0.0.5)
-      activesupport (~> 4.2.1)
+    locomotivecms_common (0.1.0)
+      activesupport (~> 4.2.5.2)
       attr_extras (~> 4.4.0)
       colorize
-      stringex (~> 2.5.2)
+      stringex (~> 2.6.0)
     memory_profiler (0.9.6)
     method_source (0.8.2)
     mime-types (2.6.2)
@@ -120,7 +119,7 @@ GEM
     mini_portile2 (2.0.0)
     minitest (5.8.4)
     moneta (0.8.0)
-    mongo (2.2.1)
+    mongo (2.2.3)
       bson (~> 4.0)
     morphine (0.1.1)
     multi_json (1.11.2)
@@ -187,7 +186,7 @@ GEM
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     stackprof (0.2.7)
-    stringex (2.5.2)
+    stringex (2.6.0)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
@@ -214,7 +213,7 @@ DEPENDENCIES
   json_spec (~> 1.1.4)
   locomotivecms_steam!
   memory_profiler
-  mongo (~> 2.2.1)
+  mongo (~> 2.2.3)
   origin (~> 2.1.1)
   pry-byebug (~> 3.3.0)
   puma

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

@@ -28,10 +28,13 @@ module Locomotive::Steam
 
           def parse_metafields(fields)
             fields.each_with_index.map do |(name, attributes), position|
+              name, attributes = name.to_a[0] if name.is_a?(Hash) # ordered list of fields
+
               if attributes # Hash
                 attributes[:label]  = { default: attributes[:label] } if attributes[:label].is_a?(String)
                 attributes[:hint]   = { default: attributes[:hint] } if attributes[:hint].is_a?(String)
               end
+
               { name: name.to_s, position: position }.merge(attributes || {})
             end
           end

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

@@ -22,6 +22,7 @@ module Locomotive
 
                   modify_for_selects(_attributes)
                   modify_for_associations(_attributes)
+                  modify_for_files(_attributes)
 
                   list << _attributes
                 end
@@ -34,6 +35,27 @@ module Locomotive
               end
             end
 
+            def modify_for_files(attributes)
+              content_type.file_fields.each do |field|
+                attributes[:"#{field.name}_size"] ||= {}
+                value = attributes[:"#{field.name}_size"]
+
+                if (path = attributes[field.name.to_sym]).is_a?(Hash)
+                  path.each { |locale, path| value[locale.to_s] = file_size(path) }
+                else
+                  value['default'] = file_size(path)
+                end
+              end
+            end
+
+            def file_size(path)
+              return nil if path.blank?
+
+              _path = File.join(site_path, 'public', path)
+
+              File.exists?(_path) ? File.size(_path) : nil
+            end
+
             def modify_for_associations(attributes)
               content_type.association_fields.each do |field|
                 case field.type

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

@@ -23,7 +23,7 @@ module Locomotive
             private
 
             def load_metafields_schema
-              schema = _load(File.join(site_path, 'config', 'metafields_schema.yml'))
+              _load(File.join(site_path, 'config', 'metafields_schema.yml'))
             end
 
           end

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

@@ -51,11 +51,11 @@ module Locomotive::Steam
         end
 
         class Asc < Direction
-          def <=>(other); @obj <=> other.obj; end
+          def <=>(other) @obj && other.obj ? @obj <=> other.obj : @obj ? -1 : 1; end
         end
 
         class Desc < Direction
-          def <=>(other); other.obj <=> @obj; end
+          def <=>(other); @obj && other.obj ? other.obj <=> @obj : @obj ? -1 : 1; end
         end
 
       end

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

@@ -129,8 +129,13 @@ module Locomotive::Steam
     end
 
     def _cast_file(field)
-      _cast_convertor(field.name) do |value|
-        value.respond_to?(:url) ? value : FileField.new(value, self.base_url, self.updated_at)
+      _cast_convertor(field.name) do |value, locale|
+        if value.respond_to?(:url)
+          value
+        else
+          size = (self[:"#{field.name}_size"] || {})[locale || 'default']
+          FileField.new(value, self.base_url, size, self.updated_at)
+        end
       end
     end
 
@@ -172,7 +177,7 @@ module Locomotive::Steam
     # Represent a file
     class FileField
 
-      attr_accessor_initialize :filename, :base, :updated_at
+      attr_accessor_initialize :filename, :base, :size, :updated_at
 
       def url
         return if filename.blank?

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

@@ -7,6 +7,7 @@ module Locomotive::Steam
 
     def_delegator :fields, :associations, :association_fields
     def_delegator :fields, :selects, :select_fields
+    def_delegator :fields, :files, :file_fields
     def_delegator :fields, :default, :fields_with_default
 
     def initialize(attributes = {})

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

@@ -38,7 +38,7 @@ module Locomotive
 
             return @labels_and_values if @labels_and_values
 
-            ordered_fields = @namespace['fields'].sort { |f| f['position'] }
+            ordered_fields = @namespace['fields'].sort { |a, b| a['position'] <=> b['position'] }
 
             @labels_and_values = ordered_fields.map do |field|
               value, localized = values[field['name']], field['localized']

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

@@ -12,6 +12,10 @@ module Locomotive
             NumberProxyHelper.new(:percentage, @context).invoke(input, options)
           end
 
+          def human_size(input, *options)
+            NumberProxyHelper.new(:human_size, @context).invoke(input, options)
+          end
+
           def mod(input, modulus)
             input.to_i % modulus.to_i
           end

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

@@ -47,6 +47,10 @@ module Locomotive
               end
             end
 
+            def blank?
+              false
+            end
+
             protected
 
             def render_default_content

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

@@ -44,7 +44,8 @@ module Locomotive
                 content_from_default: self.render_default_content,
                 format:               @element_options[:format] || 'html',
                 rows:                 @element_options[:rows] || 10,
-                line_break:           @element_options[:line_break].blank? ? true : @element_options[:line_break]
+                inline:               @element_options[:inline],
+                line_break:           @element_options[:line_break].blank? ? true : @element_options[:line_break],
               )
             end
 
@@ -67,14 +68,14 @@ module Locomotive
               super
             end
             def default_element_attributes
-              super.merge(format: 'raw', rows: 2, line_break: false)
+              super.merge(format: 'raw', rows: 2, line_break: false, inline: true)
             end
           end
           ::Liquid::Template.register_tag('editable_short_text'.freeze, ShortText)
 
           class LongText < ShortText
             def default_element_attributes
-              super.merge(format: 'html', rows: 15, line_break: true)
+              super.merge(format: 'html', rows: 15, line_break: true, inline: false)
             end
           end
           ::Liquid::Template.register_tag('editable_long_text'.freeze, LongText)

data/lib/locomotive/steam/middlewares/locale_redirection.rb

@@ -29,7 +29,7 @@ module Locomotive::Steam
       end
 
       def apply_redirection?
-        site.locales.size > 1 && request.get?
+        site.locales.size > 1 && request.get? && env['PATH_INFO'] != '/sitemap.xml'
       end
 
       def default_locale?

data/lib/locomotive/steam/models/i18n_field.rb

@@ -43,7 +43,9 @@ module Locomotive::Steam
         if default
           @translations = Hash.new(yield(default))
         else
-          each { |l, _value| self[l] = yield(_value) }
+          each do |l, _value|
+            self[l] = block.arity == 2 ? yield(_value, l) : yield(_value)
+          end
         end
         self
       end

data/lib/locomotive/steam/repositories/content_entry_repository.rb

@@ -171,7 +171,7 @@ module Locomotive
 
         conditions = prepare_conditions({ k(name, op) => i18n_value_of(entry, name) })
 
-        public_send(op == 'gt' ? :last : :first) do
+        public_send(asc_op == 'gt' ? :first : :last) do
           where(conditions).order_by(order_by)
         end
       end

data/lib/locomotive/steam/repositories/content_type_field_repository.rb

@@ -22,6 +22,10 @@ module Locomotive
         query { where(type: :select) }.all
       end
 
+      def files
+        query { where(type: :file) }.all
+      end
+
       def belongs_to
         query { where(type: :belongs_to) }.all
       end

data/lib/locomotive/steam/version.rb

@@ -3,6 +3,6 @@
 # 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
 module Locomotive
   module Steam
-    VERSION = '1.0.1'
+    VERSION = '1.1.0.rc1'
   end
 end

data/locomotivecms_steam.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler',    '~> 1.7'
   spec.add_development_dependency 'rake',       '~> 10.4.2'
 
-  spec.add_development_dependency 'mongo',      '~> 2.2.1'
+  spec.add_development_dependency 'mongo',      '~> 2.2.3'
   spec.add_development_dependency 'origin',     '~> 2.1.1'
 
   spec.add_dependency 'nokogiri',               '~> 1.6.7.2'
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'chronic',                '~> 0.10.2'
 
   spec.add_dependency 'rack-rewrite',           '~> 1.5.1'
-  spec.add_dependency 'rack-cache',             '~> 1.2'
+  spec.add_dependency 'rack-cache',             '~> 1.6.1'
   spec.add_dependency 'dragonfly',              '~> 1.0.12'
   spec.add_dependency 'moneta',                 '~> 0.8.0'
   spec.add_dependency 'rack_csrf',              '~> 2.5.0'
@@ -37,16 +37,16 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sass',                   '~> 3.4.21'
   spec.add_dependency 'coffee-script',          '~> 2.4.1'
   spec.add_dependency 'compass',                '~> 1.0.3'
-  spec.add_dependency 'autoprefixer-rails',     '~> 6.2.3'
+  spec.add_dependency 'autoprefixer-rails',     '~> 6.3.3.1'
 
-  spec.add_dependency 'kramdown',               '~> 1.9.0'
+  spec.add_dependency 'kramdown',               '~> 1.10.0'
   spec.add_dependency 'RedCloth',               '~> 4.2.9'
   spec.add_dependency 'haml',                   '~> 4.0.6'
   spec.add_dependency 'mimetype-fu',            '~> 0.1.2'
   spec.add_dependency 'mime-types',             '~> 2.6.1'
 
   spec.add_dependency 'locomotivecms-solid',      '~> 4.0.1'
-  spec.add_dependency 'locomotivecms_common',     '~> 0.0.5'
+  spec.add_dependency 'locomotivecms_common',     '~> 0.1.0'
 
   spec.required_ruby_version = '>= 2.0'
 end

data/spec/fixtures/default/data/songs.yml

@@ -8,7 +8,9 @@
     duration: "6:28"
     short_description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur vitae tincidunt urna. Nunc felis purus, ultricies et venenatis bibendum, fringilla eu lectus. Sed cursus, sem at blandit mattis, libero quam egestas tortor, eget cursus dolor tellus id nunc.
     audio_url: http://blip.tv/file/get/NicolasRaynier-Milk617.flv
-    cover: /samples/asset_collections/cover.jpg
+    cover:
+      en: /samples/asset_collections/cover.jpg
+      fr: /samples/photo_2.jpg
     band: pearl-jam
 - "Song #3":
     duration: "6:28"
@@ -43,4 +45,4 @@
     duration: "6:28"
     short_description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur vitae tincidunt urna. Nunc felis purus, ultricies et venenatis bibendum, fringilla eu lectus. Sed cursus, sem at blandit mattis, libero quam egestas tortor, eget cursus dolor tellus id nunc.
     audio_url: http://blip.tv/file/get/NicolasRaynier-Milk617.flv
-    cover: /samples/asset_collections/cover.jpg
+    cover: /samples/asset_collections/cover.jpg

data/spec/unit/adapters/filesystem/sanitizers/site_spec.rb

@@ -26,7 +26,26 @@ describe Locomotive::Steam::Adapters::Filesystem::Sanitizers::Site do
     describe 'with a schema' do
 
       # see the metafields_schema.yml in the fixtures folder
-      let(:schema) { {:social=>{:label=>{:fr=>"Social (FR)"}, :position=>1, :fields=>["facebook_id", "google_id"]}, :github=>{:position=>0, :fields=>{:api_url=>{:label=>"API Url", :type=>"string", :hint=>"API endpoint"}, :expires_in=>{:label=>{:en=>"Expires in", :fr=>"Expire dans"}, :hint=>{:en=>"Cache - In milliseconds", :fr=>"Cache - En millisecondes"}, :type=>"integer", :min=>0, :max=>3600}}}} }
+      let(:schema) { {
+        :social => {
+          :label    => { :fr=>"Social (FR)" },
+          :position => 1,
+          :fields   => ["facebook_id", "google_id"]
+        },
+        :github => {
+          :position => 0,
+          :fields   => {
+            :api_url    => { :label => "API Url", :type => "string", :hint => "API endpoint" },
+            :expires_in => { :label => { :en => "Expires in", :fr => "Expire dans" }, :hint => { :en => "Cache - In milliseconds", :fr => "Cache - En millisecondes" }, :type => "integer", :min => 0, :max => 3600 }
+          }
+        },
+        :theme => {
+          :fields => [
+            { :color => { :label => 'Color', type: 'color' } },
+            { :header => { :label => 'Header image', type: 'image' } }
+          ]
+        }
+      } }
 
       it 'loads the full schema' do
         # First namespace
@@ -40,6 +59,12 @@ describe Locomotive::Steam::Adapters::Filesystem::Sanitizers::Site do
         expect(subject[1]['position']).to eq 0
         expect(subject[1]['fields'].count).to eq 2
         expect(subject[1]['fields'][0]).to eq('name' => 'api_url', 'position' => 0, 'label' => { 'default' => 'API Url' }, 'type' => 'string', 'hint' => { 'default' => 'API endpoint' })
+
+        # Third namespace
+        expect(subject[2]['label']).to eq('default' => 'theme')
+        expect(subject[2]['fields'].count).to eq 2
+        expect(subject[2]['fields'][0]).to eq('name' => 'color', 'position' => 0, 'label' => { 'default' => 'Color' }, 'type' => 'color')
+        expect(subject[2]['fields'][1]).to eq('name' => 'header', 'position' => 1, 'label' => { 'default' => 'Header image' }, 'type' => 'image')
       end
 
       context 'label is a string instead of a hash' do

data/spec/unit/adapters/filesystem/yaml_loaders/content_entry_spec.rb

@@ -6,7 +6,7 @@ require_relative '../../../../../lib/locomotive/steam/adapters/filesystem/yaml_l
 describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::ContentEntry do
 
   let(:site_path)     { default_fixture_site_path }
-  let(:content_type)  { instance_double('Bands', _id: 42, slug: 'bands', association_fields: [], select_fields: []) }
+  let(:content_type)  { instance_double('Bands', _id: 42, slug: 'bands', association_fields: [], select_fields: [], file_fields: []) }
   let(:scope)         { instance_double('Scope', locale: :en, context: { content_type: content_type }) }
   let(:loader)        { described_class.new(site_path) }
 
@@ -23,7 +23,7 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::ContentEntry do
     context 'a content type with a belongs_to field' do
 
       let(:field)         { instance_double('Field', name: 'band', type: :belongs_to) }
-      let(:content_type)  { instance_double('Songs', slug: 'songs', association_fields: [field], select_fields: []) }
+      let(:content_type)  { instance_double('Songs', slug: 'songs', association_fields: [field], select_fields: [], file_fields: []) }
 
       it 'adds a new attribute for the foreign key' do
         expect(subject.first[:band_id]).to eq 'pearl-jam'
@@ -36,7 +36,7 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::ContentEntry do
     context 'a content type with a select field' do
 
       let(:field)         { instance_double('Field', name: 'kind', type: :select) }
-      let(:content_type)  { instance_double('Bands', slug: 'bands', select_fields: [field], association_fields: []) }
+      let(:content_type)  { instance_double('Bands', slug: 'bands', select_fields: [field], association_fields: [], file_fields: []) }
 
       it 'adds a new attribute for the foreign key' do
         expect(subject.first[:kind_id]).to eq 'grunge'
@@ -45,6 +45,22 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::ContentEntry do
 
     end
 
+    context 'a content type with a file field' do
+
+      let(:field)         { instance_double('Field', name: 'cover', type: :file) }
+      let(:content_type)  { instance_double('Songs', slug: 'songs', select_fields: [], association_fields: [], file_fields: [field]) }
+
+      it 'stores the size of the file' do
+        expect(subject.first[:cover_size]).to eq('default' => 14768)
+      end
+
+      it 'stores the size of the file in multiple locales' do
+        expect(subject[1][:cover_size]).to eq('en' => 14768, 'fr' => 165883)
+      end
+
+
+    end
+
   end
 
 end

data/spec/unit/adapters/memory/order_spec.rb

@@ -71,6 +71,21 @@ describe Locomotive::Steam::Adapters::Memory::Order do
 
     it { expect(subject.map(&:id)).to eq([3, 2, 1, 4]) }
 
+    context 'nil value in the array' do
+
+      let(:array) {
+        [
+          instance_double('Entry1', id: 1, title: 'b', position: 1),
+          instance_double('Entry2', id: 2, title: 'b', position: 2),
+          instance_double('Entry3', id: 3, title: nil, position: 3),
+          instance_double('Entry3', id: 4, title: 'c', position: 1)
+        ]
+      }
+
+      it { expect(subject.map(&:id)).to eq([2, 1, 4, 3]) }
+
+    end
+
   end
 
 end

data/spec/unit/entities/content_entry_spec.rb

@@ -169,11 +169,20 @@ describe Locomotive::Steam::ContentEntry do
     context 'a file' do
       let(:field_type)  { :file }
       let(:value)       { '/foo.png' }
+      let(:attributes)  { { my_field: value, my_field_size: { 'default' => 42 } } }
       it { expect(subject.url).to eq('/foo.png') }
+      it { expect(subject.size).to eq(42) }
       context 'localized' do
         let(:value) { build_i18n_field(en: '/foo-en.png', fr: '/foo-fr.png') }
+        let(:attributes)  { { my_field: value, my_field_size: { 'en' => 42, 'fr' => 7 } } }
         it { expect(subject.translations[:en].url).to eq('/foo-en.png') }
+        it { expect(subject.translations[:en].size).to eq(42) }
         it { expect(subject.translations[:fr].url).to eq('/foo-fr.png') }
+        it { expect(subject.translations[:fr].size).to eq(7) }
+      end
+      context 'no file size provided' do
+        let(:attributes)  { { my_field: value } }
+        it { expect(subject.size).to eq(nil) }
       end
     end
 

data/spec/unit/liquid/drops/content_entry_spec.rb

@@ -101,7 +101,7 @@ describe Locomotive::Steam::Liquid::Drops::ContentEntry do
   describe '#as_json' do
 
     let(:type) { instance_double('Type', fields_by_name: { title: instance_double('StringField', type: :string ), picture: instance_double('FileField', type: :file), category: instance_double('SelectField', type: :select) }) }
-    let(:picture_field) { Locomotive::Steam::ContentEntry::FileField.new('foo.png', 'http://assets.dev', 42) }
+    let(:picture_field) { Locomotive::Steam::ContentEntry::FileField.new('foo.png', 'http://assets.dev', 0, 42) }
 
     before do
       allow(entry).to receive(:to_hash).and_return({ '_id' => 1, 'title' => 'Hello world', 'picture' => picture_field, 'category_id' => 42 })

data/spec/unit/liquid/drops/metafields_spec.rb

@@ -3,11 +3,27 @@ require 'spec_helper'
 describe Locomotive::Steam::Liquid::Drops::Metafields do
 
   let(:metafields)  { { 'my_namespace' => { 'analytics_id' => { 'default' => '42' }, 'street' => { 'en' => '7 Albert Camus Alley', 'fr' => '7 allée Albert Camus' } } } }
-  let(:schema)      { [ { 'name' => 'my_namespace', fields: [{ name: 'analytics_id' }, { name: 'street', localized: true }, { name: 'country' }] }].as_json }
+  let(:schema)      { [ { 'name' => 'my_namespace', fields: [{ name: 'analytics_id', position: 1 }, { name: 'street', localized: true, position: 0 }, { name: 'country', :position => 2 }] }].as_json }
   let(:site)        { instance_double('Site', metafields: metafields, metafields_schema: schema) }
   let(:context)     { ::Liquid::Context.new({}, {}, { locale: 'en' }) }
   let(:drop)        { described_class.new(site).tap { |d| d.context = context } }
 
+  describe 'fields' do
+
+    let(:namespace) { drop.before_method(:my_namespace).tap { |d| d.context = context } }
+
+    it 'gives the number of the fields' do
+      expect(namespace.size).to eq 3
+    end
+
+    it 'iterates over the fields and keeps the order' do
+      list = []
+      namespace.each { |el| list << el['name'] }
+      expect(list).to eq(['street', 'analytics_id', 'country'])
+    end
+
+  end
+
   describe 'calling a metafield' do
 
     context 'unknown namespace' do

data/spec/unit/liquid/filters/number_spec.rb

@@ -87,6 +87,35 @@ describe Locomotive::Steam::Liquid::Filters::Number do
 
   end
 
+  describe '#human_size' do
+
+    subject { human_size(input, options) }
+
+    context 'not a number' do
+
+      it { expect(subject).to eq nil }
+
+    end
+
+    context 'a number' do
+
+      let(:input) { 1234567890 }
+
+      it { expect(subject).to eq '1.15 GB' }
+
+    end
+
+    context 'with options' do
+
+      let(:input) { '1234567' }
+      let(:options) { ['precision: 2'] }
+
+      it { expect(subject).to eq '1.2 MB' }
+
+    end
+
+  end
+
   describe '#mod' do
 
     it 'returns correct number modulus' do

data/spec/unit/liquid/tags/editable/file_spec.rb

@@ -145,6 +145,12 @@ describe Locomotive::Steam::Liquid::Tags::Editable::File do
 
     end
 
+    context 'no default file and inside a capture block' do
+      let(:source)  { "{% capture url %}{% editable_file banner, hint: 'some text' %}{% endeditable_file %}{% endcapture %}->{{ url }}" }
+      let(:element) { instance_double('EditableFile', id: 42, default_source_url: nil, source?: true, source: '/foo/bar', content: nil, base_url: '') }
+      it { is_expected.to eq '->/foo/bar?1183150800' }
+    end
+
   end
 
 end

data/spec/unit/liquid/tags/editable/text_spec.rb

@@ -62,6 +62,7 @@ describe Locomotive::Steam::Liquid::Tags::Editable::Text do
         it { is_expected.to include(format: 'html') }
         it { is_expected.to include(rows: 10) }
         it { is_expected.to include(line_break: true) }
+        it { is_expected.to include(inline: nil) }
         it { is_expected.to include(content_from_default: 'Hello world') }
 
         context 'with a defined slug' do

data/spec/unit/middlewares/locale_redirection_spec.rb

@@ -90,6 +90,11 @@ describe Locomotive::Steam::Middlewares::LocaleRedirection do
         it { is_expected.to eq [301, '/mounted-on/somewhere/de/hello/world'] }
       end
 
+      describe 'requesting sitemap.xml' do
+        let(:url) { 'http://models.example.com/sitemap.xml' }
+        it { is_expected.to eq [200, nil] }
+      end
+
     end
 
     describe 'with locale' do

data/spec/unit/repositories/content_entry_repository_spec.rb

@@ -123,65 +123,91 @@ describe Locomotive::Steam::ContentEntryRepository do
 
   end
 
-  describe '#next' do
+  describe '#next or #previous' do
 
-    let(:type) { build_content_type('Articles', order_by: { _position: 'asc' }, label_field_name: :title, localized_names: [:title], fields: _fields, fields_by_name: { title: instance_double('Field', name: :title, type: :string) }, fields_with_default: []) }
+    let(:direction) { 'asc' }
+    let(:type)      { build_content_type('Articles', order_by: { _position: direction }, label_field_name: :title, localized_names: [:title], fields: _fields, fields_by_name: { title: instance_double('Field', name: :title, type: :string) }, fields_with_default: []) }
+    let(:entry)     { nil }
     let(:entries) do
       [
         { content_type_id: 1, _position: 0, _label: 'Update #1', title: { fr: 'Mise a jour #1' }, text: { en: 'added some free stuff', fr: 'phrase FR' }, date: '2009/05/12', category: 'General' },
         { content_type_id: 1, _position: 1, _label: 'Update #2', title: { fr: 'Mise a jour #2' }, text: { en: 'bla bla', fr: 'blabbla' }, date: '2009/05/12', category: 'General' },
-        { content_type_id: 1, _position: 2, _label: 'Update #3', title: { fr: 'Mise a jour #2' }, text: { en: 'bla bla', fr: 'blabbla' }, date: '2009/05/12', category: 'General' }
+        { content_type_id: 1, _position: 2, _label: 'Update #3', title: { fr: 'Mise a jour #3' }, text: { en: 'bla bla', fr: 'blabbla' }, date: '2009/05/12', category: 'General' },
+        { content_type_id: 1, _position: 3, _label: 'Update #4', title: { fr: 'Mise a jour #4' }, text: { en: 'bla bla', fr: 'blabbla' }, date: '2009/05/12', category: 'General' }
       ]
     end
 
-    let(:entry) { nil }
-    subject { repository.next(entry) }
+    describe '#next' do
 
-    it { is_expected.to eq nil }
-
-    context 'being last' do
+      subject { repository.next(entry) }
 
-      let(:entry) { instance_double('Entry', content_type: type, _position: 2) }
       it { is_expected.to eq nil }
 
-    end
+      context 'being last' do
 
-    context 'being middle' do
+        let(:entry) { instance_double('Entry', content_type: type, _position: 3) }
+        it { is_expected.to eq nil }
 
-      let(:entry) { instance_double('Entry', content_type: type, _position: 1) }
-      it { expect(subject._position).to eq 2 }
+      end
 
-    end
+      context 'being middle' do
 
-  end
+        let(:entry) { instance_double('Entry', content_type: type, _position: 0) }
+        it { expect(subject._position).to eq 1 }
 
-  describe '#previous' do
+        describe 'another example' do
 
-    let(:type) { build_content_type('Articles', order_by: { _position: 'asc' }, label_field_name: :title, localized_names: [:title], fields: _fields, fields_by_name: { title: instance_double('Field', name: :title, type: :string) }, fields_with_default: []) }
-    let(:entries) do
-      [
-        { content_type_id: 1, _position: 0, _label: 'Update #1', title: { fr: 'Mise a jour #1' }, text: { en: 'added some free stuff', fr: 'phrase FR' }, date: '2009/05/12', category: 'General' },
-        { content_type_id: 1, _position: 1, _label: 'Update #2', title: { fr: 'Mise a jour #2' }, text: { en: 'bla bla', fr: 'blabbla' }, date: '2009/05/12', category: 'General' },
-        { content_type_id: 1, _position: 2, _label: 'Update #3', title: { fr: 'Mise a jour #2' }, text: { en: 'bla bla', fr: 'blabbla' }, date: '2009/05/12', category: 'General' }
-      ]
-    end
+          let(:entry) { instance_double('Entry', content_type: type, _position: 1) }
+          it { expect(subject._position).to eq 2 }
 
-    let(:entry) { nil }
-    subject { repository.previous(entry) }
+        end
 
-    it { is_expected.to eq nil }
+        context 'changing direction' do
 
-    context 'being first' do
+          let(:direction) { 'desc' }
+          let(:entry) { instance_double('Entry', content_type: type, _position: 2) }
+          it { expect(subject._position).to eq 1 }
 
-      let(:entry) { instance_double('Entry', content_type: type, _position: 0) }
-      it { is_expected.to eq nil }
+        end
+
+      end
 
     end
 
-    context 'being middle' do
+    describe '#previous' do
 
-      let(:entry) { instance_double('Entry', content_type: type, _position: 1) }
-      it { expect(subject._position).to eq 0 }
+      subject { repository.previous(entry) }
+
+      it { is_expected.to eq nil }
+
+      context 'being first' do
+
+        let(:entry) { instance_double('Entry', content_type: type, _position: 0) }
+        it { is_expected.to eq nil }
+
+      end
+
+      context 'being middle' do
+
+        let(:entry) { instance_double('Entry', content_type: type, _position: 1) }
+        it { expect(subject._position).to eq 0 }
+
+        describe 'another example' do
+
+          let(:entry) { instance_double('Entry', content_type: type, _position: 2) }
+          it { expect(subject._position).to eq 1 }
+
+        end
+
+        context 'changing direction' do
+
+          let(:direction) { 'desc' }
+          let(:entry) { instance_double('Entry', content_type: type, _position: 2) }
+          it { expect(subject._position).to eq 3 }
+
+        end
+
+      end
 
     end
 

data/spec/unit/repositories/content_type_field_repository_spec.rb

@@ -55,6 +55,18 @@ describe Locomotive::Steam::ContentTypeFieldRepository do
     subject { repository.default }
 
     it { expect(subject.first.name).to eq 'email' }
+    it { expect(subject.count).to eq 1 }
+
+  end
+
+  describe '#files' do
+
+    let(:collection)  { [{ name: 'name', type: 'string' }, { name: 'picture', type: 'file' }] }
+
+    subject { repository.files }
+
+    it { expect(subject.first.name).to eq 'picture' }
+    it { expect(subject.count).to eq 1 }
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0.rc1
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: origin
   requirement: !ruby/object:Gem::Requirement
@@ -159,14 +159,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -271,28 +271,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.2.3
+        version: 6.3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.2.3
+        version: 6.3.3.1
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -369,14 +369,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.1.0
 description: The LocomotiveCMS Steam is the rendering stack used by both Wagon and
   Engine
 email:
@@ -466,7 +466,7 @@ files:
 - lib/locomotive/steam/liquid/drops/page.rb
 - lib/locomotive/steam/liquid/drops/session_proxy.rb
 - lib/locomotive/steam/liquid/drops/site.rb
-- lib/locomotive/steam/liquid/drops/upload_file.rb
+- lib/locomotive/steam/liquid/drops/uploaded_file.rb
 - lib/locomotive/steam/liquid/errors.rb
 - lib/locomotive/steam/liquid/filters/base.rb
 - lib/locomotive/steam/liquid/filters/date.rb
@@ -816,9 +816,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1