rhodes 3.3.3.beta.1 → 3.3.3.beta.2

data/res/generators/templates/application/public/jquery/jquery.json-2.3.min.js

@@ -0,0 +1,23 @@
+
+(function($){var escapeable=/["\\\x00-\x1f\x7f-\x9f]/g,meta={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'};$.toJSON=typeof JSON==='object'&&JSON.stringify?JSON.stringify:function(o){if(o===null){return'null';}
+var type=typeof o;if(type==='undefined'){return undefined;}
+if(type==='number'||type==='boolean'){return''+o;}
+if(type==='string'){return $.quoteString(o);}
+if(type==='object'){if(typeof o.toJSON==='function'){return $.toJSON(o.toJSON());}
+if(o.constructor===Date){var month=o.getUTCMonth()+1,day=o.getUTCDate(),year=o.getUTCFullYear(),hours=o.getUTCHours(),minutes=o.getUTCMinutes(),seconds=o.getUTCSeconds(),milli=o.getUTCMilliseconds();if(month<10){month='0'+month;}
+if(day<10){day='0'+day;}
+if(hours<10){hours='0'+hours;}
+if(minutes<10){minutes='0'+minutes;}
+if(seconds<10){seconds='0'+seconds;}
+if(milli<100){milli='0'+milli;}
+if(milli<10){milli='0'+milli;}
+return'"'+year+'-'+month+'-'+day+'T'+
+hours+':'+minutes+':'+seconds+'.'+milli+'Z"';}
+if(o.constructor===Array){var ret=[];for(var i=0;i<o.length;i++){ret.push($.toJSON(o[i])||'null');}
+return'['+ret.join(',')+']';}
+var name,val,pairs=[];for(var k in o){type=typeof k;if(type==='number'){name='"'+k+'"';}else if(type==='string'){name=$.quoteString(k);}else{continue;}
+type=typeof o[k];if(type==='function'||type==='undefined'){continue;}
+val=$.toJSON(o[k]);pairs.push(name+':'+val);}
+return'{'+pairs.join(',')+'}';}};$.evalJSON=typeof JSON==='object'&&JSON.parse?JSON.parse:function(src){return eval('('+src+')');};$.secureEvalJSON=typeof JSON==='object'&&JSON.parse?JSON.parse:function(src){var filtered=src.replace(/\\["\\\/bfnrtu]/g,'@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']').replace(/(?:^|:|,)(?:\s*\[)+/g,'');if(/^[\],:{}\s]*$/.test(filtered)){return eval('('+src+')');}else{throw new SyntaxError('Error parsing JSON, source is not valid.');}};$.quoteString=function(string){if(string.match(escapeable)){return'"'+string.replace(escapeable,function(a){var c=meta[a];if(typeof c==='string'){return c;}
+c=a.charCodeAt();return'\\u00'+Math.floor(c/16).toString(16)+(c%16).toString(16);})+'"';}
+return'"'+string+'"';};})(jQuery);

data/res/generators/templates/application/public/js/jquery-wp7-patch.js

@@ -44,6 +44,27 @@
         return {};
     }
 
+    function normalizeAjaxData(data) {
+        // if it is an object then return as it is
+        if ('object' == typeof data) return data;
+        // if it is a query string then parse it and return as an object
+        if ('string' == typeof data) {
+            data = $.trim(data);
+            data = (0 <= data.indexOf('?')) ? data.substring(data.indexOf('?')) : data;
+            var items = {};
+            $.each(data.split('&'), function(idx, item){
+                var keyVal = item.split('=');
+                if (keyVal && keyVal[0]) {
+                    items[keyVal[0]] = keyVal[1] || null;
+                }
+            });
+            return items;
+        }
+        // if it is neither string nor object,
+        // then so far we have no idea how to handle it
+        return {};
+    }
+
     var _ajax = $.ajax;
 
     function wp7ajax() {
@@ -80,44 +101,64 @@
         //console.log('typeof options.data: ' + typeof options.data);
         //if ("string" == typeof options.data) console.log('options.data: ' + options.data);
 
-        var urlQueryParams = "";
         // set next call id value
-        var cbIdValue = encodeURIComponent(_rho_callbackId_valuePrefix + callbackCount++);
+        var cbIdValue = (_rho_callbackId_valuePrefix + callbackCount++);
 
-        if ("string" == typeof options.data) {
-            urlQueryParams = options.data;
-        }
-        if ("object" != typeof options.data) {
-            options.data = {};
-        }
+        // ensure data is an object, not string
+        var data = normalizeAjaxData(options.data);
 
         // set callback id param value
-        options.data[_rho_callbackId_paramName] = cbIdValue;
+        data[_rho_callbackId_paramName] = encodeURIComponent(cbIdValue);
+
         // set deferred object to resolve/reject late
         options[_rho_deferred_paramName] = $.Deferred();
+
         // store options for pending callback
-        pendingCallbacks[options.data[_rho_callbackId_paramName]] = options;
+        pendingCallbacks[cbIdValue] = options;
 
         // compose GET request formatted URI
-        $.each(options.data, function(name, value){
-            urlQueryParams += ((0 < urlQueryParams.length ? "&" : "")
+        var urlQueryParams = "";
+        $.each(data, function(name, value){
+            urlQueryParams += ((0 < urlQueryParams.length ? "&" : "?")
                 +encodeURIComponent(name) +'=' +encodeURIComponent(value));
         });
 
+        var request = $.extend({}, {
+            url: options.url,
+            type: options.type || 'GET',
+            contentType: options.contentType || 'application/x-www-form-urlencoded',
+            headers: options.headers || {},
+            username: options.username || null,
+            password: options.password || null,
+            data: data
+        });
+
+        if (options.accepts) {
+            request.headers['Accept'] = options.accepts;
+        }
+
         //console.log('wp7notifyProxy: urlQueryParams: ' +urlQueryParams);
-        window.external.notify('request:' +options.url +"?" +urlQueryParams);
+        var reqObj = $.toJSON(request);
+        window.external.notify('request:' +reqObj);
+        //window.external.notify('request:' +options.url +urlQueryParams);
         return options[_rho_deferred_paramName];
     }
 
-    function fireHandlers(options, result, status, errCode) {
+    function fireHandlers(options, result, headers, status, errCode) {
         // TODO: fake jqXHR needs to be provided
-        var jqXHR = null;
-
+        var jqXHR = {
+            getResponseHeader: function(name) {
+                return ("object" == typeof headers) ? headers[name] : undefined;
+            },
+            getAllResponseHeaders: function() {
+                return ("object" == typeof headers) ? headers : {};
+            }
+        };
         if ("error" == status) {
             if ('function' == typeof options.error) {
                 // start handler asynchronously
                 setTimeout(function(){
-                    options.error.apply(this, [jqXHR, status, result]);
+                    options.error.apply(options.context, [jqXHR, status, result]);
                 }, 1);
             }
             if ('object' == typeof options[_rho_deferred_paramName]) {
@@ -127,7 +168,7 @@
             if ('function' == typeof options.success) {
                 // start handler asynchronously
                 setTimeout(function(){
-                    options.success.apply(this, [result, status, jqXHR]);
+                    options.success.apply(options.context, [result, status, jqXHR]);
                 }, 1);
             }
             if ('object' == typeof options[_rho_deferred_paramName]) {
@@ -136,14 +177,21 @@
         }
     }
 
-    window._rho_ajaxProxyCallback = function(callbackId, result, status, errCode) {
+    window._rho_ajaxProxyCallback = function(callbackId, result, headers, status, errCode) {
         var cbId = decodeURIComponent(callbackId);
         //console.log('_rho_ajaxProxyCallback: callback for: ' +cbId);
+        //console.log('_rho_ajaxProxyCallback: result: ' +result);
         if (pendingCallbacks[cbId]) {
-            fireHandlers(pendingCallbacks[cbId], result, status, errCode);
+            //console.log('_rho_ajaxProxyCallback: callback found!');
+            fireHandlers(pendingCallbacks[cbId], result,
+                ("string" == typeof headers) ? $.parseJSON(headers) : headers,
+                status, errCode);
             delete pendingCallbacks[cbId];
         }
     };
 
+    window._rho_execJsWrapper = function(expr) {
+        eval(expr);
+    };
 
 })(jQuery);

data/spec/phone_spec/app/Case/case.rb

@@ -4,4 +4,26 @@ class Case
     include Rhom::PropertyBag
 
     enable :full_update
+
+    #set :freezed, true
+    
+    property :status, :string
+    property :assigned_user_id, :string
+    property :created_by_name, :string
+    property :work_log, :string
+    property :priority, :string
+    property :case_number, :string
+    property :account_id, :string
+    property :type, :string
+    property :modified_user_id, :string
+    property :name, :string
+    property :assigned_user_name, :string
+    property :modified_by_name, :string
+    property :description, :string
+    property :date_modified, :string
+    property :date_entered, :string
+    property :resolution, :string
+    property :created_by, :string
+    property :account_name, :string
+    
 end

data/spec/phone_spec/app/Customer/customer.rb

@@ -4,4 +4,20 @@ class Customer
   enable :sync
 
   set :sync_priority, 2
+
+  #set :freezed, true
+
+    property :address, :string
+    property :created_at, :string
+    property :city, :string
+    property :email, :string
+    #property :first, :string
+    property :last, :string
+    property :updated_at,  :string
+    property :lat, :string
+    property :long, :string
+    property :phone, :string
+    property :state, :string
+    property :zip, :string
+  
 end

data/spec/phone_spec/app/spec/rhom_object_spec.rb

@@ -22,11 +22,22 @@ require 'rho/rhoutils'
 require 'json'
 
 USE_HSQLDB = !System.get_property('has_sqlite')
-USE_COPY_FILES = !defined? RHO_ME && !defined? RHO_WP7
+USE_COPY_FILES = true
+
+if defined? RHO_ME
+ USE_COPY_FILES = false
+end
+
+if defined? RHO_WP7
+ USE_COPY_FILES = false
+end
+
 if ( System.get_property('platform') == 'WINDOWS' && System.get_property('device_name') != 'Win32' )
     USE_COPY_FILES = false
 end
 
+puts "USE_COPY_FILES: #{USE_COPY_FILES}"
+
 def getAccount
     return Account_s if $spec_settings[:schema_model]
     
@@ -61,6 +72,8 @@ def clean_db_data
     getTestDB().delete_all_from_table('client_info')
     getTestDB().delete_all_from_table('object_values')
     getTestDB().delete_all_from_table('changed_values')
+    getTestDB().delete_all_from_table('Account_s')
+    getTestDB().delete_all_from_table('Case_s')
     getTestDB().commit
 end
 
@@ -117,6 +130,9 @@ class Test_Helper
         else
             clean_db_data
         end
+
+        Rho::RhoConfig.sources()[getCase_str()]['freezed'] = false if !$spec_settings[:schema_model]
+        
     end
     
     def before_each
@@ -164,11 +180,11 @@ describe "Rhom::RhomObject" do
     account.name = 'hello name'
     account.industry = 'hello industry'
     account.object = '3560c0a0-ef58-2f40-68a5-fffffffffffff'
-    account.value = 'xyz industries'
+    #account.value = 'xyz industries'
     account.name.should == 'hello name'
     account.industry.should == 'hello industry'
     account.object.should == '3560c0a0-ef58-2f40-68a5-fffffffffffff'
-    account.value.should == 'xyz industries'
+    #account.value.should == 'xyz industries'
   end
   
   it "should retrieve getCase models" do
@@ -570,15 +586,20 @@ end
   end
   
   it "should _NOT_ set 'attrib_type' field for a record" do
-    new_attributes = {"attrib_type"=>"Partner"}
-    @account = getAccount.find('44e804f2-4933-4e20-271c-48fcecd9450d')
-    @account.update_attributes(new_attributes)
   
-    @new_acct = getAccount.find('44e804f2-4933-4e20-271c-48fcecd9450d')
-  
-    @new_acct.name.should == "Mobio India"
-    @new_acct.instance_variables.each do |var|
-      var.to_s.gsub(/@/,'').match('\btype\b').should be_nil
+    if $spec_settings[:schema_model]
+        1.should == 1
+    else
+        new_attributes = {"attrib_type"=>"Partner"}
+        @account = getAccount.find('44e804f2-4933-4e20-271c-48fcecd9450d')
+        @account.update_attributes(new_attributes)
+      
+        @new_acct = getAccount.find('44e804f2-4933-4e20-271c-48fcecd9450d')
+      
+        @new_acct.name.should == "Mobio India"
+        @new_acct.instance_variables.each do |var|
+          var.to_s.gsub(/@/,'').match('\btype\b').should be_nil
+        end
     end
   end
   
@@ -1582,6 +1603,82 @@ end
     
   end          
 #=end  
+
+  it "should not add property to freezed model" do
+  
+    if !$spec_settings[:schema_model]  
+        props = Rho::RhoConfig.sources()[getCase_str()]
+        props['freezed'] = true
+    
+        props['freezed'].should == true
+        #props['property'].should_not be_nil
+        #props['property']['description'].should_not be_nil
+    end
+
+    lambda { obj = getCase().new( :wrong_address => 'test') }.should raise_error(ArgumentError)
+    lambda { obj = getCase().create( :wrong_address => 'test') }.should raise_error(ArgumentError)
+    
+    lambda { 
+        obj = getCase().new
+        obj.wrong_address = 'test'
+    }.should raise_error(ArgumentError)
+    
+    lambda { 
+        obj = getCase().new
+        obj.update_attributes(:wrong_address => 'test')
+    }.should raise_error(ArgumentError)
+    
+    if $spec_settings[:schema_model]  
+        lambda { 
+            getCase().find_by_sql("INSERT INTO #{getCase_str()}(object,wrong_address) values ('1234', 'my_addr')")
+        }.should raise_error(ArgumentError)            
+    end
+    
+  end
+
+  it "should add property to freezed model" do
+    if !$spec_settings[:schema_model]  
+        props = Rho::RhoConfig.sources()[getCase_str()]
+        props['freezed'] = true
+    
+        props['freezed'].should == true
+        #props['property'].should_not be_nil
+        #props['property']['description'].should_not be_nil
+    end
+    
+    obj = getCase().new( :description => 'test')
+    obj.description.should == "test"
+    
+    obj1 = getCase().create( :description => 'test1')
+    obj1.description.should == "test1"
+    res1 = getCase().find(obj1.object)
+    res1.should_not be_nil
+    res1.description.should == "test1"    
+
+    obj2 = getCase().new
+    obj2.description = 'test2'
+    obj2.save()
+    res2 = getCase().find(obj2.object)
+    res2.should_not be_nil
+    res2.description.should == "test2"
+    
+    obj3 = getCase().new
+    obj3.update_attributes(:description => 'test3')
+    obj3.description.should == "test3"
+    res3 = getCase().find(obj3.object)
+    res3.should_not be_nil
+    res3.description.should == "test3"    
+
+    if $spec_settings[:schema_model]  
+        getCase().find_by_sql("INSERT INTO #{getCase_str()}(object,description) values ('1234', 'my_addr')")
+        res4 = getCase().find('1234')
+        res4.should_not be_nil
+        res4.description.should == "my_addr"    
+        
+    end
+        
+  end
+          
 end
 #=begin
 describe "Rhom#paginate" do

data/spec/phone_spec/app/spec/syncengine_spec.rb

@@ -59,9 +59,11 @@ def syncserver_url
                     when /apple/i      then 'iphone'
                     when /symbian/i    then 'symbian'
                     when /wp7/i    then 'wp'
+                    when /windows/i    then 'wm'
   end
   platform = 'win32' if System.get_property('device_name') == 'Win32'
 
+  puts "platform: #{platform}"
   exact_url = SYNC_SERVER_URL.gsub(/exact_platform/, platform)
   puts "going to reset server: #{exact_url}"
   exact_url
@@ -258,7 +260,7 @@ end
     res['status'].should == 'complete'
     res['error_code'].to_i.should == ::Rho::RhoError::ERR_NONE
   end
-
+  
   it "should sync all" do
     SyncEngine.logged_in.should == 1
   
@@ -862,6 +864,46 @@ end
     item2.vars.should_not be_nil
   end
 
+  it "should not sync non-exist properties from freezed model" do
+    SyncEngine.logged_in.should == 1
+  
+    res = ::Rho::RhoSupport::parse_query_parameters getCustomer.sync( "/app/Settings/sync_notify")
+    res['status'].should == 'ok'
+    res['error_code'].to_i.should == ::Rho::RhoError::ERR_NONE
+  
+    cust = getCustomer().find(:first, :conditions => {:first => 'CustTest2'} )
+    cust.should_not be_nil
+
+    Rhom::Rhom.database_full_reset    
+    Rho::RhoConfig.bulksync_state='1'
+    
+    cust1 = getCustomer().find(:first)
+    cust1.should be_nil
+
+    saved_src = Rho::RhoConfig.sources[getCustomer_str()]
+    begin
+        if !$spec_settings[:schema_model]    
+            Rho::RhoConfig.sources[getCustomer_str()]['freezed'] = true
+        else
+            Rho::RhoConfig.sources[getCustomer_str()]['schema']['property'].delete('first')        
+        end    
+        ::Rho::RHO.init_sync_source_properties(Rho::RhoConfig::sources.values)
+        
+        res2 = ::Rho::RhoSupport::parse_query_parameters getCustomer.sync( "/app/Settings/sync_notify")
+        res2['status'].should == 'ok'
+        res2['error_code'].to_i.should == ::Rho::RhoError::ERR_NONE
+
+        cust_all = getCustomer().find(:all)
+        cust_all.should_not be_nil
+        cust_all.size.should > 0
+
+        cust2 = getCustomer().find(:first, :conditions => {:first => 'CustTest2'} )
+        cust2.should be_nil
+    ensure    
+        Rho::RhoConfig.sources[getCustomer_str()] = saved_src
+    end    
+  end
+    
   it "should logout" do
     SyncEngine.logout()