rhodes 0.2.3 → 0.2.4

data/History.txt

@@ -1,3 +1,7 @@
+== 0.2.4 2009-01-27
+ * added show.erb to model generator [#164]
+ * base source_adapter should include user_id on sync
+
 == 0.2.3 2009-01-26
  * added newgem dependency
 

data/Manifest.txt

@@ -13,12 +13,14 @@ generators/templates/model/controller.rb
 generators/templates/model/edit.erb
 generators/templates/model/index.erb
 generators/templates/model/new.erb
+generators/templates/model/show.erb
 generators/templates/source/source_adapter.rb
 lib/ServeME.rb
 lib/TestServe.rb
 lib/builtinME.rb
 lib/date.rb
 lib/date/format.rb
+lib/dateME.rb
 lib/erb.rb
 lib/find.rb
 lib/rational.rb

data/generators/rhogen.rb

@@ -10,13 +10,13 @@ module Rhogen
   DESC
 
   class BaseGenerator < Templater::Generator
-      def class_name
-        name.gsub('-', '_').camel_case
-      end
-
-      alias_method :module_name, :class_name
+    def class_name
+      name.gsub('-', '_').camel_case
     end
 
+    alias_method :module_name, :class_name
+  end
+
   class AppGenerator < BaseGenerator
 
     def self.source_root
@@ -34,17 +34,17 @@ module Rhogen
 
     template :application do |template|
       template.source = 'application.rb'
-      template.destination = "#{name}/application.rb"
+      template.destination = "#{name.camel_case}/application.rb"
     end
 
     template :index do |template|
       template.source = 'index.erb'
-      template.destination = "#{name}/index.erb"
+      template.destination = "#{name.camel_case}/index.erb"
     end
 
     template :layout do |template|
       template.source = 'layout.erb'
-      template.destination = "#{name}/layout.erb"
+      template.destination = "#{name.camel_case}/layout.erb"
     end
 
   end
@@ -86,6 +86,11 @@ module Rhogen
       template.source = 'new.erb'
       template.destination = "#{name.camel_case}/new.erb"
     end
+    
+    template :new do |template|
+      template.source = 'show.erb'
+      template.destination = "#{name.camel_case}/show.erb"
+    end
 
     template :controller do |template|
       template.source = 'controller.rb'

data/generators/templates/model/controller.rb

@@ -10,7 +10,8 @@ class <%= class_name %>Controller < Rho::RhoController
 
   # GET /<%= class_name %>/1
   def show
-    @<%= name.pluralize %> = <%= class_name %>.find(@params['object'])
+    @<%= name %> = <%= class_name %>.find(@params['id'])
+    render :action => :show
   end
 
   # GET /<%= class_name %>/new

data/generators/templates/model/index.erb

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

data/generators/templates/model/show.erb

@@ -0,0 +1,6 @@
+<ul id="<%= name %>" title="Show <%= class_name %>">
+  <% attributes.each do |attribute| %>
+    <li><%%=@<%=name%>.<%=attribute%>%></li>
+  <% end %>
+  <li><%%=link_to "Edit #{@<%=name%>.<%=attributes[0]%>}", "edit", @<%=name%>.object%></li>
+</ul>

data/generators/templates/source/source_adapter.rb

@@ -24,6 +24,7 @@ class <%=name%> < SourceAdapter
         o.object=x['id']
         o.attrib=y.name
         o.value=y.value
+        o.user_id=user_id if user_id
         o.save
       end
     end

data/lib/builtinME.rb

@@ -59,9 +59,9 @@ module Kernel
 end
 
 class Object
-    def to_a
-        [self]
-    end
+#    def to_a
+#        [self]
+#    end
 	
     alias type :class 
     
@@ -76,6 +76,14 @@ module Enumerable
         each {|x| yield x, i; i = i + 1}
     end
 	
+    def to_a
+        arr = []
+        each{|obj| arr <<obj}
+        return arr
+    end
+    
+    alias entries :to_a
+	
     def inject(*args)
         if args.size == 0 then
             vals = to_a
@@ -128,9 +136,9 @@ class Array
       a
     end
 	
-    def to_a
-        self
-    end
+#    def to_a
+#        self
+#    end
 	
     def join(sepString="")
         return to_s if sepString.nil? || sepString == ""
@@ -215,6 +223,17 @@ class Hash
     
     alias each_pair each
     
+    def to_a
+        res = []
+        each_pair do |k, v|
+          item = []
+          item << k
+          item << v
+          res << item
+        end
+        res
+    end
+
     def inspect
         r = '{'
         is_first = true

data/lib/dateME.rb

@@ -0,0 +1,24 @@
+require 'date/format'
+
+class Time
+
+  def strftime(fmt='%F')
+    DateTimeME.new(self).strftime(fmt);
+  end
+end
+
+class DateTimeME < Date
+
+  def wday() @m_time.wday end
+  def mon() @m_time.mon end
+  def year() @m_time.year end
+  def mday() @m_time.mday end
+  def hour() @m_time.hour end
+  def min() @m_time.min end
+  def sec() @m_time.sec end
+  
+  def initialize( time )
+    @m_time = time
+  end
+  
+end

data/lib/rho/rhocontact.rb

@@ -20,7 +20,7 @@ module Rho
 			def create!(properties)
 				pb = Phonebook::openPhonebook
 				unless pb.nil?
-					record = Phonebook::createRecord
+					record = Phonebook::createRecord(pb)
 					if record.nil?
 						puts "Can't find record " + properties['id']
 					else

data/lib/rhodes.rb

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

data/lib/rhom/rhom_db_adapter.rb

@@ -52,7 +52,7 @@ module Rhom
       def execute_sql(sql=nil)
         result = []
         if sql
-          puts 'query is ' + sql
+          #puts 'query is ' + sql
           # Make sure we lock the sync engine's mutex
           # before we perform a database transaction.
           # This prevents concurrency issues.
@@ -71,7 +71,7 @@ module Rhom
             SyncEngine::unlock_sync_mutex
           end
         end
-        puts "returned #{result.length.to_s} records..."
+        #puts "returned #{result.length.to_s} records..."
         result
       end
     

data/lib/rhom/rhom_object.rb

@@ -36,6 +36,10 @@ module Rhom
         end
       end
     end
+    
+    def remove_var(name)
+      remove_instance_variable("@#{name}")
+    end
   
     def strip_braces(str=nil)
       str ? str.gsub(/\{/,"").gsub(/\}/,"") : nil
@@ -49,5 +53,9 @@ module Rhom
       end
       return hash
     end
+    
+    def method_name_reserved?(method)
+      method =~ /object|source_id|update_type|type/
+    end
   end # RhomObject
 end # Rhom

data/lib/rhom/rhom_object_factory.rb

@@ -76,22 +76,47 @@ module Rhom
                 def get_source_id
                   Rho::RhoConfig::sources[self.name.to_s]['source_id'].to_s
                 end
+                
                 # retrieve a single record if object id provided, otherwise return
                 # full list corresponding to factory's source id
                 def find(*args)
                   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
-                    result = ::Rhom::RhomDbAdapter::select_from_table(::Rhom::TABLE_NAME,
-                                                              '*',
-                                                              {"source_id"=>get_source_id,"update_type"=>'query'},
-                                                              {"order by"=>'object'})
+                    conditions = {"source_id"=>get_source_id}
                   else
-                    obj = strip_braces(args.first.to_s)
-                    result = ::Rhom::RhomDbAdapter::select_from_table(::Rhom::TABLE_NAME,
-                                                              '*',
-                                                              {"object"=>obj,"update_type"=>'query'})
+                    conditions = {"object"=>strip_braces(args.first.to_s)}
+                  end
+                  
+                  # process query, create, and update lists in order
+                  ["query", "create", "update"].each do |update_type|
+                    conditions.merge!({"update_type"=>update_type})
+                    objs = ::Rhom::RhomDbAdapter::select_from_table(::Rhom::TABLE_NAME, '*', conditions,
+                                                                    {"order by"=>'object'})
+                    objs.collect! do |obj|
+                      object = obj['object']
+                      attrib = obj['attrib']
+                      value = obj['value']
+                      hash_list[object] = get_new_obj(obj) if not hash_list[object]
+                      if not method_name_reserved?(attrib) and hash_list[object].send attrib.to_sym
+                        hash_list[object].remove_var(attrib)
+                      end
+                      hash_list[object].send attrib.to_sym, value if not method_name_reserved?(attrib)
+                      nil # remove the element from the array
+                    end
                   end
-                  list = get_list(result)
+
+                  # convert hash to array
+                  list = hash_list.values
+                  hash_list = nil
                   if list.length == 1 and args.first != :all
                     return list[0]
                   end
@@ -101,54 +126,12 @@ module Rhom
                 def find_by(*args)
                   # TODO: implement
                 end
-
-                # returns an array of objects based on an existing array
-                def get_list(objs)
-                  new_list = []
-                  attrib_length = 0
-                  source = Rho::RhoConfig::sources[self.name.to_s]
-                  if source
-                    attrib_length = source['attribs'].length
-                  end
-                  if attrib_length == 0
-                    # source attributes are not initialized, try again
-                    ::Rhom::RhomObjectFactory::init_source_attribs
-                  end
-                  if objs and source and attrib_length > 0
-                    list_length = 0
-                    list_length = (objs.length / attrib_length) unless attrib_length == 0
-                    new_obj = nil
-                    # iterate over the array and determine object
-                    # structure based on attribute/value pairs
-                    list_length.times do |i|
-                      new_obj = get_new_obj(objs[i*attrib_length])
-                      attrib_length.times do |j|
-                        # setup index and assign accessors
-                        idx = i*attrib_length+j
-                        begin
-                          # only update attributes if they belong
-                          # to the current object
-                          if objs[idx]['object'] == strip_braces((new_obj.send 'object'.to_sym))
-                            attrib = objs[idx]['attrib'].to_s
-                            value = objs[idx]['value'].to_s
-                            new_obj.send attrib.to_sym, value
-                          end
-                        rescue
-                          puts "failed to reference objs[#{idx}]..."
-                        end
-                      end
-                      new_list << new_obj
-                    end
-                  end
-                  new_list
-                end
   
+                private
                 # returns new model instance with a temp object id
                 def get_new_obj(obj, type='query')
                   tmp_obj = self.new
                   tmp_obj.send 'object'.to_sym, "{#{obj['object'].to_s}}"
-                  tmp_obj.send 'source_id'.to_sym, get_source_id
-                  tmp_obj.send 'update_type'.to_sym, type
                   tmp_obj
                 end
               end #class methods
@@ -190,15 +173,6 @@ module Rhom
                                                                "update_type"=>'create'})
                   end
                 end
-                # Create a temporary query record to display in the list
-                Rho::RhoConfig::sources[self.class.name.to_s]['attribs'].each do |attrib|
-                  result = ::Rhom::RhomDbAdapter::insert_into_table(::Rhom::TABLE_NAME,
-                                                            {"source_id"=>self.get_inst_source_id,
-                                                             "object"=>obj,
-                                                             "attrib"=>attrib['attrib'],
-                                                             "value"=>self.send(attrib['attrib'].to_sym),
-                                                             "update_type"=>'query'})
-                end
                 result
               end
           
@@ -236,10 +210,6 @@ module Rhom
               def inst_strip_braces(str=nil)
                 str ? str.gsub(/\{/,"").gsub(/\}/,"") : nil
               end
-            
-              def method_name_reserved?(method)
-                method =~ /object|source_id|update_type/
-              end
             end)
         end
       end

data/lib/rhom/rhom_source.rb

@@ -3,6 +3,7 @@ require 'rhom/rhom_object'
 
 module Rhom
   class RhomSource
+    include RhomObject
     attr_accessor :source_url
     attr_reader   :source_id, :name, :last_updated, :last_inserted_size, 
                   :last_deleted_size, :last_sync_duration,

data/spec/configs/account.rb

@@ -1,3 +1,3 @@
 require 'rho'
 
-Rho::RhoConfig::add_source("Account", {"url"=>"http://rhosync.rhohub.com/sources/1", "source_id"=>1})
+Rho::RhoConfig::add_source("Account", {"url"=>"http://rhosyncdev.rhohub.com/sources/1", "source_id"=>1})

data/spec/configs/case.rb

@@ -1,3 +1,3 @@
 require 'rho'
 
-Rho::RhoConfig::add_source("Case", {"url"=>"http://rhosync.rhohub.com/sources/2", "source_id"=>2})
+Rho::RhoConfig::add_source("Case", {"url"=>"http://rhosyncdev.rhohub.com/sources/2", "source_id"=>2})

data/spec/configs/employee.rb

@@ -1,3 +1,3 @@
 require 'rho'
 
-Rho::RhoConfig::add_source("Employee", {"url"=>"http://rhosync.rhohub.com/sources/3", "source_id"=>3})
+Rho::RhoConfig::add_source("Employee", {"url"=>"http://rhosyncdev.rhohub.com/sources/3", "source_id"=>3})

data/spec/model_generator_spec.rb

@@ -24,7 +24,7 @@ describe Rhogen::ModelGenerator do
   end
 
   it "should create config.rb, controller.rb, index.erb, edit.erb, and new.erb files" do
-    ['config.rb', 'controller.rb', 'index.erb', 'edit.erb', 'new.erb'].each do |template|
+    ['config.rb', 'controller.rb', 'index.erb', 'edit.erb', 'new.erb', 'show.erb'].each do |template|
       @generator.should create("/tmp/#{model_name.camel_case}/#{template}")
     end
   end

data/spec/rhom_object_factory_spec.rb

@@ -34,6 +34,7 @@ describe "RhomObjectFactory" do
   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
   end
   
   it "should dynamically assign values" do
@@ -50,30 +51,26 @@ describe "RhomObjectFactory" do
   
   it "should retrieve Case models" do
     results = Case.find(:all)
-    #array_print(results)
-    results.length.should == 5
-    "60".should == results[0].case_number
-    "hire another engineer".should == results[4].name
+    results.length.should == 7
+    results[0].case_number.should == "57"
+    results[4].name.should == "implement SugarCRM sample app"
   end
   
   it "should retrieve Account models" do
     results = Account.find(:all)
     results.length.should == 5
-    #array_print(results)
-    
-    "Mobio India".should == results[0].name
-    "Technology".should == results[0].industry
-    "Aeroprise".should == results[1].name
-    "Technology".should == results[1].industry
-    "Electronics".should == results[4].industry
-    "Mirapath".should == results[4].name
+    results[0].name.should == "vSpring"
+    results[0].industry.should == "Finance"
+    results[1].name.should == "Rhomobile"
+    results[1].industry.should == "Technology"
+    results[4].industry.should == "Technology"
+    results[4].name.should == "Mobio India"
   end
   
   it "should have correct number of attributes" do
     @account = Account.find(:all).first
-    
-    # expecting name, industry, update_type, object, source_id
-    @account.instance_variables.size.should == 5
+
+    @account.instance_variables.size.should == 36
   end
   
   it "should calculate same djb_hash" do
@@ -99,38 +96,28 @@ describe "RhomObjectFactory" do
     destroy_id = @account.object
     @account.destroy
     @account_nil = Account.find(destroy_id)
-    
     @account_nil.size.should == 0
     new_count = Account.find(:all).size
-    
     (count - 1).should == new_count
   end
   
   it "should partially update a record" do
-    pending "due to bug #128 this fails"
-=begin
     new_attributes = {"name"=>"Mobio US"}
-    @account = Account.find(:all).first
+    @account = Account.find("44e804f2-4933-4e20-271c-48fcecd9450d")
     @account.update_attributes(new_attributes)
-    
-    @new_acct = Account.find(:all).first
-    
-    "Mobio US".should == @new_acct.name
-    "Technology".should == @new_acct.industry
-=end
+    @new_acct = Account.find("44e804f2-4933-4e20-271c-48fcecd9450d")
+    @new_acct.name.should == "Mobio US"
+    @new_acct.industry.should == "Technology"
   end
   
   it "should fully update a record" do
-    pending "due to bug #128 this fails"
-=begin
     new_attributes = {"name"=>"Mobio US", "industry"=>"Electronics"}
     @account = Account.find(:all).first
     @account.update_attributes(new_attributes)
     
     @new_acct = Account.find(:all).first
     
-    "Mobio US".should == @new_acct.name
-    "Electronics".should == @new_acct.industry
-=end
+    @new_acct.name.should == "Mobio US"
+    @new_acct.industry.should == "Electronics"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Rhomobile Dev
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-26 00:00:00 -08:00
+date: 2009-01-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,12 +120,14 @@ files:
 - generators/templates/model/edit.erb
 - generators/templates/model/index.erb
 - generators/templates/model/new.erb
+- generators/templates/model/show.erb
 - generators/templates/source/source_adapter.rb
 - lib/ServeME.rb
 - lib/TestServe.rb
 - lib/builtinME.rb
 - lib/date.rb
 - lib/date/format.rb
+- lib/dateME.rb
 - lib/erb.rb
 - lib/find.rb
 - lib/rational.rb