sproutcore 1.6.0.beta.3-java → 1.6.0-java

data/lib/gen/responder/templates/states/{@filename@.js → @filename@_state.js}

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace %>.<%= class_name.upcase %>
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block("#{namespace}.#{class_name.upcase}") %>
 /*globals <%= namespace %> */
 
 /** @class

data/lib/gen/test/templates/tests/{@filename@.js → @filename@_test.js}

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace %> Unit Test
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block("#{namespace} Unit Test") %>
 /*globals <%= namespace %> module test ok equals same stop start */
 
 module("<%= namespace %>");

data/lib/gen/theme/templates/themes/@target_name@/resources/theme_styles.css

@@ -1,8 +1,4 @@
-/* ==========================================================================
-*  Project:   <%= namespace %> Theme Styles
-*  Copyright: ©<%= Time.now.year %> My Company, Inc.
-*  ==========================================================================
-*/
+<%= copyright_block("#{namespace} Theme Styles", :css) %>
 
 /* 
   Place any styles you want to define in this file.  You can also break your

data/lib/gen/theme/templates/themes/@target_name@/theme.js

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace %>
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block(namespace) %>
 /*globals <%= namespace %> */
 
 // This is the JavaScript representation of your theme.

data/lib/gen/view/templates/tests/views/{@filename@.js → @filename@_test.js}

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace_class_name %> Unit Test
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block("#{namespace_class_name} Unit Test") %>
 /*globals <%= namespace %> module test ok equals same stop start */
 
 module("<%= namespace_class_name %>");

data/lib/gen/view/templates/views/{@filename@.js → @filename@_view.js}

@@ -1,7 +1,4 @@
-// ==========================================================================
-// Project:   <%= namespace_class_name %>
-// Copyright: ©<%= Time.now.year %> My Company, Inc.
-// ==========================================================================
+<%= copyright_block(namespace_class_name) %>
 /*globals <%= namespace %> */
 
 /** @class

data/lib/sproutcore.rb

@@ -11,25 +11,12 @@ require 'yaml'
 
 $:.delete_if {|f| f =~ /json_pure-/ } if $:.any? {|f| f =~ /json-/ }
 
-# Ruby 1.8 Compatibility
-if (RUBY_VERSION.match(/1\.8/))
+if RUBY_VERSION <= '1.8'
   $KCODE = 'u'
   require 'jcode'
   class String ; def valid_encoding? ; true ; end ; end
 end
 
-# Ruby 1.9 Compatibility
-if (RUBY_VERSION.match(/1\.9/))
-  # Fix for Rack Ruby 1.9 incompatibility. This makes 404s render again.
-  class String
-    alias each each_line unless ''.respond_to?(:each)
-  end
-end
-
-# Makes code more readable
-YES = true
-NO = false
-
 require "sproutcore/version"
 
 module SproutCore
@@ -78,7 +65,7 @@ module SproutCore
 
       # if we are logging to the screen, no reason to use a std loggin fmt
       @logger.formatter = lambda do |severity, time, progname, msg|
-        [severity, '~', msg.to_s, "\n"].join(' ')
+        [severity, time.strftime("%H:%M:%S.") + "%.3d" % (time.usec / 100000), '~', msg.to_s, "\n"].join(' ')
       end
     end
 
@@ -150,6 +137,9 @@ module SproutCore
     end
   end
 
+  def self.attach_prefix(url)
+    $script_name ? "#{$script_name}#{url}" : url
+  end
 end  # module SC
 
 SC = SproutCore # alias

data/lib/sproutcore/builders/base.rb

@@ -64,9 +64,13 @@ module SC
         writeline(dst_path,joinlines(lines))
       end
 
+      def sc_static_match
+        /(sc_static|static_url|sc_target)\(\s*['"]([^"']*?)['"]\s*\)/
+      end
+
       # Handles occurances of sc_static() or static_url()
       def replace_static_url(line)
-        line.gsub!(/(sc_static|static_url|sc_target)\(\s*['"]([^"']*?)['"]\s*\)/) do | rsrc |
+        line.gsub!(sc_static_match) do | rsrc |
           entry_name = $2
           entry_name = "#{$2}:index.html" if $1 == 'sc_target'
 

data/lib/sproutcore/builders/handlebars.rb

@@ -22,8 +22,19 @@ module SC
 
     def build(dst_path)
       template_name = entry.rootname[/^.*\/([^\/]*)$/, 1]
-      writelines dst_path, "SC.TEMPLATES[#{template_name.inspect}] = SC.Handlebars.compile(#{readlines(entry[:source_path]).to_json})"
+      template_code = readlines(entry[:source_path])
+      replace_static_url(template_code)
+      writelines dst_path, "SC.TEMPLATES[#{template_name.inspect}] = SC.Handlebars.compile(#{template_code.to_json});"
     end
+
+    def sc_static_match
+      /\{\{(sc_static|static_url|sc_target)\(\s*['"]([^"']*?)['"]\s*\)\}\}/
+    end
+
+    def static_url(url='')
+      url
+    end
+
   end
 
 end

data/lib/sproutcore/builders/module.rb

@@ -27,7 +27,7 @@ module SC
           if (SC.MODULE_INFO[target_name]) return ; <%# not an error... %>
 
           <%# first time, so add a Hash with this target's module_info %>
-          SC.MODULE_INFO[target_name] = {
+          SC.MODULE_INFO[target_name] = SC.Object.create({
             dependencies:[<%= @dependencies.join(',') %>],
             styles:[<%= @styles.join(',') %>],
             styles2x: [<%= @styles2x.join(',') %>],
@@ -35,7 +35,7 @@ module SC
             stringURL:'<%= @string %>'<% if @prefetched %>,
             isPrefetched: YES
             <% end %>
-          }
+          })
         })();
       EOT
 

data/lib/sproutcore/buildfile/string_ext.rb

@@ -32,10 +32,6 @@ end # module Module
 #
 class String
   rake_extension("ext") do
-    def replace_ext(newext)
-      sub(%r(([^/\\]\.)[^./\\]*$)) { $1 + newext }
-    end
-
     # Replace the file extension with +newext+.  If there is no extenson on
     # the string, append the new extension to the end.  If the new extension
     # is not given, or is the empty string, remove any existing extension.

data/lib/sproutcore/helpers/cssmin.rb

@@ -107,32 +107,31 @@ module SC::Helpers
     # 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
+      script.gsub!(/(\s(\s)+)/, ' ')
+      script.gsub!(/\s*;\s*/,';')
+      script.gsub!(/\s*:\s*/,':')
+      script.gsub!(/\s*\{\s*/,'{')
+      script.gsub!(/\s*\}\s*/,'}')
+      script.gsub!(/\s*,\s*/,',')
+      script.gsub!("\t",'');
+      script
+    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 += '0' if num.to_i < 16
           out += num.to_i.to_s(16) # convert to hex
         end
         out
@@ -146,54 +145,40 @@ module SC::Helpers
         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}')
+      style.gsub!(/:[\s]*white[\s]*;/, ':#fff;')
+      style.gsub!(/:[\s]*white[\s]*\}/, ':#fff}')
+      style.gsub!(/:[\s]*black[\s]*;/, ':#000;')
+      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
+      style.gsub!(/:[\s]*#([fF]00|[fF]{2}0000);/, ':red;')
+      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
+      script.gsub!(/([\s:]+)(0)(px|em|%|in|cm|mm|pc|pt|ex)/) { |match| match.gsub(/(px|em|%|in|cm|mm|pc|pt|ex)/,'') }
       # 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;')
+      script.gsub!(/:(0\s){0,3}0;/, ':0;')
+      script.gsub!(/:(0\s){0,3}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
+      script.gsub!('background-position:0;', 'background-position:0 0;');
+      # Replace 0.6 to .6, but only the first 0 and only when preceded by : or a white-space
+      script.gsub!(/[:\s]0+\.(\d+)/) { |match| match.sub('0', '') }
       # Replace ;;;; with ;
-      script = script.gsub(/[;]+/, ';')
+      script.gsub!(/[;]+/, ';')
       # Replace ;} with }
-      script = script.gsub(';}', '}')
+      script.gsub!(';}', '}')
       # Replace background-color: with background:
-      script = script.gsub('background-color:', 'background:')
+      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.gsub!(/font-weight[\s]*:[\s]*normal[\s]*;/,'font-weight:400;')
+      script.gsub!(/font-weight[\s]*:[\s]*normal[\s]*\}/,'font-weight:400}')
+      script.gsub!(/font[\s]*:[\s]*normal[\s;\}]*/) { |match| match.sub!('normal', '400') }
+      script.gsub!(/font-weight[\s]*:[\s]*bold[\s]*;/,'font-weight:700;')
+      script.gsub!(/font-weight[\s]*:[\s]*bold[\s]*\}/,'font-weight:700}')
+      script.gsub!(/font[\s]*:[\s]*bold[\s;\}]*/) { |match| match.sub!('bold', '700') }
       script
     end
 

data/lib/sproutcore/helpers/static_helper.rb

@@ -191,8 +191,10 @@ module SC
           end
         end
 
-        ret << %(<script type="text/javascript">SC.buildMode = "#{SC.build_mode}";</script>)
-        
+        url_prefix = $script_name ? %("#{$script_name}") : "null";
+
+        ret << %(<script type="text/javascript">SC.buildMode = "#{SC.build_mode}"; \n SC.urlPrefix = #{url_prefix}; </script>)
+
         return ret * "\n"
       end
 

data/lib/sproutcore/helpers/text_helper.rb

@@ -82,13 +82,10 @@ module SC
         # <i>This method is only available if RedCloth[http://whytheluckystiff.net/ruby/redcloth/]
         # is available</i>.
         def textilize(text)
-          if text.blank?
-            ""
-          else
-            textilized = RedCloth.new(text, [ :hard_breaks ])
-            textilized.hard_breaks = true if textilized.respond_to?("hard_breaks=")
-            textilized.to_html
-          end
+          return '' if text.blank?
+          textilized = RedCloth.new(text, [ :hard_breaks ])
+          textilized.hard_breaks = true if textilized.respond_to?("hard_breaks=")
+          textilized.to_html
         end
 
         # Returns the text with all the Textile codes turned into HTML tags,
@@ -97,9 +94,9 @@ module SC
         # is available</i>.
         def textilize_without_paragraph(text)
           textiled = textilize(text)
-          if textiled[0..2] == "<p>" then textiled = textiled[3..-1] end
-          if textiled[-4..-1] == "</p>" then textiled = textiled[0..-5] end
-          return textiled
+          textiled = textiled[3..-1] if textiled[0..2] == '<p>'
+          textiled = textiled[0..-5] if textiled[-4..-1] == '</p>'
+          textiled
         end
       rescue LoadError
         # We can't really help what's not there
@@ -209,7 +206,8 @@ module SC
         if (cycle.nil? || cycle.values != values)
           cycle = set_cycle(name, Cycle.new(*values))
         end
-        return cycle.to_s
+
+        cycle.to_s
       end
 
       # Resets a cycle so that it starts from the first element the next time
@@ -234,7 +232,7 @@ module SC
         def to_s
           value = @values[@index].to_s
           @index = (@index + 1) % @values.size
-          return value
+          value
         end
       end
 
@@ -244,7 +242,7 @@ module SC
         # uses an instance variable of ActionView::Base.
         def get_cycle(name)
           @_cycles = Hash.new unless defined?(@_cycles)
-          return @_cycles[name]
+          @_cycles[name]
         end
 
         def set_cycle(name, cycle_object)

data/lib/sproutcore/models/generator.rb

@@ -293,6 +293,28 @@ module SC
       [self.namespace, self.instance_name].compact.join '.'
     end
 
+    def copyright_block(desc, commented=:javascript)
+      company = ENV['COMPANY'] || "My Company, Inc."
+
+      str = ["==========================================================================",
+             "Project:   #{desc}",
+             "Copyright: @#{Time.now.year} #{company}",
+             "=========================================================================="]
+
+      case commented
+      when true, :javascript, :js
+        str.map!{|s| "// #{s}" }
+      when :css
+        str[0] = "/* #{str[0]}"
+        str[1..-1].each{|s| s.replace "*  #{s}" }
+        str << "*/"
+      when :ruby
+        str.map!{|s| "# #{s}" }
+      end
+
+      str.join("\n")
+    end
+
     # Verifies that the passed array of keys are defined on the object.  If
     # you pass an optional block, the block will be invoked for each key so
     # you can validate the value as well.  Otherwise, this will raise an error

data/lib/sproutcore/models/manifest.rb

@@ -235,10 +235,10 @@ module SC
 
       # Normalize to new extension if provided.  else copy ext from entry...
       if ext = opts[:ext]
-        opts[:url] = opts[:url].replace_ext(ext)
-        opts[:staging_path] = opts[:staging_path].replace_ext(ext)
-        opts[:build_path] = opts[:build_path].replace_ext(ext)
-        opts[:filename] = opts[:filename].replace_ext(ext)
+        opts[:url] = opts[:url].ext(ext)
+        opts[:staging_path] = opts[:staging_path].ext(ext)
+        opts[:build_path] = opts[:build_path].ext(ext)
+        opts[:filename] = opts[:filename].ext(ext)
       else
         opts[:ext] = entry[:ext]
       end

data/lib/sproutcore/models/manifest_entry.rb

@@ -167,6 +167,7 @@ module SC
     def cacheable_url
       ret = self[:url]
       ret = [ret, self.timestamp].join('?') if target.config[:timestamp_urls]
+      ret = SC.attach_prefix(ret)
       if target.config[:hyper_domaining]
         ret = [self.hyperdomain_prefix(ret), ret].join('')
       end

data/lib/sproutcore/models/target.rb

@@ -642,7 +642,9 @@ module SC
         js_urls = []
         javascript_entries.each do |resource_name, entries|
           resource_name = resource_name.ext('js')
-          pf = (resource_name == 'javascript.js') ? %w(source/lproj/strings.js source/core.js source/utils.js) : []
+
+          pf = (resource_name == 'javascript.js') ? ['source/lproj/strings.js', 'source/core.js', 'source/utils.js'] : []
+
           SC::Helpers::EntrySorter.sort(entries, pf).each do |entry|
             if minify_js && entry[:minified]
               js_urls << entry.cacheable_url
@@ -759,112 +761,6 @@ module SC
       return nil
     end
 
-    ######################################################
-    # BUILD DOCS METHODS
-    #
-
-    # Creates all of the documentation for the target.
-    #
-    # === Options
-    #
-    #  :build_root:: the root path to place built documentation
-    #  :language::   the language to build.  defaults to preferred lang
-    #  :required::   include required targets.  defaults to true
-    def build_docs!(opts ={})
-
-      build_root   = opts[:build_root] || nil
-      language     = opts[:language] || self.config.preferred_language || :en
-      logger       = opts[:logger] || SC.logger
-      template_name = opts[:template] || 'sproutcore'
-      use_required = opts[:required]
-      use_required = true if use_required.nil?
-
-      # collect targets to build
-      doc_targets = [self]
-      doc_targets = (self.expand_required_targets + [self]) if use_required
-
-      # convert targets to manifests so we can get alll files
-      doc_manifests = doc_targets.map do |target|
-        target.manifest_for(:language => language)
-      end
-
-      # Collect all source entries, in the order they should be loaded
-      file_list = []
-      doc_manifests.each do |manifest|
-        entry = manifest.build!.entry_for('javascript.js')
-        next if entry.nil?
-
-        # loop over entries, collecting their source entries until we get
-        # back to the original source files.  Since we expand these entries
-        # in their proper load order this should give us something suitable
-        # to hand to jsdoc.
-        entries = entry.ordered_entries || entry.source_entries
-        while entries && entries.size>0
-          new_entries = []
-          entries.each do |cur_entry|
-            sources = cur_entry.ordered_entries || cur_entry.source_entries
-            if sources
-              new_entries += sources
-            elsif entry.filename =~ /\.js$/
-              file_list << cur_entry.source_path
-            end
-          end
-          entries = new_entries
-        end
-      end
-
-      file_list = file_list.uniq # remove duplicates
-      file_list = file_list.select { |path| File.exist?(path) }
-
-      logger.info "Building #{target_name} docs at #{build_root}"
-      FileUtils.mkdir_p(build_root)
-
-      # Prepare jsdoc opts
-      jsdoc_root    = File.expand_path('../../../../', __FILE__) / 'vendor' / 'jsdoc'
-      jar_path      = jsdoc_root / 'jsrun.jar'
-      runjs_path    = jsdoc_root / 'app' / 'run.js'
-
-      # look for a directory matching the template name
-      cur_project = self.project
-      has_template = false
-      while cur_project
-        template_path = cur_project.project_root / 'doc_templates' / template_name
-        has_template = File.directory?(template_path)
-        cur_project = has_template ? nil : cur_project.parent_project
-      end
-
-      if !has_template
-        cur_project = self.project
-        has_template = false
-        while cur_project
-          template_path = cur_project.project_root / template_name
-          has_template = File.directory?(template_path)
-          cur_project = has_template ? nil : cur_project.parent_project
-        end
-      end
-      throw("could not find template named #{template_name}") if !has_template
-
-      # wrap files in quotes...
-      # Note: using -server gives an approx. 25% speed boost over -client
-      # (the default)
-      js_doc_cmd = %(java -server -Djsdoc.dir="#{jsdoc_root}" -jar "#{jar_path}" "#{runjs_path}" -t="#{template_path}" -d="#{build_root}" "#{ file_list * '" "' }" -v)
-
-      logger.info "File Manifest:\r\n"
-      file_list.each { |file_path| logger.info(file_path) }
-
-      puts "Generating docs for #{self.target_name}\r\nPlease be patient this could take awhile..."
-
-      # use pipe so that we can immediately log output as it happens
-      IO.popen(js_doc_cmd) do |pipe|
-        while line = pipe.gets
-          next if line =~ /WARNING: (<|===|index:)/
-          logger.info line.sub(/\n$/,'')
-        end
-      end
-
-      puts "Finished."
-    end
-
   end
 
 end