locomotive_cms 2.2.0 → 2.2.1

data/app/models/locomotive/content_entry.rb

@@ -176,7 +176,11 @@ module Locomotive
       self._slug = self._label.dup if self._slug.blank? && self._label.present?
 
       if self._slug.present?
-        self._slug.permalink!
+        # if the slug includes one "_" at least, we consider that the "_" is used instead of "-".
+        underscore = !self._slug.index('_').nil?
+
+        self._slug.permalink!(underscore)
+
         self._slug = self.next_unique_slug if self.slug_already_taken?
       end
 

data/app/models/locomotive/page.rb

@@ -106,7 +106,12 @@ module Locomotive
 
     def normalize_slug
       self.slug = self.title.clone if self.slug.blank? && self.title.present?
-      self.slug.permalink! if self.slug.present?
+      if self.slug.present?
+        # if the slug includes one "_" at least, we consider that the "_" is used instead of "-".
+        underscore = !self.slug.index('_').nil?
+
+        self.slug.permalink!(underscore)
+      end
     end
 
     def set_default_raw_template

data/app/views/locomotive/notifications/new_content_entry.html.haml

@@ -15,8 +15,6 @@
        - 
       %i
         - case field.type.to_s
-        - when 'string', 'text', 'boolean', 'date'
-          = value
         - when 'file'
           - url = value.guess_url
           - url = url =~ /^http/ ? url : URI.join("http://#{@domain}", url).to_s # Amazon S3 (http/https) or local files ?
@@ -26,4 +24,8 @@
         - when 'belongs_to'
           = value.try(:_label)
         - when 'has_many', 'many_to_many'
-          = value.map(&:_label).join(', ')
+          = value.map(&:_label).join(', ')
+        - when 'tags'
+          = value.join(', ')
+        - else
+          = value

data/lib/locomotive/engine.rb

@@ -36,6 +36,7 @@ module Locomotive
         tinymce/plugins/locomotive_media/*.js
         tinymce/plugins/locomotive_media/langs/*.js
         tinymce/themes/advanced/skins/locomotive/*.css
+        aloha/plugins/custom/locomotive_media/**/*.css
         aloha/plugins/custom/locomotive_media/**/*.js
         aloha/plugins/custom/inputcontrol/**/*.css
         aloha/plugins/custom/inputcontrol/**/*.js)

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

@@ -42,32 +42,53 @@ module Locomotive
 
         def collection
           if @context['with_scope']
-            self.modify_with_scope_with_relations
+            self.modify_with_scope
           end
 
           @collection ||= @content_type.ordered_entries(@context['with_scope']).visible
         end
 
-        def modify_with_scope_with_relations
-          relations = @content_type.klass_with_custom_fields(:entries).relations
-          @context['with_scope'].dup.each do |key, value|
-            if relation = self.relation_with(key, relations)
-              model = Locomotive::ContentType.class_name_to_content_type(relation.class_name, @context.registers[:site])
-              entry = model.entries.where(model.label_field_name => value).first
+        def modify_with_scope
+          fields = @content_type.ordered_custom_fields(:entries)
 
-              @context['with_scope'].delete(key)
-              @context['with_scope'][relation.key] = entry
+          @context['with_scope'].dup.each do |key, value|
+            if relation = self.relation_with(key)
+              # belongs_to, has_many, many_to_many relationships: use the _id
+              self.modify_with_scope_with_relation(key, value, relation)
+            elsif field = fields.detect { |f| f.name == key && f.type == 'select' }
+              # use the id of the option instead of the name
+              self.modify_with_scope_with_select(key, value, field)
             end
           end
         end
 
-        def relation_with(name, relations)
-          if relations.keys.include?(name.to_s)
-            relations[name]
-          elsif relations.keys.include?(name.to_s.pluralize)
-            relations[name.to_s.pluralize]
+        def modify_with_scope_with_relation(key, value, relation)
+          model = Locomotive::ContentType.class_name_to_content_type(relation.class_name, @context.registers[:site])
+          entry = model.entries.where(model.label_field_name => value).first
+
+          # modify the scope
+          @context['with_scope'].delete(key)
+          @context['with_scope'][relation.key] = entry
+        end
+
+        def relation_with(name)
+          @relations ||= @content_type.klass_with_custom_fields(:entries).relations
+
+          if @relations.keys.include?(name.to_s)
+            @relations[name]
+          elsif @relations.keys.include?(name.to_s.pluralize)
+            @relations[name.to_s.pluralize]
           end
         end
+
+        def modify_with_scope_with_select(key, value, field)
+          option = field.select_options.detect { |option| [option.name, option._id.to_s].include?(value) }
+
+          # modify the scope
+          @context['with_scope'].delete(key)
+          @context['with_scope']["#{key}_id"] = option.try(:_id)
+        end
+
       end
 
     end

data/lib/locomotive/liquid/drops/site.rb

@@ -14,6 +14,7 @@ module Locomotive
         end
 
         protected
+
         def scoped_pages
           if @context["with_scope"]
             self._source.pages.where(@context["with_scope"])
@@ -21,6 +22,7 @@ module Locomotive
             self._source.pages
           end
         end
+
       end
     end
   end

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

data/lib/tasks/locomotive.rake

@@ -23,8 +23,10 @@ namespace :locomotive do
               page.send :_parse_and_serialize_template
               page.save
               puts "[#{site.name}][#{locale}] processing...#{page.title}"
-            rescue TypeError => e
+            rescue TypeError
               pages.insert(0, page)
+            rescue ::Liquid::Error => e
+              puts "\tLiquid error: #{e.message} (#{page._id})"
             end
           end
         end

data/spec/models/locomotive/content_entry_spec.rb

@@ -43,6 +43,10 @@ describe Locomotive::ContentEntry do
       build_content_entry(_slug: 'dogs').tap(&:save!)._slug.should == 'dogs'
     end
 
+    it 'accepts underscore instead of dashes' do
+      build_content_entry(_slug: 'monkey_wrench').tap(&:save!)._slug.should == 'monkey_wrench'
+    end
+
     it 'uses the given slug if it is unique' do
       build_content_entry(_slug: 'monkeys').tap(&:save!)._slug.should == 'monkeys'
       build_content_entry(_slug: 'cats-2').tap(&:save!)._slug.should == 'cats-2'

data/spec/models/locomotive/page_spec.rb

@@ -114,6 +114,10 @@ describe Locomotive::Page do
       page = FactoryGirl.build(:page, title: ' Valid  ité.html ', slug: nil, site: page.site)
       page.should be_valid
       page.slug.should == 'valid-ite-dot-html'
+
+      page = FactoryGirl.build(:page, slug: ' convention_Valid  ité.html ')
+      page.valid?
+      page.slug.should == 'convention_valid_ite_dot_html'
     end
 
     it 'has no cache strategy' do
@@ -180,9 +184,9 @@ describe Locomotive::Page do
       archives.reload.children.count.should == 2
       archives.children.last.depth.should == 2
       archives.children.last.children.first.depth.should == 3
-      
+
     end
-    
+
     it "builds children fullpaths" do
       sub_child_1 = FactoryGirl.create(:page, title: 'Sub Subpage 1', slug: 'bar', parent: @child_1, site: @home.site)
       sub_child_1.fullpath.should == "foo/bar"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -1416,7 +1416,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -31990377363803179
+      hash: 4035827424997986314
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -1425,7 +1425,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -31990377363803179
+      hash: 4035827424997986314
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23