From f6ae58cef450dce7c86438c86a1da71db120323f Mon Sep 17 00:00:00 2001
From: Kaito <matthewfu.tw@gmail.com>
Date: Fri, 12 Aug 2011 17:47:03 +0800
Subject: [PATCH] Trying to create Design from upload package

---
 app/assets/javascripts/javascripts            |   1 +
 app/assets/stylesheets/stylesheets            |   1 +
 .../admin/.designs_controller.rb.swp          | Bin 12288 -> 12288 bytes
 app/controllers/admin/designs_controller.rb   |  46 +++++-------------
 app/models/design.rb                          |   1 +
 5 files changed, 15 insertions(+), 34 deletions(-)
 create mode 120000 app/assets/javascripts/javascripts
 create mode 120000 app/assets/stylesheets/stylesheets

diff --git a/app/assets/javascripts/javascripts b/app/assets/javascripts/javascripts
new file mode 120000
index 000000000..58b551d16
--- /dev/null
+++ b/app/assets/javascripts/javascripts
@@ -0,0 +1 @@
+javascripts
\ No newline at end of file
diff --git a/app/assets/stylesheets/stylesheets b/app/assets/stylesheets/stylesheets
new file mode 120000
index 000000000..b4d321570
--- /dev/null
+++ b/app/assets/stylesheets/stylesheets
@@ -0,0 +1 @@
+stylesheets
\ No newline at end of file
diff --git a/app/controllers/admin/.designs_controller.rb.swp b/app/controllers/admin/.designs_controller.rb.swp
index 2336817e6cdf9baf51898671ae09f7b8e75e4a5e..d81669d20df3199767390205c2f8e3e9d64ee837 100644
GIT binary patch
literal 12288
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
Dymzqk

delta 303
zcmWm8!7GDt9LMqRS}E=K*pn9Zgr03yCYf?ra-~qi$(-0T9M;&Qc^+#C<K+7Elt03a
zr&#R|U?&F>2V7is;OZvted^Wcd;0ci6dDDiIJLHzGqaP^LUfUZmDKV?q+ec?XN>o_
zMYrO(UOb_nl&z9uXYzKne6VkA?OY#L!@*B@M1|6UrvFAyhm^=Ox=+$nJ1Ww|9d2=j
z3!LK&HEduVc`PA@?>><hj*!C~QW(Y{1`xrQCh~!IJZh4aHpc^6@NkS-#L$Zl<390*
tS9HfdsUWT!%HK@R`<-Od{~KMs8M_SWVw$^F-F6)_VQue~D*k<D<{!@}KyCm4

diff --git a/app/controllers/admin/designs_controller.rb b/app/controllers/admin/designs_controller.rb
index 3231df468..f5026baaa 100644
--- a/app/controllers/admin/designs_controller.rb
+++ b/app/controllers/admin/designs_controller.rb
@@ -12,26 +12,28 @@ class Admin::DesignsController < ApplicationController
     temp_file = Tempfile.new("temp_file")
     temp_file.binmode
     original_file = params[:design][:package_file]
-      if original_file.content_type == 'application/zip'
+      #if original_file.content_type == 'application/zip'
         temp_file.write(original_file.read)
-        filename = original_file.original_filename
+        temp_file.rewind
+        filename = File.basename(original_file.original_filename,".zip")
         unzip_design(temp_file, filename)
-      else
-        flash[:error] = "Upload file should be in zip format"
-      end
+      #else
+      #  flash[:error] = "Upload file should be in zip format"
+      #end
       temp_file.close
     end
   end
   def unzip_design(file, zip_name)
     Zip::ZipFile.open(file) { |zip_file|
-      design = Design.new.from_json(zip_file.read("#{zip_name}/#{zip_name}.json"))
-      
+      design = Design.new.from_json(zip_file.read("#{zip_name}/info.json"))
       Dir.mktmpdir('f_path') { |dir|
-        title = design.layout_filename
-        temp_file = File.new(dir + '/' + title, 'w+')
+        title = 'layout.html'  #design.layout_filename  Should be layout file name,set to be fetch
+        temp_file = File.new(dir + '/' + title, 'w+') #dir/zip_name
         temp_file.write zip_file.read(zip_name + '/' + title)
+        debugger
+        design.build_layout
         design.layout = temp_file
-        ['stylesheets', 'javascripts', 'images'].each do |type|
+        ['themes', 'javascripts', 'images'].each do |type|
           eval("design.#{type}").each do |object|
             title = object.file_filename
             temp_file = File.new(dir + '/' + title, 'w+')
@@ -45,19 +47,6 @@ class Admin::DesignsController < ApplicationController
       design.save
     }
   end
-  def proc_package
-    #uri = URI.parse("http://localhost:3001/design/fraisier")
-    #http = Net::HTTP.new(uri.host, uri.port)
-    #request = Net::HTTP::Get.new(uri.request_uri)
-    #response = http.request(request)
-    temp_file = Tempfile.new("temp_file")
-    temp_file.binmode
-    temp_file.write response.body
-    zip_name = response['content-disposition'].split('filename=')[1].gsub(/[\\\"]|.zip/, '') rescue ''
-    unzip_design(temp_file, zip_name)
-    temp_file.close
-  end
-
 
   def index
     @designs = Design.all.entries
@@ -78,17 +67,6 @@ class Admin::DesignsController < ApplicationController
     end
   end
 
-  def apply
-    @design = Design.find(params[:id])
-    Layout.create(:name => @design.title,:description=>@design.intro,:content=>@design.layout.file.read)
-    #TODO do somehting to validate 
-#    doc = Nokogiri::HTML(@design.layout.file.read)
-    flash[:notice] = "Successfully applied design and created a layout."
-    
-    redirect_to admin_designs_url
-
-  end
-
   def edit_file
     @design = Design.find(params[:id])
     filename = params[:filename]
diff --git a/app/models/design.rb b/app/models/design.rb
index 397cf1547..78bc51fc5 100644
--- a/app/models/design.rb
+++ b/app/models/design.rb
@@ -2,6 +2,7 @@ class Design
   include Mongoid::Document
   include Mongoid::Timestamps
 
+
   field :title
   field :author
   field :intro