rhodes 0.2.0 → 0.2.1

data/Manifest.txt

@@ -6,7 +6,8 @@ Rakefile
 bin/rhogen
 generators/rhogen.rb
 generators/templates/application/application.rb
-generators/templates/application/index.html
+generators/templates/application/index.erb
+generators/templates/application/layout.erb
 generators/templates/model/config.rb
 generators/templates/model/controller.rb
 generators/templates/model/edit.erb
@@ -21,6 +22,7 @@ lib/date/format.rb
 lib/erb.rb
 lib/find.rb
 lib/rational.rb
+lib/rationalME.rb
 lib/rho.rb
 lib/rho/render.rb
 lib/rho/rho.rb
@@ -29,6 +31,7 @@ lib/rho/rhocontact.rb
 lib/rho/rhocontroller.rb
 lib/rho/rhofsconnector.rb
 lib/rho/rhosupport.rb
+lib/rho/rhoviewhelpers.rb
 lib/rho/settings_controller.rb
 lib/rhodes.rb
 lib/rhoframework.rb

data/generators/rhogen.rb

@@ -2,119 +2,124 @@ require 'rubygems'
 require 'templater'
 
 module Rhogen
-  
+
   extend Templater::Manifold
-  
+
   desc <<-DESC
     Generate rhodes application
   DESC
-  
+
   class BaseGenerator < Templater::Generator
       def class_name
         name.gsub('-', '_').camel_case
       end
-      
+
       alias_method :module_name, :class_name
     end
-  
+
   class AppGenerator < BaseGenerator
-    
+
     def self.source_root
       File.join(File.dirname(__FILE__), 'templates', 'application')
     end
-    
+
     desc <<-DESC
       Generates a new rhodes application.  This will create a new directory with two files:
       application.rb and index.html
     DESC
-    
+
     #option :testing_framework, :desc => 'Specify which testing framework to use (spec, test_unit)'
-    
+
     first_argument :name, :required => true, :desc => "application name"
-    
+
     template :application do |template|
       template.source = 'application.rb'
       template.destination = "#{name}/application.rb"
     end
-    
+
     template :index do |template|
-      template.source = 'index.html'
-      template.destination = "#{name}/index.html"
+      template.source = 'index.erb'
+      template.destination = "#{name}/index.erb"
+    end
+
+    template :layout do |template|
+      template.source = 'layout.erb'
+      template.destination = "#{name}/layout.erb"
     end
-    
+
   end
-  
+
   class ModelGenerator < BaseGenerator
-    
+
     def self.source_root
       File.join(File.dirname(__FILE__), 'templates', 'model')
     end
-    
+
     desc <<-DESC
-      Generates a new model for a given source.  You must specify name, source_url, and source_id.  
+      Generates a new model for a given source.  You must specify name, source_url, and source_id.
       You can also specify an optional attribute list in the form: 'attribute1', 'attribute2', 'attribute3'...
     DESC
-    
+
     #option :testing_framework, :desc => 'Specify which testing framework to use (spec, test_unit)'
-    
+
     first_argument :name, :required => true, :desc => "model name"
     second_argument :source_url, :required => true, :desc => "source url"
     third_argument :source_id, :required => true, :desc => "source id"
     fourth_argument :attributes, :as => :array, :default => [], :required => false, :desc => "array of attributes (only string suppported right now)"
-    
+
     template :config do |template|
       template.source = 'config.rb'
       template.destination = "#{name.camel_case}/config.rb"
     end
-    
+
     template :index do |template|
       template.source = 'index.erb'
       template.destination = "#{name.camel_case}/index.erb"
     end
-    
+
     template :edit do |template|
       template.source = 'edit.erb'
       template.destination = "#{name.camel_case}/edit.erb"
     end
-    
+
     template :new do |template|
       template.source = 'new.erb'
       template.destination = "#{name.camel_case}/new.erb"
     end
-    
+
     template :controller do |template|
       template.source = 'controller.rb'
       template.destination = "#{name.camel_case}/controller.rb"
     end
-    
+
     def attributes?
       self.attributes && !self.attributes.empty?
     end
-    
+
   end
-  
+
   class SourceGenerator < BaseGenerator
     def self.source_root
       File.join(File.dirname(__FILE__), 'templates', 'source')
     end
-    
+
     desc <<-DESC
-      Generates a new source adapter with the given name and attributes.  You must specify name.  
+      Generates a new source adapter with the given name and attributes.  You must specify name.
       You can also specify an optional attribute list in the form: 'attribute1', 'attribute2', 'attribute3'...
     DESC
-  
+
     first_argument :name, :required => true, :desc => "model name"
     second_argument :attributes, :as => :array, :default => [], :required => false, :desc => "array of attributes (only string suppported right now)"
-    
+
     template :config do |template|
       template.source = 'source_adapter.rb'
       template.destination = "lib/#{name.snake_case}.rb"
     end
-    
+
   end
-  
+
   add :app, AppGenerator
   add :model, ModelGenerator
   add :source, SourceGenerator
-  
+
 end

data/generators/templates/application/index.erb

@@ -0,0 +1,11 @@
+<div class="toolbar">
+	<h1 id="pageTitle">
+		<script language="JavaScript">
+			document.write(document.title)
+		</script>
+	</h1>
+	<a id="backButton" class="button" href="./"></a>
+</div>
+<ul id="home" selected="true" title="<%= class_name %>">
+	<li>Something interesting here...</li>
+</ul>

data/generators/templates/application/layout.erb

@@ -0,0 +1,17 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title><%= class_name %></title>
+		<% if System::get_property('platform') == 'APPLE' %>
+			<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
+			<style type="text/css" media="screen">@import "/shared/js/iui/iui.css"; @import "/shared/css/rho.css";</style>
+			<script type="application/x-javascript" src="/shared/js/iui/iui.js"></script>
+			<script src="/shared/js/jquery-1.2.6.min.js"></script>
+			<script src="/shared/js/rho.js"></script>
+		<% end %>	
+	</head>
+	<body>
+		<%= @content %>
+	</body>
+</html>

data/generators/templates/model/controller.rb

@@ -1,11 +1,11 @@
 require 'rho/rhocontroller'
 
 class <%= class_name %>Controller < Rho::RhoController
-  
+
   #GET /<%= class_name %>
   def index
     @<%= name.pluralize %> = <%= class_name %>.find(:all)
-    render :index
+    render
   end
 
   # GET /<%= class_name %>/1
@@ -16,13 +16,13 @@ class <%= class_name %>Controller < Rho::RhoController
   # GET /<%= class_name %>/new
   def new
     @<%= name %> = <%= class_name %>.new
-    render :new
+    render :action => :new
   end
 
   # GET /<%= class_name %>/1/edit
   def edit
     @<%= name %> = <%= class_name %>.find(@params['id'])
-    render :edit
+    render :action => :edit
   end
 
   # POST /<%= class_name %>/create

data/lib/builtinME.rb

@@ -99,10 +99,38 @@ module Enumerable
     
     alias map :collect
     
+    def max(&proc)
+        proc = lambda { |a, b| a <=> b } unless block_given?
+        max = nil
+        each {|obj| max = obj if max.nil? || proc.call(max, obj) < 0}
+        max
+    end
+
+    def min(&proc)
+        proc = lambda { |a, b| a <=> b } unless block_given?
+        min = nil
+        each {|obj| min = obj if min.nil? || proc.call(min, obj) > 0}
+        min
+    end
+    
 end
 
 class Array
-    alias size length
+    alias reject! delete_if
+  
+    def reject
+      a = []
+      each {|x|
+        if !yield x
+          a << x
+        end
+      }
+      a
+    end
+	
+    def to_a
+        self
+    end
 	
     def join(sepString="")
         return to_s if sepString.nil? || sepString == ""
@@ -116,6 +144,9 @@ class Array
     end
 
     alias map! collect!
+    alias size length
+    alias to_ary to_a
+    alias to_s inspect
   
     def inspect
         str = "["
@@ -129,7 +160,6 @@ class Array
         }
         str << "]"
     end
-    alias to_s inspect
     
 end
 
@@ -501,6 +531,37 @@ class String
     def inspect
         '"' + to_s + '"'
     end
+
+	#from rubinius
+    # justify left = -1, center = 0, right = 1
+    def justify_string(width, str, justify)
+        return self if width <= length
+        pad = width - length
+        out = str.to_str * (pad / str.length)
+        out << str[0, pad - out.length] if out.length < pad
+        # Left justification
+        return self << out if justify == -1
+        # Right justification
+        return out << self if justify == 1
+        # and finially center
+        split = (width / 2) - (length / 2)
+        return out.insert(split-((width-length)%2), self)
+    end
+	
+	#from rubinius
+    def rjust(width, str=" ")
+        justify_string(width, str, 1)
+    end
+	
+	#from rubinius
+    def ljust(width, str=" ")
+        justify_string(width, str, -1)
+    end
+
+	#from rubinius
+    def center(width, str=" ")
+        justify_string(width, str, 0)
+    end
 	
     alias to_str to_s	
     alias size length	

data/lib/date/format.rb

@@ -5,8 +5,12 @@ require 'rational'
 
 class Date
 
+  #SECONDS_IN_DAY = 60*60*24
+  #SECONDS_IN_DAY         = Rational(1, 86400)
+
   module Format # :nodoc:
 
+
     MONTHS = {
       'january'  => 1, 'february' => 2, 'march'    => 3, 'april'    => 4,
       'may'      => 5, 'june'     => 6, 'july'     => 7, 'august'   => 8,
@@ -245,7 +249,7 @@ class Date
       when 'e', 'Oe'; emit_a(mday, 2, f)
       when 'F'
 	if m == '%F'
-	  format('%.4d-%02d-%02d', year, mon, mday) # 4p
+	  format('%.4d-%02d-%02d', year(), mon(), mday()) # 4p
 	else
 	  emit_a(strftime('%Y-%m-%d'), 0, f)
 	end
@@ -277,11 +281,11 @@ class Date
       when 'r'; emit_a(strftime('%I:%M:%S %p'), 0, f)
       when 'S', 'OS'; emit_n(sec, 2, f)
       when 's'
-	s = ((ajd - UNIX_EPOCH_IN_AJD) / SECONDS_IN_DAY).round
+	s = ((ajd - UNIX_EPOCH_IN_AJD) / Rational(1, 86400)).round
 	emit_sn(s, 1, f)
       when 'T'
 	if m == '%T'
-	  format('%02d:%02d:%02d', hour, min, sec) # 4p
+	  format('%02d:%02d:%02d', hour(), min(), sec()) # 4p
 	else
 	  emit_a(strftime('%H:%M:%S'), 0, f)
 	end
@@ -301,7 +305,7 @@ class Date
 	t = $1.size
 	sign = if offset < 0 then -1 else +1 end
 	fr = offset.abs
-	ss = fr.div(SECONDS_IN_DAY) # 4p
+	ss = fr.div(Rational(1, 86400)) # 4p
 	hh, ss = ss.divmod(3600)
 	mm, ss = ss.divmod(60)
 	if t == 3

data/lib/date.rb

@@ -193,6 +193,10 @@
 #
 #     puts secs_to_new_year()
 
+if defined? RHO_ME
+	require 'rationalME'
+end
+
 require 'rational'
 require 'date/format'
 
@@ -387,8 +391,8 @@ class Date
       end
       a = (y / 100.0).floor
       b = 2 - a + (a / 4.0).floor
-      jd = (365.25 * (y + 4716)).floor +
-	(30.6001 * (m + 1)).floor +
+      jd = (365.25 * (y + 4716)).floor() +
+	(30.6001 * (m + 1)).floor() +
 	d + b - 1524
       if jd < sg
 	jd -= b
@@ -499,7 +503,7 @@ class Date
     # Returns the Astronomical Julian Day Number as a single
     # numeric value.
     def jd_to_ajd(jd, fr, of=0) jd + fr - of - 1.to_r/2 end # :nodoc:
-
+    
     # Convert a fractional day +fr+ to [hours, minutes, seconds,
     # fraction_of_a_second]
     def day_fraction_to_time(fr) # :nodoc:
@@ -1137,7 +1141,7 @@ class Date
   #trv once :jd, :day_fraction, :mjd, :ld
 
   # Get the date as a Civil Date, [year, month, day_of_month]
-  def civil() jd_to_civil(jd, @sg) end # :nodoc:
+  def civil() jd_to_civil(jd(), @sg) end # :nodoc:
 
   # Get the date as an Ordinal Date, [year, day_of_year]
   def ordinal() jd_to_ordinal(jd, @sg) end # :nodoc:
@@ -1393,7 +1397,7 @@ class Date
   def next_year(n=1) self >> n * 12 end
   def prev_year(n=1) self << n * 12 end
 
-  require 'enumerator'
+  #require 'enumerator'
 
   # Step the current date forward +step+ days at a
   # time (or backward, if +step+ is negative) until
@@ -1517,8 +1521,9 @@ class DateTime < Date
   #
   # All day/time values default to 0.
   def self.jd(jd=0, h=0, min=0, s=0, of=0, sg=ITALY)
+    fr = _valid_time?(h, min, s)
     unless (jd = _valid_jd?(jd, sg)) &&
-	   (fr = _valid_time?(h, min, s))
+	   (fr)
       raise ArgumentError, 'invalid date'
     end
     if String === of
@@ -1542,8 +1547,9 @@ class DateTime < Date
   # +y+ defaults to -4712, and +d+ to 1; this is Julian Day Number
   # day 0.  The time values default to 0.
   def self.ordinal(y=-4712, d=1, h=0, min=0, s=0, of=0, sg=ITALY)
+    fr = _valid_time?(h, min, s)
     unless (jd = _valid_ordinal?(y, d, sg)) &&
-	   (fr = _valid_time?(h, min, s))
+	   (fr)
       raise ArgumentError, 'invalid date'
     end
     if String === of
@@ -1567,8 +1573,9 @@ class DateTime < Date
   # +y+ defaults to -4712, +m+ to 1, and +d+ to 1; this is Julian Day
   # Number day 0.  The time values default to 0.
   def self.civil(y=-4712, m=1, d=1, h=0, min=0, s=0, of=0, sg=ITALY)
+    fr = _valid_time?(h, min, s)
     unless (jd = _valid_civil?(y, m, d, sg)) &&
-	   (fr = _valid_time?(h, min, s))
+	   (fr)
       raise ArgumentError, 'invalid date'
     end
     if String === of
@@ -1595,8 +1602,9 @@ class DateTime < Date
   # Julian Day Number day 0.
   # The time values default to 0.
   def self.commercial(y=-4712, w=1, d=1, h=0, min=0, s=0, of=0, sg=ITALY)
+    fr = _valid_time?(h, min, s)
     unless (jd = _valid_commercial?(y, w, d, sg)) &&
-	   (fr = _valid_time?(h, min, s))
+	   (fr)
       raise ArgumentError, 'invalid date'
     end
     if String === of
@@ -1606,8 +1614,9 @@ class DateTime < Date
   end
 
   def self.weeknum(y=-4712, w=0, d=1, f=0, h=0, min=0, s=0, of=0, sg=ITALY) # :nodoc:
+    fr = _valid_time?(h, min, s)
     unless (jd = _valid_weeknum?(y, w, d, f, sg)) &&
-	   (fr = _valid_time?(h, min, s))
+	   (fr)
       raise ArgumentError, 'invalid date'
     end
     if String === of
@@ -1619,8 +1628,9 @@ class DateTime < Date
   private_class_method :weeknum
 
   def self.nth_kday(y=-4712, m=1, n=1, k=1, h=0, min=0, s=0, of=0, sg=ITALY) # :nodoc:
+    fr = _valid_time?(h, min, s)
     unless (jd = _valid_nth_kday?(y, m, n, k, sg)) &&
-	   (fr = _valid_time?(h, min, s))
+	   (fr)
       raise ArgumentError, 'invalid date'
     end
     if String === of
@@ -1634,8 +1644,9 @@ class DateTime < Date
   def self.new_by_frags(elem, sg) # :nodoc:
     elem = rewrite_frags(elem)
     elem = complete_frags(elem)
+    fr = valid_time_frags?(elem)
     unless (jd = valid_date_frags?(elem, sg)) &&
-	   (fr = valid_time_frags?(elem))
+	   (fr)
       raise ArgumentError, 'invalid date'
     end
     sf = (elem[:sec_fraction] || 0)
@@ -1732,8 +1743,8 @@ class Time
   end
 
   def to_datetime
-    jd = DateTime.__send__(:civil_to_jd, year, mon, mday, DateTime::ITALY)
-    fr = DateTime.__send__(:time_to_day_fraction, hour, min, [sec, 59].min) +
+    jd = DateTime.__send__(:civil_to_jd, year(), mon(), mday(), DateTime::ITALY)
+    fr = DateTime.__send__(:time_to_day_fraction, hour(), min(), [sec, 59].min) +
       nsec.to_r/86400_000_000_000
     of = utc_offset.to_r/86400
     DateTime.new!(DateTime.__send__(:jd_to_ajd, jd, fr, of),