puer 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/puer

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 
+require 'rubygems'
 require 'rubygems' unless defined?(Gem) 
 require 'thread'
 
@@ -14,3 +15,60 @@ unless $LOAD_PATH.include?(lib_dir)
 end
 
 require 'puer'
+require 'optparse'
+  
+OptionParser.new do |opts|
+  opts.banner  =<<END
+  Usage: puer [options] [filename]
+  Usage: puer all  # convert all xib files to js under current directory
+END
+
+  opts.on("-w", "--[no-]warnings", "Show warnings") do |w|
+    @show_warnings = w
+  end
+
+  opts.on("-o", "--output-file name", "Specify output file") do |o|
+    @output_file = o
+  end
+  
+  opts.on("-c", "--config-file name", "Specify config file") do |o|
+    @config_file = o
+  end
+  
+end.parse!
+
+if ARGV.size == 1
+  
+  case ARGV[0]
+  when "all"
+    Dir.glob(File.join('**','*.xib')).each do |s| 
+        puts "#{s} is converted to #{File.basename(s, '.*')}.js "
+        system "puer #{s} -o #{File.basename(s, '.*')}.js" 
+        exit   
+    end 
+  else
+    input_file = ARGV.first
+  
+    session = Session.new @config_file || File.join("#{File.dirname(__FILE__)}/../lib/puer", 'config.rb')
+    session.parse_file input_file
+    if session.has_errors?
+      puts "Aborted!"
+      puts session.full_log [:error]
+    else  
+      severities = []
+      severities.unshift :warning if @show_warnings
+      log = session.full_log severities
+      script = js_comments_for(log) + js_for(session.out)
+      if @output_file
+        File.open(@output_file, 'w') do |file|
+          file.write script
+        end
+        puts log
+      else
+        puts script
+      end
+    end
+  end
+else
+  puts "For help, type: puer -h"
+end

data/lib/puer.rb

@@ -1 +1,6 @@
-puts "Have a cup of puer"
+lib_dir = File.expand_path(File.join(File.dirname(__FILE__),'puer'))
+unless $LOAD_PATH.include?(lib_dir)
+  $LOAD_PATH << lib_dir
+end
+
+require 'xibtoti'

data/lib/puer/config.rb

@@ -0,0 +1,24 @@
+ignore_properties 'contentStretch', 'simulatedStatusBarMetrics', 'simulatedOrientationMetrics'
+ignore_classes 'IBProxyObject'
+
+# To get another creation call than standard
+# Ti.UI.create#{name}
+# give a array as value: 'IBUIWindow' => ['Window', 'myWindowCall']
+classes 'IBUIWindow' => 'Window',
+        'IBUIView' => 'View',
+        'IBUILabel' => 'Label',  
+        'IBUIButton' => 'Button'
+
+# Available types: 
+# val(:output)
+# bool(:output) # Where '0' gives {:output => false} and '1' gives {:output => true}
+# lookup(:output, {'yes' => true, 'no' => false})
+# color(:output)
+# font(:output)
+# vextor(:x, :y) # Where '{1, 2}' => {:x => 1, :y => 2}
+properties 'backgroundColor' => color(:backgroundColor),
+           'font' => font(:font),
+           'frameOrigin' => vector(:top, :bottom),
+           'frameSize' => vector(:height, :width),
+           'text' => val(:text),
+           'textColor' => color(:color)

data/lib/puer/converters.rb

@@ -0,0 +1,36 @@
+# Converters converts data in the xib files property bag to the NodeInfos property bag.
+# The output key it will have is stored here. The converter can be created with a conversion block
+# Converter.new :output {|v| Convert value v here...}
+
+class Converter
+  def initialize(output, &conversion)
+    @output = output
+    @conversion = conversion || proc {|v| v}
+  end
+  
+  def props_for(value)
+    converted_value = @conversion.call(value)
+    if converted_value
+      { @output => converted_value }
+    end
+  end
+end
+
+# MultiConverter is used for cases when a property in the xhib file's property bag needs multiple
+# properties in JS
+# Example: {'frameOrigin' => "{123, 456}"} should give {:top => 123, :bottom => 456}
+# Done by: MultiConverter.new([:top, :bottom], /\{(\d+), (\d+)\}/) {|v| v.to_i}
+
+class MultiConverter < Converter
+  def initialize(outputs, regex, &conversion)
+    @outputs = outputs
+    @regex = regex
+    @conversion = conversion || proc {|v| v}
+  end
+  
+  def props_for(value)
+    if match = @regex.match(value)
+      Hash[@outputs.zip(match.captures.map(&@conversion))]
+    end
+  end
+end

data/lib/puer/nodes.rb

@@ -0,0 +1,56 @@
+# NodeInfo contains the information from the xib, both hierarchy and properties
+
+class NodeInfo
+  def initialize(name, node_id, node_class, subviews)
+    @name = name
+    @node_id = node_id
+    @node_class = node_class
+    @subviews = subviews
+    @properties = {}
+  end
+
+  attr_reader :properties, :name, :node_class, :subviews
+  
+  def self.enumerate(name)
+    "#{name}#{(@@name_counters ||= Hash.new {0})[name]+=1}"
+  end
+
+  def self.for(hierarchy, data, session)
+    id = hierarchy['object-id'].to_s
+    info = data[id]
+    node_class = session.class_info_for info['class']
+    if node_class  
+      name = hierarchy['name'] || enumerate(node_class.name.downcase)
+      subviews = (hierarchy['children'] || []).map {|child_hierarchy| NodeInfo.for(child_hierarchy, data, session)}.compact
+      node = NodeInfo.new name, id, node_class, subviews
+      info.each do |prop, value|
+        if converter = session.converter_for(prop)
+          props = converter.props_for(value)
+          if props
+            node.properties.merge! props
+          else
+            session.log(:error, "Could not convert #{prop}: #{value}")
+          end
+        else
+          session.log(:warning, "Skipped property for #{info['class']}: #{prop}") unless session.ignore_property? prop
+        end
+      end
+      node
+    else
+      session.log(:warning, "Skipped class #{info['class']}")  unless session.ignore_class? info['class']
+    end
+    node
+  end
+end
+
+# ClassInfo contains all known information on the class of the node info (Windows, Views... etc)
+
+class ClassInfo
+  def initialize(name, creation_call="Ti.UI.create#{name}")
+    @name = name
+    @creation_call = creation_call
+  end
+  
+  attr_reader :name, :creation_call
+end
+

data/lib/puer/session.rb

@@ -0,0 +1,129 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'nodes'
+require 'converters'
+require 'rubygems'
+require 'plist'
+
+# Stores all configurable info on how to translate the xib to JS
+# The session is created from a config file.
+
+class Session
+  def initialize(path)
+    @ignore_properties = []
+    @ignore_classes = []
+    @classes = {}
+    @properties = {}
+    @log = []
+    File.open path do |file|
+      eval file.read
+    end
+  end
+  
+  attr_reader :out
+  
+  def parse_file(file)
+    data = Plist::parse_xml( %x[ibtool #{file} --hierarchy --objects --connections] )
+    @out = data['com.apple.ibtool.document.hierarchy'].map {|hierarchy| NodeInfo.for hierarchy, data['com.apple.ibtool.document.objects'], self}.compact
+    data['com.apple.ibtool.document.connections'].each do |connection|
+      # TODO
+    end
+    @out
+  end
+  
+  def full_log(severities=[])
+    excluded = @log.map(&:first).uniq - severities
+    (excluded.empty? ? '' : "There were log entries of severity: #{excluded.join ', '}\n") +
+    @log.map do |severity, message|
+      "[#{severity}] #{message}" if severities.include? severity
+    end.compact.join("\n")
+  end
+  
+  def has_errors?
+    @log.any? {|severity, message| severity == :error}
+  end
+  
+  def log(severity, message)
+    @log.push [severity, message]
+  end
+  
+  def ignore_class?(class_name)
+    @ignore_classes.include? class_name
+  end
+  
+  def ignore_property?(property_name)
+    @ignore_properties.include? property_name
+  end
+  
+  def converter_for(property_name)
+    @properties[property_name]
+  end
+  
+  def class_info_for(class_name)
+    @classes[class_name]
+  end
+  
+  def classes(class_hash)
+    class_hash.each do |key, value|
+      @classes[key] = ClassInfo.new(*value)
+    end
+  end
+  
+  def ignore_properties(*names)
+    @ignore_properties += names
+  end
+  
+  def ignore_classes(*names)
+    @ignore_classes += names
+  end
+  
+  def properties(properties_hash)
+    @properties.merge! properties_hash
+  end
+  
+  # Color helper methods
+
+  def hex(v)
+    "%02x" % (v.to_f*255).round
+  end
+
+  def rgba(r, g, b, a)
+    "##{hex(r)}#{hex(g)}#{hex(b)}#{hex(a)}"
+  end
+  
+  # Methods for converter creation in config file
+  
+  def val(name)
+    Converter.new(name)
+  end
+
+  def bool(name)
+    Converter.new(name) {|v| v==1}
+  end
+
+  def lookup(name, hash)
+    Converter.new(name) {|v| hash[v]}
+  end
+
+  def color(name)
+    Converter.new(name) do |v| 
+      case v
+      when /NS(?:Calibrated|Device)RGBColorSpace (\d+(?:\.\d+)?) (\d+(?:\.\d+)?) (\d+(?:\.\d+)?) (\d+(?:\.\d+)?)/
+        rgba($1, $2, $3, $4)
+      when /NS(?:Calibrated|Device)WhiteColorSpace (\d+(?:\.\d+)?) (\d+(?:\.\d+)?)/
+        rgba($1, $1, $1, $2)
+      when /NSCustomColorSpace Generic Gray colorspace (\d+(?:\.\d+)?) (\d+(?:\.\d+)?)/
+        rgba($1, $1, $1, $2)
+      end
+    end
+  end
+
+  def font(name)
+    Converter.new(name) do |v| 
+      {:fontFamily => v['Family'], :fontSize => v['Size']}
+    end
+  end
+
+  def vector(x, y)
+    MultiConverter.new([x, y], /\{(\d+), (\d+)\}/) {|v| v.to_i}
+  end
+end

data/lib/puer/xibtoti.rb

@@ -0,0 +1,33 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'session'
+
+def inline_js_for(data)
+
+    case data
+    when Hash 
+      '{' + data.map {|k,v| "#{k}:#{inline_js_for(v)}"}.join(',') + '}'
+    when String 
+      "'#{data}'"
+    else 
+      data.to_s
+    end  
+
+end
+
+def creation_call(name, class_name, info)
+  "#{name} = #{class_name}({\n" +
+    info.keys.sort.map {|key| "\t#{key}:#{inline_js_for(info[key])}"}.join(",\n") + "\n});"
+end
+
+def js_sections_for(node)
+  [creation_call(node.name, node.node_class.creation_call, node.properties)] +
+    node.subviews.map {|child| [js_sections_for(child), "#{node.name}.add(#{child.name});"]}.flatten
+end
+
+def js_for(nodes)
+  nodes.map {|node| js_sections_for(node)}.flatten.join("\n\n")
+end
+
+def js_comments_for text
+ ""  #text.map {|line| line.chomp.empty? ? line : "// #{line}"}.join + "\n"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-23 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -220,45 +236,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.3.1
 - !ruby/object:Gem::Dependency
-  name: ruby-prof
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-- !ruby/object:Gem::Dependency
-  name: system_timer
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
+        version: 3.2.8
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 3.2.8
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: grit
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -266,9 +266,9 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: grit
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -284,7 +284,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: hirb
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -300,7 +300,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hirb
+  name: cli-colorize
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -316,7 +316,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cli-colorize
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -332,7 +332,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -348,7 +348,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: plist
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -377,6 +377,11 @@ files:
 - README.md
 - VERSION
 - lib/puer.rb
+- lib/puer/config.rb
+- lib/puer/converters.rb
+- lib/puer/nodes.rb
+- lib/puer/session.rb
+- lib/puer/xibtoti.rb
 - !binary |-
   YmluL3B1ZXI=
 homepage: http://github.com/eiffelqiu/puer
@@ -394,7 +399,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3248177067678294062
+      hash: -841221982100314824
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -403,7 +408,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Titanium Starter Project Generate Tools