coherent 0.6.7 → 0.6.8

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.6.8

data/bin/coherent

@@ -9,9 +9,10 @@ def find_project_file(dir=nil)
   dir ||= Dir.pwd
   
   while dir.length > 1
-    Dir.glob(File.join(dir, '*.jsproj')) { |file|
-      return file if File.basename(dir)===File.basename(file, '.jsproj')
-    }
+    files= Dir.glob(File.join(dir, '*.jsproj'))
+    if (1==files.length)
+      return files.first
+    end
     dir = File.dirname(dir)
   end
   

data/coherent.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{coherent}
-  s.version = "0.6.7"
+  s.version = "0.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Watkins"]
-  s.date = %q{2010-11-10}
+  s.date = %q{2010-11-24}
   s.default_executable = %q{coherent}
   s.description = %q{Tools for building Coherent application or modules.}
   s.email = %q{jeff@metrocat.org}
@@ -58,13 +58,9 @@ Gem::Specification.new do |s|
      "generators/nib/USAGE",
      "generators/nib/nib_generator.rb",
      "generators/nib/templates/@name@.css.erb",
+     "generators/nib/templates/@name@.html.erb",
      "generators/nib/templates/@name@.js.erb",
-     "generators/nib/templates/custom-view.html.erb",
      "lib/coherent.rb",
-     "lib/distilery.rb",
-     "lib/distilery/bundle-task.rb",
-     "lib/distilery/coherent-asset-filter.rb",
-     "lib/distilery/nib-file.rb",
      "lib/plugin.rb",
      "lib/plugin/commands.rb",
      "lib/plugin/commands/discover.rb",

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

@@ -2,16 +2,16 @@
 
 NIB('<%=name%>', {
 
-    'custom-view': VIEW({
-                    /* Put your view structure here. */
-                    
-                    ':root': coherent.View({
-                            /* This is the container DOM element. */
-                        })
-                }),
+  '<%=name%>': VIEW({
+      /* Put your view structure here. */
+      
+      ':root': coherent.View({
+              /* This is the container DOM element. */
+          })
+  }),
 
-    'owner': {
-        view: 'custom-view'
-    }
+  'owner': {
+    view: REF('<%=name%>')
+  }
 
 });

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: coherent
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 6
-  - 7
-  version: 0.6.7
+  - 8
+  version: 0.6.8
 platform: ruby
 authors: 
 - Jeff Watkins
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 -08:00
+date: 2010-11-24 00:00:00 -08:00
 default_executable: coherent
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,13 +99,9 @@ files:
 - generators/nib/USAGE
 - generators/nib/nib_generator.rb
 - generators/nib/templates/@name@.css.erb
+- generators/nib/templates/@name@.html.erb
 - generators/nib/templates/@name@.js.erb
-- generators/nib/templates/custom-view.html.erb
 - lib/coherent.rb
-- lib/distilery.rb
-- lib/distilery/bundle-task.rb
-- lib/distilery/coherent-asset-filter.rb
-- lib/distilery/nib-file.rb
 - lib/plugin.rb
 - lib/plugin/commands.rb
 - lib/plugin/commands/discover.rb

data/lib/distilery.rb

@@ -1,5 +0,0 @@
-script_dir=File.join(File.dirname(__FILE__), "distilery")
-
-require "#{script_dir}/nib-file.rb"
-require "#{script_dir}/bundle-task.rb"
-require "#{script_dir}/coherent-asset-filter.rb"

data/lib/distilery/bundle-task.rb

@@ -1,37 +0,0 @@
-require "#{$script_dir}/tasks/javascript-task.rb"
-
-class BundleTask < JavascriptTask
-
-  content_type "js"
-  output_type "jsbundle"
-    
-  # NibTask handles files that end in .jsnib
-  def handles_file?(file)
-    ['js', 'css'].include?(file.content_type)
-  end
-
-  def process_file(file)
-    destination= File.expand_path(remove_prefix||"")
-    jsfile= JavascriptFile.new(@name_concat)
-    
-    if (!@concat.empty?)
-      @concat << @concatenation_join_string||""
-    end
-    
-    case file.content_type
-    when "js"
-      @concat << file.filtered_content(options)
-      @debug << file.debug_content(options)
-    when "css"
-      included_content= file.filtered_content(options)
-      included_content= file.minify_content(included_content)
-      
-      included_content= jsfile.escape_embeded_content(included_content)
-      
-      @concat << "NIB.asset('#{file.relative_to_folder(destination)}', '#{included_content}');\n"
-    else
-      file.warning "Unknown file type: #{file.content_type}"
-    end
-  end
-  
-end

data/lib/distilery/coherent-asset-filter.rb

@@ -1,65 +0,0 @@
-require "#{$script_dir}/filters/file-reference-filter"
-
-$include_regex= /NIB\.asset\(['"]([^)]+)['"]\)/
-$include_regex_old= /INC\(['"]([^)]+)['"]\)/
-
-class CoherentAssetFilter < FileReferenceFilter
-  
-  def handles_file(file)
-    return ["js"].include?(file.content_type)
-  end
-  
-  def preprocess_content(file, content)
-    content= content.split("\n")
-    
-    line_num=0
-    
-    content.each { |line|
-      
-      line_num+=1
-      
-      line.gsub!($include_regex) { |match|
-
-        import_file= File.expand_path(File.join(file.parent_folder, $1))
-
-        if (!File.exists?(import_file))
-          file.warning "Missing asset: #{$1}", line_num
-          "NIB.asset('#{$1}')"
-        else
-          asset= SourceFile.from_path(import_file)
-          file.add_asset(asset);
-          if (file.can_embed_as_content(asset))
-            "NIB.asset('#{file_reference(asset)}','#{content_reference(asset)}')"
-          else
-            "NIB.asset('#{file_reference(asset)}')"
-          end
-        end
-        
-      }
-
-      line.gsub!($include_regex_old) { |match|
-
-        import_file= File.expand_path(File.join(file.parent_folder, $1))
-
-        if (!File.exists?(import_file))
-          file.warning "Missing import file: #{$1}", line_num
-          "INC('#{$1}')"
-        else
-          asset= SourceFile.from_path(import_file)
-          file.add_asset(asset);
-          if (file.can_embed_as_content(asset))
-            "INC('#{file_reference(asset)}','#{content_reference(asset)}')"
-          else
-            "INC('#{file_reference(asset)}')"
-          end
-        end
-        
-      }
-      
-    }
-    
-    content.join("\n")
-  end
-
-end
-

data/lib/distilery/nib-file.rb

@@ -1,13 +0,0 @@
-require "#{$script_dir}/file-types/javascript-file.rb"
-
-class NibFile < JavascriptFile
-
-  def self.extension
-    ".jsnib"
-  end
-
-  def content_type
-    "js"
-  end
-
-end