psd2html 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c285961d492dab7ec2462fa504d338c7cfd93801
-  data.tar.gz: e9dbd07796a7688e57c79c3965a9e5e2ad016e7e
+  metadata.gz: 507d8336a81cbfb89f58e6016204d914d944da50
+  data.tar.gz: 4ca147dff5d8e3dffc9819c066adcaf81e6fa270
 SHA512:
-  metadata.gz: 3d05e194a7dad02fcd2c6a529b5b29de98f4e0c03e3c7a2f750886ffaa3560d342f9a3c6e734e6dd7efb67ee0157c02eeb7cdbed69f08e0a73968bd12429f2c1
-  data.tar.gz: 22dbd20f07b74e0628e10f1c696745bd9143a49d0b1317413bd9206a13ea7b7903b855b2582d6c0b0ee909574a9285e56e9b799e6d6d9891deb1f7069d698123
+  metadata.gz: 3114efbc5a00334a46b02f89f000b5f42ba0267a03b9107c7de7ab6236a11390d4f27b0520a780e3ea512435caf1c9b618a4c4f591504453cd2beeab54d73c68
+  data.tar.gz: 245e00d2128f24ad74035974bbb3ebaf994fcd96daae293d617e55c18cd9035a44e2a2473bde9d0848f0d1c4c5be34ee0550a927a3dc1ffda5fe4110e44c6890

data/bin/psd2html

@@ -1,12 +1,21 @@
 #!/usr/bin/env ruby
-require 'psd2html'
+require_relative '../lib/psd2html.rb'
 psdPath = ARGV[0]
 dstHtmlPath = ARGV[1]
-psd = Psd2Html.new(psdPath)
-unless dstHtmlPath
-  puts psd.render()
-else
+
+if psdPath && dstHtmlPath
+  psd = Psd2Html.new(psdPath,dstHtmlPath)
   fh = File.new(dstHtmlPath, "w")  #创建一个可写文件流
   fh.puts psd.render()
   fh.close
-end
+else
+  puts <<-EOF
+  Please provide psdpath and htmlpath
+
+  Usage:
+    psd2html psdpath htmlpath
+  EOF
+end
+
+
+

data/lib/psd2html.rb

@@ -1,10 +1,10 @@
 require 'psd'
-require_relative 'psd2html/until.rb'
+require_relative './until.rb'
 require_relative 'psd2html/convertor.rb'
 Dir.glob( File.expand_path( "psd2html/psconvertor/*.rb", File.dirname(__FILE__) ) ) do |convertor|
   require convertor
 end
-Until.log("start generate psd tree....")
+
 class Psd2Html
 	CONVERTING_MAP = {
 		"text" => ::Psd2html::PsConvertor::Text,
@@ -16,13 +16,14 @@ class Psd2Html
 		"img-bg" => ::Psd2html::PsConvertor::ImgBackground,
 		"root" => ::Psd2html::PsConvertor::Root
 	}
-	def initialize(psdPath)
+	def initialize(psdPath,dstHtmlPath)
+    @dstHtmlPath = dstHtmlPath
 		psd = PSD.new(psdPath)
 		psd.parse! 
 		blockRoot = psd.tree
 		rootConvertor = get_convertor(blockRoot,1)
 		@treeRoot = format_tree(rootConvertor)
-    puts "start generate psd tree...."
+    Until.log("start generate psd tree....")
   end
 
   def render_css
@@ -48,7 +49,7 @@ class Psd2Html
   protected
   	def get_convertor(node,index)
 
-  		return CONVERTING_MAP["root"].new(node,index) if node.root? 
+  		return CONVERTING_MAP["root"].new(node,index,@dstHtmlPath) if node.root? 
 
   		return unless node.name.include?("|") 
 
@@ -56,7 +57,7 @@ class Psd2Html
   		unless CONVERTING_MAP.include?(convertorName)
   			return
   		end
-  		CONVERTING_MAP[convertorName].new(node,index)
+  		CONVERTING_MAP[convertorName].new(node,index,@dstHtmlPath)
 		end
 		def format_tree(convertor)
 			if convertor.psNode.has_children?

data/lib/psd2html/convertor.rb

@@ -24,11 +24,12 @@ module Psd2html
   			"tag" => "div",
   			"content" => ""
   		}
-  		def initialize(psNode,index)
+  		def initialize(psNode,index,dstPath)
 		    @psNode = psNode
 		    @index = index
 		    @parentConvertor = nil
 		    @childrenConvertors = []
+        @dstPath = dstPath
 	    end
 	    def guid
 	    	className = @psNode.name.split("|")[-2]
@@ -40,6 +41,15 @@ module Psd2html
 	    	end
 	    	
 	    end
+
+      def curleft
+        wrapleft = @parentConvertor.psNode.respond_to?("left") ? parentConvertor.psNode.left : 0
+        "#{@psNode.left-wrapleft}px"
+      end
+      def curtop
+        wraptop = @parentConvertor.psNode.respond_to?("top") ? parentConvertor.psNode.top : 0
+        "#{@psNode.top-wraptop}px"
+      end
 	    #需要被重写，用于生成css的对象hash
 	    def css_skeleton
 	    	CSS_HASH_BASE
@@ -56,6 +66,7 @@ module Psd2html
 	    end
 	    #为了处理css的同名问题，需要使用一个hash来去重
 	    def css_map
+        Until.log("start generate css of #{@psNode.name}...")
 	    	return unless css_skeleton
 	    	data = css_skeleton.clone
 	    	data["styles"] = hash_to_array(data["styles"])
@@ -66,7 +77,6 @@ module Psd2html
 	    	end
 	    end
 	    def render_css
-        Until.log("start generate css of #{@psNode.name}...")
 	    	css_map()
 	    	cssStr = ""
 	    	@@css_dictory.values.each do |cssData|
@@ -74,11 +84,10 @@ module Psd2html
 	    	end
 	    	@@css_dictory = {}
 	    	cssStr = sync_css(cssStr)
-        Until.log("done generate css of #{@psNode.name}...")
 	    end
 	    
 	    def render_html
-        Until.log("start generate html of #{@psNode.name}...")
+        Until.log("start generate html of #{}...")
 	    	return "" unless html_skeleton
 	    	data = html_skeleton.clone
 	    	data["attributes"] = hash_to_array(data["attributes"])
@@ -89,7 +98,6 @@ module Psd2html
 	    		    	
 	    	htmlStr = Mustache.render(get_html_tpl,data)
 	    	htmlStr = sync_html(htmlStr)
-        Until.log("done generate html of #{@psNode.name}...")
 	    end
 	    def sync_css(cssstr)
 	    	cssstr
@@ -108,10 +116,16 @@ module Psd2html
 	      def css_hook(style)
 	      	hookHash = {
 	      		"pt" => "px",
-	      		"MicrosoftYaHei" => "microsoft yahei"
+	      		"MicrosoftYaHei" => "microsoft yahei",
+            "rgba\\((\\s*\\d+,\\s*\\d+,\\s*\\d+),\\s*\\d+\\)" => -> { '#' + $1.split(',').map { |v| v.to_i.to_s(16) }.join }
 	      	}
 	      	hookHash.each do |key,value|
-	      		style = style.gsub(key,value)
+            if value.is_a?(Proc)
+              
+              style = style.gsub(Regexp.new(key)) { value.call }
+            else
+              style = style.gsub(Regexp.new(key), value)
+            end
 	      	end
 	      	style
 	      end

data/lib/psd2html/psconvertor/block.rb

@@ -3,6 +3,7 @@ module Psd2html
 	  	class Block < ::Psd2html::Convertor
 	  		
 	  		def css_skeleton
+
 	  			cssRenderData = {
 	  				"classname" => "block-#{guid}",
 		  			"styles" => {
@@ -10,8 +11,8 @@ module Psd2html
 		  				"display" => "inline-block",
 		  				"width" => "#{@psNode.width}px",
 		  				"height" => "#{@psNode.height}px",
-		  				"left" => "#{@psNode.left-@parentConvertor.psNode.left}px",
-	  					"top" => "#{@psNode.top-@parentConvertor.psNode.top}px",
+		  				"left" => curleft,
+	  					"top" => curtop,
 	  					"z-index" => "#{@psNode.depth}#{@parentConvertor.childrenConvertors.length - @index.to_i}"
 		  			}
 	  			}

data/lib/psd2html/psconvertor/img.rb

@@ -7,10 +7,11 @@ module Psd2html
 	  			"styles" => {
 	  				"position" => "absolute",
   					"display" => "inline-block",
+            "border" => "none",
 	  				"width" => "#{@psNode.width}px",
 	  				"height" => "#{@psNode.height}px",
-	  				"left" => "#{@psNode.left-@parentConvertor.psNode.left}px",
-	  				"top" => "#{@psNode.top-@parentConvertor.psNode.top}px",
+	  				"left" => curleft,
+	  				"top" => curtop,
 	  				"z-index" => "#{@psNode.depth}#{@parentConvertor.childrenConvertors.length - @index.to_i}"
 	  			}
   			}
@@ -20,8 +21,10 @@ module Psd2html
 	    	"<{{tag}} {{#attributes}} {{key}}=\"{{value}}\" {{/attributes}} />"
 	    end
 	    def html_skeleton
-	    	imgUrl = "./img-source-#{guid}-#{Time.now.to_i}.png"
-	    	@psNode.image.save_as_png(imgUrl)
+        
+
+	    	imgUrl = "#{File.dirname(@dstPath)}/img-source-#{guid}-#{Time.now.to_i}.png"
+        @psNode.image.save_as_png(imgUrl)
 	    	htmlRenderData = {
 	    		"attributes" => {
 	  				"class" => "img-#{guid}",

data/lib/psd2html/psconvertor/imgLink.rb

@@ -12,22 +12,22 @@ module Psd2html
   					"display" => "inline-block",
 	  				"width" => "#{@psNode.width}px",
 	  				"height" => "#{@psNode.height}px",
-	  				"left" => "#{@psNode.left-@parentConvertor.psNode.left}px",
-	  				"top" => "#{@psNode.top-@parentConvertor.psNode.top}px",
+	  				"left" => curleft,
+	  				"top" => curtop,
 	  				"z-index" => "#{@psNode.depth}#{@parentConvertor.childrenConvertors.length - @index.to_i}"
 	  			}
   			}
 	    	cssRenderData = CSS_HASH_BASE.merge(cssRenderData)
 	    end
 	    def html_skeleton
-	    	imgUrl = "./img-source-#{guid}-#{Time.now.to_i}.png"
-	    	@psNode.image.save_as_png(imgUrl)
+	    	imgUrl = "#{File.dirname(@dstPath)}/img-source-#{guid}-#{Time.now.to_i}.png"
+        @psNode.image.save_as_png(imgUrl)
 	    	htmlRenderData = {
 	    		"attributes" => {
 	  				"class" => "img-#{guid}",
 	  				"href" => "#"
 	  			},
-	  			"content" => "<img src=\"#{imgUrl}\" />",
+	  			"content" => "<img border=0 src=\"#{imgUrl}\" />",
 	  			"tag" => "a"
 	    	}
 	    	htmlRenderData = HTML_HASH_BASE.merge(htmlRenderData)

data/lib/psd2html/psconvertor/text.rb

@@ -9,8 +9,8 @@ module Psd2html
   					"display" => "inline-block",
 	  				"width" => "#{@psNode.width+2}px",
 	  				"height" => "#{@psNode.height+2}px",
-	  				"left" => "#{@psNode.left-@parentConvertor.psNode.left}px",
-	  				"top" => "#{@psNode.top-@parentConvertor.psNode.top}px",
+	  				"left" => curleft,
+	  				"top" => curtop,
 	  				"z-index" => "#{@psNode.depth}#{@parentConvertor.childrenConvertors.length - @index.to_i}"
 	  			}
   			}

data/lib/psd2html/version.rb

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

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: psd2html
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - cherishpeace
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: psd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ files:
 - lib/psd2html/psconvertor/textLink.rb
 - lib/psd2html/version.rb
 - lib/until.rb
-homepage: ''
+homepage: https://github.com/cherishpeace/psd2html
 licenses:
 - MIT
 metadata: {}