locomotivecms_steam 1.2.0.rc2 → 1.2.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a6e18bc9462639abb5ca0ad612c9e25891657dc
-  data.tar.gz: 4671db28b74b0241d7c31fdb6573aa93f0e10350
+  metadata.gz: eec023af794726f45fcdf70d6cb85b9874a8b56e
+  data.tar.gz: 67d5c5968b4597655ead417285dfa9163204d819
 SHA512:
-  metadata.gz: 237e6723009705ffb9ea1295ea8976074cbaa79ebe5a47f866896f2e34f2af9563640e53951b97d7540b0e0ffb9d2a86b74bc93bab7df02f317ec869a691feb8
-  data.tar.gz: 0847e3956476840614b275101f659ca01ca6a708568f25a66bca0db5cb023c9d1bab620c22e3c66f2806676b74a6cc294d104ebcbfc97a5a82fc34503c37ed44
+  metadata.gz: e6e0cab759ddd568f92f50dd88a4e1116b09f2ac959908dcf0067da5c4e2d90236fa75d3beabb7c8070fdaee9a8d7015d677b74d29aeb84c00beec500a7ff125
+  data.tar.gz: 86e838bd1b3db3ff5cd16465c1a0fb2d2ded0000368cbaca310409fc8fd93a93b90bb42e3252dd94313336f27fa7a3e5d3253dc6fd6af1499280ee652a89485e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.2.0.rc2)
+    locomotivecms_steam (1.2.0.rc3)
       RedCloth (~> 4.3.2)
       autoprefixer-rails (~> 6.3.3.1)
       chronic (~> 0.10.2)
@@ -112,20 +112,18 @@ GEM
     mime-types (2.6.2)
     mimetype-fu (0.1.2)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
+    minitest (5.9.1)
     moneta (0.8.0)
     mongo (2.2.7)
       bson (~> 4.0)
     morphine (0.1.1)
     multi_json (1.12.1)
     multi_xml (0.5.5)
-    nokogiri (1.6.8)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
     nokogumbo (1.4.9)
       nokogiri
     origin (2.2.0)
-    pkg-config (1.1.7)
     pony (1.11)
       mail (>= 2.0)
     pry (0.10.4)

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

@@ -52,7 +52,11 @@ module Locomotive::Steam
     end
 
     def make_id(id)
-      BSON::ObjectId.from_string(id)
+      begin
+        BSON::ObjectId.from_string(id)
+      rescue BSON::ObjectId::Invalid
+        false
+      end
     end
 
     def base_url(mapper, scope, entity = nil)

data/lib/locomotive/steam/liquid/tags/action.rb

@@ -38,7 +38,7 @@ module Locomotive
 
           def render(context)
             Locomotive::Common::Logger.info "[action] executing #{@description}"
-            service(context).run(super, context['params'], context)
+            service(context).run(super, safe_params(context), context)
             ''
           end
 
@@ -48,6 +48,24 @@ module Locomotive
             context.registers[:services].action
           end
 
+          def safe_params(context)
+            return {} if context['params'].blank?
+
+            context['params'].dup.tap do |params|
+              # Tempfile can't be converted in Duktape for obvious reasons
+              replace_tempfile(params)
+            end
+          end
+
+          def replace_tempfile(hash)
+            hash.each do |key, value|
+              case value
+              when Tempfile then hash[key] = value.path
+              when Hash     then replace_tempfile(value)
+              end
+            end
+          end
+
         end
 
         ::Liquid::Template.register_tag('action'.freeze, Action)

data/lib/locomotive/steam/liquid/tags/consume.rb

@@ -72,7 +72,7 @@ module Locomotive
                 Locomotive::Common::Logger.info "[consume] #{@url.inspect} / #{@api_options.inspect}"
 
                 context.scopes.last[@name] = service(context).consume(@url, @api_options)
-              rescue Timeout::Error
+              rescue Timeout::Error, Errno::ETIMEDOUT
                 context.scopes.last[@name] = last_response(context)
               end
 

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

@@ -22,8 +22,12 @@ module Locomotive
         default_attribute :content_type, -> (repository) { repository.content_type }
       end
 
-      # this is the starting point of all the next methods
+      # this is the starting point of all the next methods.
+      # type can be either an instance of the ContentTypeRepository class
+      # or the id of a content type.
       def with(type)
+        type = self.content_type_repository.find(type) if type.is_a?(String)
+
         self.content_type = type # used for creating the scope
         self.scope.context[:content_type] = type
 
@@ -131,11 +135,15 @@ module Locomotive
       end
 
       def prepare_conditions(*conditions)
-        _conditions = Conditions.new(adapter, conditions.first, self.content_type.fields).prepare
+        _conditions = Conditions.new(conditions.first, self.content_type.fields, simple_clone).prepare
 
         super({ _visible: true }, _conditions)
       end
 
+      def simple_clone
+        self.class.new(self.adapter, self.site, self.locale, self.content_type_repository)
+      end
+
       def add_localized_fields_to_mapper(mapper)
         unless self.content_type.localized_names.blank?
           mapper.localized_attributes(*self.content_type.localized_names)
@@ -185,10 +193,10 @@ module Locomotive
 
       class Conditions
 
-        def initialize(adapter, conditions = {}, fields)
-          @adapter    = adapter
+        def initialize(conditions = {}, fields, target_repository)
           @conditions = conditions.try(:with_indifferent_access) || {}
           @fields, @operators = fields, {}
+          @target_repository = target_repository
 
           @conditions.each do |name, value|
             _name, operator = name.to_s.split('.')
@@ -206,10 +214,10 @@ module Locomotive
           _prepare(@fields.dates_and_date_times) { |field, value| value_to_date(value, field.type) }
 
           # belongs_to
-          _prepare(@fields.belongs_to) { |field, value| value_to_id(value) }
+          _prepare(@fields.belongs_to) { |field, value| value_to_id(value, field.target_id) }
 
           # many_to_many
-          _prepare(@fields.many_to_many) { |field, value| values_to_ids(value) }
+          _prepare(@fields.many_to_many) { |field, value| values_to_ids(value, field.target_id) }
 
           @conditions
         end
@@ -237,16 +245,31 @@ module Locomotive
           end
         end
 
-        def value_to_id(value)
+        def values_to_ids(value, target_id)
+          [*value].map { |_value| value_to_id(_value, target_id) }
+        end
+
+        def value_to_id(value, target_id)
           _value = if value.is_a?(Hash)
             value['_id'] || value[:_id]
           elsif value.respond_to?(:each) # array
-            values_to_ids(value)
+            values_to_ids(value, target_id)
           else
             value.respond_to?(:_id) ? value._id : value
           end
 
-          @adapter.make_id(_value)
+          if (id = @target_repository.adapter.make_id(_value)) == false
+            slug_to_id(value, target_id)
+          else
+            id
+          end
+        end
+
+        def slug_to_id(slug, target_id)
+          if _repository = @target_repository.with(target_id)
+            _entry = _repository.first { where(_slug: slug).only(:_id) }
+            _entry.try(:_id)
+          end
         end
 
         def value_to_date(value, type)
@@ -259,10 +282,6 @@ module Locomotive
           type == :date ? _value.to_date : _value.to_datetime
         end
 
-        def values_to_ids(value)
-          [*value].map { |_value| value_to_id(_value) }
-        end
-
       end
 
     end

data/lib/locomotive/steam/services/content_entry_service.rb

@@ -34,6 +34,8 @@ module Locomotive
             _repository.create(entry)
           end
 
+          logEntryOperation(type_slug, decorated_entry)
+
           _json_decorate(decorated_entry, as_json)
         end
       end
@@ -48,6 +50,8 @@ module Locomotive
             _repository.update(entry)
           end
 
+          logEntryOperation(type_slug, decorated_entry)
+
           _json_decorate(decorated_entry, as_json)
         end
       end
@@ -65,8 +69,20 @@ module Locomotive
         content_type_repository.by_slug(slug)
       end
 
+      def logger
+        Locomotive::Common::Logger
+      end
+
       private
 
+      def logEntryOperation(type_slug, entry)
+        if (json = entry.as_json)['errors'].blank?
+          logger.info "[#{type_slug}] Entry persisted with success. #{json}"
+        else
+          logger.error "[#{type_slug}] Failed to persist entry. #{json}"
+        end
+      end
+
       def with_repository(type_or_slug)
         type = type_or_slug.respond_to?(:fields) ? type_or_slug : get_type(type_or_slug)
 

data/lib/locomotive/steam/services/external_api_service.rb

@@ -50,7 +50,7 @@ module Locomotive
         parsed_response = response.parsed_response
 
         if response.code == 200
-          HashConverter.to_underscore parsed_response
+          HashConverter.to_underscore(parsed_response)
         else
           Locomotive::Common::Logger.error "[WebService] consumed #{path}, #{options.inspect}, response = #{response.inspect}"
           nil

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.2.0.rc2'
+    VERSION = '1.2.0.rc3'
   end
 end

data/spec/integration/repositories/content_entry_repository_spec.rb

@@ -7,11 +7,13 @@ describe Locomotive::Steam::ContentEntryRepository do
 
   shared_examples_for 'a repository' do
 
-    let(:site)            { Locomotive::Steam::Site.new(_id: site_id, locales: %w(en fr nb)) }
-    let(:locale)          { :en }
-    let(:type_repository) { Locomotive::Steam::ContentTypeRepository.new(adapter, site, locale) }
-    let(:repository)      { described_class.new(adapter, site, locale, type_repository).with(type) }
-    let(:type)            { type_repository.by_slug('bands') }
+    let(:site)              { Locomotive::Steam::Site.new(_id: site_id, locales: %w(en fr nb)) }
+    let(:locale)            { :en }
+    let(:type_repository)   { Locomotive::Steam::ContentTypeRepository.new(adapter, site, locale) }
+    let(:repository)        { described_class.new(adapter, site, locale, type_repository).with(type) }
+    let(:type)              { type_repository.by_slug('bands') }
+    let(:target_type)       { type_repository.by_slug('songs') }
+    let(:target_repository) { described_class.new(adapter, site, locale, type_repository).with(target_type) }
 
     describe '#all' do
       subject { repository.all }
@@ -55,6 +57,11 @@ describe Locomotive::Steam::ContentEntryRepository do
       it { expect(subject.map { |entry| entry[:name] }).to eq(['Alice in Chains', 'Pearl Jam']) }
     end
 
+    describe 'filter by a belongs_to field' do
+      subject { target_repository.all(band: 'the-who') }
+      it { expect(subject.map { |entry| entry[:title] }).to eq(['Song #5', 'Song #6']) }
+    end
+
     describe '#group_by_select_option' do
       subject { repository.group_by_select_option(:kind) }
       it { expect(subject.map { |h| h[:name] }).to eq(%w(grunge rock country)) }
@@ -73,9 +80,8 @@ describe Locomotive::Steam::ContentEntryRepository do
 
     describe '#create' do
 
-      let(:type) { type_repository.by_slug('songs') }
-      let(:attributes) { { title: 'Jeremy', band: 'pearl-jam', short_description: '"Jeremy" is a song by the American rock band Pearl Jam' } }
-      let(:entry) { repository.with(type).build(attributes) }
+      let(:attributes) { { title: 'Jeremy', band_id: 'pearl-jam', short_description: '"Jeremy" is a song by the American rock band Pearl Jam' } }
+      let(:entry) { repository.with(target_type).build(attributes) }
 
       subject { repository.create(entry) }
 
@@ -89,7 +95,7 @@ describe Locomotive::Steam::ContentEntryRepository do
     describe '#inc' do
 
       let(:type) { type_repository.by_slug('songs') }
-      let(:attributes) { { title: 'Jeremy', band: 'pearl-jam', short_description: '"Jeremy" is a song by the American rock band Pearl Jam', views: 41 } }
+      let(:attributes) { { title: 'Jeremy', band_id: 'pearl-jam', short_description: '"Jeremy" is a song by the American rock band Pearl Jam', views: 41 } }
       let(:entry) { repository.with(type).build(attributes) }
 
       before { repository.create(entry) }

data/spec/support/mongo.rb

@@ -1,3 +1,4 @@
 require 'mongo'
 
-Mongo::Logger.logger.level = Logger::INFO # DEBUG # INFO
+Mongo::Logger.logger.level = Logger::INFO
+# Mongo::Logger.logger.level = Logger::DEBUG

data/spec/unit/liquid/tags/action_spec.rb

@@ -18,6 +18,15 @@ describe Locomotive::Steam::Liquid::Tags::Action do
 
     it { subject; expect(context['foo']).to eq 42.0 }
 
+    describe 'uploaded file' do
+
+      let(:assigns) { { 'params' => { 'my_file' => { 'tempfile' => Tempfile.new('my_file') } } } }
+      let(:source)  { '{% action "uploaded file" %}setProp("path", params.my_file.tempfile);{% endaction %}' }
+
+      it { subject; expect(context['path']).to match /\/my_file/ }
+
+    end
+
   end
 
 end

data/spec/unit/repositories/content_entry_repository_spec.rb

@@ -407,7 +407,7 @@ describe Locomotive::Steam::ContentEntryRepository do
     context 'belongs_to fields' do
 
       let(:value)       { 42 }
-      let(:field)       { instance_double('BelongsToField', name: 'person', persisted_name: 'person_id') }
+      let(:field)       { instance_double('BelongsToField', name: 'person', persisted_name: 'person_id', target_id: '42') }
       let(:_fields)     { instance_double('Fields', selects: [], belongs_to: [field], many_to_many: [], dates_and_date_times: []) }
       let(:conditions)  { { 'person' => value } }
 
@@ -450,7 +450,7 @@ describe Locomotive::Steam::ContentEntryRepository do
     context 'many_to_many fields' do
 
       let(:value)       { 42 }
-      let(:field)       { instance_double('ManyToManyField', name: 'tags', persisted_name: 'tag_ids') }
+      let(:field)       { instance_double('ManyToManyField', name: 'tags', persisted_name: 'tag_ids', target_id: '42') }
       let(:_fields)     { instance_double('Fields', selects: [], belongs_to: [], many_to_many: [field], dates_and_date_times: []) }
       let(:conditions)  { { 'tags.in' => value } }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc2
+  version: 1.2.0.rc3
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler