rhodes 2.0.0.beta1 → 2.0.0.beta2

data/rakefile.rb

@@ -275,6 +275,11 @@ def common_bundle_start(startdir, dest)
     end
   end
 
+  if $excludeextlib  
+      chdir dest
+      $excludeextlib.each {|e| Dir.glob(e).each {|f| rm f}}
+  end
+  
   chdir startdir
   #throw "ME"
   cp_r app + '/app',File.join($srcdir,'apps')

data/res/generators/rhogen.rb

@@ -1,5 +1,7 @@
 require 'rubygems'
 require 'templater'
+#TODO: This is temporary, see https://www.pivotaltracker.com/story/show/3399292
+gem "activesupport", "= 2.3.5"
 require 'active_support'
 require File.dirname(__FILE__) + '/../../lib/rhodes'
 

data/rhodes.gemspec

@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = '2.0.0.beta1'
+  s.version = '2.0.0.beta2'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]

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

@@ -1,4 +1,4 @@
-source_name|attrib|object|value|attrib_type
+source_name|attrib|object|value
 Case|status|41a4e1f1-2c0c-7e51-0495-4900dc4c072c|New|
 Case|assigned_user_id|41a4e1f1-2c0c-7e51-0495-4900dc4c072c|d64e9409-6445-db6f-e9eb-48fce5e9fb16|
 Case|created_by_name|41a4e1f1-2c0c-7e51-0495-4900dc4c072c|adam|

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

@@ -1,4 +1,4 @@
-source_id|attrib|object|value|attrib_type
+source_id|attrib|object|value
 23|name|722182959|i6mu98hel8|
 23|address|722182959|s8ganw9i49|
 23|industry|722182959|v2zjhoetsk|

data/spec/framework_spec/app/spec/rhom_object_spec.rb

@@ -144,7 +144,7 @@ describe "Rhom::RhomObject" do
     new_id = @account1.object
     @account1.save
     @account2 = Account.find(new_id)
-    @account2.object.should =="{#{@account1.object}}"
+    @account2.object.should =="#{@account1.object}"
     @account2.name.should == vars['name']
     @account2.industry.should == vars['industry']
   end
@@ -155,7 +155,7 @@ describe "Rhom::RhomObject" do
     new_id = @account1.object
     @account1.save
     @account2 = Account.find(new_id)
-    @account2.object.should =="{#{@account1.object}}"
+    @account2.object.should =="#{@account1.object}"
     @account2.name.should == vars['name']
     @account2.industry.should == vars['industry']
   end
@@ -166,7 +166,7 @@ describe "Rhom::RhomObject" do
     new_id = @account1.object
     @account1.save
     @account2 = Account.find(new_id)
-    @account2.object.should =="{#{@account1.object}}"
+    @account2.object.should =="#{@account1.object}"
     @account2.name.should == vars['name']
     @account2.industry.should == vars['industry']
   end
@@ -191,7 +191,7 @@ describe "Rhom::RhomObject" do
     new_id = @account1.object
     @account1.save
     @account2 = Account.find(new_id)
-    @account2.object.should =="{#{@account1.object}}"
+    @account2.object.should =="#{@account1.object}"
     @account2.name.should == vars['name']
     @account2.industry.should == vars['industry']
     
@@ -199,7 +199,7 @@ describe "Rhom::RhomObject" do
     @account2.update_attributes(update_attributes)
 
     @account3 = Account.find(new_id)    
-    @account3.object.should =="{#{@account1.object}}"
+    @account3.object.should =="#{@account1.object}"
     @account3.name.should == vars['name']
     @account3.industry.should == update_attributes['industry']
 
@@ -217,7 +217,7 @@ describe "Rhom::RhomObject" do
     @account1.save
     
     @account2 = Account.find(new_id)
-    @account2.object.should =="{#{@account1.object}}"
+    @account2.object.should =="#{@account1.object}"
     @account2.name.should == vars['name']
     
     update_attributes = {"industry"=>"electronics2"}
@@ -225,7 +225,7 @@ describe "Rhom::RhomObject" do
     @account2.save
     
     @account3 = Account.find(new_id)    
-    @account3.object.should =="{#{@account1.object}}"
+    @account3.object.should =="#{@account1.object}"
     @account3.name.should == vars['name']
     @account3.industry.should == update_attributes['industry']
 
@@ -507,7 +507,7 @@ describe "Rhom::RhomObject" do
     
     @accts.length.should == 0
   end
-  
+=begin  
   it "should support blob file type" do
     @acct = Account.new({'image_uri'=>"/db/images/mynewimage.png"})
     @acct.name = "my new acct"
@@ -515,7 +515,7 @@ describe "Rhom::RhomObject" do
     @res = ::Rho::RHO.get_user_db().select_from_table('object_values','*', 'attrib_type' => "blob.file")
     @res.length.should == 1
   end
-  
+=end  
   it "should include only selected column" do
     @accts = Account.find(:all, :select => ['name'])
     
@@ -601,7 +601,7 @@ describe "Rhom::RhomObject" do
       3.times do |x|
         @accts = Account.paginate(:page => x)
         @accts.length.should == 10
-        @accts[9].object.should == "{#{@expected[x][:object]}}"
+        @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]
@@ -613,7 +613,7 @@ describe "Rhom::RhomObject" do
     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].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]
@@ -624,7 +624,7 @@ describe "Rhom::RhomObject" do
     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].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]

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 0
   - 0
-  - beta1
-  version: 2.0.0.beta1
+  - beta2
+  version: 2.0.0.beta2
 platform: ruby
 authors: 
 - Rhomobile
@@ -267,6 +267,25 @@ files:
 - lib/extensions/rholang/lang_sr.rb
 - lib/extensions/rholang/rhoerror_ru.rb
 - lib/extensions/rholang/rhomsg_ru.rb
+- lib/extensions/rhoxml/rexml/child.rb
+- lib/extensions/rhoxml/rexml/document.rb
+- lib/extensions/rhoxml/rexml/element.rb
+- lib/extensions/rhoxml/rexml/encoding.rb
+- lib/extensions/rhoxml/rexml/encodings/US-ASCII.rb
+- lib/extensions/rhoxml/rexml/encodings/UTF-16.rb
+- lib/extensions/rhoxml/rexml/encodings/UTF-8.rb
+- lib/extensions/rhoxml/rexml/namespace.rb
+- lib/extensions/rhoxml/rexml/node.rb
+- lib/extensions/rhoxml/rexml/parent.rb
+- lib/extensions/rhoxml/rexml/parseexception.rb
+- lib/extensions/rhoxml/rexml/parsers/baseparser.rb
+- lib/extensions/rhoxml/rexml/parsers/treeparser.rb
+- lib/extensions/rhoxml/rexml/parsers/xpathparser.rb
+- lib/extensions/rhoxml/rexml/set.rb
+- lib/extensions/rhoxml/rexml/source.rb
+- lib/extensions/rhoxml/rexml/xmltokens.rb
+- lib/extensions/rhoxml/rexml/xpath.rb
+- lib/extensions/rhoxml/rexml/xpath_parser.rb
 - lib/extensions/set/set.rb
 - lib/extensions/uri/uri/common.rb
 - lib/extensions/uri/uri/ftp.rb
@@ -324,7 +343,6 @@ files:
 - lib/test/rho_stubs.rb
 - lib/test/syncdb.sqlite
 - LICENSE
-- LICENSING_OPTIONS
 - Manifest.txt
 - platform/android/build/android.rake
 - platform/android/build/androidcommon.rb
@@ -444,6 +462,7 @@ files:
 - platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogOptionsDialog.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/uri/MailUriHandler.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/uri/SmsUriHandler.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/uri/TelUriHandler.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/uri/UriHandler.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/uri/VideoUriHandler.java
@@ -455,7 +474,6 @@ files:
 - platform/bb/build/RhoBundleAlx.erb
 - platform/bb/build/rhodes_build.files
 - platform/bb/build/rhodesApp.csl
-- platform/bb/build/rhodesApp.rapc
 - platform/bb/build/rhodesAppAlx.erb
 - platform/bb/build/RubyVM_build.files
 - platform/bb/build/RubyVM_MANIFEST.MF
@@ -1515,6 +1533,7 @@ files:
 - platform/shared/rubyext/RhoRuby.h
 - platform/shared/rubyext/System.cpp
 - platform/shared/rubyext/WebView.h
+- platform/shared/rubyJVM/src/com/rho/Capabilities.java
 - platform/shared/rubyJVM/src/com/rho/Convert.java
 - platform/shared/rubyJVM/src/com/rho/DateTimeTokenizer.java
 - platform/shared/rubyJVM/src/com/rho/db/DBAdapter.java
@@ -3625,7 +3644,6 @@ files:
 - res/generators/templates/model/show.bb.erb
 - res/generators/templates/model/show.erb
 - res/generators/templates/model/spec.rb
-- res/generators/templates/source/source_adapter.rb
 - res/generators/templates/spec/app/fileutils.rb
 - res/generators/templates/spec/app/mspec/expectations/expectations.rb
 - res/generators/templates/spec/app/mspec/expectations/should.rb
@@ -3744,7 +3762,6 @@ files:
 - res/generators/templates/spec/app/spec_runner.rb
 - res/generators/templates/spec/app/SpecRunner/controller.rb
 - res/generators/templates/spec/app/SpecRunner/index.erb
-- rhobuild.yml
 - rhobuild.yml.example
 - rhodes.gemspec
 - spec/framework_spec/app/Account/config.rb

data/LICENSING_OPTIONS

@@ -1 +0,0 @@
-If you can comply with the terms of the GPLv3 license (in this distributable as the file LICENSE), then you canuse that license.   This includes being willing to open source your application.  We also make a commercial license available. Write to sales@rhomobile.com for details

data/platform/bb/build/rhodesApp.rapc

@@ -1,9 +0,0 @@
-MIDlet-Name: rhodesApp
-MIDlet-Version: 0.2.0
-MIDlet-Vendor: rhomobile
-MIDlet-Jar-URL: rhodesApp.jar
-MIDlet-Jar-Size: 0
-MicroEdition-Profile: MIDP-2.0
-MicroEdition-Configuration: CLDC-1.1
-MIDlet-1: rhodesApp,resources/icon.png,
-RIM-MIDlet-Flags-1: 1

data/res/generators/templates/source/source_adapter.rb

@@ -1,48 +0,0 @@
-class <%=name.camelize%> < SourceAdapter
-  def initialize(source,credential)
-    super(source,credential)
-  end
- 
-  def login
-    #TODO: Write some code here
-    # use the variable @source.login and @source.password
-    raise "Please provide some code to perform an authenticated login to the backend application"
-  end
- 
-  def query
-    # TODO: write some code here, Query your backend for objects. Put into some variable that is used in sync method below
-    raise "Please provide some code to read records from the backend application"
-  end
- 
-  def sync
-    # TODO: write code here that converts the data you got back from query into an @result object
-    # where @result is a hash of hashes,  each array item representing an object
-    # for example: @result={"1"=>{"name"=>"Acme","industry"=>"Electronics"},"2"=>{"name"=>"Best","industry"=>"Software"}}
-    # if you have such a hash of hashes, then you can just call "super" as shown below
-    super # this creates object value triples from an @result variable that contains a hash of hashes 
-  end
- 
-  def create(name_value_list,blob=nil)
-    #TODO: write some code here
-    # the backend application will provide the object hash key and corresponding value
-    raise "Please provide some code to create a single object in the backend application using the hash values in name_value_list"
-  end
- 
-  def update(name_value_list)
-    #TODO: write some code here
-    # be sure to have a hash key and value for "object"
-    raise "Please provide some code to update a single object in the backend application using the hash values in name_value_list"
-  end
- 
-  def delete(name_value_list)
-    #TODO: write some code here if applicable
-    # be sure to have a hash key and value for "object"
-    # for now, we'll say that its OK to not have a delete operation
-    # raise "Please provide some code to delete a single object in the backend application using the hash values in name_value_list"
-  end
- 
-  def logoff
-    #TODO: write some code here if applicable
-    # no need to do a raise here
-  end
-end

data/rhobuild.yml

@@ -1,37 +0,0 @@
---- 
-env: 
-  app: /Users/lars/Dev/code/rhomobile/rhodes-system-api-samples
-  paths: 
-    android-ndk: /Users/lars/Dev/android-ndk-r3
-    java: /Library/Java/Home/bin
-    android: /Users/lars/Dev/android-sdk-mac_86
-    4.6: 
-      jde: 
-      sim: 9000
-      mds: 
-    cabwiz: 
-    4.2: 
-      jde: 
-      sim: 8100
-      mds: 
-excludedirs: 
-  bb: 
-  - public/js/iui
-  - public/js/jquery*
-  - public/js/prototype*
-  - public/css/iphone*
-  - public/iwebkit
-  - "**/*.db"
-  - "**/.*.swo"
-  - "**/.*.swn"
-  - "**/jquery*.js"
-  - "**/.DS_Store"
-android: 
-build: 
-  symbianpath: platform/symbian
-  bb: 
-  bbsignpwd: somepasswordhere
-  bbpath: platform/bb
-  wmpath: platform/wm
-  androidpath: platform/android
-  iphonepath: platform/iphone