coherent 0.6.10 → 0.6.11

data/VERSION

@@ -1 +1 @@
-0.6.10
+0.6.11

data/app_generators/coherent/templates/src/js/AppDelegate.js.erb

@@ -37,6 +37,21 @@
   */
   hashDidChange: function(hashValue)
   {
-  } 
+  },
+  
+  pageTitleForString: function(string)
+  {
+    return string;
+  },
+  
+  historyStateForViewController: function(viewController)
+  {
+    return null;
+  },
+  
+  viewControllerForPath: function(path, historyState)
+  {
+    return null;
+  }
   
 });

data/bin/coherent

@@ -5,17 +5,30 @@ require 'rubigen'
 
 require 'rubigen/scripts/generate'
 
+BUILD_FILE= 'Buildfile'
+
 def find_project_file(dir=nil)
+  cwd= Dir.pwd
   dir ||= Dir.pwd
-  
   while dir.length > 1
-    files= Dir.glob(File.join(dir, '*.jsproj'))
-    if (1==files.length)
-      return files.first
+    build_file= File.join(dir, BUILD_FILE)
+    return build_file if File.exists?(build_file)
+    
+    projects= Dir.glob(File.join(dir, "*.jsproj"))
+    return from_file(projects.first) if 1==projects.size
+    
+    unless 0==projects.size
+      puts "More than one candidate for Project:"
+      projects.each { |e|
+        puts "  #{e}"
+      }
+      exit 1
     end
-    dir = File.dirname(dir)
+    
+    dir= File.dirname(dir)
   end
   
+  nil
 end
 
 

data/coherent.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{coherent}
-  s.version = "0.6.10"
+  s.version = "0.6.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Watkins"]
-  s.date = %q{2010-11-27}
+  s.date = %q{2011-02-05}
   s.default_executable = %q{coherent}
   s.description = %q{Tools for building Coherent application or modules.}
   s.email = %q{jeff@metrocat.org}
@@ -94,7 +94,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://coherentjs.org}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Tools for building Coherent application or modules.}
   s.test_files = [
     "test/helper.rb",
@@ -110,7 +110,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/generators/class/class_generator.rb

@@ -1,4 +1,5 @@
 require "#{File.dirname(__FILE__)}/../../lib/coherent"
+require "yaml"
 
 class ClassGenerator < CoherentBaseGenerator
 
@@ -12,9 +13,21 @@ class ClassGenerator < CoherentBaseGenerator
     full_name= args.shift
     parts= full_name.split(".")
     
-    @namespace= parts[0..-2].join(".")
+    
     @name= parts[-1]
     @full_name= full_name
+    @namespace= parts[0..-2].join(".")
+    
+    if @namespace.empty?
+      @target_folder = "src/js"
+      project = YAML::load_file(PROJECT_FILE)
+      if project["export"].is_a?(String)
+        @namespace = project["export"]
+        @full_name= [@namespace, @name].join(".")
+      end
+    else
+      @target_folder = "src/js/#{namespace.gsub(".", "/")}"
+    end
     
     extract_options
   end
@@ -22,7 +35,7 @@ class ClassGenerator < CoherentBaseGenerator
   def manifest
     record do |m|
 
-      copy_template_folder m, "src/js/#{@namespace.gsub(".", "/")}"
+      copy_template_folder m, @target_folder
       
     end
   end

data/generators/class/templates/@name@.js.erb

@@ -2,9 +2,12 @@
 
 
 /**
-
+  class <%=full_name%>
+  
+  This is a good place to document your class.
  */
-<%= namespace.empty? ? "var " : ""%><%=full_name%>= Class.create(coherent.KVO, {
+<%= namespace.empty? ? "var " : ""%><%=full_name%>= Class.create(coherent.KVO,
+{
 
     sampleProperty: function()
     {

data/generators/nib/nib_generator.rb

@@ -10,7 +10,10 @@ class NibGenerator < CoherentBaseGenerator
     super
     usage if args.empty?
     @name = args.shift
-
+    if (@name.as_identifier != @name)
+      puts "Create NIB: name must be a valid identifier: #{@name} => #{@name.as_identifier}"
+      @name= @name.as_identifier
+    end
     extract_options
   end
 

data/generators/nib/templates/@name@.js.erb

@@ -2,16 +2,15 @@
 
 NIB('<%=name%>', {
 
-  '<%=name%>': VIEW({
-    ':root': coherent.View({
-      //  Set up necessary bindings and configuration information for your
-      //  root view here.
-      })
-  }),
+  <%= name %> : VIEW({
+      ':root': coherent.View({
+          //  Set up necessary bindings and configuration information for your
+          //  root view here.
+        })
+    }),
 
   //  Connect your views or controllers to the owning ViewController
-  'owner':
-  {
+  owner: {
     //  Connect the main view for the ViewController, without this association
     //  the ViewController won't be able to display your view.
     view: REF('<%=name%>')

data/lib/coherent.rb

@@ -1,5 +1,25 @@
 require "active_support"
 
+class String
+  def as_identifier
+    word= self.to_s.gsub(/(?:^|\W)(.)/) { $1.upcase }
+    # word[0..0].downcase + word[1..-1]
+  end
+  def starts_with?(prefix)
+    prefix = prefix.to_s
+    self[0, prefix.length] == prefix
+  end
+  def remove_indent
+    str= sub(/^\n*/, "")
+    match= str.match(/(^\s+)/)
+    return str unless match
+    str.gsub(/^#{match[1]}/, '').strip
+  end
+  def indent(str)
+    self.gsub(/^/, str)
+  end
+end
+
 class CoherentBaseGenerator < RubiGen::Base
   
   def copy_template_folder(m, path=nil)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: coherent
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 6
-  - 10
-  version: 0.6.10
+  - 11
+  version: 0.6.11
 platform: ruby
 authors: 
 - Jeff Watkins
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-27 00:00:00 -08:00
+date: 2011-02-05 00:00:00 -08:00
 default_executable: coherent
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Tools for building Coherent application or modules.