red 4.1.6 → 4.1.7

data/Manifest.txt

@@ -1,9 +1,3 @@
-History.txt
-License.txt
-Manifest.txt
-PostInstall.txt
-README.txt
-Rakefile
 bin/red
 config/website.yml
 lib/red.rb
@@ -41,13 +35,12 @@ lib/source/redshift/user_events.rb
 lib/source/redshift/validator.rb
 lib/source/redshift/window.rb
 lib/source/redspec/index.html
-lib/source/redspec/lib
-lib/source/redspec/lib/red_spec
 lib/source/redspec/lib/red_spec/red_spec.red
 lib/source/redspec/lib/stylesheets/specs.sass
-script/console
-script/destroy
-script/generate
+License.txt
+Manifest.txt
+Rakefile
+README.txt
 spec/array.red
 spec/hash.red
 spec/object.red

data/Rakefile

@@ -7,7 +7,7 @@ $hoe = Hoe.new('red', Red::VERSION) do |p|
   p.developer('Jesse Sielaff', 'jesse.sielaff@gmail.com')
   p.description          = 'Red writes like Ruby and runs like JavaScript.'
   p.changes              = '' #p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.post_install_message = 'PostInstall.txt'
+  p.post_install_message = 'For more information on Red, see http://github.com/backtik/red/wikis'
   p.name                 = 'red'
   p.rubyforge_name       = 'red-js'
   p.extra_deps           = [

data/lib/red.rb

@@ -16,7 +16,7 @@ require 'red/nodes/logic_nodes'
 require 'red/nodes/variable_nodes'
 
 module Red # :nodoc:
-  VERSION = '4.1.6'
+  VERSION = '4.1.7'
   
   ARRAY_NODES = {
     :and          => LogicNode::Conjunction::And,
@@ -256,4 +256,10 @@ module Red # :nodoc:
   def self.rails
     require 'red/plugin'
   end
+  
+  def javascript_safe_succ!(string)
+    string.succ!
+    string.succ! if %w(as break byte case catch char class const do else enum false final float for goto if in int is long on new null short super this throw true try use var void while with).include?(string)
+    return string
+  end
 end

data/lib/red/executable.rb

@@ -3,7 +3,7 @@ module Red # :nodoc:
     @files ||= ''
     self.make_plugin_directory('vendor/plugins/red', true)
     self.create_plugin_file(:open, 'vendor/plugins/red/init.rb', "require 'rubygems'\nrequire 'red'\n\nRed.rails\n")
-    self.make_plugin_directory('public/javascripts/red')
+    self.make_plugin_directory('public/javascripts/red/lib')
     
     return unless display_message
     puts @files && exit

data/lib/red/nodes/assignment_nodes.rb

@@ -46,7 +46,7 @@ module Red
       def initialize(variable_name_sexp, expression_sexp, options)
         variable_name = variable_name_sexp.red!
         expression    = expression_sexp.red!(:as_assignment => true)
-        a             = @@red_boolean.succ!.dup
+        a             = javascript_safe_succ!(@@red_boolean).dup
         if options[:as_argument_default]
           self << "%s=$T($.%s=%s)?$.%s:%s" % [variable_name, a, variable_name, a, expression]
         else

data/lib/red/nodes/logic_nodes.rb

@@ -50,9 +50,9 @@ module Red
         end
         
         def self.string # :nodoc:
-          a = @@red_boolean.succ!.dup
-          b = @@red_boolean.succ!.dup
-          c = @@red_boolean.succ!.dup
+          a = javascript_safe_succ!(@@red_boolean).dup
+          b = javascript_safe_succ!(@@red_boolean).dup
+          c = javascript_safe_succ!(@@red_boolean).dup
           "(($.%s=$T(%s))?(($.%s=$T($.%s=%s))?$.%s:$.%s):$.%s)" % [a, '%s', c, b, '%s', b, c, a]
         end
       end
@@ -66,7 +66,7 @@ module Red
         end
         
         def self.string
-          a = @@red_boolean.succ!.dup
+          a = javascript_safe_succ!(@@red_boolean).dup
           "($T($.%s=%s)?$.%s:%s)" % [a, '%s', a, '%s']
         end
       end

data/lib/source/redshift/accessors.rb

@@ -1,7 +1,7 @@
 require 'element'
 
 class Element
-  `c$Element.__keyed_attributes__={class:'className',for:'htmlFor'}`
+  `c$Element.__keyed_attributes__={'class':'className','for':'htmlFor'}`
   `c$Element.__boolean_attributes__={checked:'checked',declare:'declare',defer:'defer',disabled:'disabled',ismap:'ismap',multiple:'multiple',noresize:'noresize',noshade:'noshade',readonly:'readonly',selected:'selected'}`
   
   # call-seq:

data/lib/source/redshift/cookie.rb

@@ -72,7 +72,7 @@ class Cookie
   #   Cookie.new(:user_jds, '8557acb0') unless Cookie.read(:user_jds)
   # 
   def self.read(key)
-    value = `#{OPTIONS[:document].native}.cookie.match('(?:^|;)\\s*' + #{Regexp.escape(key)}.__value__ + '=([^;]*)')`
+    value = `#{OPTIONS[:document]}.__native__.cookie.match('(?:^|;)\\s*' + #{Regexp.escape(key)}.__value__ + '=([^;]*)')`
     return value ? `$q(decodeURIComponent(value[1]))` : nil
   end
   

data/lib/source/redshift/document.rb

@@ -1,4 +1,6 @@
 require 'selectors'
+require 'user_events'
+require 'window'
 
 # The +Document+ object enables access to top-level HTML elements like
 # <i><head></i>, <i><html></i>, and <i><body></i>.
@@ -8,7 +10,6 @@ require 'selectors'
 # powerful <tt>Document.[]</tt> method.
 # 
 module Document
-  
   `document.head=document.getElementsByTagName('head')[0]`
   `document.html=document.getElementsByTagName('html')[0]`
   `document.window=(document.defaultView||document.parentWindow)`

data/lib/source/redshift/element.rb

@@ -413,5 +413,6 @@ class Element
   # FIX: Incomplete
   # 
   def to_s
+    
   end
 end

data/lib/source/redshift/event.rb

@@ -222,8 +222,8 @@ class Event
   # _evnt_.
   # 
   def prevent_default
-    native = `this.__native__`
-    `native.preventDefault?native.preventDefault():native.returnValue=false`
+    `var Native = this.__native__`
+    `Native.preventDefault?Native.preventDefault():Native.returnValue=false`
     return self
   end
   
@@ -264,8 +264,8 @@ class Event
   # Instructs the event to stop propagating, then returns _evnt_.
   # 
   def stop_propagation
-    native = `this.__native__`
-    `native.stopPropagation?native.stopPropagation():native.cancelBubble=true`
+    `var Native = this.__native__`
+    `Native.stopPropagation?Native.stopPropagation():Native.cancelBubble=true`
     return self
   end
   

data/lib/source/redshift/situated.rb

@@ -174,9 +174,9 @@ module Situated
     end
     
     def offsets
-      `var native = this.__native__`
+      `var Native = this.__native__`
       if trident?
-        `var bound = native.getBoundingClientRect()`
+        `var bound = Native.getBoundingClientRect()`
         `var html  = this.m$document.__native__.documentElement`
         return {
           :x => `bound.left + html.scrollLeft - html.clientLeft`,
@@ -188,7 +188,7 @@ module Situated
       return {:x => `position.x`, :y => `position.y`} if self.is_body?
       `
       
-      element = native
+      element = Native
       while (element && !c$Situated.c$Utilities.m$is_body_bool(element)){
         position.x += element.offsetLeft;
         position.y += element.offsetTop;
@@ -211,17 +211,17 @@ module Situated
         element = element.offsetParent;
       }
       
-      if (#{gecko?} && !c$Situated.c$Utilities.m$border_box(native)){
-        position.x -= c$Situated.c$Utilities.m$left_border(native);
-        position.y -= c$Situated.c$Utilities.m$top_border(native);
+      if (#{gecko?} && !c$Situated.c$Utilities.m$border_box(Native)){
+        position.x -= c$Situated.c$Utilities.m$left_border(Native);
+        position.y -= c$Situated.c$Utilities.m$top_border(Native);
       }
       `
       return {:x => `position.x`, :y => `position.y`}
     end
         
     def position_at(x,y)
-      native = `this.__native__`
-      h = {:left => x - Situated::Utilities.styleNumber(native, `'margin-left'`), :top => y - Situated::Utilities.styleNumber(native, `'margin-top'`), :position => 'absolute'}
+      `var Native = this.__native__`
+      h = {:left => x - Situated::Utilities.styleNumber(`Native`, `'margin-left'`), :top => y - Situated::Utilities.styleNumber(`Native`, `'margin-top'`), :position => 'absolute'}
       self.set_styles(h)
     end
     

data/lib/source/ruby.rb

@@ -51,6 +51,7 @@
       var includer=Red.inferConstantFromString(x);
       Red.donateMethodsToSingleton(module,includer,false);
       Red.donateMethodsToClass(module.prototype,includer.prototype,false);
+      if(includer == window){return nil;};
       switch(includer.m$class().__name__){case 'Module':Red.updateIncluders(includer);break;case 'Class':Red.updateChildren(includer);break;};
     };
   },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: red
 version: !ruby/object:Gem::Version 
-  version: 4.1.6
+  version: 4.1.7
 platform: ruby
 authors: 
 - Jesse Sielaff
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-07 00:00:00 -05:00
+date: 2008-11-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,18 +60,10 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
 - License.txt
 - Manifest.txt
-- PostInstall.txt
 - README.txt
 files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- PostInstall.txt
-- README.txt
-- Rakefile
 - bin/red
 - config/website.yml
 - lib/red.rb
@@ -109,20 +101,19 @@ files:
 - lib/source/redshift/validator.rb
 - lib/source/redshift/window.rb
 - lib/source/redspec/index.html
-- lib/source/redspec/lib
-- lib/source/redspec/lib/red_spec
 - lib/source/redspec/lib/red_spec/red_spec.red
 - lib/source/redspec/lib/stylesheets/specs.sass
-- script/console
-- script/destroy
-- script/generate
+- License.txt
+- Manifest.txt
+- Rakefile
+- README.txt
 - spec/array.red
 - spec/hash.red
 - spec/object.red
 - spec/string.red
 has_rdoc: true
 homepage: Red takes the Ruby you write and turns it into JavaScript for your browser.
-post_install_message: PostInstall.txt
+post_install_message: For more information on Red, see http://github.com/backtik/red/wikis
 rdoc_options: 
 - --main
 - README.txt

data/PostInstall.txt

@@ -1,2 +0,0 @@
-
-For more information on Red, see http://github.com/jessesielaff/red/wikis

data/script/console

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# File: script/console
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-
-libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the console
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/red.rb'}"
-puts "Loading red gem"
-exec "#{irb} #{libs} --simple-prompt"

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)