rhodes 0.2.5 → 0.2.6

data/History.txt

@@ -1,3 +1,6 @@
+== 0.2.6 2009-01-29
+ * changed signature of url_for, link_to, and redirect
+
 == 0.2.5 2009-01-28
  * erb labels are now humanized
 

data/Manifest.txt

@@ -55,6 +55,7 @@ spec/configs/case.rb
 spec/configs/employee.rb
 spec/generator_spec_helper.rb
 spec/model_generator_spec.rb
+spec/rho_controller_spec.rb
 spec/rho_spec.rb
 spec/rhom_object_factory_spec.rb
 spec/source_generator_spec.rb

data/generators/templates/model/controller.rb

@@ -30,20 +30,20 @@ class <%= class_name %>Controller < Rho::RhoController
   def create
     @<%= name %> = <%= class_name %>.new(@params['<%= name %>'])
     @<%= name %>.save
-    redirect :index
+    redirect :action => :index
   end
 
   # POST /<%= class_name %>/1/update
   def update
     @<%= name %> = <%= class_name %>.find(@params['id'])
     @<%= name %>.update_attributes(@params['<%= name %>'])
-    redirect :index
+    redirect :action => :index
   end
 
   # POST /<%= class_name %>/1/delete
   def delete
     @<%= name %> = <%= class_name %>.find(@params['id'])
     @<%= name %>.destroy
-    redirect :index
+    redirect :action => :index
   end
 end

data/generators/templates/model/edit.erb

@@ -2,7 +2,7 @@
 	  class="panel" 
 	  id="<%= name %>_edit_form" 
 	  method="POST" 
-	  action="<%%=url_for('update')%>">
+	  action="<%%=url_for(:action => :update)%>">
 	<fieldset>
 		<input type="hidden" name="id" value="<%%=@<%= name %>.object%>"/>
 		<% attributes.each do |attribute| %>
@@ -14,7 +14,7 @@
 	</fieldset>
 	<input type="submit" value="Update"/>
 	<p align="center">
-		<a href="<%%=url_for('delete', @<%= name %>.object)%>">
+		<a href="<%%=url_for(:action => :delete, :id => @<%= name %>.object)%>">
 			<font color="#990000">Delete</font>
 		</a>
 	</p>

data/generators/templates/model/index.erb

@@ -1,10 +1,10 @@
 <ul id="<%= name.pluralize %>" title="<%= class_name.pluralize %>">
 <%%@<%=name.pluralize%>.each do |x|%>
 <%if self.attributes?%>
-<li><%%=link_to "#{x.<%=attributes[0]%>}", "show", x.object%></li>
+<li><%%=link_to "#{x.<%=attributes[0]%>}", :action => :show, :id => x.object%></li>
 <%else%>
 <li>Some list entry...</li>
 <%end%>
 <%%end%>
-<li><font color="blue"><%%=link_to "New <%= class_name %>", "new"%></font></li>
+<li><font color="blue"><%%=link_to "New <%= class_name %>", :action => :new%></font></li>
 </ul>

data/generators/templates/model/new.erb

@@ -2,7 +2,7 @@
 	  class="panel"
 	  id="<%= name %>_new_form" 
 	  method="POST" 
-	  action="<%%=url_for('create')%>">
+	  action="<%%=url_for(:action => :create)%>">
 	<fieldset>
 		<input type="hidden" name="id" value="<%%=@<%= name %>.object%>"/>
 		<% attributes.each do |attribute| %>

data/generators/templates/model/show.erb

@@ -2,5 +2,5 @@
   <% attributes.each do |attribute| %>
     <li><%%=@<%=name%>.<%=attribute%>%></li>
   <% end %>
-  <li><%%=link_to "Edit #{@<%=name%>.<%=attributes[0]%>}", "edit", @<%=name%>.object%></li>
+  <li><%%=link_to "Edit #{@<%=name%>.<%=attributes[0]%>}", :action => :edit, :id => @<%=name%>.object%></li>
 </ul>

data/lib/builtinME.rb

@@ -154,7 +154,6 @@ class Array
     alias map! collect!
     alias size length
     alias to_ary to_a
-    alias to_s inspect
   
     def inspect
         str = "["
@@ -168,6 +167,8 @@ class Array
         }
         str << "]"
     end
+
+    alias to_s inspect
     
 end
 

data/lib/rho/rho.rb

@@ -34,7 +34,6 @@ module Rho
     # setup the sources table and model attributes for all applications
     def init_sources
       if defined? Rho::RhoConfig::sources
-        src_attribs = []
         
         # quick and dirty way to get unique array of hashes
         uniq_sources = Rho::RhoConfig::sources.values.inject([]) { |result,h| 
@@ -47,7 +46,6 @@ module Rho
           src_id = source['source_id']
           url = source['url']
           if !self.source_initialized?(src_id)
-            puts "initializing source #{src_id}..."
             Rhom::RhomDbAdapter::insert_into_table('sources',
                                                   {"source_id"=>src_id,"source_url"=>url})
           end

data/lib/rho/rhocontroller.rb

@@ -5,10 +5,6 @@ require 'rho/rhoviewhelpers'
 module Rho
   class RhoController
 
-	#def initialize
-	#	self.class.layout 'layout'
-	#end
-
     def default_action
       return Hash['GET','show','PUT','update','POST','update',
         'DELETE','delete'][@request['request-method']] unless @request['id'].nil?
@@ -28,11 +24,12 @@ module Rho
     end
     alias xhr? :xml_http_request?
 
-    def redirect(action,id=nil)
-      @response['status'] = 302
-      @response['headers']['Location'] = url_for(action,id)
-      @response['message'] = 'Moved temporarily'
+    def redirect(url_params = {},options = {})
+      @response['status'] = options['status'] || 302 
+      @response['headers']['Location'] = url_for(url_params)
+      @response['message'] = options['message'] || 'Moved temporarily'
       return ''
     end
+    
   end # RhoController
 end # Rho

data/lib/rho/rhoviewhelpers.rb

@@ -1,45 +1,121 @@
 module Rho
   class RhoController
 
-	def truncate(text, length)
-		if text
-			omission = '...'
-			l = length - omission.length
-			(text.length > length ? text[0...l] + omission : text).to_s
-		end
-	end
-
-	def click_to_call(phone,description=nil)
-		description = phone if description.nil?
-		return "" if phone.nil? or phone.length == 0
-		"<a href=\"tel:#{phone}\" target=\"_self\">#{description}</a>"
-	end
-
-	def mailto(address,description=nil)
-		description = address if description.nil?
-		return "" if address.nil? or address.length == 0
-		"<a href=\"mailto:#{address}\" target=\"_self\">#{description}</a>"
-	end
-
-    def link_to(name,action,id=nil,confirm=nil)
-      action = action.to_s
-      if (action != 'delete')
-        "<a href=\"#{url_for(action,id)}\">#{name}</a>"
+    def truncate(text,length)
+      if text
+        omission = '...'
+        l = length - omission.length
+        (text.length > length ? text[0...l] + omission : text).to_s
+      end
+    end
+
+    def click_to_call(phone,description=nil)
+      description = phone if description.nil?
+      return "" if phone.nil? or phone.length == 0
+      "<a href=\"tel:#{phone}\" target=\"_self\">#{description}</a>"
+    end
+
+    def mailto(address,description=nil)
+      description = address if description.nil?
+      return "" if address.nil? or address.length == 0
+      "<a href=\"mailto:#{address}\" target=\"_self\">#{description}</a>"
+    end
+
+    # Examples of how to use link_to method:
+    #
+    # link_to "Visit Other Site", "http://www.rhomobile.com/"
+    # ==> <a href=\"http://www.rhomobile.com/\" >Visit Other Site</a>
+    #
+    # link_to "Help", { :action => "help" }
+    # ==> <a href=\"/application/model/help\" >Help</a>
+    #
+    # link_to "Delete", { :action => "delete", :id => '{12}' }
+    # ==> <a href="/application/model/{12}/delete"  onclick="var f = document.createElement('form'); 
+    # f.style.display = 'none';this.parentNode.appendChild(f); f.method = 'POST'; 
+    # f.action = this.href;f.submit();return false;">Delete</a>
+    #
+    # link_to "Show", { :action => "show", :id => '{12}'},"style=\"height:4px;width:7px;border-width:0px;\"" 
+    # ==> <a href="/application/model/{12}/show" style="height:4px;width:7px;border-width:0px;">Show</a>
+    #
+    # link_to "Delete", { :action => "delete", :id => '{12}' }, "class=\"delete_link\""
+    # ==> <a href="/application/model/{12}/delete" class="delete_link" onclick="var f = document.createElement('form'); 
+    # f.style.display = 'none';this.parentNode.appendChild(f); f.method = 'POST'; 
+    # f.action = this.href;f.submit();return false;\">Delete</a>"
+    #
+    # link_to "Invate",:action => :invite, :query => {:name => 'John Smith', 'address' => "http://john.smith.com"}
+    # ==> <a href="/application/model/invite?name=John%20Smith&address=http%3A%2F%2Fjohn.smith.com" >Invate</a>
+    #
+    def link_to(name,url_params = {},html_options = "",confirm = nil)
+      url = url_for(url_params)
+      if (url_params[:action].to_s != 'delete')
+        "<a href=\"#{url}\" #{html_options}>#{name || url}</a>"
       else
-        "<a href=\"#{url_for(action,id)}\" onclick=\""+  #if (confirm('#{confirm}')) {
+        "<a href=\"#{url}\" #{html_options} onclick=\""+  #if (confirm('#{confirm}')) {
         "var f = document.createElement('form'); f.style.display = 'none';" +
-          "this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;f.submit();"+
-          "return false;\">#{name}</a>"
+        "this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;f.submit();"+
+        "return false;\">#{name || url}</a>"
       end
     end
 
-    def url_for(action,id=nil)
-      action = action.to_s
-      amurl = '/'+@request['application']+'/'+@request['model']
-      return action if action == '/'
-      return amurl if action == 'create' or action == 'index'
-      return amurl +'/'+ (id.nil? ? action.to_s : id.to_s + '/' + action.to_s)
+    # Examples of how to use url_for method:
+    #
+    # url_for '/some_url'
+    # ==> /some_url
+    #
+    # When generating a new URL, missing values may be filled in from the current request's parameters.
+    # For example, if application name or model are not specifyed in the call parameters, they would be filled from the request.
+    #
+    # url_for :action => :index
+    # ==> /application/model
+    #
+    # url_for :action => :create
+    # ==> /application/model
+    #
+    # url_for :action => :new
+    # ==> /application/model/new
+    #
+    # url_for :action => :show, :id => '{12}'
+    # ==> /application/model/{12}/show
+    #
+    # url_for :model => :another_model, :action => :show, :id => '{12}'
+    # ==> /application/another_model/{12}/show
+    #
+    # url_for :application => :another_app, :model => :another_model, :action => :show, :id => '{12}'
+    # ==> /another_app/another_model/{12}/show
+    # 
+    # url_for :action => :create, :query => {:name => 'John Smith', 'address' => "http://john.smith.com"}
+    # ==> /application/model?name=John%20Smith&address=http%3A%2F%2Fjohn.smith.com
+    #
+    # url_for :action => :show, :id => '{12}', :fragment => "an-anchor" 
+    # ==> /application/model/{12}/show#an-anchor
+    #
+    def url_for(params = {})
+      return params.to_s if params.is_a? String or params.is_a? Symbol
+      return '/' if not params.is_a? Hash or params.nil?
+
+      application = params[:application] || @request['application']
+      model = params[:model] || @request['model'] 
+      action = params[:action].nil? ? nil : params[:action].to_s
+      id = params[:id].nil? ? nil : params[:id].to_s
+      query = query_to_s(params[:query])
+      fragment = params[:fragment].nil? ? '' : '#' + params[:fragment]
+      
+      amurl = '/' + application.to_s + '/' + model.to_s
+
+      return amurl + query + fragment if action.nil? or action == 'create' or action == 'index'
+      return amurl +'/'+ (id.nil? ? action : id + '/' + action) + query + fragment
     end
 
+  private
+    def query_to_s(query)
+      return '' if query.nil?
+      qstring = '?'
+      query.each do |key,value|
+        qstring += '&' if qstring.length > 1
+        qstring += ERB::Util.url_encode(key.to_s) + '=' + ERB::Util.url_encode(value.to_s)
+      end
+      qstring
+    end
+    
   end # RhoController
 end # Rho

data/lib/rhodes.rb

@@ -1,6 +1,6 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '0.2.5'
+    VERSION = '0.2.6'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '0.2.2'

data/lib/rhom/rhom.rb

@@ -37,5 +37,10 @@ module Rhom
     def initialize
       @factory = RhomObjectFactory.new
     end
+    
+    def self.client_id
+      c_id = ::Rhom::RhomDbAdapter::select_from_table('client_info','client_id')[0]
+      c_id.nil? ? nil : c_id['client_id']
+    end
   end # Rhom
 end # Rhom

data/lib/rhom/rhom_object_factory.rb

@@ -26,25 +26,9 @@ module Rhom
     
     def initialize
 	    unless not defined? Rho::RhoConfig::sources
-  	    ::Rhom::RhomObjectFactory::init_source_attribs
   	    init_objects
   	  end
     end
-	
-	  class << self
-	    def init_source_attribs
-    	  # merge source attributes into config hash
-    	  # TODO: This shouldn't reference 'source[1]' directly
-    	  Rho::RhoConfig::sources.each do |source|
-    	    src_attribs = ::Rhom::RhomDbAdapter::select_from_table(::Rhom::TABLE_NAME,
-    	                                                         'attrib',
-    	                                                         {"source_id"=>source[1]['source_id'].to_s},
-    	                                                         {"distinct"=>true})
-    	    # update our source with the proper attributes
-    		  source[1].merge!({"attribs"=>src_attribs})
-    	  end
-    	end
-  	end
   
     # Initialize new object with dynamic attributes
     def init_objects
@@ -60,12 +44,12 @@ module Rhom
                   # create a temp id for the create type
                   # TODO: This is duplicative of get_new_obj
                   temp_objid = djb_hash(obj.values.to_s, 10).to_s
-                  self.send :object=, "#{temp_objid}"
-                  self.send :source_id=, obj['source_id'].to_s
-                  self.send :update_type=, 'create'
+                  self.send("object=".to_sym(), temp_objid)
+                  self.send("source_id=".to_sym(), obj['source_id'].to_s)
+                  self.send("update_type=".to_sym(), 'create')
                   obj.each do |key,value|
 					          val =  self.inst_strip_braces(value)
-                    self.send "#{key}=".to_sym, val
+                    self.send("#{key}=".to_sym(), val)
                   end
                 end
             
@@ -83,11 +67,6 @@ module Rhom
                   list = []
                   hash_list = {}
                   conditions = {}
-                  attrib_length = 0
-                  source = Rho::RhoConfig::sources[self.name.to_s]
-                  attrib_length = source['attribs'].length if source
-                  # source attributes are not initialized, try again
-                  ::Rhom::RhomObjectFactory::init_source_attribs if attrib_length == 0
 
                   # first find all query objects
                   if args.first == :all
@@ -131,7 +110,7 @@ module Rhom
                 # returns new model instance with a temp object id
                 def get_new_obj(obj, type='query')
                   tmp_obj = self.new
-                  tmp_obj.send :object=, "{#{obj['object'].to_s}}"
+                  tmp_obj.send("object=".to_sym(), "{#{obj['object'].to_s}}")
                   tmp_obj
                 end
               end #class methods

data/spec/rho_controller_spec.rb

@@ -0,0 +1,139 @@
+#
+#  rho_controller_spec.rb
+#  rhodes
+#
+#  Copyright (C) 2008 Lars Burgess. All rights reserved.
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require File.dirname(__FILE__) + "/spec_helper"
+require 'rho/rhocontroller'
+
+describe "Rho" do
+
+  it_should_behave_like "rho initializer"
+
+  describe "url_for and link_to" do
+
+    before(:each) do
+      @c = Rho::RhoController.new
+      @c.stub!(:send).and_return(nil)
+      @c.serve(nil,{'application' => 'application', 'model' => 'model'},{})
+    end
+
+    it "should generate urls for empty params" do
+      @c.url_for().should == '/application/model'
+    end
+
+    it "should generate urls for a url" do
+      @c.url_for('/some_url').should == '/some_url'
+    end
+
+    it "should generate urls for a symbol" do
+      @c.url_for(:new).should == 'new'
+    end
+
+    it "should generate urls for an action" do
+      @c.url_for(:action => :new).should == '/application/model/new'
+    end
+
+    it "should generate urls for an action and id" do
+      @c.url_for(:action => :show, :id => '{12}').should == '/application/model/{12}/show'
+    end
+
+    it "should generate urls for create or index actions" do
+      @c.url_for(:action => :index, :id => '{12}').should == '/application/model'
+      @c.url_for(:action => :create).should == '/application/model'
+    end
+
+    it "should generate urls for an model, action, and id" do
+      @c.url_for(:model => 'another_model', :action => :show, :id => '{12}').should == '/application/another_model/{12}/show'
+      @c.url_for(:model => :another_model, :action => :show, :id => '{12}').should == '/application/another_model/{12}/show'
+    end
+
+    it "should generate urls for an application, model, action, and id" do
+      @c.url_for(:application => :another_app, :model => :another_model, 
+        :action => :show, :id => '{12}').should == '/another_app/another_model/{12}/show'
+    end
+
+    it "should generate urls with a query" do
+      @c.url_for(:action => :create, :query => {:name => 'John Smith', 
+        'address' => "http://john.smith.com"}).should == '/application/model?name=John%20Smith&address=http%3A%2F%2Fjohn.smith.com'
+    end
+
+    it "should generate urls with a fragment" do
+      @c.url_for(:action => :show, :id => '{12}', :fragment => "an-anchor").should == '/application/model/{12}/show#an-anchor'
+    end
+
+    it "should generate link for a url" do
+      @c.link_to("Visit Other Site", "http://www.rhomobile.com/").should == "<a href=\"http://www.rhomobile.com/\" >Visit Other Site</a>"
+    end
+
+    it "should generate link for an action" do
+      @c.link_to("Help", :action => "help").should == "<a href=\"/application/model/help\" >Help</a>"
+    end
+
+    it "should generate link for 'delete' action" do
+      @c.link_to("Delete", :action => "delete", :id => '{12}').should == "<a href=\"/application/model/{12}/delete\"  onclick=\"var f = document.createElement('form'); f.style.display = 'none';this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;f.submit();return false;\">Delete</a>"
+    end
+
+    it "should generate link for an action and style it" do
+      @c.link_to("Show", { :action => "show", :id => '{12}'},"style=\"height:4px;width:7px;border-width:0px;\"").should == "<a href=\"/application/model/{12}/show\" style=\"height:4px;width:7px;border-width:0px;\">Show</a>"
+    end
+
+    it "should generate link for 'delete' action and style it" do
+      @c.link_to("Delete", { :action => "delete", :id => '{12}' }, "class=\"delete_link\"").should == "<a href=\"/application/model/{12}/delete\" class=\"delete_link\" onclick=\"var f = document.createElement('form'); f.style.display = 'none';this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;f.submit();return false;\">Delete</a>"
+    end
+
+    it "should generate link with a query" do
+      @c.link_to("Invate",:action => :invite, :query => {:name => 'John Smith', 'address' => "http://john.smith.com"}).should == "<a href=\"/application/model/invite?name=John%20Smith&address=http%3A%2F%2Fjohn.smith.com\" >Invate</a>"
+    end
+
+  end #describe "url_for and link_to"
+
+  describe "redirect" do
+
+    before(:each) do
+      @response = Hash.new
+      @response['headers'] = {}
+      @c = Rho::RhoController.new
+      @c.stub!(:send).and_return(nil)
+      @c.serve(nil,{'application' => 'application', 'model' => 'model'},@response)
+    end
+
+    it "should redirect to a url" do
+      @c.redirect "/start-page"
+      @response['headers']['Location'].should == "/start-page"
+      @response['status'].should == 302
+      @response['message'].should == 'Moved temporarily'
+    end
+
+    it "should redirect to an action" do
+      @c.redirect :action => :show, :id => '{12}'
+      @response['headers']['Location'].should == "/application/model/{12}/show"
+      @response['status'].should == 302
+      @response['message'].should == 'Moved temporarily'
+    end
+
+    it "should redirect to an action with 301 status code and status message" do
+      @c.redirect({:action => :show, :id => '{12}'}, {'status' => 301, 'message' => 'Moved permanently'})
+      @response['headers']['Location'].should == "/application/model/{12}/show"
+      @response['status'].should == 301
+      @response['message'].should == 'Moved permanently'
+    end
+    
+  end #describe "redirect"
+
+end

data/spec/rho_spec.rb

@@ -21,39 +21,39 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require File.dirname(__FILE__) + "/spec_helper"
 
 describe "Rho" do
-  
+
   it_should_behave_like "rho initializer"
 
   it "should populate configuration in sources table" do
     sources = Rhom::RhomDbAdapter::select_from_table('sources','*')
     sources.size.should > 1
   end
-  
+
   it "should initialize configuration only once" do
     Rhom::RhomDbAdapter::delete_all_from_table('sources')
     @rho.source_initialized?(1).should == false
     @rho.init_sources
     @rho.source_initialized?(1).should == true
   end
-  
+
   it "should have start_path" do
     Rho::RhoConfig.start_path.should == '/'
   end
-  
+
   it "should set start_path" do
     Rho::RhoConfig.start_path = '/foo/bar'
     Rho::RhoConfig.start_path.should == '/foo/bar'
   end
-  
+
   it "should retrieve start_path" do
     Rho::RhoConfig.start_path = '/'
     @rho.get_start_path.should == '/'
   end
-  
+
   it "should return from get_app" do
     pending "fix relative paths for testing of get_app"
   end
-  
+
   it "should serve request" do
     pending "need to mock request"
   end

data/spec/rhom_object_factory_spec.rb

@@ -32,9 +32,9 @@ describe "RhomObjectFactory" do
   end
   
   it "should set source_id attributes" do
-    "1".should == Account.get_source_id
-    "2".should == Case.get_source_id
-    "3".should == Employee.get_source_id
+    Account.get_source_id.should == "1"
+    Case.get_source_id.should == "2"
+    Employee.get_source_id.should == "3"
   end
 
   it "should dynamically assign values" do

data/spec/stubs.rb

@@ -20,4 +20,4 @@ class << Rho::RhoFSConnector
   def __rhoGetCurrentDir
     "../../../apps/"
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Rhomobile Dev
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-28 00:00:00 -08:00
+date: 2009-01-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -172,6 +172,7 @@ files:
 - spec/configs/employee.rb
 - spec/generator_spec_helper.rb
 - spec/model_generator_spec.rb
+- spec/rho_controller_spec.rb
 - spec/rho_spec.rb
 - spec/rhom_object_factory_spec.rb
 - spec/source_generator_spec.rb