locomotivecms_steam 1.0.0.pre.beta.1 → 1.0.0.pre.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8dd492e17a42930ea27866b0ea918ad91b126e3
-  data.tar.gz: 22c9afe5347bcca41f42e56d63b118dc049b0678
+  metadata.gz: a200877da9098d215eb31f61067aa85e17cdd031
+  data.tar.gz: 7e4a6550691aa4d42578e19471457148004791d4
 SHA512:
-  metadata.gz: 106e73a7703b15425b7cd38fe16d7b4dd517e674a7ea1efcf9d1de93ea5f6ffb63e22d138219f78b1782168f63c92df4e432fa86740c39d1955607ee49e346b9
-  data.tar.gz: 6196fa5aafdfebffe83886d172d57650b1cb4368d05c525dd74e93b9f3f0e0aa8bedde39962cf74bac5e75c7d708a55a91c18f0e99888b9549b23827cb665c09
+  metadata.gz: 35c4e6ef24a93b95c0a302174bac850a28283cb8a2efb231a0e0fa7398009654c5fa2f9bb0bd87a6c12dd59556e6510a860762a02ab3943830b078306035d15d
+  data.tar.gz: a7f438df4b3685f1da9accf8874fcc1fc18a29f141c29367acb1df52dfaae08027f0143a4a9be61ddb9424cd840656a1adbae92a83355ced83b5036938e05d33

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.0.0.pre.beta.1)
+    locomotivecms_steam (1.0.0.pre.beta.2)
       RedCloth (~> 4.2.9)
       chronic (~> 0.10.2)
       coffee-script (~> 2.4.1)
@@ -82,7 +82,7 @@ GEM
     eventmachine (1.0.7)
     execjs (2.5.2)
     ffi (1.9.10)
-    haml (4.0.6)
+    haml (4.0.7)
       tilt
     hike (1.2.3)
     http-cookie (1.0.2)

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

@@ -80,11 +80,20 @@ module Locomotive::Steam
     end
 
     def session
-      Moped::Session.new([*hosts]).tap do |session|
-        session.use database
+      if uri
+        Moped::Session.connect(uri)
+      else
+        Moped::Session.new([*hosts]).tap do |session|
+          session.use database
+          session.login(username, password) if username && password
+        end
       end
     end
 
+    def uri
+      options[:uri]
+    end
+
     def database
       options[:database]
     end
@@ -93,6 +102,14 @@ module Locomotive::Steam
       options[:hosts]
     end
 
+    def username
+      options[:username]
+    end
+
+    def password
+      options[:password]
+    end
+
   end
 
 end

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

@@ -9,7 +9,8 @@ module Locomotive::Steam
     def initialize(attributes = {})
       super({
         content: nil,
-        source: nil
+        source: nil,
+        inline_editing: true
       }.merge(attributes))
     end
 

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

@@ -12,7 +12,7 @@ module Locomotive
             def initialize(tag_name, markup, options)
               if markup =~ Syntax
                 @slug             = $1.gsub(/[\"\']/, '')
-                @element_options  = { fixed: false }
+                @element_options  = { fixed: false, inline_editing: true }
                 markup.scan(::Liquid::TagAttributes) { |key, value| @element_options[key.to_sym] = value.gsub(/^[\"\']/, '').gsub(/[\"\']$/, '') }
               else
                 raise ::Liquid::SyntaxError.new("Valid syntax: #{tag_name} <slug>(, <options>)")
@@ -48,9 +48,9 @@ module Locomotive
                 slug:           @slug,
                 hint:           @element_options[:hint],
                 priority:       @element_options[:priority] || 0,
-                fixed:          !!@element_options[:fixed],
+                fixed:          [true, 'true'].include?(@element_options[:fixed]),
                 disabled:       false,
-                inline_editing: true,
+                inline_editing: [true, 'true'].include?(@element_options[:inline_editing]),
                 from_parent:    false,
                 type:           @tag_name.to_sym
               }

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

@@ -26,7 +26,7 @@ module Locomotive
             end
 
             def editable?(context, element)
-              !!context.registers[:live_editing]
+              !!context.registers[:live_editing] && element.inline_editing
             end
 
             def default_element_attributes

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

@@ -24,7 +24,7 @@ module Locomotive
             name    = options.shift
             options = options.shift || {}
 
-            form_attributes = { method: 'POST', enctype: 'multipart/form-data' }.merge(options.slice(:id, :class, :action))
+            form_attributes = prepare_form_attributes(options)
 
             html_content_tag :form,
               content_type_html(name) + csrf_html + callbacks_html(options) + yield,
@@ -64,6 +64,20 @@ module Locomotive
             (options.stringify_keys.to_a.collect { |a, b| "#{a}=\"#{b}\"" }).join(' ')
           end
 
+          def prepare_form_attributes(options)
+            action      = options[:action]
+            attributes  = options.slice(:id, :class, :name, :novalidate)
+
+            if action.blank? && options[:json]
+              action = current_context['path']
+              action = (action.blank? ? 'index' : action) + '.json'
+            end
+
+            { method: 'POST', enctype: 'multipart/form-data' }.merge(attributes).tap do |_attributes|
+              _attributes[:action] = action if action
+            end
+          end
+
         end
 
       end

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

@@ -42,7 +42,7 @@ module Locomotive::Steam
 
       def decorate(entry)
         return nil if entry.nil?
-        Locomotive::Steam::Decorators::I18nDecorator.new(entry, default_locale)
+        Locomotive::Steam::Decorators::I18nDecorator.new(entry, locale, default_locale)
       end
 
       def content_type_repository

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.0-beta.1'
+    VERSION = '1.0.0-beta.2'
   end
 end

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

@@ -71,10 +71,11 @@ describe Locomotive::Steam::Liquid::Tags::Editable::Text do
 
   describe 'rendering' do
 
-    let(:live_editing) { false }
+    let(:live_editing)    { false }
+    let(:element_editing) { true }
 
     let(:page)        { instance_double('Page', fullpath: 'hello-world') }
-    let(:element)     { instance_double('EditableText', _id: 42, id: 42, default_content?: true, inline_editing?: true) }
+    let(:element)     { instance_double('EditableText', _id: 42, id: 42, default_content?: true, inline_editing?: element_editing, inline_editing: element_editing) }
     let(:services)    { Locomotive::Steam::Services.build_instance(nil) }
     let(:context)     { ::Liquid::Context.new({}, {}, { page: page, services: services, live_editing: live_editing }) }
 
@@ -119,6 +120,13 @@ describe Locomotive::Steam::Liquid::Tags::Editable::Text do
 
       end
 
+      context 'editing disabled for the element' do
+
+        let(:element_editing) { false }
+        it { is_expected.to eq 'Hello world' }
+
+      end
+
     end
 
     describe 'deprecated elements' do

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

@@ -11,7 +11,7 @@ describe Locomotive::Steam::Liquid::Tags::ModelForm do
   let(:request)   { instance_double('Request', env: {}) }
   let(:source)    { "{% model_form 'newsletter_addresses' %}Newsletter Form{% endmodel_form %}" }
   let(:services)  { Locomotive::Steam::Services.build_instance(request) }
-  let(:context)   { ::Liquid::Context.new({}, {}, { services: services }) }
+  let(:context)   { ::Liquid::Context.new({ path: '' }, {}, { services: services }) }
 
   subject { render_template(source, context) }
 
@@ -32,4 +32,11 @@ describe Locomotive::Steam::Liquid::Tags::ModelForm do
 
   end
 
+  describe 'json enabled' do
+
+    let(:source) { "{% model_form 'newsletter_addresses', json: true %}Newsletter Form{% endmodel_form %}" }
+    it { is_expected.to eq %(<form method="POST" enctype="multipart/form-data" action="index.json"><input type="hidden" name="content_type_slug" value="newsletter_addresses" /><input type="hidden" name="token" value="42" />Newsletter Form</form>) }
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.1
+  version: 1.0.0.pre.beta.2
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler