locomotive_cms 2.0.1 → 2.0.2

data/app/controllers/locomotive/api/base_controller.rb

@@ -15,6 +15,8 @@ module Locomotive
 
       before_filter :set_current_thread_variables
 
+      rescue_from Exception, with: :render_access_denied
+
       self.responder = Locomotive::ActionController::Responder # custom responder
 
       respond_to :json, :xml
@@ -41,6 +43,15 @@ module Locomotive
         self.setup_i18n_fallbacks
       end
 
+      def render_access_denied(exception)
+        status = (case exception
+        when ::CanCan::AccessDenied               then 401
+        when ::Mongoid::Errors::DocumentNotFound  then 404
+        else 500
+        end)
+        render json: { error: exception.message }, status: status, layout: false
+      end
+
       def self.cancan_resource_class
         Locomotive::Api::CanCan::ControllerResource
       end

data/lib/locomotive/custom_fields.rb

@@ -38,7 +38,7 @@ module CustomFields
 
         # Set correct paths
         def store_dir
-          "sites/#{model.site_id}/content_#{model.class.model_name.demodulize.underscore}/#{model.id}/files"
+          "sites/#{model.site_id}/#{model.class.model_name.demodulize.underscore}/#{model.id}/files"
         end
 
         # In some situations, for instance, for the notification email when a content entry is created,

data/lib/locomotive/middlewares/seo_trailing_slash.rb

@@ -7,18 +7,39 @@ module Locomotive
       end
 
       def call(env)
-        path = env['PATH_INFO']
+        path, query = env['PATH_INFO'], env['QUERY_STRING']
 
         if !path.starts_with?("#{Locomotive.mounted_on}/") && (match = path.match(%r{(.+)/$}))
-          response = Rack::Response.new
-          response.redirect(match[1], 301) # moved permanently
-          response.finish
-          response.to_a
+          url = self.redirect_url(match[1], query)
+          self.redirect_to(url)
         else
           @app.call(env)
         end
       end
 
+      protected
+
+      # Create a 301 response and set it up accordingly.
+      #
+      # @params [ String ] url The url for the redirection
+      #
+      # @return [ Array ] It has the 3 parameters (status, header, body)
+      #
+      def redirect_to(url)
+        response = Rack::Response.new
+        response.redirect(url, 301) # moved permanently
+        response.finish
+        response.to_a
+      end
+
+      def redirect_url(base, query)
+        if query.blank?
+          base
+        else
+          "#{base}?#{query}"
+        end
+      end
+
     end
   end
 end

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/mongodb/migrate/20130204072721_make_editable_elements_consistent.rb

@@ -0,0 +1,107 @@
+class MakeEditableElementsConsistent < MongoidMigration::Migration
+  def self.up
+    Locomotive::Site.all.each do |site|
+      site.locales.each do |locale|
+        ::Mongoid::Fields::I18n.locale = locale
+        site.pages.each do |page|
+          puts "[#{site.name}] #{page.fullpath} (#{locale})"
+
+          found_elements = []
+
+          page.template.walk do |node, memo|
+            case node
+            when Locomotive::Liquid::Tags::InheritedBlock
+              puts "found block ! #{node.name} --- #{memo[:parent_block_name]}"
+
+              # set the new name based on a potential parent block
+              name = node.name.gsub(/[\"\']/o, '')
+
+              if memo[:parent_block_name] && !name.starts_with?(memo[:parent_block_name])
+                name = "#{memo[:parent_block_name]}/#{name}"
+              end
+
+              puts "new_name = #{name}"
+
+              # retrieve all the editable elements of this block and set them the new name
+              page.find_editable_elements(node.name).each do |el|
+                # puts "**> hurray found the element #{el.block} _ #{el.slug}"
+                el.block = name
+                puts "**> hurray found the element #{el.block} _ #{el.slug} | #{page.find_editable_element(name, el.slug).present?.inspect}"
+              end
+
+              # assign the new name to the block
+              node.instance_variable_set :@name, name
+
+              # record the new parent block name for children
+              memo[:parent_block_name] = name
+
+            when Locomotive::Liquid::Tags::Editable::ShortText,
+                Locomotive::Liquid::Tags::Editable::LongText,
+                Locomotive::Liquid::Tags::Editable::Control,
+                Locomotive::Liquid::Tags::Editable::File
+
+              puts "\tfound editable_element ! #{node.slug} --- #{memo[:parent_block_name]}"
+
+              slug = node.slug.gsub(/[\"\']/o, '')
+
+              # assign the new slug to the editable element
+              puts "\t\t...looking for #{node.slug} inside #{memo[:parent_block_name]}"
+
+              options = node.instance_variable_get :@options
+              block   = options[:block].blank? ? memo[:parent_block_name] : options[:block]
+
+              if el = page.find_editable_element(block, node.slug)
+                puts "\t\t--> yep found the element"
+
+                el.slug   = slug
+                el.block  = memo[:parent_block_name] # just to make sure
+
+                node.instance_variable_set :@slug, slug
+
+                options.delete(:block)
+                node.instance_variable_set :@block, nil  # just to make sure
+
+                found_elements << el._id
+              else
+                puts "\t\t[WARNING] el not found (#{block} - #{slug})"
+              end
+
+            end
+
+            memo
+          end # page walk
+
+          puts "found elements = #{found_elements.join(', ')} / #{page.editable_elements.count}"
+
+          # "hide" useless editable elements
+          page.editable_elements.each do |el|
+            next if found_elements.include?(el._id)
+            el.disabled = true
+          end
+
+          # serialize
+          page.send(:_serialize_template)
+
+          # puts page.template.inspect
+
+          # save ?
+          page.instance_variable_set :@template_changed, false
+          page.save
+
+          # TODO:
+          #  x ", block: 'Asset #1'"" ???? les re-assigner a "main" d'une facon ou d'une autre
+          #   => en fait, ce sont des editable elements qui n'ont pas vrais blocks
+          #  x hide useless editable elements
+          #  x re-serializer le template
+          #  ? skipper la methode parse (quoique pas besoin car template non modifie)
+          #  x snippets
+          #  x sauvegarder (sans callbacks ??)
+        end # loop: pages
+      end # loop: locales
+    end # loop: sites
+  end
+  
+  def self.down
+    raise MongoidMigration::IrreversibleMigration
+  end
+end

data/mongodb/migrate/20130326201349_rename_entry_to_content_entry.rb

@@ -0,0 +1,107 @@
+class RenameEntryToContentEntry < MongoidMigration::Migration
+
+  def self.up
+    regexp      = /(^|Locomotive::)(Content)*Entry([0-9a-fA-F]{24})$/
+    replacement = "\\1ContentEntry\\3"
+
+    # content entries
+    self.update_content_entries(regexp, replacement)
+
+    # content types
+    self.update_content_types(regexp, replacement)
+
+    # templatized pages
+    self.update_templatized_pages(regexp, replacement)
+  end
+
+  def self.down
+    regexp      = /(^|Locomotive::)(Content)+Entry([0-9a-fA-F]{24})$/
+    replacement = "\\1Entry\\3"
+
+    # content entries
+    self.update_content_entries(regexp, replacement)
+
+    # content types
+    self.update_content_types(regexp, replacement)
+
+    # templatized pages
+    self.update_templatized_pages(regexp, replacement)
+  end
+
+  private
+
+  def self.update_content_entries(regexp, replacement)
+    self.fetch_rows(Locomotive::ContentEntry) do |collection, attributes|
+      recipe      = attributes['custom_fields_recipe']
+      type        = attributes['_type']
+      new_recipe  = replace_value_by(recipe, regexp, replacement)
+      selector    = { '_id' => attributes['_id'] }
+      operations  = { '$set' => {
+        '_type' => replace_value_by(type, regexp, replacement),
+        'custom_fields_recipe' => new_recipe
+      } }
+      collection.update selector, operations
+    end
+    puts "content entries UPDATED"
+  end
+
+  def self.update_content_types(regexp, replacement)
+    self.fetch_rows(Locomotive::ContentType) do |collection, attributes|
+      updates       = {}
+      attributes['entries_custom_fields'].each_with_index do |custom_field, index|
+        new_custom_field = replace_value_by(custom_field, regexp, replacement)
+        updates["entries_custom_fields.#{index}"] = new_custom_field
+      end
+
+      selector    = { '_id' => attributes['_id'] }
+      operations  = { '$set' => updates }
+      collection.update selector, operations
+    end
+    puts "content types UPDATED"
+  end
+
+  def self.update_templatized_pages(regexp, replacement)
+    self.fetch_rows(Locomotive::Page) do |collection, attributes|
+      if klass_name = attributes['target_klass_name']
+        new_klass_name  = replace_value_by(klass_name, regexp, replacement)
+        selector        = { '_id' => attributes['_id'] }
+        operations      = { '$set' => { 'target_klass_name' => new_klass_name } }
+        collection.update selector, operations
+      end
+    end
+    puts "templatized pages UPDATED"
+  end
+
+  def self.fetch_rows(klass, &block)
+    per_page    = 100
+    collection  = klass.collection.driver
+    count       = collection.count
+    num_pages   = (count.to_f / per_page).floor
+
+    # paginate the whole collection to avoid mongodb cursor error
+    (0..num_pages).each do |page|
+      offset = per_page * page.to_i
+      collection.find.sort("_id").limit(per_page).skip(offset).each do |attributes|
+        block.call(collection, attributes)
+      end
+    end
+  end
+
+  def self.replace_value_by(object, regexp, replacement)
+    return object.gsub(regexp, replacement) if object.is_a?(String)
+
+    list = nil
+    list = object if object.is_a?(Array)
+    list = object.values if object.is_a?(Hash)
+
+    list.each do |value|
+      case value
+      when String then value.gsub!(regexp, replacement)
+      when Array, Hash then self.replace_value_by(value, regexp, replacement)
+      end
+    end
+
+    object
+  end
+
+end

data/spec/models/locomotive/content_entry_spec.rb

@@ -7,10 +7,10 @@ describe Locomotive::ContentEntry do
   before(:each) do
     Locomotive::Site.any_instance.stubs(:create_default_pages!).returns(true)
     @content_type = FactoryGirl.build(:content_type)
-    @content_type.entries_custom_fields.build :label => 'Title', :type => 'string'
-    @content_type.entries_custom_fields.build :label => 'Description', :type => 'text'
-    @content_type.entries_custom_fields.build :label => 'Visible ?', :type => 'boolean', :name => 'visible'
-    @content_type.entries_custom_fields.build :label => 'File', :type => 'file'
+    @content_type.entries_custom_fields.build label: 'Title', type: 'string'
+    @content_type.entries_custom_fields.build label: 'Description', type: 'text'
+    @content_type.entries_custom_fields.build label: 'Visible ?', type: 'boolean', name: 'visible'
+    @content_type.entries_custom_fields.build label: 'File', type: 'file'
     @content_type.valid?
     @content_type.send(:set_label_field)
   end
@@ -24,56 +24,57 @@ describe Locomotive::ContentEntry do
     ## Validations ##
 
     it 'requires the presence of title' do
-      content_entry = build_content_entry :title => nil
+      content_entry = build_content_entry title: nil
       content_entry.should_not be_valid
       content_entry.errors[:title].should == ["can't be blank"]
     end
 
     it 'requires the presence of the permalink (_slug)' do
-      content_entry = build_content_entry :title => nil
+      content_entry = build_content_entry title: nil
       content_entry.should_not be_valid
       content_entry.errors[:_slug].should == ["can't be blank"]
     end
 
   end
 
-  context 'setting the slug' do
+  describe '#slug' do
+
     before :each do
-      build_content_entry(:_slug => 'dogs').tap(&:save!)._slug.should == 'dogs'
+      build_content_entry(_slug: 'dogs').tap(&:save!)._slug.should == 'dogs'
     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'
+      build_content_entry(_slug: 'monkeys').tap(&:save!)._slug.should == 'monkeys'
+      build_content_entry(_slug: 'cats-2').tap(&:save!)._slug.should == 'cats-2'
     end
 
     it 'appends a number to the end of the slug if it is not unique' do
-      build_content_entry(:_slug => 'dogs').tap(&:save!)._slug.should == 'dogs-1'
-      build_content_entry(:_slug => 'dogs').tap(&:save!)._slug.should == 'dogs-2'
-      build_content_entry(:_slug => 'dogs-2').tap(&:save!)._slug.should == 'dogs-3'
-      build_content_entry(:_slug => 'dogs-2').tap(&:save!)._slug.should == 'dogs-4'
+      build_content_entry(_slug: 'dogs').tap(&:save!)._slug.should == 'dogs-1'
+      build_content_entry(_slug: 'dogs').tap(&:save!)._slug.should == 'dogs-2'
+      build_content_entry(_slug: 'dogs-2').tap(&:save!)._slug.should == 'dogs-3'
+      build_content_entry(_slug: 'dogs-2').tap(&:save!)._slug.should == 'dogs-4'
     end
 
     it 'ignores the case of a slug' do
-      build_content_entry(:_slug => 'dogs').tap(&:save!)._slug.should == 'dogs-1'
-      build_content_entry(:_slug => 'DOGS').tap(&:save!)._slug.should == 'dogs-2'
+      build_content_entry(_slug: 'dogs').tap(&:save!)._slug.should == 'dogs-1'
+      build_content_entry(_slug: 'DOGS').tap(&:save!)._slug.should == 'dogs-2'
     end
 
     it 'correctly handles slugs with multiple numbers' do
-      build_content_entry(:_slug => 'fish-1-2').tap(&:save!)._slug.should == 'fish-1-2'
-      build_content_entry(:_slug => 'fish-1-2').tap(&:save!)._slug.should == 'fish-1-3'
+      build_content_entry(_slug: 'fish-1-2').tap(&:save!)._slug.should == 'fish-1-2'
+      build_content_entry(_slug: 'fish-1-2').tap(&:save!)._slug.should == 'fish-1-3'
 
-      build_content_entry(:_slug => 'fish-1-hi').tap(&:save!)._slug.should == 'fish-1-hi'
-      build_content_entry(:_slug => 'fish-1-hi').tap(&:save!)._slug.should == 'fish-1-hi-1'
+      build_content_entry(_slug: 'fish-1-hi').tap(&:save!)._slug.should == 'fish-1-hi'
+      build_content_entry(_slug: 'fish-1-hi').tap(&:save!)._slug.should == 'fish-1-hi-1'
     end
   end
 
-  context '#i18n' do
+  describe '#i18n' do
 
     before(:each) do
       localize_content_type @content_type
       ::Mongoid::Fields::I18n.locale = 'en'
-      @content_entry = build_content_entry(:title => 'Hello world')
+      @content_entry = build_content_entry(title: 'Hello world')
       ::Mongoid::Fields::I18n.locale = 'fr'
     end
 
@@ -90,12 +91,13 @@ describe Locomotive::ContentEntry do
   end
 
   describe "#navigation" do
+
     before(:each) do
       @content_type.order_by = '_position'
       @content_type.save
 
       %w(first second third).each_with_index do |item, index|
-        content = build_content_entry(:title => item.to_s, :_position => index)
+        content = build_content_entry(title: item.to_s, _position: index)
         content.save
         instance_variable_set "@#{item}", content
       end
@@ -196,24 +198,35 @@ describe Locomotive::ContentEntry do
     end
 
     it 'uses the to_label method if the value of the label field defined it' do
-      entry = build_content_entry(:_label_field_name => 'with_to_label')
-      entry.stubs(:with_to_label).returns(mock('with_to_label', :to_label => 'acme'))
+      entry = build_content_entry(_label_field_name: 'with_to_label')
+      entry.stubs(:with_to_label).returns(mock('with_to_label', to_label: 'acme'))
       entry._label.should == 'acme'
     end
 
     it 'uses the to_s method at last if the label field did not define the to_label method' do
-      entry = build_content_entry(:_label_field_name => 'not_a_string')
-      entry.stubs(:not_a_string).returns(mock('not_a_string', :to_s => 'not_a_string'))
+      entry = build_content_entry(_label_field_name: 'not_a_string')
+      entry.stubs(:not_a_string).returns(mock('not_a_string', to_s: 'not_a_string'))
       entry._label.should == 'not_a_string'
     end
 
   end
 
+  describe '#file' do
+
+    let(:entry) { build_content_entry(title: 'Hello world', file: FixturedAsset.open('5k.png')) }
+
+    it 'writes the file to the filesystem' do
+      entry.save
+      entry.file.url.should_not =~ /content_content_entry/
+    end
+
+  end
+
   describe '#public_submission' do
 
     before(:each) do
-      @account_1 = FactoryGirl.build('admin user', :id => fake_bson_id('1'))
-      @account_2 = FactoryGirl.build('frenchy user', :id => fake_bson_id('2'))
+      @account_1 = FactoryGirl.build('admin user', id: fake_bson_id('1'))
+      @account_2 = FactoryGirl.build('frenchy user', id: fake_bson_id('2'))
 
       @content_type.public_submission_enabled = true
       @content_type.public_submission_accounts = ['', @account_1._id, @account_2._id.to_s]
@@ -221,7 +234,7 @@ describe Locomotive::ContentEntry do
       site = FactoryGirl.build(:site)
       site.stubs(:accounts).returns([@account_1, @account_2])
 
-      @content_entry = build_content_entry(:site => site)
+      @content_entry = build_content_entry(site: site)
     end
 
     it 'does not send email notifications if the api is disabled' do
@@ -237,8 +250,8 @@ describe Locomotive::ContentEntry do
     end
 
     it 'sends email notifications when a new instance is created' do
-      Locomotive::Notifications.expects(:new_content_entry).with(@account_1, @content_entry).returns(mock('mailer', :deliver => true))
-      Locomotive::Notifications.expects(:new_content_entry).with(@account_2, @content_entry).returns(mock('mailer', :deliver => true))
+      Locomotive::Notifications.expects(:new_content_entry).with(@account_1, @content_entry).returns(mock('mailer', deliver: true))
+      Locomotive::Notifications.expects(:new_content_entry).with(@account_2, @content_entry).returns(mock('mailer', deliver: true))
       @content_entry.save
     end
 
@@ -260,7 +273,7 @@ describe Locomotive::ContentEntry do
   end
 
   def build_content_entry(options = {})
-    @content_type.entries.build({ :title => 'Locomotive', :description => 'Lorem ipsum....', :_label_field_name => 'title' }.merge(options))
+    @content_type.entries.build({ title: 'Locomotive', description: 'Lorem ipsum....', _label_field_name: 'title' }.merge(options))
   end
 
   def fake_bson_id(id)

data/spec/requests/seo_trailing_slash_spec.rb

@@ -22,4 +22,10 @@ describe 'Locomotive::Middlewares::SeoTrailingSlash' do
     response.status.should be(301)
   end
 
+  it 'removes the trailing slash but preserves the query' do
+    get '/hello_world/?test=name'
+    response.status.should be(301)
+    response.location.should == '/hello_world?test=name'
+  end
+
 end

metadata

@@ -2,14 +2,14 @@
 name: locomotive_cms
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -1104,6 +1104,8 @@ files:
 - lib/locomotive_cms.rb
 - lib/tasks/development.rake
 - lib/tasks/locomotive.rake
+- mongodb/migrate/20130204072721_make_editable_elements_consistent.rb
+- mongodb/migrate/20130326201349_rename_entry_to_content_entry.rb
 - public/favicon.ico
 - vendor/assets/fonts/locomotive/fontawesome-webfont.eot
 - vendor/assets/fonts/locomotive/fontawesome-webfont.svg
@@ -1337,7 +1339,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -3303457319512363184
+      hash: -4389909398335603459
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
@@ -1346,7 +1348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -3303457319512363184
+      hash: -4389909398335603459
       version: '0'
 requirements: []
 rubyforge_project: