sproutcore 0.9.17 → 0.9.18

data/lib/sproutcore/build_tools/resource_builder.rb

@@ -52,7 +52,13 @@ module SproutCore
 
       # Join the lines together.  This is one last chance to do some prep of
       # the data (such as minifcation and comment stripping)
-      def join(lines); lines.join; end
+      def join(lines)
+        if bundle.minify?
+          SproutCore::CSSPacker.new.compress(lines.join)
+        else
+          lines.join
+        end
+      end
 
       # Rewrites any inline content such as static urls.  Subclasseses can
       # override this to rewrite any other inline content.
@@ -88,7 +94,7 @@ module SproutCore
           # check for requires.  Only follow a require if the require is in
           # the list of filenames.
           required_file = _require_for(filename, line)
-          unless required_file.nil? || !filenames.include?(required_file)
+          if required_file && filenames.include?(required_file)
             lines, required = _build_one(required_file, lines, required, link_only)
           end
 
@@ -102,6 +108,11 @@ module SproutCore
           lines << filename
 
         elsif file_lines.size > 0
+          
+          if entry.ext == "sass"
+            file_lines = [ SproutCore::Renderers::Sass.compile(entry, file_lines.join()) ]
+          end
+          
           lines << "/* Start ----------------------------------------------------- " << filename << "*/\n\n" 
           lines +=  file_lines
           lines << "\n\n/* End ------------------------------------------------------- "  << filename << "*/\n\n"
@@ -119,13 +130,14 @@ module SproutCore
 
       # check line for required() pattern.  understands JS and CSS.
       def _require_for(filename,line)
-        new_file = line.scan(/require\(['"](.*)['"]\)/)
+        new_file = line.scan(/require\s*\(\s*['"](.*)(\.(js|css|sass))?['"]\s*\)/)
         ret = (new_file.size > 0) ? new_file.first.first : nil
         ret.nil? ? nil : filename_for_require(ret)
       end
 
-      def filename_for_require(ret); "#{ret}.css"; end
-
+      def filename_for_require(ret)
+        filenames.include?("#{ret}.css") ? "#{ret}.css" : "#{ret}.sass"
+      end
     end
 
     class JavaScriptResourceBuilder < ResourceBuilder

data/lib/sproutcore/bundle_installer.rb

@@ -36,7 +36,9 @@ module SproutCore
       ### Install Only Options
       
       if can_install
-        opts.on("-s", "--source=URL", "Specify a URL to install from.  You can provide either a full URL or just the path on github to your project.  The tool assumes that the url you provide plus '.git' can be used to clone the project.")
+        opts.on("-s", "--source=URL", "Specify a URL to install from.  You can provide either a full URL or just the path on github to your project.  The tool assumes that the url you provide plus '.git' can be used to clone the project.") do |opt_source|
+          options[:source] = opt_source
+        end
 
         opts.on("-f", "--[no-]force", "Normally SproutCore will not install a bundle if a directory already exists at the install location.  If you include this option, it will forceably install bundles even if it has to delete an existing directory.") do |opt_force|
           options[:force] = !!opt_force

data/lib/sproutcore/bundle_manifest.rb

@@ -258,10 +258,10 @@ module SproutCore
         :html
       when /\.haml$/
         :html
-      when /\.html.haml$/
-        :html
       when /\.css$/
         :stylesheet
+      when /\.sass$/
+        :stylesheet
       when /\.js$/
         :javascript
       when /\.lproj\/.+/
@@ -326,6 +326,8 @@ module SproutCore
         ret.build_path = File.join(*[bundle.build_root, language.to_s, cache_link, ret.filename].compact)
         ret.url = [url_root, language.to_s, cache_link, ret.filename].compact.join('/')
       end
+      ret.build_path.sub!(/\.sass$/, '.css')
+      ret.url.sub!(/.sass$/, '.css')
 
       # Done.
       return ret
@@ -349,7 +351,6 @@ module SproutCore
   # ext::          the file extension
   # source_path:: absolute paths into source that will comprise this resource
   # url::          the url that should be used to reference this resource in the current mode.
-  # build_url::    the url that will be used to referene this resource in production.
   # build_path::   absolute path to the compiled resource
   # type::         the top-level category
   # original_path:: save the original path used to build this entry

data/lib/sproutcore/cssmin.rb

@@ -0,0 +1,195 @@
+# module and class name have been modified
+#
+# == MIT License
+# See http://code.google.com/p/rainpress/
+#
+# == About
+#
+# Rainpress is a compressor for CSS. It's written in ruby, but should not be 
+# limited to ruby projects.
+#
+# Rainpress does not apply common compression algorithms like gzip, it removes 
+# unnecessary characters and replaces some attributes with a shorter equivalent 
+# name.
+#
+# == Links
+#
+# * {Rainpress Website}[http://rainpress.xhochy.com/]
+# * {SVN repository}[http://code.google.com/p/rainpress/source]
+# * {Bugtracker}[https://bugs.launchpad.net/rainpress/]
+# * {Wiki}[http://code.google.com/p/rainpress/w/list]
+# * {Translations}[https://translations.launchpad.net/rainpress/]
+# * {XhochY Weblog (for Announcements about Rainpress)}[http://xhochy.org/en/]
+# * {Mailinglist}[http://groups.google.com/group/xy-oss-projects-discussion]
+# * {Continous Integration Builds and Tests}[http://cruisecontrol-rb.xhochy.com/builds/rainpress]
+# * {Freshmeat Record}[http://freshmeat.net/projects/rainpress]
+module SproutCore
+
+  # == Information
+  #
+  # This is the main class of Rainpress, create an instance of it to compress
+  # your CSS-styles.
+  #
+  # == Simple Usage
+  #
+  #   packer = SproutCore::CSSPacker.new
+  #   compressed_style = packer.compress(style)
+  class CSSPacker
+  
+    # Use always this functions if you want to compress your CSS-style
+    #
+    # <b>Options:</b>
+    #
+    # * <tt>:preserveComments</tt> - if set to true, comments will not be 
+    #   removed
+    # * <tt>:preserveNewline</tt> - if set to true, newlines will not be removed
+    # * <tt>:preserveSpaces</tt> - if set to true, spaces will not be removed
+    # * <tt>:preserveColors</tt> - if set to true, colors will not be modified
+    # * <tt>:skipMisc</tt> - if set to true, miscellaneous compression parts
+    #   will be skipped
+    def compress(style, options = {})
+      # remove comments
+      style = remove_comments(style) unless options[:preserveComments]
+    	
+  	  # remove newlines
+      style = remove_newlines(style) unless options[:preserveNewlines]
+    	
+	  # remove unneeded spaces
+      style = remove_spaces(style) unless options[:preserveSpaces]
+    	
+	  # replace colours with shorter names
+      style = shorten_colors(style) unless options[:preserveColors]
+      
+      # make all other things
+      style = do_misc(style) unless options[:skipMisc]
+      
+	  style
+	end
+  
+    # Remove all comments out of the CSS-Document
+  	def remove_comments(script)
+      input = script
+      script = ''
+      
+      while input.length > 0 do
+        pos = input.index("/*");
+        
+        # No more comments
+        if pos == nil
+          script += input
+          input = '';
+        else # Comment beginning at pos
+          script += input[0..(pos-1)] if pos > 0 # only append text if there is some
+          input = input[(pos+2)..-1]
+          # Comment ending at pos
+          pos = input.index("*/")
+          input = input[(pos+2)..-1]
+        end
+      end
+      
+      # return
+  		script
+  	end
+
+    # Remove all newline characters
+  	def remove_newlines(script)
+  		script.gsub(/\n|\r/,'')
+  	end
+  	
+    # 1. Turn mutiple spaces into a single
+    # 2. Remove spaces around ;:{},
+    # 3. Remove tabs
+    def remove_spaces(script)
+  	  script = script.gsub(/(\s(\s)+)/, ' ')
+      script = script.gsub(/\s*;\s*/,';')
+      script = script.gsub(/\s*:\s*/,':')
+      script = script.gsub(/\s*\{\s*/,'{')
+      script = script.gsub(/\s*\}\s*/,'}')
+      script = script.gsub(/\s*,\s*/,',')
+      script.gsub("\t",'');
+  	end
+  	
+  	# Replace color values with their shorter equivalent
+  	#
+  	# 1. Turn rgb(,,)-colors into #-values
+  	# 2. Shorten #AABBCC down to #ABC
+  	# 3. Replace names with their shorter hex-equivalent
+  	#    * white -> #fff
+   	#    * black -> #000
+  	# 4. Replace #-values with their shorter name
+  	#    * #f00 -> red
+  	def shorten_colors(style)
+  	  # rgb(50,101,152) to #326598
+      style = style.gsub(/rgb\s*\(\s*([0-9,\s]+)\s*\)/) do |match|
+        out = '#'
+        $1.split(',').each do |num|
+          if num.to_i < 16 
+            out += '0'
+          end
+          out += num.to_i.to_s(16) # convert to hex
+        end
+        out
+      end
+      # #AABBCC to #ABC, keep if preceed by a '='
+      style = style.gsub(/([^\"'=\s])(\s*)#([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])/) do |match|
+        out = match        
+        if ($3.downcase == $4.downcase) and ($5.downcase == $6.downcase) and ($7.downcase == $8.downcase)
+          out = $1 + '#' + $3.downcase + $5.downcase + $7.downcase 
+        end
+        out
+      end
+      # shorten several names to numbers
+      style = style.gsub(/:[\s]*white[\s]*;/, ':#fff;')
+      style = style.gsub(/:[\s]*white[\s]*\}/, ':#fff}')
+      style = style.gsub(/:[\s]*black[\s]*;/, ':#000;')
+      style = style.gsub(/:[\s]*black[\s]*\}/, ':#000}')
+      # shotern several numbers to names
+      style = style.gsub(/:[\s]*#([fF]00|[fF]{2}0000);/, ':red;')
+      style = style.gsub(/:[\s]*#([fF]00|[fF]{2}0000)\}/, ':red}')
+      
+  	  style
+    end
+  
+    # Do miscellaneous compression methods on the style
+    def do_misc(script)
+      # Replace 0(pt,px,em,%) with 0 but only when preceded by : or a white-space
+      script = script.gsub(/([\s:]+)(0)(px|em|%|in|cm|mm|pc|pt|ex)/) do |match|
+        match.gsub(/(px|em|%|in|cm|mm|pc|pt|ex)/,'')
+      end
+      # Replace 0 0 0 0; with 0.
+      script = script.gsub(':0 0 0 0;', ':0;')
+      script = script.gsub(':0 0 0 0}', ':0}')
+      script = script.gsub(':0 0 0;', ':0;')
+      script = script.gsub(':0 0 0}', ':0}')
+      script = script.gsub(':0 0}', ':0}')
+      script = script.gsub(':0 0;', ':0;')
+      # Replace background-position:0; with background-position:0 0;
+      script = script.gsub('background-position:0;', 'background-position:0 0;');
+      # Replace 0.6 to .6, but only when preceded by : or a white-space
+      script = script.gsub(/[:\s]0+\.(\d+)/) do |match|
+        match.sub('0', '') # only first '0' !!
+      end
+      # Replace ;;;; with ;
+      script = script.gsub(/[;]+/, ';')
+      # Replace ;} with }
+      script = script.gsub(';}', '}')
+      # Replace background-color: with background:
+      script = script.gsub('background-color:', 'background:')
+      # Replace font-weight:normal; with 400, bold with 700
+      script = script.gsub(/font-weight[\s]*:[\s]*normal[\s]*;/,'font-weight:400;')
+      script = script.gsub(/font-weight[\s]*:[\s]*normal[\s]*\}/,'font-weight:400}')
+      script = script.gsub(/font[\s]*:[\s]*normal[\s;\}]*/) do |match|
+        match.sub('normal', '400')
+      end
+      script = script.gsub(/font-weight[\s]*:[\s]*bold[\s]*;/,'font-weight:700;')
+      script = script.gsub(/font-weight[\s]*:[\s]*bold[\s]*\}/,'font-weight:700}')
+      script = script.gsub(/font[\s]*:[\s]*bold[\s;\}]*/) do |match|
+        match.sub('bold', '700')
+      end
+      
+      script
+    end
+    
+  end
+  
+end

data/lib/sproutcore/generator_helper.rb

@@ -126,6 +126,21 @@ module SproutCore
       @args.first || default_base_class_name
     end
 
+    # Checks whether the proper file structure exists to generate files
+    def file_structure_exists?
+      has_path_and_filename? && target_directory_exists?
+    end
+    
+    # Checks whether the target directory for a generated file exists
+    def target_directory_exists?
+      File.exists?("#{Dir.pwd}/clients/#{File.dirname(args[0])}")
+    end
+    
+    # Checks that file generation was in the format client_name/file_name
+    def has_path_and_filename?
+      !(File.dirname(args[0]) == '.')
+    end
+        
     ###################
     # Borrowed from Rails NamedBase
 

data/lib/sproutcore/helpers/capture_helper.rb

@@ -6,26 +6,7 @@ module SproutCore
 
       # Captures the resulting value of the block and returns it
       def capture(*args, &block)
-        begin
-          buffer = eval('_buf', block.binding)
-        rescue
-          buffer = nil
-        end
-        
-        if buffer.nil?
-          capture_haml(&block)
-        else
-          pos = buffer.length
-          block.call(*args)
-
-          # get emitted data
-          data = buffer[pos..-1]
-
-          # remove from buffer
-          buffer[pos..-1] = ''
-
-          data
-        end
+        self.renderer ? self.renderer.capture(args, &block) : block.call(*args).to_s
       end
 
       # executes the passed block, placing the resulting content into a variable called
@@ -33,10 +14,9 @@ module SproutCore
       # variable or by calling yield(:area_name)
       #
       def content_for(name, &block)
-        eval "@content_for_#{name} = (@content_for_#{name} || '') + capture(&block)"
+        eval "@content_for_#{name} = (@content_for_#{name} || '') + (capture(&block) || '')"
       end
 
     end
-
   end
 end

data/lib/sproutcore/helpers/dom_id_helper.rb

@@ -0,0 +1,14 @@
+module SproutCore
+  module Helpers
+
+    module DomIdHelper
+      @@tick = 0
+
+      def dom_id!(type="id")
+        @@tick += 1
+        return "#{type}_#{(Time.now.to_i + @@tick)}"
+      end
+    end
+
+  end
+end

data/lib/sproutcore/helpers/static_helper.rb

@@ -32,7 +32,9 @@ module SproutCore
         urls = []
         all_bundles.each do |b|
           urls += b.sorted_stylesheet_entries(opts).map { |x| x.cacheable_url }
-          urls += (b.stylesheet_libs || [])
+        end
+        all_bundles.each do |b|
+          urls += b.stylesheet_libs.reject { |lib| urls.include? lib } if b.stylesheet_libs
         end
 
         # Convert to HTML and return
@@ -73,7 +75,9 @@ module SproutCore
         urls = []
         all_bundles.each do |b|
           urls += b.sorted_javascript_entries(opts).map { |x| x.cacheable_url }
-          urls += (b.javascript_libs || [])
+        end
+        all_bundles.each do |b|
+          urls += b.javascript_libs.reject { |lib| urls.include? lib } if b.javascript_libs
         end
 
         # Convert to HTML and return

data/lib/sproutcore/helpers/text_helper.rb

@@ -26,7 +26,7 @@ module SproutCore
       # is equivalent to using:
       #   <%= "hello" %>
       def concat(string, binding)
-        eval('_buf', binding) << string
+        renderer.concat(string, binding)
       end
 
       # If +text+ is longer than +length+, +text+ will be truncated to the length of

data/lib/sproutcore/merb.rb

@@ -15,8 +15,8 @@
 
 # Load Merb if it is available
 begin
-  gem('merb-core', '>= 0.9.1', '< 0.9.5')
+  gem('merb-core', '>= 0.9.1')
   Dir.glob(File.join(File.dirname(__FILE__),'merb','**','*.rb')).each { |x| require(x) }
 rescue LoadError
-  puts "WARNING: sproutcore/merb requires Merb 0.9.1 through 0.9.4. Earlier and later releases are not supported. Module was not loaded."
+  puts "WARNING: sproutcore/merb requires Merb 0.9.1 or later. Earlier releases are not supported. Module was not loaded."
 end

data/lib/sproutcore/renderers/erubis.rb

@@ -0,0 +1,43 @@
+module Sproutcore
+  module Renderers
+
+    class Erubis
+      def initialize(html_context)
+        @html_context = html_context
+      end
+
+      def compile(input)
+        require 'erubis'
+        ::Erubis::Eruby.new.convert(input)
+      end
+
+      def concat(string, binding)
+        eval('_buf', binding) << string
+      end
+
+      def capture(*args, &block)
+        begin
+          buffer = eval('_buf', block.binding)
+        rescue
+          buffer = nil
+        end
+
+        if buffer.nil?
+          block.call(*args).to_s
+        else
+          pos = buffer.length
+          block.call(*args)
+
+          # get emitted data
+          data = buffer[pos..-1]
+
+          # remove from buffer
+          buffer[pos..-1] = ''
+
+          data
+        end
+      end
+    end
+
+  end
+end