From 8da0db2454d4de1588fe436088d8d1642ac1e18a Mon Sep 17 00:00:00 2001
From: did <didier@nocoffee.fr>
Date: Thu, 28 Jul 2011 00:39:59 +0200
Subject: [PATCH] improve the solution for the issue #127 and write tests (pull
 request #139)

---
 Gemfile.lock                                  |   4 +-
 .../extensions/page/editable_elements.rb      |   5 +-
 lib/locomotive/import/pages.rb                |  49 +++++++++---------
 spec/fixtures/themes/default.zip              | Bin 403470 -> 512342 bytes
 spec/lib/locomotive/import_spec.rb            |  14 ++++-
 5 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 45f8a22a..fa1be25e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -52,7 +52,7 @@ GEM
     bson (1.3.1)
     bson_ext (1.3.1)
     builder (2.1.2)
-    bushido (0.0.31)
+    bushido (0.0.34)
       highline (>= 1.6.1)
       json (>= 1.4.6)
       orm_adapter (~> 0.0.3)
@@ -289,7 +289,7 @@ DEPENDENCIES
   actionmailer-with-request
   autotest
   bson_ext (~> 1.3.0)
-  bushido (= 0.0.31)
+  bushido (= 0.0.34)
   bushido_stub (= 0.0.3)
   cancan
   capybara
diff --git a/app/models/extensions/page/editable_elements.rb b/app/models/extensions/page/editable_elements.rb
index 2a9022f4..3c588d50 100644
--- a/app/models/extensions/page/editable_elements.rb
+++ b/app/models/extensions/page/editable_elements.rb
@@ -67,10 +67,13 @@ module Extensions
 
             if existing_el.nil? # new one from parents
               new_attributes = el.attributes.merge(:from_parent => true)
+
               if new_attributes['default_attribute'].present?
                 new_attributes['default_content'] = self.send(new_attributes['default_attribute']) || el.content
               else
-                new_attributes['default_content'] = el.content
+                if el.respond_to?(:content) # only for text
+                  new_attributes['default_content'] = el.content
+                end
               end
 
               self.editable_elements.build(new_attributes, el.class)
diff --git a/lib/locomotive/import/pages.rb b/lib/locomotive/import/pages.rb
index 1d3de006..f24d098d 100644
--- a/lib/locomotive/import/pages.rb
+++ b/lib/locomotive/import/pages.rb
@@ -82,30 +82,9 @@ module Locomotive
         page.attributes = attributes
 
         page.save!
-        
+
         unless editable_elements_attributes.nil?
-          page.editable_elements.each do |editable_element|
-            editable_elements_attributes.each do |attributes|
-              if editable_element.block == attributes['block'] && editable_element.slug == attributes['slug']
-                if editable_element.respond_to?(:source)
-                  # editable_file, update file
-                  unless attributes['content'].blank?
-                    full_path = File.join(File.join(theme_path,'public',attributes['content']))
-                    if File.exists?(full_path)
-                      file = File.open(full_path)
-                      editable_element.source = file
-                      editable_element.save!
-                      file.close
-                    end
-                  end
-                else  
-                  # update content value
-                  editable_element.update_attribute(:content, attributes['content'])
-                end
-                break
-              end
-            end
-          end
+          self.assign_editable_elements(page, editable_elements_attributes)
         end
 
         self.log "adding #{page.fullpath} (#{template.blank? ? 'without' : 'with'} template) / #{page.position}"
@@ -117,6 +96,28 @@ module Locomotive
         page
       end
 
+      def assign_editable_elements(page, elements)
+        page.reload # editable elements are not synchronized otherwise
+
+        elements.each do |attributes|
+          element = page.find_editable_element(attributes['block'], attributes['slug'])
+
+          next if element.nil?
+
+          if element.respond_to?(:source)
+            asset_path = File.join(theme_path, 'public', attributes['content'])
+
+            if File.exists?(asset_path)
+              element.source = File.open(asset_path)
+            end
+          else
+            element.content = attributes['content']
+          end
+        end
+
+        page.save!
+      end
+
       def build_parent_template(template)
         # just check if the template contains the extends keyword
         fullpath = template.scan(/\{% extends \'?([\w|\/]+)\'? %\}/).flatten.first
@@ -148,7 +149,7 @@ module Locomotive
         return if template.blank?
 
         template.gsub!(/\/samples\/(.*\.[a-zA-Z0-9]{3})/) do |match|
-          name = $1
+          name = File.basename($1)
 
           if asset = site.assets.where(:source_filename => name).first
             asset.source.url
diff --git a/spec/fixtures/themes/default.zip b/spec/fixtures/themes/default.zip
index b157828b6836b61ff907452b662f30af82f120af..973d2494eb10ab84e7ff4fa8fb110ea5bc5c8cbb 100644
GIT binary patch
delta 6611
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
I5&rN00J{KbJ^%m!

delta 4435
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
Ee**fh^Z)<=

diff --git a/spec/lib/locomotive/import_spec.rb b/spec/lib/locomotive/import_spec.rb
index 10b29bfa..007900c2 100644
--- a/spec/lib/locomotive/import_spec.rb
+++ b/spec/lib/locomotive/import_spec.rb
@@ -55,18 +55,28 @@ describe Locomotive::Import::Job do
       @site.pages.not_found.first.should_not be_nil
     end
 
+    it 'sets the editable text for a page from the site config file' do
+      page = @site.pages.where(:title => 'Contact').first
+      page.find_editable_element('content', 'address').content.should == '<p>Our office address: 215 Vine Street, Scranton, PA 18503</p>'
+    end
+
+    it 'sets the editable file for a page from the site config file' do
+      page = @site.pages.where(:title => 'Contact').first
+      page.find_editable_element('content', 'office').source_filename.should == 'office.jpg'
+    end
+    
     it 'inserts templatized page' do
       page = @site.pages.where(:templatized => true).first
       page.should_not be_nil
       page.fullpath.should == 'portfolio/content_type_template'
     end
-
+    
     it 'inserts redirection page' do
       page = @site.pages.where(:redirect => true).first
       page.should_not be_nil
       page.redirect_url.should == 'http://blog.locomotivecms.com'
     end
-
+    
     it 'inserts snippets' do
       @site.snippets.count.should == 1
     end