psd2html 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 507d8336a81cbfb89f58e6016204d914d944da50
-  data.tar.gz: 4ca147dff5d8e3dffc9819c066adcaf81e6fa270
+  metadata.gz: b4f4dd329046219f159667e59ff966a397782ac9
+  data.tar.gz: 2e6517e70e73826f6152217c41fcc9b663d0ec53
 SHA512:
-  metadata.gz: 3114efbc5a00334a46b02f89f000b5f42ba0267a03b9107c7de7ab6236a11390d4f27b0520a780e3ea512435caf1c9b618a4c4f591504453cd2beeab54d73c68
-  data.tar.gz: 245e00d2128f24ad74035974bbb3ebaf994fcd96daae293d617e55c18cd9035a44e2a2473bde9d0848f0d1c4c5be34ee0550a927a3dc1ffda5fe4110e44c6890
+  metadata.gz: 62d616b613a78ce5bb061db7f1e0c8a3cdb36d34d03cb1e131956a2ed712a8bdf2e40627aa06c5779d3528f01518cc0b18e7fa1b04ea568f83dd5ecce34fc1c5
+  data.tar.gz: 24faa4f7e34cc2e491e01cfaafdcbb3c5e25063d662d1881fa2858307d6b5e1575fcdc8ab2675b77b13fb6ee4a508d383f488e370081605cf021350d5fba7423

data/lib/psd2html.rb

@@ -47,13 +47,28 @@ class Psd2Html
   end
 
   protected
+    def get_convertorname(node)
+      type = node.to_hash[:type]
+      if node.name.include?("|")
+        convertorName = node.name.split('|').last.to_s
+      elsif type == :group
+        convertorName = "block"
+      elsif type == :layer && !node.text.nil?
+        convertorName = "text"
+      else
+        convertorName = "img"
+      end 
+      
+    end
   	def get_convertor(node,index)
 
   		return CONVERTING_MAP["root"].new(node,index,@dstHtmlPath) if node.root? 
 
-  		return unless node.name.include?("|") 
-
-  		convertorName = node.name.split('|').last.to_s
+  		#return unless node.name.include?("|") 
+      #if node.name.include?("|")
+        #convertorName = node.name.split('|').last.to_s
+      #end
+  		convertorName = get_convertorname(node)
   		unless CONVERTING_MAP.include?(convertorName)
   			return
   		end

data/lib/psd2html/convertor.rb

@@ -32,7 +32,11 @@ module Psd2html
         @dstPath = dstPath
 	    end
 	    def guid
-	    	className = @psNode.name.split("|")[-2]
+        if @psNode.name.include?("|")
+	    	  className = @psNode.name.split("|")[-2]
+        else
+          className = @psNode.name
+        end
 	    	guidStr = className+@index.to_s
 	    	if /\p{Han}+/u.match(className)
 	    		Digest::MD5.hexdigest(guidStr)
@@ -87,7 +91,7 @@ module Psd2html
 	    end
 	    
 	    def render_html
-        Until.log("start generate html of #{}...")
+        Until.log("start generate html of #{@psNode.name}...")
 	    	return "" unless html_skeleton
 	    	data = html_skeleton.clone
 	    	data["attributes"] = hash_to_array(data["attributes"])

data/lib/psd2html/version.rb

@@ -1,3 +1,3 @@
 module Psd2html
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: psd2html
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - cherishpeace
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache