sproutcore 0.9.11 → 0.9.12

data/lib/sproutcore/helpers/static_helper.rb

@@ -4,62 +4,75 @@
 #
 module SproutCore
   module Helpers
-    
+
     module StaticHelper
 
-      # This method will return the HTML to link to all the stylesheets 
-      # required by the named bundle.  If you pass no options, the current 
+      # This method will return the HTML to link to all the stylesheets
+      # required by the named bundle.  If you pass no options, the current
       # client will be used.
-      # 
-      # bundle_name = the name of the bundle to render or nil to use the 
-      # current :language => the language to render. defaults to current 
+      #
+      # bundle_name = the name of the bundle to render or nil to use the
+      # current :language => the language to render. defaults to current
       # language
       #
       def stylesheets_for_client(bundle_name = nil, opts = {})
 
         opts[:language] ||= language
         
+        # Set the import method to use the standard <link> tag, if not set
+        include_method = opts[:include_method] ||= :link
+
         # Get bundle
         cur_bundle = bundle_name.nil? ? bundle : library.bundle_for(bundle_name)
-        
+
         # Convert to a list of required bundles
         all_bundles = cur_bundle.all_required_bundles
-        
+
         # For each bundle, get the ordered list of stylsheet urls
         urls = []
         all_bundles.each do |b|
-          urls += b.sorted_stylesheet_entries(opts).map { |x| x.url }
+          urls += b.sorted_stylesheet_entries(opts).map { |x| x.cacheable_url }
           urls += (b.stylesheet_libs || [])
         end
 
         # Convert to HTML and return
         urls = urls.map do |url|
-          %(  <link href="#{url}" rel="stylesheet" type="text/css" />)
+          if include_method == :import
+            %(  @import url('#{url}');)
+          else
+            %(  <link href="#{url}" rel="stylesheet" type="text/css" />)
+          end
+        end
+        
+        # if include style is @import, surround with style tags
+        if include_method == :import
+          %(<style type="text/css">\n#{urls * "\n"}</style>)
+        else
+          urls.join("\n")
         end
-        urls.join("\n")
       end
-    
-      # This method will return the HTML to link to all the javascripts 
-      # required by the client.  If you pass no options, the current client 
+
+      # This method will return the HTML to link to all the javascripts
+      # required by the client.  If you pass no options, the current client
       # will be used.
-      # 
-      # client_name = the name of the client to render or nil to use the 
+      #
+      # client_name = the name of the client to render or nil to use the
       # current :language => the language to render. defaults to @language.
       #
       def javascripts_for_client(bundle_name = nil, opts = {})
 
         opts[:language] ||= language
-        
+
         # Get bundle
         cur_bundle = bundle_name.nil? ? bundle : library.bundle_for(bundle_name)
-        
+
         # Convert to a list of required bundles
         all_bundles = cur_bundle.all_required_bundles
-        
+
         # For each bundle, get the ordered list of stylsheet urls
         urls = []
         all_bundles.each do |b|
-          urls += b.sorted_javascript_entries(opts).map { |x| x.url }
+          urls += b.sorted_javascript_entries(opts).map { |x| x.cacheable_url }
           urls += (b.javascript_libs || [])
         end
 
@@ -67,10 +80,10 @@ module SproutCore
         urls = urls.map do |url|
           %(  <script type="text/javascript" src="#{url}"></script>)
         end
-      
+
         # Add preferred language definition...
         urls << %(<script type="text/javascript">String.preferredLanguage = "#{language}";</script>)
-        
+
         urls.join("\n")
       end
 
@@ -78,16 +91,16 @@ module SproutCore
       def static_url(resource_name, opts = {})
         opts[:language] ||= language
         entry = bundle.find_resource_entry(resource_name, opts)
-        entry.nil? ? '' : entry.url
+        entry.nil? ? '' : entry.cacheable_url
       end
-            
+
       # Localizes the passed string, using the optional passed options.
       def loc(string, opts = {})
         opts[:language] ||= language
         bundle.strings_hash(opts)[string] || string
       end
-      
+
     end
-  
+
   end
 end

data/lib/sproutcore/helpers/tag_helper.rb

@@ -10,10 +10,10 @@ module SproutCore
     module TagHelper
       include ERB::Util
 
-      # Returns an empty HTML tag of type +name+ which by default is XHTML 
-      # compliant. Setting +open+ to true will create an open tag compatible 
-      # with HTML 4.0 and below. Add HTML attributes by passing an attributes 
-      # hash to +options+. For attributes with no value like (disabled and 
+      # Returns an empty HTML tag of type +name+ which by default is XHTML
+      # compliant. Setting +open+ to true will create an open tag compatible
+      # with HTML 4.0 and below. Add HTML attributes by passing an attributes
+      # hash to +options+. For attributes with no value like (disabled and
       # readonly), give it a value of true in the +options+ hash. You can use
       # symbols or strings for the attribute names.
       #
@@ -21,15 +21,15 @@ module SproutCore
       #    # => <br />
       #   tag("br", nil, true)
       #    # => <br>
-      #   tag("input", { :type => 'text', :disabled => true }) 
+      #   tag("input", { :type => 'text', :disabled => true })
       #    # => <input type="text" disabled="disabled" />
       def tag(name, options = nil, open = false)
         "<#{name}#{tag_options(options) if options}" + (open ? ">" : " />")
       end
 
       # Returns an HTML block tag of type +name+ surrounding the +content+. Add
-      # HTML attributes by passing an attributes hash to +options+. For attributes 
-      # with no value like (disabled and readonly), give it a value of true in 
+      # HTML attributes by passing an attributes hash to +options+. For attributes
+      # with no value like (disabled and readonly), give it a value of true in
       # the +options+ hash. You can use symbols or strings for the attribute names.
       #
       #   content_tag(:p, "Hello world!")
@@ -82,7 +82,7 @@ module SproutCore
           tag_options = options ? tag_options(options) : ""
           "<#{name}#{tag_options}>#{content}</#{name}>"
         end
-      
+
         def tag_options(options)
           cleaned_options = convert_booleans(options.stringify_keys.reject {|key, value| value.nil?})
           ' ' + cleaned_options.map {|key, value| %(#{key}="#{escape_once(value)}")}.sort * ' ' unless cleaned_options.empty?
@@ -96,12 +96,12 @@ module SproutCore
         def boolean_attribute(options, attribute)
           options[attribute] ? options[attribute] = attribute : options.delete(attribute)
         end
-        
+
         # Fix double-escaped entities, such as &amp;amp;, &amp;#123;, etc.
         def fix_double_escape(escaped)
           escaped.gsub(/&amp;([a-z]+|(#\d+));/i) { "&#{$1};" }
         end
-        
+
         def block_is_within_action_view?(block)
           eval("defined? _erbout", block.binding)
         end

data/lib/sproutcore/helpers/text_helper.rb

@@ -5,9 +5,9 @@ require 'sproutcore/helpers/tag_helper'
 
 module SproutCore
   module Helpers #:nodoc:
-    # The TextHelper Module provides a set of methods for filtering, formatting 
-    # and transforming strings that can reduce the amount of inline Ruby code in 
-    # your views. These helper methods extend ActionView making them callable 
+    # The TextHelper Module provides a set of methods for filtering, formatting
+    # and transforming strings that can reduce the amount of inline Ruby code in
+    # your views. These helper methods extend ActionView making them callable
     # within your template files as shown in the following example which truncates
     # the title of each post to 10 characters.
     #
@@ -16,10 +16,10 @@ module SproutCore
     #     Title: <%= truncate(post.title, 10) %>
     #   <% end %>
     #    => Title: This is my...
-    module TextHelper      
-      # The preferred method of outputting text in your views is to use the 
-      # <%= "text" %> eRuby syntax. The regular _puts_ and _print_ methods 
-      # do not operate as expected in an eRuby code block. If you absolutely must 
+    module TextHelper
+      # The preferred method of outputting text in your views is to use the
+      # <%= "text" %> eRuby syntax. The regular _puts_ and _print_ methods
+      # do not operate as expected in an eRuby code block. If you absolutely must
       # output text within a code block, you can use the concat method.
       #
       #   <% concat "hello", binding %>
@@ -29,10 +29,10 @@ module SproutCore
         eval('_buf', binding) << string
       end
 
-      # If +text+ is longer than +length+, +text+ will be truncated to the length of 
+      # If +text+ is longer than +length+, +text+ will be truncated to the length of
       # +length+ and the last three characters will be replaced with the +truncate_string+.
       #
-      #   truncate("Once upon a time in a world far far away", 14)  
+      #   truncate("Once upon a time in a world far far away", 14)
       #    => Once upon a...
       def truncate(text, length = 30, truncate_string = "...")
         if text.nil? then return end
@@ -41,13 +41,13 @@ module SproutCore
       end
 
       # Highlights one or more +phrases+ everywhere in +text+ by inserting it into
-      # a +highlighter+ string. The highlighter can be specialized by passing +highlighter+ 
+      # a +highlighter+ string. The highlighter can be specialized by passing +highlighter+
       # as a single-quoted string with \1 where the phrase is to be inserted.
       #
-      #   highlight('You searched for: rails', 'rails')  
+      #   highlight('You searched for: rails', 'rails')
       #   # => You searched for: <strong class="highlight">rails</strong>
       #
-      #   highlight('You searched for: rails', ['for', 'rails'], '<em>\1</em>')  
+      #   highlight('You searched for: rails', ['for', 'rails'], '<em>\1</em>')
       #   # => You searched <em>for</em>: <em>rails</em>
       def highlight(text, phrases, highlighter = '<strong class="highlight">\1</strong>')
         if text.blank? || phrases.blank?
@@ -58,16 +58,16 @@ module SproutCore
         end
       end
 
-      # Extracts an excerpt from +text+ that matches the first instance of +phrase+. 
+      # Extracts an excerpt from +text+ that matches the first instance of +phrase+.
       # The +radius+ expands the excerpt on each side of +phrase+ by the number of characters
       # defined in +radius+. If the excerpt radius overflows the beginning or end of the +text+,
-      # then the +excerpt_string+ will be prepended/appended accordingly. If the +phrase+ 
+      # then the +excerpt_string+ will be prepended/appended accordingly. If the +phrase+
       # isn't found, nil is returned.
       #
-      #   excerpt('This is an example', 'an', 5) 
+      #   excerpt('This is an example', 'an', 5)
       #    => "...s is an examp..."
       #
-      #   excerpt('This is an example', 'is', 5) 
+      #   excerpt('This is an example', 'is', 5)
       #    => "This is an..."
       def excerpt(text, phrase, radius = 100, excerpt_string = "...")
         if text.nil? || phrase.nil? then return end
@@ -87,8 +87,8 @@ module SproutCore
       end
 
       # Attempts to pluralize the +singular+ word unless +count+ is 1. If +plural+
-      # is supplied, it will use that when count is > 1, if the ActiveSupport Inflector 
-      # is loaded, it will use the Inflector to determine the plural form, otherwise 
+      # is supplied, it will use that when count is > 1, if the ActiveSupport Inflector
+      # is loaded, it will use the Inflector to determine the plural form, otherwise
       # it will just add an 's' to the +singular+ word.
       #
       #   pluralize(1, 'person')  => 1 person
@@ -131,7 +131,7 @@ module SproutCore
           end
         end
 
-        # Returns the text with all the Textile codes turned into HTML tags, 
+        # Returns the text with all the Textile codes turned into HTML tags,
         # but without the bounding <p> tag that RedCloth adds.
         # <i>This method is only available if RedCloth[http://whytheluckystiff.net/ruby/redcloth/]
         # is available</i>.
@@ -157,12 +157,12 @@ module SproutCore
       rescue LoadError
         # We can't really help what's not there
       end
-      
+
       # Returns +text+ transformed into HTML using simple formatting rules.
-      # Two or more consecutive newlines(<tt>\n\n</tt>) are considered as a 
+      # Two or more consecutive newlines(<tt>\n\n</tt>) are considered as a
       # paragraph and wrapped in <tt><p></tt> tags. One newline (<tt>\n</tt>) is
       # considered as a linebreak and a <tt><br /></tt> tag is appended. This
-      # method does not remove the newlines from the +text+. 
+      # method does not remove the newlines from the +text+.
       def simple_format(text)
         content_tag 'p', text.to_s.
           gsub(/\r\n?/, "\n").                    # \r\n and \r -> \n
@@ -170,9 +170,9 @@ module SproutCore
           gsub(/([^\n]\n)(?=[^\n])/, '\1<br />')  # 1 newline   -> br
       end
 
-      # Turns all urls and email addresses into clickable links. The +link+ parameter 
+      # Turns all urls and email addresses into clickable links. The +link+ parameter
       # will limit what should be linked. You can add html attributes to the links using
-      # +href_options+. Options for +link+ are <tt>:all</tt> (default), 
+      # +href_options+. Options for +link+ are <tt>:all</tt> (default),
       # <tt>:email_addresses</tt>, and <tt>:urls</tt>.
       #
       #   auto_link("Go to http://www.rubyonrails.org and say hello to david@loudthinking.com") =>
@@ -201,9 +201,9 @@ module SproutCore
       def strip_links(text)
         text.gsub(/<a\b.*?>(.*?)<\/a>/mi, '\1')
       end
-      
+
       # Creates a Cycle object whose _to_s_ method cycles through elements of an
-      # array every time it is called. This can be used for example, to alternate 
+      # array every time it is called. This can be used for example, to alternate
       # classes for table rows:
       #
       #   <% @items.each do |item| %>
@@ -212,9 +212,9 @@ module SproutCore
       #     </tr>
       #   <% end %>
       #
-      # You can use named cycles to allow nesting in loops.  Passing a Hash as 
+      # You can use named cycles to allow nesting in loops.  Passing a Hash as
       # the last parameter with a <tt>:name</tt> key will create a named cycle.
-      # You can manually reset a cycle by calling reset_cycle and passing the 
+      # You can manually reset a cycle by calling reset_cycle and passing the
       # name of the cycle.
       #
       #   <% @items.each do |item| %>
@@ -244,8 +244,8 @@ module SproutCore
         end
         return cycle.to_s
       end
-      
-      # Resets a cycle so that it starts from the first element the next time 
+
+      # Resets a cycle so that it starts from the first element the next time
       # it is called. Pass in +name+ to reset a named cycle.
       def reset_cycle(name = "default")
         cycle = get_cycle(name)
@@ -254,12 +254,12 @@ module SproutCore
 
       class Cycle #:nodoc:
         attr_reader :values
-        
+
         def initialize(first_value, *values)
           @values = values.unshift(first_value)
           reset
         end
-        
+
         def reset
           @index = 0
         end
@@ -270,7 +270,7 @@ module SproutCore
           return value
         end
       end
-      
+
       private
         # The cycle helpers need to store the cycles in a place that is
         # guaranteed to be reset every time a page is rendered, so it
@@ -279,7 +279,7 @@ module SproutCore
           @_cycles = Hash.new unless defined?(@_cycles)
           return @_cycles[name]
         end
-        
+
         def set_cycle(name, cycle_object)
           @_cycles = Hash.new unless defined?(@_cycles)
           @_cycles[name] = cycle_object
@@ -288,13 +288,13 @@ module SproutCore
         AUTO_LINK_RE = %r{
                         (                          # leading text
                           <\w+.*?>|                # leading HTML tag, or
-                          [^=!:'"/]|               # leading punctuation, or 
+                          [^=!:'"/]|               # leading punctuation, or
                           ^                        # beginning of line
                         )
                         (
                           (?:https?://)|           # protocol spec, or
                           (?:www\.)                # www.*
-                        ) 
+                        )
                         (
                           [-\w]+                   # subdomain or domain
                           (?:\.[-\w]+)*            # remaining subdomains or domain

data/lib/sproutcore/helpers.rb

@@ -1,3 +1,3 @@
 # Helpers are mostly borrowed from Rails 2.0.2 with some additional features specifically
 # for building client-side JavaScript.
-Dir.glob(File.join(File.dirname(__FILE__),'helpers','**','*.rb')).each { |x| require x }
+Dir.glob(File.join(File.dirname(__FILE__),'helpers','**','*.rb')).each { |x| require x }

data/lib/sproutcore/jsdoc.rb

@@ -1,24 +1,24 @@
 # This utility module will use jsdoc to create documentation from a SproutCore
 # client.  Note that for this to work you must have Java installed (sudder).
 module SproutCore
-  
+
   module JSDoc
-    
+
     # Creates the documentation for the specified set of clients, replacing
-    # the contents of the output file.  Requires some of the following 
+    # the contents of the output file.  Requires some of the following
     # options.
-    # 
+    #
     # :bundle => A Bundle instance - or -
     # :files  => Absolute paths to input files
     # :build_path => absolute path to the build root.  Uses the bundle if not provided.
-    def self.generate(opts = {}) 
+    def self.generate(opts = {})
       bundle = opts[:bundle]
       build_path = opts[:build_path] || File.join(bundle.build_root, '-docs', 'data')
       raise "MISSING OPTION: :bundle => bundle or :build_path => path required for JSDoc" if build_path.nil?
-      
+
       # get the list of files to build for.
       files = opts[:files]
-      if files.nil? 
+      if files.nil?
         raise "MISSING OPTION: :bundle => bundle or :files => list of files required for JSDoc" if bundle.nil?
         entries = bundle.entries_for(:javascript, :hidden => :include)
         files = entries.map { |x| x.composite? ? nil : x.source_path }.compact.uniq
@@ -34,11 +34,11 @@ module SproutCore
       template_path = File.join(jsdoc_root, 'templates', 'sproutcore')
 
       puts %(GENERATING: java -Djsdoc.dir="#{jsdoc_root}" -jar "#{jar_path}" "#{runjs_path}" -t="#{template_path}" -d="#{build_path}" "#{ files * '" "' }" -v)
-      
+
       # wrap files in quotes...
-      
+
       SC.logger.debug `java -Djsdoc.dir="#{jsdoc_root}" -jar "#{jar_path}" "#{runjs_path}" -t="#{template_path}" -d="#{build_path}" "#{ files * '" "' }" -v`
-    
+
     end
   end
 end

data/lib/sproutcore/jsmin.rb

@@ -36,15 +36,15 @@ module SproutCore
 
   class JSMin
     EOF = -1
-    
-    # this will minify a single line 
+
+    # this will minify a single line
     def self.run(str)
       minifier = SproutCore::JSMin.new(str)
       minifier.jsmin
       minifier.stdout
     end
-    
-    def initialize(str) 
+
+    def initialize(str)
       @theA = ""
       @theB = ""
       @str = str || ''
@@ -55,29 +55,29 @@ module SproutCore
     def stdin_getc
       ret = @str.nil? || (@loc >= @str.size) ? nil : @str[@loc]
       @loc += 1
-      return ret 
+      return ret
     end
-    
+
     def stdin_ungetc(str)
       @loc -= 1
       @loc = 0 if @loc < 0
     end
-    
+
     def stdout_write(chr)
       @stdout << chr
     end
-    
+
     def stdout
       return @stdout
     end
-    
+
 #### JSMIN
 ## To update, replace the text below with the latest jsmin.rb. Then replace:
-## $theA => @theA, $theB => @theB, 
-## $stdin.getc => stdin_getc, $stdin.ungetc => stding_ungetc, 
+## $theA => @theA, $theB => @theB,
+## $stdin.getc => stdin_getc, $stdin.ungetc => stding_ungetc,
 ## $stdout.write => stdout_write
 
-    # isAlphanum -- return true if the character is a letter, digit, 
+    # isAlphanum -- return true if the character is a letter, digit,
     # underscore, dollar sign, or non-ASCII character
     def isAlphanum(c)
       return false if !c || c == EOF
@@ -86,8 +86,8 @@ module SproutCore
       c == '\\' || c[0] > 126)
     end
 
-    # get -- return the next character from stdin. Watch out for lookahead. 
-    # If the character is a control character, translate it to a space or 
+    # get -- return the next character from stdin. Watch out for lookahead.
+    # If the character is a control character, translate it to a space or
     # linefeed.
     def get()
       c = stdin_getc