dashcode-converter 0.0.1 → 0.1.0

data/lib/dashcode-converter/nib.rb

@@ -11,14 +11,13 @@ module DashcodeConverter
     class Nib
 
       DECL_TEMPLATE= <<-EOF
-          /*import coherent*/
+          /*jsl:import coherent*/
+          
           NIB('<%=name%>', {
             
           <%=items_array.join(",\n\n").indent(INDENT)%>,
           
-              'owner': {
-                view: REF('<%=name%>')
-              }
+          <%=_owner_decl.indent(INDENT)%>
           });
       EOF
       
@@ -27,8 +26,10 @@ module DashcodeConverter
       def initialize(name, owner)
         @name= name
         @owner= owner
+        @owner_references= {}
         @items= {}
         @views= []
+        add_owner_reference('view', name)
       end
       
       def add_view(view)
@@ -36,18 +37,30 @@ module DashcodeConverter
         views << view
       end
       
+      def add_item(item)
+        items[item.name]= item
+      end
+      
       def add_view_from_path(path, name=@name)
-        view= View.new(name, parse(path), self)
+        view= View.new(name, self)
+        view.parse_spec(parse_parts(path))
         add_view(view)
       end
       
       def add_datasources_from_path(path)
-        datasources= parse(path)
-        datasources.each { |name, datasource|
-          items[name]= NibItem.new(name, datasource, self)
+        datasources= parse_parts(path)
+        datasources.each { |name, spec|
+          datasource= NibItem.new(name, self)
+          datasource.parse_spec(spec)
+          items[name]= datasource
+          add_owner_reference(name, name)
         }
       end
-
+      
+      def add_owner_reference(name, reference)
+        @owner_references[name]= JavascriptCode("REF('#{reference}')")
+      end
+      
       def declaration
         return @declaration if @declaration
         
@@ -56,7 +69,7 @@ module DashcodeConverter
         @declaration= ERB.new(DECL_TEMPLATE.remove_indent).result binding
       end
       
-      def parse(path)
+      def parse_parts(path)
         in_json= false
         json= "{\n"
         text= File.read(path)
@@ -82,6 +95,10 @@ module DashcodeConverter
         name
       end
       
+      def _owner_decl
+        "owner: #{@owner_references.to_json(JSON_PARAMS)}"
+      end
+      
     end
 
   end

data/lib/dashcode-converter/nib/collection-view.rb

@@ -7,9 +7,24 @@ module DashcodeConverter
       def adjust_declaration_for_CollectionView(decl)
         if decl.include?("dataArrayBinding")
           decl.delete("dataArray")
-          decl["contentBinding"]= decl.delete("dataArrayBinding")
-        end
 
+          array_controller_name= nib.unique_name(name[1..-1])
+          array_controller= NibItem.new(array_controller_name, nib)
+          array_controller.classname="coherent.ArrayController"
+          array_controller.spec= {
+              "contentBinding" => decl.delete("dataArrayBinding")
+            }
+          nib.add_item(array_controller)
+          nib.add_owner_reference(array_controller_name,array_controller_name)
+          
+          decl["contentBinding"]= {
+            :keypath => "#{array_controller_name}.arrangedObjects"
+          }
+          decl["selectionIndexesBinding"]= {
+            :keypath => "#{array_controller_name}.selectionIndexes"
+          }
+        end
+        
         decl.delete("useDataSource")
         decl.delete("sampleRows")
         decl.delete("labelElementId")
@@ -22,7 +37,7 @@ module DashcodeConverter
       # version 3.0 used a whacky star notation for binding to values in the
       # list view.
       def fixup_html_for_CollectionView(html)
-        template= View.new(nib.unique_name("ItemTemplate"), nil, nib)
+        template= View.new(nib.unique_name("#{name[1..-1]}Item"), nib)
         template.is_template= true
         nib.add_view(template)
         @spec["viewTemplate"]= JavascriptCode("REF('#{template.name}')")

data/lib/dashcode-converter/nib/nib-item.rb

@@ -4,13 +4,14 @@ module DashcodeConverter
     class NibItem
 
       attr_reader :name, :nib
-      attr_accessor :view
+      attr_accessor :view, :classname, :spec
        
-      def initialize(name, spec, nib)
+      def initialize(name, nib)
         @name= name
         @nib= nib
         @view= nil
-        @spec= from_spec(spec)
+        base_classname= ""
+        @spec= {}
       end
 
       def declaration
@@ -20,6 +21,10 @@ module DashcodeConverter
         @declaration= "'#{name}': #{@classname}(#{values})"
       end
       
+      def base_classname
+        @base_classname ||= @classname.split(".")[-1]
+      end
+      
       def fixup_html(html)
         if 'coherent.Button'==@classname
           html.name='button'
@@ -29,12 +34,12 @@ module DashcodeConverter
         end
 
         # allow class specific fixups
-        if self.respond_to?("fixup_html_for_#{@fixupname}")
-          self.send("fixup_html_for_#{@fixupname}", html)
+        if self.respond_to?("fixup_html_for_#{base_classname}")
+          self.send("fixup_html_for_#{base_classname}", html)
         end
       end
       
-      def from_spec(spec)
+      def parse_spec(spec)
         nib_item= {}
         spec.each { |key, value|
           next if ["view", "Class", "propertyValues"].include?(key)
@@ -63,15 +68,14 @@ module DashcodeConverter
           parts[0]= "coherent" if parts[0]=="DC"
           parts[1]= CLASSNAME_LOOKUP[parts[1]] if CLASSNAME_LOOKUP.include?(parts[1])
         end
-      
-        @fixupname= parts[-1]
 
-        if self.respond_to?("adjust_declaration_for_#{@fixupname}")
-          nib_item= self.send("adjust_declaration_for_#{@fixupname}", nib_item)
+        @classname= parts.join(".")
+
+        if self.respond_to?("adjust_declaration_for_#{base_classname}")
+          nib_item= self.send("adjust_declaration_for_#{base_classname}", nib_item)
         end
 
-        @classname= parts.join(".")
-        nib_item
+        @spec= nib_item
       end
       
     end

data/lib/dashcode-converter/nib/view.rb

@@ -12,12 +12,11 @@ module DashcodeConverter
       attr_reader :name, :nib, :items, :items_by_id
       attr_accessor :is_template
       
-      def initialize(name, spec, nib)
+      def initialize(name, nib)
         @name= name
         @nib= nib
         @items= []
         @items_by_id= {}
-        from_spec(spec) if spec
       end
 
       def remove_item(item)
@@ -31,9 +30,10 @@ module DashcodeConverter
         @items << item
       end
       
-      def from_spec(spec)
+      def parse_spec(spec)
         spec.each { |id, part_spec|
-          item= NibItem.new("##{id}", part_spec, nib)
+          item= NibItem.new("##{id}", nib)
+          item.parse_spec(part_spec)
           add_item(item)
         }
       end

data/lib/dashcode-converter/project.rb

@@ -5,18 +5,47 @@ module DashcodeConverter
   
   class Project
     
-    attr_accessor :namespace
+    attr_accessor :namespace, :name
+
+    PROJECT_TEMPLATE= <<-EOF
+      name: <%=name%>
+      version: 1.0.0
+      notice: src/NOTICE
+      type: application
+      export: <%=name%>
+      output folder: build
+
+      external:
+        - name: coherent
+          path: ext/coherent
+          repository: https://github.com/jeffwatkins/coherent.git
+
+      include:
+        - coherent
+  
+      source:
+        - src/index.html
+        - src/<%=name%>.jsnib
+    EOF
     
     def initialize(project_bundle, output_folder)
       @project_bundle= File.expand_path(project_bundle)
       @name= File.basename(@project_bundle, ".*")
       @namespace= @name
-      @output_folder= File.expand_path(File.join(output_folder, "#{@name}.#{BUNDLE_EXTENSION}"))
+      @output_folder= File.expand_path(File.join(output_folder, @name))
+      @nib_folder= "#{@name}.#{BUNDLE_EXTENSION}"
+      @nib_output_folder= File.join(@output_folder, "src", @nib_folder)
+      
+      @images_output_folder= File.join(@output_folder, "src", @nib_folder, "images")
+      
       @parts_spec_path= File.join(@project_bundle, "project", "safari", "Parts", "setup.js")
       @datasources_spec_path= File.join(@project_bundle, "project", "Parts", "datasources.js")
       @css_path= File.join(@project_bundle, "project", "safari", "main.css")
       @markup_path= File.join(@project_bundle, "project", "index.html")
-      @images_folder= File.join(@output_folder, "images")
+      @scripts= Scripts.new(File.join(@project_bundle, "project", "safari"))
+      
+      @controller_name= "#{@name.capitalize}Controller"
+      
       FileUtils.mkdir_p(@output_folder)
     end
 
@@ -39,7 +68,7 @@ module DashcodeConverter
     end
 
     def relative_path(path)
-      path_relative_to_folder(path, @output_folder)
+      path_relative_to_folder(path, @nib_output_folder)
     end
     
     def doc
@@ -51,7 +80,7 @@ module DashcodeConverter
 
     def controller
       return @controller if @controller
-      @controller= Controller.new(@name, @namespace)
+      @controller= Controller.new(@name, @namespace, @scripts)
     end
     
     def nib
@@ -72,7 +101,7 @@ module DashcodeConverter
         if (!File.exists?(image_file))
           match
         else
-          new_image_file= File.join(@images_folder, File.basename(image_file))
+          new_image_file= File.join(@images_output_folder, File.basename(image_file))
           FileUtils.mkdir_p(File.dirname(new_image_file))
           FileUtils.cp image_file, new_image_file
           "url(\"#{relative_path(new_image_file)}\")"
@@ -100,7 +129,7 @@ module DashcodeConverter
       
       content.css("[src]").each { |node|
         image_file= File.join(dirname, node.attribute('src'))
-        new_image_file= File.join(@images_folder, File.basename(image_file))
+        new_image_file= File.join(@images_output_folder, File.basename(image_file))
         FileUtils.mkdir_p(File.dirname(new_image_file))
         FileUtils.cp image_file, new_image_file
         node["src"]= relative_path(new_image_file)
@@ -120,11 +149,46 @@ module DashcodeConverter
     def convert
       fixup_html
       
+      FileUtils.mkdir_p(@nib_output_folder)
       FileUtils.mkdir_p(@output_folder)
-      FileUtils.mkdir_p(@images_folder)
-      
+      FileUtils.mkdir_p(@images_output_folder)
+
       Dir.chdir(@output_folder) do
-        File.open("#{@name.capitalize}Controller.js", "w") { |controller_file|
+        File.open("#{@name}.jsproj", "w") { |project_file|
+          project_file << ERB.new(PROJECT_TEMPLATE.remove_indent).result(binding)
+        }
+      end
+      
+      Dir.chdir(File.join(@output_folder, "src")) do
+        File.open("index.html", "w") { |html|
+          html <<%{
+            <!DOCTYPE HTML>
+            <html>
+              <head>
+                <link rel="stylesheet" href="#{@name}.css" type="text/css" media="screen" charset="utf-8">
+                <script src="#{@name}.js" type="text/javascript" charset="utf-8"></script>
+              </head>
+  
+              <body>
+              </body>
+              <script type="text/javascript" charset="utf-8">
+                distil.onready(function(){
+    
+                  var controller= new #{@name}.#{@controller_name}({
+                                      nibName: '#{@name}'
+                                    });
+                  controller.view();
+      
+                });
+  
+              </script>
+            </html>
+          }.remove_indent
+        }
+      end
+      
+      Dir.chdir(@nib_output_folder) do
+        File.open("#{@controller_name}.js", "w") { |controller_file|
           controller_file << controller.declaration
         }
         File.open("#{@name}.js", "w") { |nib_file|
@@ -137,6 +201,11 @@ module DashcodeConverter
           html_file << doc.css("body > *:first-child")[0].serialize
         }
       end
+      
+      Dir.chdir(@output_folder) do
+        system 'distil'
+      end
+      
     end
     
   end

data/lib/dashcode-converter/scripts.rb

@@ -0,0 +1,19 @@
+module DashcodeConverter
+  
+  class Scripts
+    
+    def initialize(folder)
+      @context= V8::Context.new
+      @context.load(File.join(File.dirname(__FILE__), "env.js"))
+      Dir.glob(File.join(folder, "**", "*.js")) { |file|
+        @context.load(file)
+      }
+    end
+    
+    def [](name)
+      @context[name]
+    end
+    
+  end
+  
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dashcode-converter
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jeff Watkins
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 -07:00
+date: 2010-11-15 00:00:00 -08:00
 default_executable: dashcode-converter
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,38 @@ dependencies:
         version: 1.4.3.1
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: therubyracer
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 7
+        - 5
+        version: 0.7.5
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: distil
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 0
+        - 13
+        - 1
+        version: 0.13.1
+  type: :runtime
+  version_requirements: *id004
 description: ""
 email: jeff@metrocat.org
 executables: 
@@ -68,11 +100,13 @@ files:
 - dashcode-converter.tmproj
 - lib/dashcode-converter.rb
 - lib/dashcode-converter/controller.rb
+- lib/dashcode-converter/env.js
 - lib/dashcode-converter/nib.rb
 - lib/dashcode-converter/nib/collection-view.rb
 - lib/dashcode-converter/nib/nib-item.rb
 - lib/dashcode-converter/nib/view.rb
 - lib/dashcode-converter/project.rb
+- lib/dashcode-converter/scripts.rb
 has_rdoc: true
 homepage: http://github.com/jeffwatkins/dashcode-converter
 licenses: []