red 3.3.0 → 3.4.0

data/History.txt

@@ -1,3 +1,14 @@
+== 3.4.0 2008-08-09
+
+* 2 major enhancements:
+  * Added functionality to "obj" of "class << obj" construct.
+  * Souped up -r and -u options for the Red executable.
+
+* 3 bug fixes:
+  * Added <= and >= to the list of sugared Ruby operators.
+  * Fixed nested ternary operators.
+  * Fixed camelcasing of all_CAPS sections in identifiers.
+
 == 3.3.0 2008-08-08
 
 * 1 major enhancement:

data/lib/red/assignment_nodes.rb

@@ -9,6 +9,14 @@ module Red
       return [@variable_name, @expression].compile_nodes(:as_argument => true)
     end
     
+    def compile_increment(options = {})
+      return "%s%s" % [options[:receiver] || @variable_name.compile_node, @expression.increment_operator * 2]
+    end
+    
+    def call_to_increment?
+      return @expression.increment_operator rescue false
+    end
+    
     class ClassVariableNode < AssignmentNode  # :nodoc:
       def compile_node(options = {})
         expression = @expression.compile_node(:as_argument => true)
@@ -17,6 +25,7 @@ module Red
           "%s: %s"
         else
           receiver = "%s.%s" % [@@red_class, @variable_name.compile_node]
+          return self.compile_increment(:receiver => receiver) if self.call_to_increment?
           "%s = %s"
         end % [receiver, expression]
       end
@@ -24,19 +33,23 @@ module Red
     
     class GlobalVariableNode < AssignmentNode  # :nodoc:
       def compile_node(options = {})
+        return self.compile_increment if self.call_to_increment?
         return "%s = %s" % self.compile_internals
       end
     end
     
     class InstanceVariableNode < AssignmentNode # :nodoc:
       def compile_node(options = {})
-        return "this.%s = %s" % self.compile_internals
+        receiver = "this.%s" % @variable_name.compile_node
+        return self.compile_increment(:receiver => receiver) if self.call_to_increment?
+        return "this.%s = %s" % [receiver, @expression.compile_node(:as_argument => true)]
       end
     end
     
     class LocalVariableNode < AssignmentNode # :nodoc:
       def compile_node(options = {})
-        return (@variable_name.is_a?(LiteralNode::NamespaceNode) ? "%s = %s" : "var %s = %s") % self.compile_internals
+        return self.compile_increment if self.call_to_increment?
+        return (@variable_name.is_a?(LiteralNode::NamespaceNode) || options[:skip_var] ? "%s = %s" : "var %s = %s") % self.compile_internals
       end
     end
     
@@ -51,7 +64,8 @@ module Red
       end
       
       def compile_internals(options = {})
-        variable_name, slot, expression = [@variable_name, @slot, @expression].compile_nodes(:quotes => '', :as_argument => true)
+        variable_name, slot = [@variable_name, @slot].compile_nodes(:quotes => '')
+        expression = @expression.compile_node(:as_argument => true)
         receiver = self.compile_receiver(variable_name, slot)
         return [receiver, expression]
       end
@@ -63,9 +77,17 @@ module Red
     
     class OperatorNode # :nodoc:
       def compile_node(options = {})
+        return self.compile_increment if self.call_to_increment?
         return "%s%s = %s %s %s" % self.compile_internals
       end
       
+      def compile_increment(options = {})
+        receiver, operation = [@receiver, @operation].compile_nodes
+        slot = @slot.compile_node(:quotes => '')
+        original = self.compile_receiver(receiver, slot)
+        return "%s%s" % [original, operation * 2]
+      end
+      
       def compile_internals(options = {})
         receiver, operation = [@receiver, @operation].compile_nodes
         expression = @expression.compile_node(:as_argument => true)
@@ -75,6 +97,10 @@ module Red
         return [var, original, original, operation, expression]
       end
       
+      def call_to_increment?
+        return ['+', '-'].include?(@operation.compile_node) && @expression.compile_node == '1'
+      end
+      
       class BracketNode < OperatorNode # :nodoc:
         def initialize(receiver, bracket_contents, operation, expression)
           @receiver, @slot, @operation, @expression = [receiver, bracket_contents.last, operation, expression].build_nodes
@@ -105,7 +131,7 @@ module Red
         end
         
         def var?
-          return "var " unless [VariableNode::GlobalVariableNode, VariableNode::InstanceVariableNode].include?(@receiver.class)
+          return "var " unless [VariableNode::GlobalVariableNode, VariableNode::InstanceVariableNode, VariableNode::ClassVariableNode].include?(@receiver.class)
         end
       end
       
@@ -119,7 +145,7 @@ module Red
         end
         
         def var?
-          return "var " unless [VariableNode::GlobalVariableNode, VariableNode::InstanceVariableNode].include?(@receiver.class)
+          return "var " unless [VariableNode::GlobalVariableNode, VariableNode::InstanceVariableNode, VariableNode::ClassVariableNode].include?(@receiver.class)
         end
       end
     end

data/lib/red/call_nodes.rb

@@ -40,17 +40,18 @@ module Red
     class MethodNode # :nodoc:
       def compile_node(options = {})
         call_to_returned_function = [DefinitionNode::InstanceMethodNode, CallNode::BlockNode].include?(@receiver.class) ? :call : false
-        receiver = @receiver.compile_node
-        function = @function.compile_node
+        receiver, function = [@receiver, @function].compile_nodes
         arguments = @arguments.compile_nodes(:as_argument => true, :quotes => "'")
         return ("$%s(%s)" % [receiver = ((receiver == '$-') || (receiver == 'id' && @@red_library == :Prototype) ? nil : receiver), arguments.first]).gsub('$$','$').gsub('$class','$$') if @receiver.is_a?(VariableNode::GlobalVariableNode) && function == '-'
         case function.to_sym
-        when :-, :+, :<, :>, :%, :*, :/, :^, :==, :===, :instanceof
+        when :-, :+, :<, :>, :>=, :<=, :%, :*, :/, :^, :==, :===, :instanceof
           "%s %s %s" % [receiver, function, arguments.first]
         when :raise
           "throw(%s)" % [arguments.first]
         when :new
           "new %s(%s)" % [receiver, arguments.join(', ')]
+        when :var
+          "var %s" % [arguments.join(', ')]
         when :[]
           if ([:symbol, :string].include?(@arguments.first.data_type) rescue false)
             arguments = @arguments.compile_nodes(:quotes => "", :as_argument => true)
@@ -66,6 +67,10 @@ module Red
         end
       end
       
+      def increment_operator
+        return @function.compile_node if ['+', '-'].include?(@function.compile_node) && @arguments.first.compile_node == '1'
+      end
+      
       class ExplicitNode < MethodNode # :nodoc:
         def initialize(receiver, function, arguments = [nil])
           @receiver, @function = [receiver, function].build_nodes

data/lib/red/conditional_nodes.rb

@@ -15,7 +15,7 @@ module Red
       
       def compile_internals(options = {})
         true_case, else_case, condition = [@true_case, @else_case, @condition].compile_nodes
-        return [condition, (true_case.empty? ? 'null' : true_case), (else_case.empty? ? 'null' : else_case)] if options[:as_argument]
+        return [condition, (true_case.empty? ? 'null' : @true_case.compile_node(:as_argument => true)), (else_case.empty? ? 'null' : @else_case.compile_node(:as_argument => true))] if options[:as_argument]
         condition = (true_case.empty? ? "!(%s)" : "%s") % [condition]
         true_case = "{ %s; }" % [true_case] unless true_case.empty?
         join      = " else "                      unless true_case.empty? || else_case.empty?

data/lib/red/control_nodes.rb

@@ -88,7 +88,8 @@ module Red
       end
       
       def compile_internals(options = {})
-        condition, body = [@condition, @body].compile_nodes
+        condition = @condition.compile_node(:skip_var => true)
+        body = @body.compile_node
         return [condition, body]
       end
     end
@@ -108,7 +109,8 @@ module Red
       end
       
       def compile_internals(options = {})
-        condition, body = [@condition, @body].compile_nodes
+        condition = @condition.compile_node(:skip_var => true)
+        body = @body.compile_node
         return [condition, body]
       end
     end

data/lib/red/data_nodes.rb

@@ -75,11 +75,12 @@ module Red
         return @value = @value.to_s unless camelize? && !disabled
         words = @value.to_s.gsub(/@|\$/,'').split(/_| /)
         underscore = words.shift if words.first.empty?
-        @value = (underscore ? '_' : '') + words[0] + words[1..-1].map {|word| word.capitalize}.join
+        @value = (underscore ? '_' : '') + words[0] + words[1..-1].map {|word| word == word.upcase ? word : word.capitalize }.join
       end
       
       def camelize?
-        is_not_a_constant_name        = @value.to_s != @value.to_s.upcase
+        value = @value.to_s
+        is_not_a_constant_name        = value != value.upcase || value =~ (/@|\$/)
         is_not_a_js_special_attribute = @value.to_s[0..1] != '__'
         return is_not_a_constant_name && is_not_a_js_special_attribute
       end

data/lib/red/definition_nodes.rb

@@ -127,14 +127,20 @@ module Red
       
     class ObjectLiteralNode # :nodoc:
       def initialize(receiver, scope)
+        old_class = @@red_class
+        @@red_class = @class = receiver.build_node.compile_node
         block_node = scope.assoc(:block) || scope
         properties = block_node.select {|node| (node.first == :cvdecl) rescue false }
         functions = block_node.select {|node| ![:block, :scope].include?(node) }
         @slots = (properties | functions).build_nodes
+        @@red_class = old_class
       end
       
       def compile_node(options = {})
+        old_class = @@red_class
+        @@red_class = @class
         slots = @slots.compile_nodes(:as_prototype => true).compact.join(', ')
+        @@red_class = old_class
         return "{ %s }" % [slots]
       end
     end

data/lib/red/executable.rb

@@ -1,26 +1,49 @@
 module Red # :nodoc:
-  def build_red_plugin_for_rails
-    self.make_rails_directory('vendor/plugins/red')
+  def build_red_plugin_for_rails(display_message = true)
+    @files ||= ''
+    self.make_rails_directory('vendor/plugins/red', true)
     
-    File.open('vendor/plugins/red/init.rb', 'w') { |f| f.write("require 'rubygems'\nrequire 'red'\n\nRed.rails\n") }
+    self.create_plugin_file(:open, 'vendor/plugins/red/init.rb', "require 'rubygems'\nrequire 'red'\n\nRed.rails\n")
     
-    puts "Red plugin added to project."
+    self.make_rails_directory('public/javascripts/red')
+    
+    return unless display_message
+    puts RED_MESSAGES[:rails] % @files
     exit
   end
   
   def add_unobtrusive(library)
-    red_directory_created = self.make_rails_directory('public/javascripts/red')
-    File.copy(File.join(File.dirname(__FILE__), "../javascripts/#{(library || '').downcase}_dom_ready.js"), "public/javascripts/dom_ready.js")
-    File.copy(File.join(File.dirname(__FILE__), "../javascripts/red/unobtrusive.red"), 'public/javascripts/red/unobtrusive.red')
+    @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"))
     
-    puts RED_MESSAGES[:unobtrusive]
-    exit
   rescue Errno::ENOENT
     puts "There is no Unobtrusive Red support for #{library}"
-    Dir.rmdir('public/javascripts/red') if red_directory_created
+  ensure
+    puts RED_MESSAGES[:unobtrusive] % @files
     exit
   end
   
+  def create_plugin_file(operation, filename, contents)
+    file_status = self.check_if_plugin_file_exists(filename)
+    case operation
+      when :open : File.open(filename, 'w') { |f| f.write(contents) } if file_status == 'created'
+      when :copy : File.copy(contents, filename)
+    end
+    @files << "\n%s  %s" % [file_status, filename]
+  end
+  
+  def check_if_plugin_file_exists(filename)
+    if File.exists?(filename)
+      print "File #{filename} exists. Overwrite [yN]? "
+      return (gets =~ /y/i ? 'created' : 'exists ')
+    else
+      return 'created'
+    end
+  end
+  
   def direct_translate(string)
     js_output = hush_warnings { string.string_to_node }.compile_node
     print_js(js_output, 'test')
@@ -41,13 +64,10 @@ module Red # :nodoc:
     puts RED_MESSAGES[:output] % [("- #{filename}.js" unless filename == 'test'), js_output, @@red_errors ||= '']
   end
   
-  def make_rails_directory(dir)
+  def make_rails_directory(dir, only_this_directory = false)
     parent_dir = File.dirname(dir)
-    unless File.exists?(parent_dir)
-      puts "Directory #{parent_dir} does not exist."
-      exit
-    end
-    Dir.mkdir(dir) unless File.exists?(dir)
+    self.make_rails_directory(parent_dir) unless File.exists?(parent_dir) || only_this_directory
+    @files << (File.exists?(dir) ? "\nexists   %s" : Dir.mkdir(dir) && "\ncreated  %s") % dir
   rescue SystemCallError
     puts "Unable to create directory in #{parent_dir}"
     exit
@@ -116,12 +136,16 @@ Use red -h for help.
   MESSAGE
   
   RED_MESSAGES[:unobtrusive] = <<-MESSAGE
-
-public/javascripts/dom_ready.js
-public/javascripts/red
-public/javascripts/red/unobtrusive.red
+%s
 
 Unobtrusive Red added to project.
 
   MESSAGE
+  
+  RED_MESSAGES[:rails] = <<-MESSAGE
+%s
+
+Red plugin added to project.
+
+  MESSAGE
 end

data/lib/red/version.rb

@@ -1,7 +1,7 @@
 module Red
   module VERSION #:nodoc:
     MAJOR = 3
-    MINOR = 3
+    MINOR = 4
     TINY  = 0
     
     STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/red.rb

@@ -20,7 +20,7 @@ require 'red/wrap_nodes'
 module Red
   @@red_library = nil
   @@red_module  = nil
-  @@red_class   = nil
+  @@red_class   = :window
   @@rescue_is_safe = false
   @@exception_index = 0
   

data/tasks/deployment.rake

@@ -1,10 +1,5 @@
 desc 'Release the website and new gem version'
-task :deploy => [:check_version, :release] do
-  puts "Remember to create SVN tag:"
-  puts "svn copy svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/trunk " +
-    "svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/tags/REL-#{VERS} "
-  puts "Suggested comment:"
-  puts "Tagging release #{CHANGES}"
+task :deploy => [:check_version, :publish_docs, :release] do
 end
 
 task :check_version do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: red
 version: !ruby/object:Gem::Version 
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors: 
 - Jesse Sielaff
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-08 00:00:00 -04:00
+date: 2008-08-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency