coherent 0.3.0 → 0.4.0

data/LICENSE

@@ -1,4 +1,10 @@
-Copyright (c) 2009 Jeff Watkins
+Copyright (c) 2009-2010 Jeff Watkins
+
+Plugin code adapted from the Ruby On Rails plugin code, which is copyright 2005
+by Ryan Tomayko (rtomayko@gmail.com) and available under the MIT license:
+(http://www.opensource.org/licenses/mit-license.php)
+
+
 
 Apache License
 Version 2.0, January 2004

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/app_generators/coherent/templates/distil.yml.erb

@@ -33,7 +33,7 @@ all:
         # but they may be included in the wrong order. So it's usually best to
         # specify them explicitly
         - src/css/reset.css
-        - src/css/<%=name%>.js
+        - src/css/<%=name%>.css
 
     jsnib:
         # Create a JSNIB package file for each folder in the src/nibs folder.

data/app_generators/coherent/templates/src/css/@name@.css.erb

@@ -2,118 +2,118 @@
 
 /*  Styles for UI elements that have been selected.
  */
-.selected
+.c-selected
 {
 }
 
 /*  Styles applied to views that are disabled. Not all browsers support the
     disabled pseudo selector, so Coherent applies the disabled class instead.
  */
-.disabled
+.c-disabled
 {
 }
 
 /*  Views that are read-only will have these styles.
  */
-.read-only
+.c-read-only
 {
 }
 
 /*  When a view is displaying the placeholder value for a null value, the view
     will have this class name.
  */
-.nullValue
+.c-placeholder
 {
 }
 
 /*  Since not all browsers support the focus pseudo selector, Coherent applies
     the focused class to all views that accept first responder status.
  */
-.focused
+.c-focused
 {
 }
 
-.hover
+.c-hover
 {
 }
 
-.asc
+.c-asc
 {
 }
 
-.desc
+.c-desc
 {
 }
 
-.active
+.c-active
 {
 }
 
-.updating
+.c-updating
 {
 }
 
-.invisible
+.c-invisible
 {
 }
 
-.invalid
+.c-invalid
 {
 }
 
-.inserted
+.c-inserted
 {
 }
 
-.deleted
+.c-deleted
 {
 }
 
-.replacing
+.c-replacing
 {
 }
 
-.loading
+.c-loading
 {
 }
 
-.first
+.c-first
 {
 }
 
-.last
+.c-last
 {
 }
 
-.drag-and-drop-copy
+.c-drag-and-drop-copy
 {
 }
 
-.drag-and-drop-move
+.c-drag-and-drop-move
 {
 }
 
-.drag-and-drop-link
+.c-drag-and-drop-link
 {
 }
 
-.drag-and-drop-no
+.c-drag-and-drop-no
 {
 }
 
-.coherent_windowInactive
+.c-window-inactive
 {
 }
 
-.outline-expanded
+.c-outline-expanded
 {
 }
 
-.outline-leaf
+.c-outline-leaf
 {
 }
 
-.outline-disclosure-button
+.c-outline-disclosure-button
 {
 }
 

data/bin/coherent

@@ -35,6 +35,10 @@ when 'demo'
 
   generator= ARGV.shift
   RubiGen::Scripts::Generate.new.run(ARGV, :generator => generator)
+when 'plugin'
+  require File.join(File.dirname(__FILE__), "../lib/plugin")
+  ARGV.shift
+  Coherent::Commands::Plugin.parse!
 else
   APP_ROOT= find_app_root || Dir.pwd
   

data/coherent.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{coherent}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Watkins"]
-  s.date = %q{2010-02-18}
+  s.date = %q{2010-03-26}
   s.default_executable = %q{coherent}
   s.description = %q{Tools for building Coherent application or modules.}
   s.email = %q{jeff@metrocat.org}
@@ -55,19 +55,6 @@ Gem::Specification.new do |s|
      "generators/class/USAGE",
      "generators/class/class_generator.rb",
      "generators/class/templates/@name@.js.erb",
-     "generators/gallery_sample/USAGE",
-     "generators/gallery_sample/gallery_sample_generator.rb",
-     "generators/gallery_sample/templates/src/nibs/@name@/@name@.css",
-     "generators/gallery_sample/templates/src/nibs/@name@/@name@.html",
-     "generators/gallery_sample/templates/src/nibs/@name@/@name@.jsnib.erb",
-     "generators/gallery_sample/templates/src/nibs/@name@/@name@.json",
-     "generators/gallery_sample/templates/src/nibs/@name@/images/next.gif",
-     "generators/gallery_sample/templates/src/nibs/@name@/images/prev.gif",
-     "generators/gallery_sample/templates/src/nibs/@name@/photos/molly-1.jpg",
-     "generators/gallery_sample/templates/src/nibs/@name@/photos/molly-2.jpg",
-     "generators/gallery_sample/templates/src/nibs/@name@/photos/molly-3.jpg",
-     "generators/gallery_sample/templates/src/nibs/@name@/photos/molly-4.jpg",
-     "generators/gallery_sample/templates/src/nibs/@name@/photos/molly-5.jpg",
      "generators/nib/USAGE",
      "generators/nib/nib_generator.rb",
      "generators/nib/templates/@name@.css.erb",
@@ -75,9 +62,26 @@ Gem::Specification.new do |s|
      "generators/nib/templates/@name@.jsnib.erb",
      "lib/coherent.rb",
      "lib/distilery.rb",
+     "lib/distilery/bundle-task.rb",
      "lib/distilery/coherent-asset-filter.rb",
      "lib/distilery/nib-file.rb",
-     "lib/distilery/nib-task.rb"
+     "lib/plugin.rb",
+     "lib/plugin/commands.rb",
+     "lib/plugin/commands/discover.rb",
+     "lib/plugin/commands/info.rb",
+     "lib/plugin/commands/install.rb",
+     "lib/plugin/commands/list.rb",
+     "lib/plugin/commands/plugin.rb",
+     "lib/plugin/commands/remove.rb",
+     "lib/plugin/commands/source.rb",
+     "lib/plugin/commands/sources.rb",
+     "lib/plugin/commands/unsource.rb",
+     "lib/plugin/commands/update.rb",
+     "lib/plugin/environment.rb",
+     "lib/plugin/plugin.rb",
+     "lib/plugin/recursive-http-fetcher.rb",
+     "lib/plugin/repositories.rb",
+     "lib/plugin/repository.rb"
   ]
   s.homepage = %q{http://coherentjs.org}
   s.rdoc_options = ["--charset=UTF-8"]

data/demo_generators/gallery/templates/distil.yml.erb

@@ -33,7 +33,7 @@ all:
         # but they may be included in the wrong order. So it's usually best to
         # specify them explicitly
         - src/css/reset.css
-        - src/css/<%=name%>.js
+        - src/css/<%=name%>.css
 
     jsnib:
         # Create a JSNIB package file for each folder in the src/nibs folder.

data/demo_generators/gallery/templates/src/css/@name@.css.erb

@@ -2,118 +2,118 @@
 
 /*  Styles for UI elements that have been selected.
  */
-.selected
+.c-selected
 {
 }
 
 /*  Styles applied to views that are disabled. Not all browsers support the
     disabled pseudo selector, so Coherent applies the disabled class instead.
  */
-.disabled
+.c-disabled
 {
 }
 
 /*  Views that are read-only will have these styles.
  */
-.read-only
+.c-read-only
 {
 }
 
 /*  When a view is displaying the placeholder value for a null value, the view
     will have this class name.
  */
-.nullValue
+.c-placeholder
 {
 }
 
 /*  Since not all browsers support the focus pseudo selector, Coherent applies
     the focused class to all views that accept first responder status.
  */
-.focused
+.c-focused
 {
 }
 
-.hover
+.c-hover
 {
 }
 
-.asc
+.c-asc
 {
 }
 
-.desc
+.c-desc
 {
 }
 
-.active
+.c-active
 {
 }
 
-.updating
+.c-updating
 {
 }
 
-.invisible
+.c-invisible
 {
 }
 
-.invalid
+.c-invalid
 {
 }
 
-.inserted
+.c-inserted
 {
 }
 
-.deleted
+.c-deleted
 {
 }
 
-.replacing
+.c-replacing
 {
 }
 
-.loading
+.c-loading
 {
 }
 
-.first
+.c-first
 {
 }
 
-.last
+.c-last
 {
 }
 
-.drag-and-drop-copy
+.c-drag-and-drop-copy
 {
 }
 
-.drag-and-drop-move
+.c-drag-and-drop-move
 {
 }
 
-.drag-and-drop-link
+.c-drag-and-drop-link
 {
 }
 
-.drag-and-drop-no
+.c-drag-and-drop-no
 {
 }
 
-.coherent_windowInactive
+.c-window-inactive
 {
 }
 
-.outline-expanded
+.c-outline-expanded
 {
 }
 
-.outline-leaf
+.c-outline-leaf
 {
 }
 
-.outline-disclosure-button
+.c-outline-disclosure-button
 {
 }
 

data/lib/distilery.rb

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

data/lib/distilery/bundle-task.rb

@@ -0,0 +1,37 @@
+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