red 4.1.5 → 4.1.6

data/bin/red

@@ -6,7 +6,6 @@
 require 'rubygems' rescue nil
 require 'red'
 require 'red/executable'
-require 'red/version'
 require 'optparse'
 require 'ftools'
 

data/lib/red.rb

@@ -3,6 +3,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 require 'parse_tree'
 require 'red/errors'
+require 'red/executable'
 require 'red/plugin'
 require 'red/nodes/assignment_nodes'
 require 'red/nodes/call_nodes'
@@ -15,7 +16,7 @@ require 'red/nodes/logic_nodes'
 require 'red/nodes/variable_nodes'
 
 module Red # :nodoc:
-  VERSION = '4.1.5'
+  VERSION = '4.1.6'
   
   ARRAY_NODES = {
     :and          => LogicNode::Conjunction::And,

data/lib/red/executable.rb

@@ -9,18 +9,6 @@ module Red # :nodoc:
     puts @files && exit
   end
   
-  # def add_unobtrusive(library)
-  #   @files ||= ''
-  #   self.build_red_plugin_for_rails(false)
-  #   self.create_plugin_file(:copy, 'public/javascripts/dom_ready.js', File.join(File.dirname(__FILE__), "../javascripts/#{(library || '').downcase}_dom_ready.js"))
-  #   self.create_plugin_file(:copy, 'public/javascripts/red/unobtrusive.red', File.join(File.dirname(__FILE__), "../javascripts/red/unobtrusive.red"))
-  #   
-  # rescue Errno::ENOENT
-  #   puts "There is no Unobtrusive Red support for #{library}"
-  # ensure
-  #   puts @files && exit
-  # end
-  
   def make_plugin_directory(dir, only_this_directory = false)
     parent_dir = File.dirname(dir)
     self.make_plugin_directory(parent_dir) unless File.exists?(parent_dir) || only_this_directory

data/lib/red/plugin.rb

@@ -1,43 +1,49 @@
 module Red
-  class << self
-    def already_updated?
-      @@red_updated ||= false
-    end
-    
-    def update_javascripts
-      @@red_updated = true
-      Red.init
-      red_dir = 'public/javascripts/red/'
-      Dir.glob("#{red_dir}**/*.red").each do |filepath|
-        if self.update?(filename = filepath.gsub(red_dir,'').gsub(/.[rb|red]+$/,'')) || true
-          js_output = (File.read(filepath).translate_to_sexp_array.red! || '')
-          
-          filename.split('/')[0...-1].inject('public/javascripts') do |string,dir|
-            new_dir = string << '/' << dir
-            Dir.mkdir(new_dir) unless File.exists?(new_dir)
-            string
-          end
-          
-          File.open("public/javascripts/#{filename}.js", 'w') { |f| f.write(js_output) }
-        end
-      end
-    end
-    
-    def update?(filename)
-      if File.exists?("public/javascripts/#{filename}.js")
-        (File.mtime("public/javascripts/red/#{filename}.red") rescue File.mtime("public/javascripts/red/#{filename}.rb")) > File.mtime("public/javascripts/#{filename}.js")
-      else
-        return true
+  def self.update_javascripts
+    red_dir = 'public/javascripts/red/'
+    (Dir.glob("%s/*.red" % red_dir) + Dir.glob("%s/*.rb" % red_dir)).each do |filepath|
+      basename = File.basename(filepath).gsub(/\.(rb|red)/,'')
+      if self.update?(basename)
+        Red.init(filepath)
+        js_output = File.read(filepath).translate_to_sexp_array.red!
+        ruby_js   = compile_ruby_js_source
+        pre  = Red.debug ? "try{" : ""
+        post = Red.debug ? "}catch(e){if(e.__class__){m$raise(e);};$ee=e;var m=e.message.match(/([^\\$]+)\\.m\\$(\\w+)\\sis\\snot\\sa\\sfunction/);if(m){m$raise(c$NoMethodError,$q('undefined method \"'+m[2]+'\" for '+m[1]));};var c=e.message.match(/([\\s\\S]+)\\sis\\sundefined/);if(c){c=c[1].replace(/\\./g,'::').replace(/c\\$/g,'');m$raise(c$NameError,$q('uninitialized constant '+c));};}" : ""
+        File.open("public/javascripts/%s.js" % basename, 'w') {|f| f.write(pre + ruby_js + js_output + post)}
       end
     end
   end
   
+  def self.update?(basename)
+    return true unless File.exists?('public/javascripts/%s.js' % basename)
+    return (File.mtime('public/javascripts/red/%s.red' % basename) rescue File.mtime('public/javascripts/red/%s.rb' % basename)) > File.mtime('public/javascripts/%s.js' % basename)
+  end
+  
+  # def self.update_javascripts
+  #   @@red_updated = true
+  #   Red.init
+  #   red_dir = 'public/javascripts/red/'
+  #   Dir.glob("#{red_dir}**/*.red").each do |filepath|
+  #     if self.update?(filename = filepath.gsub(red_dir,'').gsub(/.[rb|red]+$/,'')) || true
+  #       js_output = (File.read(filepath).translate_to_sexp_array.red! || '')
+  #       
+  #       filename.split('/')[0...-1].inject('public/javascripts') do |string,dir|
+  #         new_dir = string << '/' << dir
+  #         Dir.mkdir(new_dir) unless File.exists?(new_dir)
+  #         string
+  #       end
+  #       
+  #       File.open("public/javascripts/#{filename}.js", 'w') { |f| f.write(js_output) }
+  #     end
+  #   end
+  # end
+  
   module RailsBase # :nodoc:
     def self.included(base)
       base.send('alias_method', :red_old_process, :process)
       base.class_eval do
         def process(*args)
-          Red.update_javascripts #unless Red.already_updated?
+          Red.update_javascripts
           red_old_process(*args)
         end
       end

data/lib/source/redshift/code_events.rb

@@ -71,7 +71,11 @@ module CodeEvents
   def fire(sym, delay, *args)
     name = sym.to_sym
     return self unless @code_events && events_group = @code_events[name]
-    events_group.each {|proc| proc.process_event(self, delay, args) }
+    events_group.each do |proc|
+      `var f=function(){return proc.__block__.apply(null,args);}`
+      `if(delay){return setTimeout(f,delay);}`
+      `f()`
+    end
     return self
   end
   
@@ -193,12 +197,4 @@ module CodeEvents
       return self
     end
   end
-  
-  class ::Proc # :nodoc:
-    def process_event(context, delay, args_array) # :nodoc:
-      `var f=this.__block__.__unbound__,event_function=function(){return f.apply(context,args_array);}`
-      `if(delay){return setTimeout(event_function,delay);}`
-      `event_function()`
-    end
-  end
 end

data/lib/source/redshift/cookie.rb

@@ -1,3 +1,5 @@
+require 'document'
+
 # Class +Cookie+ governs the writing and accessing of cookies in the browser.
 # 
 # A cookie is a key-value pair stored by your browser as text data. If you
@@ -91,7 +93,7 @@ class Cookie
     end
     `str += '; secure'` if cookie.secure
     
-    `#{cookie.document.native}.cookie = str`
+    `#{cookie.document}.__native__.cookie = str`
     return cookie
   end
   

data/lib/source/redshift/request.rb

@@ -25,6 +25,15 @@ class Request
     }
   }
   
+  class Response
+    attr :text, :xml
+    
+    def initialize(text,xml)
+      @text = text
+      @xml  = xml
+    end
+  end
+  
   # call-seq:
   #   Request.new(options = {}) -> request
   # 
@@ -34,9 +43,9 @@ class Request
     `this.__xhr__ = typeof(ActiveXObject)=='undefined' ? new XMLHttpRequest : new ActiveXObject('MSXML2.XMLHTTP')`
     @options = OPTIONS.merge(options)
     `#{@options[:headers]}.__xhr__=this.__xhr__`  # MooTools sets the ResponseHeaders in the xhr
-  # def (@options[:headers]).[](name)             # only during execution, but allows you to get
-  #   `this.__xhr__.getResponseHeader(name)`      # at them at any time. I'm not sure whether it
-  # end                                           # is necessary for us to emulate this exactly.
+    # def (@options[:headers]).[](name)             # only during execution, but allows you to get
+    #   `this.__xhr__.getResponseHeader(name)`      # at them at any time. I'm not sure whether it
+    # end                                           # is necessary for us to emulate this exactly.
   end
   
   # call-seq:
@@ -127,15 +136,6 @@ class Request
     return self
   end
   
-  # call-seq:
-  #   req.failure! -> req
-  # 
-  # Fires _req_'s "response" and "failure" callbacks, then returns _req_.
-  # 
-  def failure!
-    self.fire(:response).fire(:failure, @xhr);
-  end
-  
   # call-seq:
   #   req.headers -> hash
   # 
@@ -161,11 +161,11 @@ class Request
       `try{#{@status}=xhr.status}catch(e){;}`
       
       if self.success?
-        @response = {:text => `$q(xhr.responseText)`, :xml => `xhr.responseXML`}
-        self.success!(self.process_scripts(@response[:text]), @response[:xml])
+        @response = Response.new(self.process_scripts(`$q(xhr.responseText)`), `xhr.responseXML`)
+        self.fire(:response, 0, @response).fire(:success, 0, @response).call_chain
       else
-        @response = {:text => nil, :xml => nil};
-        self.failure!
+        @response = Response.new(nil,nil)
+        self.fire(:response, 0, @response).fire(:failure, 0, @xhr)
       end
       
       `xhr.onreadystatechange=function(){;}`
@@ -190,15 +190,6 @@ class Request
     return str.strip_scripts(@options[:eval_scripts])
   end
   
-  # call-seq:
-  #   req.success!(text, xml) -> req
-  # 
-  # Fires _req_'s "response" and "success" callbacks, then returns _req_.
-  # 
-  def success!(text, xml)
-    self.fire(:response, [text, xml]).fire(:success, [text, xml]).call_chain
-  end
-  
   # call-seq:
   #   req.success? -> true or false
   # 
@@ -230,7 +221,7 @@ class Request
     # 
     def strip_scripts(evaluate = false)
       scripts = ''
-      result = `this.__value__.replace(/<script[^>]*>([\\s\\S]*?)<\\/script>/gi,function(){scripts.__value__+=arguments[1]+'\\n';return '';})`
+      result = `$q(this.__value__.replace(/<script[^>]*>([\\s\\S]*?)<\\/script>/gi,function(){scripts.__value__+=arguments[1]+'\\n';return '';}))`
       Document.execute_js(scripts) if evaluate
       return result
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: red
 version: !ruby/object:Gem::Version 
-  version: 4.1.5
+  version: 4.1.6
 platform: ruby
 authors: 
 - Jesse Sielaff
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-06 00:00:00 -05:00
+date: 2008-11-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency