rhodes 0.2.4 → 0.2.5

data/History.txt

@@ -1,3 +1,6 @@
+== 0.2.5 2009-01-28
+ * erb labels are now humanized
+
 == 0.2.4 2009-01-27
  * added show.erb to model generator [#164]
  * base source_adapter should include user_id on sync

data/Manifest.txt

@@ -17,6 +17,7 @@ generators/templates/model/show.erb
 generators/templates/source/source_adapter.rb
 lib/ServeME.rb
 lib/TestServe.rb
+lib/bsearch.rb
 lib/builtinME.rb
 lib/date.rb
 lib/date/format.rb

data/Rakefile

@@ -18,7 +18,8 @@ $hoe = Hoe.new('rhodes', Rhodes::VERSION) do |p|
     ['templater'],
     ['diff-lcs'],
     ['extlib'],
-    ['newgem']
+    ['newgem'],
+    ['activesupport']
   ]
   
   p.clean_globs |= %w[**/.DS_Store tmp *.log]

data/generators/rhogen.rb

@@ -1,8 +1,8 @@
 require 'rubygems'
 require 'templater'
+require 'activesupport'
 
 module Rhogen
-
   extend Templater::Manifold
 
   desc <<-DESC
@@ -50,6 +50,7 @@ module Rhogen
   end
 
   class ModelGenerator < BaseGenerator
+    include ActiveSupport::Inflector
 
     def self.source_root
       File.join(File.dirname(__FILE__), 'templates', 'model')

data/generators/templates/model/edit.erb

@@ -7,7 +7,7 @@
 		<input type="hidden" name="id" value="<%%=@<%= name %>.object%>"/>
 		<% attributes.each do |attribute| %>
 		  <div class="row">
-			  <label><%=attribute%>: </label>
+			  <label><%=humanize(attribute)%>: </label>
 			  <input type="text" name="<%= name %>[<%= attribute %>]" value="<%%=@<%=name%>.<%=attribute%>%>"/>
 		  </div>
 		<% end %>

data/generators/templates/model/new.erb

@@ -7,7 +7,7 @@
 		<input type="hidden" name="id" value="<%%=@<%= name %>.object%>"/>
 		<% attributes.each do |attribute| %>
 		  <div class="row">
-			  <label><%=attribute%>: </label>
+			  <label><%=humanize(attribute)%>: </label>
 			  <input type="text" name="<%= name %>[<%= attribute %>]"/>
 		  </div>
 		<% end %>

data/lib/bsearch.rb

@@ -0,0 +1,120 @@
+#
+# Ruby/Bsearch - a binary search library for Ruby.
+#
+# Copyright (C) 2001 Satoru Takabayashi <satoru@namazu.org>
+#     All rights reserved.
+#     This is free software with ABSOLUTELY NO WARRANTY.
+#
+# You can redistribute it and/or modify it under the terms of
+# the Ruby's licence.
+#
+# Example:
+#
+#  % irb -r ./bsearch.rb
+#  >> %w(a b c c c d e f).bsearch_first {|x| x <=> "c"}
+#  => 2
+#  >> %w(a b c c c d e f).bsearch_last {|x| x <=> "c"}
+#  => 4
+#  >> %w(a b c e f).bsearch_first {|x| x <=> "c"}
+#  => 2
+#  >> %w(a b e f).bsearch_first {|x| x <=> "c"}
+#  => nil
+#  >> %w(a b e f).bsearch_last {|x| x <=> "c"}
+#  => nil
+#  >> %w(a b e f).bsearch_lower_boundary {|x| x <=> "c"}
+#  => 2
+#  >> %w(a b e f).bsearch_upper_boundary {|x| x <=> "c"}
+#  => 2
+#  >> %w(a b c c c d e f).bsearch_range {|x| x <=> "c"}
+#  => 2...5
+#  >> %w(a b c d e f).bsearch_range {|x| x <=> "c"}
+#  => 2...3
+#  >> %w(a b d e f).bsearch_range {|x| x <=> "c"}
+#  => 2...2
+
+module Bsearch
+  VERSION = '1.5'
+end
+
+class Array
+  #
+  # The binary search algorithm is extracted from Jon Bentley's
+  # Programming Pearls 2nd ed. p.93
+  #
+
+  #
+  # Return the lower boundary. (inside)
+  #
+  def bsearch_lower_boundary (range = 0 ... self.length, &block)
+    lower  = range.first() -1
+    upper = if range.exclude_end? then range.last else range.last + 1 end
+    while lower + 1 != upper
+      mid = ((lower + upper) / 2).to_i # for working with mathn.rb (Rational)
+      if yield(self[mid]) < 0
+	lower = mid
+      else
+	upper = mid
+      end
+    end
+    return upper
+  end
+
+  #
+  # This method searches the FIRST occurrence which satisfies a
+  # condition given by a block in binary fashion and return the
+  # index of the first occurrence. Return nil if not found.
+  #
+  def bsearch_first (range = 0 ... self.length, &block)
+    boundary = bsearch_lower_boundary(range, &block)
+    if boundary >= self.length || yield(self[boundary]) != 0
+      return nil
+    else
+      return boundary
+    end
+  end
+
+  alias bsearch bsearch_first
+
+  #
+  # Return the upper boundary. (outside)
+  #
+  def bsearch_upper_boundary (range = 0 ... self.length, &block)
+    lower  = range.first() -1
+    upper = if range.exclude_end? then range.last else range.last + 1 end
+    while lower + 1 != upper
+      mid = ((lower + upper) / 2).to_i # for working with mathn.rb (Rational)
+      if yield(self[mid]) <= 0
+	lower = mid
+      else
+	upper = mid
+      end
+    end
+    return lower + 1 # outside of the matching range.
+  end
+
+  #
+  # This method searches the LAST occurrence which satisfies a
+  # condition given by a block in binary fashion and return the
+  # index of the last occurrence. Return nil if not found.
+  #
+  def bsearch_last (range = 0 ... self.length, &block)
+    # `- 1' for canceling `lower + 1' in bsearch_upper_boundary.
+    boundary = bsearch_upper_boundary(range, &block) - 1
+
+    if (boundary <= -1 || yield(self[boundary]) != 0)
+      return nil
+    else
+      return boundary
+    end
+  end
+
+  #
+  # Return the search result as a Range object.
+  #
+  def bsearch_range (range = 0 ... self.length, &block)
+    lower = bsearch_lower_boundary(range, &block)
+    upper = bsearch_upper_boundary(range, &block)
+    return lower ... upper
+  end
+end
+

data/lib/rho/rhocontact.rb

@@ -1,3 +1,5 @@
+require 'bsearch'
+
 module Rho
 	class RhoContact
 		class << self
@@ -62,6 +64,47 @@ module Rho
 				end
 			end
 
-		end
-	end
-end
+			# Examples of how to use select method:
+			#
+    		# selected = Rho::RhoContact.select('first_name' => 'David') { |x| x[1]['last_name']=='Taylor' }
+			# ==> returns record(s) of the David Taylor
+			#
+    		# selected = Rho::RhoContact.select('first_name' => 'Kate')
+			# ==> Returns all records of Kate
+			#
+    		# selected = Rho::RhoContact.select('last_name' => 'User') do |x|
+    		# 	x[1]['first_name']=='Test' and x[1]['company_name']=="rhomobile"
+    		# end
+			# ==> returns all records of the Test User from the company rhomobile
+			#
+			def select(index, &block)
+				key, value = index.keys[0], index.values[0]
+				if @contacts.nil? or @key != key
+					@key, @contacts = key, find(:all).to_a.sort! {|x,y| x[1][key] <=> y[1][key] }
+				end
+				found = @contacts[@contacts.bsearch_range {|x| x[1][key] <=> value}]
+				unless found.nil? or block.nil?
+					return found.select(&block)
+				end
+				return found
+			end
+
+			def select_by_name(first_last_name, &block)
+				if @contacts.nil?
+					@contacts = find(:all).to_a.sort! do |x,y|
+						x[1]['first_name'] + " " + x[1]['last_name'] <=> y[1]['first_name'] + " " + y[1]['last_name']
+					end
+				end
+				range = @contacts.bsearch_range do |x|
+					x[1]['first_name'] + " " + x[1]['last_name'] <=> first_last_name
+				end
+				found = @contacts[range]
+				unless found.nil? or block.nil?
+					return found.select(&block)
+				end
+				return found
+			end
+
+		end #<< self
+	end # class RhoContact
+end # module Rho

data/lib/rhodes.rb

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

data/lib/rhom/rhom_object.rb

@@ -28,12 +28,16 @@ module Rhom
     def method_missing(name, *args)
       unless name == Fixnum
         varname = name.to_s.gsub(/=/,"")
-        if instance_variable_defined? "@#{varname}"
-          #TODO: Figure out why this returns an array
-          instance_variable_get( "@#{varname}" )[0]
-        else  
-          instance_variable_set( "@#{varname}", args )  
+        setting = (name.to_s =~ /=/)
+        inst_var = nil
+
+        if setting
+          inst_var = instance_variable_set( "@#{varname}", args[0] )  
+        else
+          inst_var = instance_variable_get( "@#{varname}" )
         end
+        
+        inst_var
       end
     end
     

data/lib/rhom/rhom_object_factory.rb

@@ -60,12 +60,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'.to_sym, "#{temp_objid}"
-                  self.send 'source_id'.to_sym, obj['source_id'].to_s
-                  self.send 'update_type'.to_sym, 'create'
+                  self.send :object=, "#{temp_objid}"
+                  self.send :source_id=, obj['source_id'].to_s
+                  self.send :update_type=, 'create'
                   obj.each do |key,value|
 					          val =  self.inst_strip_braces(value)
-                    self.send key, val
+                    self.send "#{key}=".to_sym, val
                   end
                 end
             
@@ -106,10 +106,10 @@ module Rhom
                       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
+                      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)
+                      hash_list[object].send("#{attrib}=".to_sym(), value) if not method_name_reserved?(attrib)
                       nil # remove the element from the array
                     end
                   end
@@ -131,7 +131,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'.to_sym, "{#{obj['object'].to_s}}"
+                  tmp_obj.send :object=, "{#{obj['object'].to_s}}"
                   tmp_obj
                 end
               end #class methods

data/lib/rhom/rhom_source.rb

@@ -7,9 +7,9 @@ module Rhom
     attr_accessor :source_url
     attr_reader   :source_id, :name, :last_updated, :last_inserted_size, 
                   :last_deleted_size, :last_sync_duration,
-                  :last_sync_success
+                  :last_sync_success, :distinct_objects
                   
-    def initialize(args)
+    def initialize(args,count=0)
       # setup the name
       # TODO: should really store this in the database
       Rho::RhoConfig::sources.each do |key,value|
@@ -24,6 +24,11 @@ module Rhom
       @last_deleted_size = args['last_deleted_size'].to_i
       @last_sync_duration = args['last_sync_duration'].to_i
       @last_sync_success = args['last_sync_success'].to_i == 1 ? true : false
+      @distinct_objects = ::Rhom::RhomDbAdapter::select_from_table(
+                                                             ::Rhom::TABLE_NAME,
+                                                             'object',
+                                                             {"source_id"=>@source_id},
+                                                             {"distinct"=>true}).length
     end
     
     class << self

data/spec/rhom_object_factory_spec.rb

@@ -36,7 +36,7 @@ describe "RhomObjectFactory" do
     "2".should == Case.get_source_id
     "3".should == Employee.get_source_id
   end
-  
+
   it "should dynamically assign values" do
     account = Account.new
     account.name = 'hello name'
@@ -109,7 +109,7 @@ describe "RhomObjectFactory" do
     @new_acct.name.should == "Mobio US"
     @new_acct.industry.should == "Technology"
   end
-  
+
   it "should fully update a record" do
     new_attributes = {"name"=>"Mobio US", "industry"=>"Electronics"}
     @account = Account.find(:all).first
@@ -120,4 +120,21 @@ describe "RhomObjectFactory" do
     @new_acct.name.should == "Mobio US"
     @new_acct.industry.should == "Electronics"
   end
+
+  it "should retrieve and modify one record" do
+    @acct = Account.find('44e804f2-4933-4e20-271c-48fcecd9450d')
+    
+    @acct.name.should == "Mobio US"
+    @acct.industry.should == "Technology"
+    
+    @acct.name = "Rhomobile US"
+    
+    @acct.name.should == "Rhomobile US"
+  end
+  
+  it "should return an empty value for a non-existent attribute" do
+    @acct = Account.find('44e804f2-4933-4e20-271c-48fcecd9450d')
+    
+    @acct.foobar.should be_nil
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Rhomobile Dev
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-27 00:00:00 -08:00
+date: 2009-01-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -124,6 +134,7 @@ files:
 - generators/templates/source/source_adapter.rb
 - lib/ServeME.rb
 - lib/TestServe.rb
+- lib/bsearch.rb
 - lib/builtinME.rb
 - lib/date.rb
 - lib/date/format.rb