rhodes-framework 1.1.1 → 1.2.0

data/lib/rhom/rhom_source.rb

@@ -3,7 +3,7 @@ require 'rhom/rhom_object'
 
 module Rhom
   class RhomSource
-    include RhomObject
+    include ::Rhom::RhomObject
     attr_accessor :source_url
     attr_reader   :source_id, :name, :last_updated, :last_inserted_size, 
                   :last_deleted_size, :last_sync_duration,
@@ -25,14 +25,14 @@ module Rhom
       @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_values',
                                                              'object',
                                                              {"source_id"=>@source_id},
                                                              {"distinct"=>true}).length
     end
     
     class << self
-      include RhomObject
+      include ::Rhom::RhomObject
       def find(*args)
         list = []
         if args.first == :all
@@ -48,12 +48,12 @@ module Rhom
         end
         list.size > 1 ? list : list[0]
       end
-    end
-    
-    def update_attributes(params=nil)
-      if params
-        ::Rhom::RhomDbAdapter::update_into_table('sources', {"source_url"=>params['source_url']},
-                                                 {"source_id"=>strip_braces(params['source_id'])})
+      
+      def update_attributes(params=nil)
+        if params
+          ::Rhom::RhomDbAdapter::update_into_table('sources', {"source_url"=>params['source_url']},
+                                                   {"source_id"=>strip_braces(params['source_id'])})
+        end
       end
     end
   end

data/lib/singleton.rb

@@ -9,9 +9,9 @@
 # *  this ensures that only one instance of Klass lets call it
 #    ``the instance'' can be created.
 #
-#    a,b  = Klass.instance, Klass.instance
-#    a == b   # => true
-#    a.new    #  NoMethodError - new is private ...
+#      a,b  = Klass.instance, Klass.instance
+#      a == b    # => true
+#      Klass.new #  NoMethodError - new is private ...
 #
 # *  ``The instance'' is created at instantiation time, in other
 #    words the first call of Klass.instance(), thus

data/lib/time.rb

@@ -87,8 +87,26 @@ class Time
     end
 
     def zone_utc?(zone)
-      # * +0000 means localtime. [RFC 2822]
-      # * GMT is a localtime abbreviation in Europe/London, etc.
+      # * +0000
+      #   In RFC 2822, +0000 indicate a time zone at Universal Time.
+      #   Europe/London is "a time zone at Universal Time" in Winter.
+      #   Europe/Lisbon is "a time zone at Universal Time" in Winter.
+      #   Atlantic/Reykjavik is "a time zone at Universal Time".
+      #   Africa/Dakar is "a time zone at Universal Time".
+      #   So +0000 is a local time such as Europe/London, etc.
+      # * GMT
+      #   GMT is used as a time zone abbreviation in Europe/London,
+      #   Africa/Dakar, etc.
+      #   So it is a local time.
+      #
+      # * -0000, -00:00
+      #   In RFC 2822, -0000 the date-time contains no information about the
+      #   local time zone.
+      #   In RFC 3339, -00:00 is used for the time in UTC is known,
+      #   but the offset to local time is unknown.
+      #   They are not appropriate for specific time zone such as
+      #   Europe/London because time zone neutral, 
+      #   So -00:00 and -0000 are treated as UTC.
       if /\A(?:-00:00|-0000|-00|UTC|Z|UT)\z/i =~ zone
         true
       else

data/lib/version.rb

@@ -1,8 +1,8 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '1.1.1'
+    VERSION = '1.2.0'
   end
   unless defined? RhodesFramework::DBVERSION
-    DBVERSION = '1.1.1'
+    DBVERSION = '1.2.0'
   end
 end

data/spec/app/mspec/matchers/raise_error.rb

@@ -8,7 +8,8 @@ class RaiseErrorMatcher
   def matches?(proc)
     proc.call
     return false
-  rescue Exception => @actual
+  rescue Exception => err
+    @actual = err
     return false unless @exception === @actual
     if @message then
       case @message

data/spec/app/spec/fixtures/object_values.txt

@@ -41,7 +41,7 @@ id|source_id|attrib|object|value|update_type|attrib_type
 -8943188|1|phone_alternate|44e804f2-4933-4e20-271c-48fcecd9450d||query|
 63546948|1|billing_address_state|44e804f2-4933-4e20-271c-48fcecd9450d||query|
 114237576|1|modified_user_id|44e804f2-4933-4e20-271c-48fcecd9450d|1|query|
-220076107|1|description|44e804f2-4933-4e20-271c-48fcecd9450d||query|
+220076107|1|description|44e804f2-4933-4e20-271c-48fcecd9450d|Hello description!|query|
 326182291|1|modified_by_name|44e804f2-4933-4e20-271c-48fcecd9450d|admin|query|
 517349454|1|employees|44e804f2-4933-4e20-271c-48fcecd9450d||query|
 596458092|1|shipping_address_postalcode|44e804f2-4933-4e20-271c-48fcecd9450d||query|
@@ -53,7 +53,7 @@ id|source_id|attrib|object|value|update_type|attrib_type
 1065948343|1|created_by_name|44e804f2-4933-4e20-271c-48fcecd9450d|admin|query|
 1072561171|1|shipping_address_state|44e804f2-4933-4e20-271c-48fcecd9450d||query|
 -1036293295|1|phone_fax|63cf13da-cff4-99e7-f946-48fcec93f1cc||query|
--1015063951|1|description|63cf13da-cff4-99e7-f946-48fcec93f1cc||query|
+-1015063951|1|description|63cf13da-cff4-99e7-f946-48fcec93f1cc|NULL|query|
 -992493612|1|ownership|63cf13da-cff4-99e7-f946-48fcec93f1cc||query|
 -991176969|1|date_modified|63cf13da-cff4-99e7-f946-48fcec93f1cc|2008-10-22 20:30:48|query|
 -981671585|1|billing_address_city|63cf13da-cff4-99e7-f946-48fcec93f1cc|Mountain View|query|

data/spec/app/spec/pagination/fixtures/object_values.txt

@@ -0,0 +1,91 @@
+id|source_id|attrib|object|value|update_type|attrib_type
+3974518272|1|name|722182959|i6mu98hel8|query|
+4664309006|1|address|722182959|s8ganw9i49|query|
+589446524|1|industry|722182959|v2zjhoetsk|query|
+3876717954|1|name|7480317731|79nqr7ekzr|query|
+1047652407|1|address|7480317731|emv1tezmdf|query|
+7940339732|1|industry|7480317731|1zg7f7q6ib|query|
+1453307208|1|name|9703256901|m9ibat6pln|query|
+5456472891|1|address|9703256901|ksoi86kwyc|query|
+6075196515|1|industry|9703256901|zl2zw45pn6|query|
+5230840089|1|name|3195084835|pjpl6sobl3|query|
+1929483477|1|address|3195084835|46kknwty4n|query|
+9740966958|1|industry|3195084835|96st4bu34a|query|
+7554672898|1|name|8219349185|cfcau6hu6q|query|
+4262441275|1|address|8219349185|5ubw1mbmou|query|
+2432667078|1|industry|8219349185|tmm1oniagk|query|
+2040389189|1|name|3788304956|c2z5izd8w9|query|
+7210816262|1|address|3788304956|6rd9nv8dml|query|
+4077709208|1|industry|3788304956|hxua4d6ttl|query|
+484525050|1|name|8027894003|5h9na4kko4|query|
+374989352|1|address|8027894003|ch5y19t1am|query|
+4571097261|1|industry|8027894003|andru1w2mh|query|
+9443114267|1|name|1624803503|uvwfd2wg9m|query|
+4130674901|1|address|1624803503|ugw28merrh|query|
+9576733217|1|industry|1624803503|xtu32wf5jz|query|
+2916529985|1|name|582939287|9o8eqtit6t|query|
+8567865384|1|address|582939287|gijtz958h5|query|
+96887757|1|industry|582939287|u4ymg2m2zi|query|
+7641527628|1|name|8763523348|39afj8vbj6|query|
+3849164324|1|address|8763523348|x7jincp3xj|query|
+6241904090|1|industry|8763523348|sge128jo9o|query|
+7519723638|1|name|4177558452|n7v3cp7tv9|query|
+9188001335|1|address|4177558452|9xzm6x951r|query|
+9651970835|1|industry|4177558452|lcm13yye47|query|
+8238171029|1|name|9559781556|koelvv2o9b|query|
+7812936798|1|address|9559781556|a195i7az2q|query|
+7630562848|1|industry|9559781556|rikqunzzd1|query|
+9679383363|1|name|5440884324|a8ndhdim5d|query|
+3088649963|1|address|5440884324|xywggb3pjs|query|
+5492167833|1|industry|5440884324|xjaivb6tn4|query|
+871068039|1|name|3286353653|uc7tak51ya|query|
+9666820827|1|address|3286353653|eu4dm28hnw|query|
+3879374462|1|industry|3286353653|nj3cjxsemo|query|
+1927465246|1|name|9897778878|n5qx54qcye|query|
+9107742171|1|address|9897778878|stzc1x7upn|query|
+4005202237|1|industry|9897778878|9kdinrjlcx|query|
+9411476383|1|name|1439722928|6ls8u98dfd|query|
+6118455758|1|address|1439722928|s28czydd5y|query|
+3105418573|1|industry|1439722928|uelsjlq4ps|query|
+4618953217|1|name|1715509841|doiwnygkz1|query|
+3202706158|1|address|1715509841|nu97261eix|query|
+9826021200|1|industry|1715509841|b3m4sswkg9|query|
+644887737|1|name|532060249|bad8ei15oc|query|
+7472846965|1|address|532060249|fci62a3i2g|query|
+5745448554|1|industry|532060249|cz4n2udhp1|query|
+848581571|1|name|892827894|igjernnrke|query|
+9292713023|1|address|892827894|8bhxhtd3qw|query|
+9611544405|1|industry|892827894|tp535844r8|query|
+5229692242|1|name|3119932988|9ayg49v9tx|query|
+9600330393|1|address|3119932988|go72f9az69|query|
+2073992524|1|industry|3119932988|rwyk7udigr|query|
+2613952071|1|name|5277763718|c1ekv44ald|query|
+5504223361|1|address|5277763718|kohrans65v|query|
+3339356668|1|industry|5277763718|ml2ghjs1yk|query|
+4557519944|1|name|4654600856|ushf7xcah6|query|
+4775818524|1|address|4654600856|4lfxmtllja|query|
+1133728008|1|industry|4654600856|o1b39qjvjr|query|
+1069996400|1|name|1655351781|4k2c5yfc8f|query|
+7837083732|1|address|1655351781|sczu2hfdyj|query|
+8927726574|1|industry|1655351781|ekctzoz4m8|query|
+5780896975|1|name|1309838006|e88yfcytke|query|
+4274270111|1|address|1309838006|booh7m2fit|query|
+519751842|1|industry|1309838006|hl6vj2ax4e|query|
+7646452151|1|name|8903473873|lmptpbx53p|query|
+2782146309|1|address|8903473873|bxd7mermv5|query|
+8949644025|1|industry|8903473873|4r6zbfz99e|query|
+6984271752|1|name|9229834060|92zmxntghe|query|
+9941761060|1|address|9229834060|23gutsl1n3|query|
+8712994862|1|industry|9229834060|zyrwtn24je|query|
+8535323717|1|name|5736612273|7t7yepm6wb|query|
+1216942042|1|address|5736612273|pm6ybo5eoh|query|
+5513088546|1|industry|5736612273|xj3y2udqqd|query|
+8711188148|1|name|7529312408|1fgbzmyf9k|query|
+5091631871|1|address|7529312408|8mr6hhd4ep|query|
+9736561282|1|industry|7529312408|7r56i8dkqd|query|
+174146755|1|name|1553806230|j5sc8ii27l|query|
+6963850495|1|address|1553806230|n2jovgvmw9|query|
+9394990834|1|industry|1553806230|xusnhhgrgz|query|
+7825564826|1|name|527579259|dgx6foa3bw|query|
+4011313493|1|address|527579259|bcgi7t4e3e|query|
+3633057181|1|industry|527579259|ozjdrljgm2|query|

data/spec/app/spec/rho_controller_spec.rb

@@ -27,7 +27,7 @@ describe "Rho::RhoController" do
     before do
       @c = Rho::RhoController.new
       @c.stub!(:send).and_return(nil)
-      @c.serve(nil,{'application' => 'application', 'model' => 'model'},{})
+      @c.serve(AppApplication.new,nil,{'application' => 'application', 'model' => 'model'},{})
     end
 
     it "should generate urls for empty params" do
@@ -112,7 +112,7 @@ describe "Rho::RhoController" do
       @response['headers'] = {}
       @c = Rho::RhoController.new
       @c.stub!(:send).and_return(nil)
-      @c.serve(nil,{'application' => 'application', 'model' => 'model'},@response)
+      @c.serve(AppApplication.new,nil,{'application' => 'application', 'model' => 'model'},@response)
     end
 
     it "should redirect to a url" do

data/spec/app/spec/rho_spec.rb

@@ -22,7 +22,8 @@ require 'spec/spec_helper'
 describe "Rho" do
 
   before(:each) do
-    Rho::RhoConfig.config = {'start_path'=>'/app','options_path'=>'/app/Settings'}
+    Rho::RhoConfig.config['start_path'] = '/app'
+    Rho::RhoConfig.config['options_path'] = '/app/Settings'
   end
   
   it "should populate configuration in sources table" do
@@ -39,7 +40,7 @@ describe "Rho" do
   end
   
   it "should set start_path" do
-    Rho::RhoConfig.config['start_path'] = '/foo/bar'
+    Rho::RhoConfig.start_path = '/foo/bar'
     Rho::RhoConfig.start_path.should == '/foo/bar'
   end
   
@@ -48,7 +49,11 @@ describe "Rho" do
   end
   
   it "should set options_path" do
-    Rho::RhoConfig.config['options_path'] = '/ops2'
+    Rho::RhoConfig.options_path = '/ops2'
     Rho::RhoConfig.options_path.should == '/ops2'
   end
+  
+  it "should read arbitrary options" do
+    Rho::RhoConfig.arbitrary_option.should == 'rhodes rocks!'
+  end
 end

data/spec/app/spec/rhom_db_adapter_spec.rb

@@ -0,0 +1,27 @@
+#
+#  rhom_db_adapter_spec.rb
+#  rhodes
+#
+#  Copyright (C) 2008 Rhomobile, Inc. 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/>.
+#
+require 'spec/spec_helper'
+
+# describe "RhomDbAdapter" do
+#   
+#   it "should return attributes as columns" do
+#     
+#   end
+# end

data/spec/app/spec/{rhom_object_factory_spec.rb → rhom_object_spec.rb}

@@ -17,8 +17,9 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 require 'spec/spec_helper'
+require 'rhom'
 
-describe "Rhom::RhomObjectFactory" do
+describe "Rhom::RhomObject" do
   
   it_should_behave_like "rhom initializer"
   
@@ -58,21 +59,30 @@ describe "Rhom::RhomObjectFactory" do
     results[1].industry.should == "Technology"
   end
   
+  it "should respond to find_all" do
+    results = Account.find_all
+    results.length.should == 2
+    results[0].name.should == "Mobio India"
+    results[0].industry.should == "Technology"
+    results[1].name.should == "Aeroprise"
+    results[1].industry.should == "Technology"
+  end
+  
   it "should have correct number of attributes" do
     @account = Account.find(:all).first
   
-    @account.instance_variables.size.should == 36
+    @account.vars.size.should == 37
   end
   
   it "should get count of objects" do
     Account.count.should == 2
   end
   
-  # it "should raise RecordNotFound error if nil given as find argument" do
-  #   lambda {
-  #     get 'index'
-  #   }.should_raise(Rhom::RecordNotFound)
-  # end
+  it "should raise RecordNotFound error if nil given as find argument" do
+    lambda {
+      Account.find(nil)
+    }.should raise_error(::Rhom::RecordNotFound)
+  end
   
   it "should create multiple records offline" do
     vars = {"name"=>"foobarthree", "industry"=>"entertainment"}
@@ -94,6 +104,19 @@ describe "Rhom::RhomObjectFactory" do
     acct.industry.should == 'solar'
   end
   
+  it "should create records with no attribs in database" do
+    ::Rhom::RhomDbAdapter.delete_all_from_table('object_values')
+    res = ::Rhom::RhomDbAdapter.select_from_table('object_values',"*")
+    res.length.should == 0
+    vars = {"name"=>"foobarthree", "industry"=>"entertainment"}
+    account = Account.new(vars)
+    obj = account.object
+    account.save
+    acct = Account.find(obj)
+    acct.name.should == 'foobarthree'
+    acct.industry.should == 'entertainment'
+  end
+  
   it "should create a record" do
     vars = {"name"=>"some new record", "industry"=>"electronics"}
     @account1 = Account.new(vars)
@@ -349,6 +372,13 @@ describe "Rhom::RhomObjectFactory" do
     @accts[1].industry.should == "Technology"
   end
   
+  it "should find with multiple conditions" do
+    @accts = Account.find(:all, :conditions => {'name' => 'Mobio India', 'industry' => 'Technology'})
+    @accts.length.should == 1
+    @accts[0].name.should == "Mobio India"
+    @accts[0].industry.should == "Technology"
+  end
+  
   it "should find first with conditions" do
     @mobio_ind_acct = Account.find(:first, :conditions => {'name' => 'Mobio India'})
     @mobio_ind_acct.name.should == "Mobio India"
@@ -407,7 +437,7 @@ describe "Rhom::RhomObjectFactory" do
     
     @accts[0].name.should == "Mobio India"
     @accts[0].industry.should be_nil
-    @accts[0].instance_variables.length.should == 2
+    @accts[0].vars.length.should == 2
   end
   
   it "should include only selected columns" do
@@ -416,7 +446,7 @@ describe "Rhom::RhomObjectFactory" do
     @accts[0].name.should == "Mobio India"
     @accts[0].industry.should == "Technology"
     @accts[0].shipping_address_street.should be_nil
-    @accts[0].instance_variables.length.should == 3
+    @accts[0].vars.length.should == 3
   end
   
   it "should include selected columns and conditions" do
@@ -425,6 +455,91 @@ describe "Rhom::RhomObjectFactory" do
     @accts[0].name.should == "Mobio India"
     @accts[0].industry.should == "Technology"
     @accts[0].shipping_address_street.should be_nil
-    @accts[0].instance_variables.length.should == 3
+    @accts[0].vars.length.should == 3
+  end
+  
+  it "should support find with conditions => nil" do
+    @accts = Account.find(:all, :conditions => {'description' => nil})
+    @accts.length.should == 1
+    @accts[0].name.should == "Aeroprise"
+    @accts[0].industry.should == "Technology"
+  end
+  
+  it "should support sql conditions arg" do
+    @accts = Account.find(:all, :conditions => "name = 'Mobio India'")
+    @accts.length.should == 1
+    @accts[0].name.should == "Mobio India"
+    @accts[0].industry.should == "Technology"
+  end
+  
+  it "should support complex sql conditions arg" do
+    @accts = Account.find(:all, :conditions => "name like 'Mobio%'")
+    @accts.length.should == 1
+    @accts[0].name.should == "Mobio India"
+    @accts[0].industry.should == "Technology"
+  end
+  
+  it "should support sql conditions single filter" do
+    @accts = Account.find(:all, :conditions => ["name like ?", "'Mob%'"])
+    @accts.length.should == 1
+    @accts[0].name.should == "Mobio India"
+    @accts[0].industry.should == "Technology"
+  end
+  
+  it "should support sql conditions with multiple filters" do
+    @accts = Account.find(:all, :conditions => ["name like ? and industry like ?", "'Mob%'", "'Tech%'"])
+    @accts.length.should == 1
+    @accts[0].name.should == "Mobio India"
+    @accts[0].industry.should == "Technology"
+  end
+  
+  describe "Rhom#paginate" do
+    before(:each) do
+      Rho::RhoUtils.load_offline_data(['object_values'], 'spec/pagination')
+    end
+
+    after(:each) do
+      Rhom::RhomDbAdapter.start_transaction
+      Rhom::RhomDbAdapter.delete_all_from_table('client_info')
+      Rhom::RhomDbAdapter.delete_all_from_table('object_values')
+      Rhom::RhomDbAdapter.commit
+    end
+    
+    @expected = [{:object => '3788304956', :name => 'c2z5izd8w9', :address => '6rd9nv8dml', :industry => 'hxua4d6ttl'},
+                {:object => '7480317731', :name => '79nqr7ekzr', :address => 'emv1tezmdf', :industry => '1zg7f7q6ib'},
+                {:object => '9897778878', :name => 'n5qx54qcye', :address => 'stzc1x7upn', :industry => '9kdinrjlcx'}]
+  
+    it "should support paginate with no options" do
+      3.times do |x|
+        @accts = Account.paginate(:page => x)
+        @accts.length.should == 10
+        @accts[9].object.should == "{#{@expected[x][:object]}}"
+        @accts[9].name.should == @expected[x][:name]
+        @accts[9].address.should == @expected[x][:address]
+        @accts[9].industry.should == @expected[x][:industry]
+      end
+      @accts = Account.paginate(:page => 3)
+      @accts.length.should == 0
+    end
+    
+    it "should support paginate with options" do
+      @accts = Account.paginate(:page => 0, :per_page => 20)
+      @accts.length.should == 20
+      @accts[9].object.should == "{#{@expected[0][:object]}}"
+      @accts[9].name.should == @expected[0][:name]
+      @accts[9].address.should == @expected[0][:address]
+      @accts[9].industry.should == @expected[0][:industry]
+      @accts = Account.paginate(:page => 3)
+      @accts.length.should == 0
+    end
+    
+    it "should support paginate with options and conditions" do
+      @accts = Account.paginate(:page => 0, :per_page => 20, :conditions => {'name' => 'c2z5izd8w9'})
+      @accts.length.should == 1
+      @accts[0].object.should == "{#{@expected[0][:object]}}"
+      @accts[0].name.should == @expected[0][:name]
+      @accts[0].address.should == @expected[0][:address]
+      @accts[0].industry.should == @expected[0][:industry]
+    end
   end
 end