rhodes 5.5.0.22 → 5.5.2

data/platform/wm/rhodes/browser/BrowserFactory.cpp

@@ -85,7 +85,7 @@ IBrowserEngine* BrowserFactory::create(HWND hwndParent)
     //TODO TAU
 	//String             xmlConfigType   = rho_wmimpl_get_webengine();
 	String             xmlConfigType;
-    String             rhoConfigType   = RHOCONF().getString("webengine");
+    String             rhoConfigType   = RHOCONF().getString("webengine");  
     
     if (get_app_build_config_item("webengine"))
     {
@@ -110,10 +110,12 @@ IBrowserEngine* BrowserFactory::create(HWND hwndParent)
 
     if (selBrowserType == eNone)
     {
-        selBrowserType = eIE;
-        LOG(INFO) + "WebKit extension missing. Selected Internet Explorer engine automatically.";
+        selBrowserType = eWebkit;
+        LOG(INFO) + "Browser engine was not set in config`s. Selected Webkit engine automatically.";
     } 
 
+	//TAU
+	selBrowserType = eWebkit;
     m_selBrowserType = selBrowserType;
 
     switch (selBrowserType)
@@ -156,4 +158,4 @@ EBrowserEngineType BrowserFactory::getCurrentBrowserType()
 extern "C" bool rho_wmimpl_is_browser_ieforwm()
 {
     return (bool)(rho::eIE == rho::BrowserFactory::getCurrentBrowserType());
-}
+}

data/platform/wm/rhodes/rhodes.vcproj

@@ -454,7 +454,7 @@
 			/>
 			<DeploymentTool
 				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\Kitchen Sink"
+				RemoteDirectory="%CSIDL_PROGRAM_FILES%\sas"
 				RegisterOutput="0"
 				AdditionalFiles=""
 			/>
@@ -1095,7 +1095,7 @@
 			/>
 			<DeploymentTool
 				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\Kitchen Sink"
+				RemoteDirectory="%CSIDL_PROGRAM_FILES%\sas"
 				RegisterOutput="0"
 				AdditionalFiles=""
 			/>
@@ -2031,31 +2031,6 @@
 		</Configuration>
 	</Configurations>
 	<References>
-		<AssemblyReference
-			RelativePath="System.dll"
-			AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
-			MinFrameworkVersion="131072"
-		/>
-		<AssemblyReference
-			RelativePath="System.Data.dll"
-			AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"
-			MinFrameworkVersion="131072"
-		/>
-		<AssemblyReference
-			RelativePath="System.Drawing.dll"
-			AssemblyName="System.Drawing, Version=2.0.0.0, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
-			MinFrameworkVersion="131072"
-		/>
-		<AssemblyReference
-			RelativePath="System.Windows.Forms.dll"
-			AssemblyName="System.Windows.Forms, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
-			MinFrameworkVersion="131072"
-		/>
-		<AssemblyReference
-			RelativePath="System.XML.dll"
-			AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
-			MinFrameworkVersion="131072"
-		/>
 	</References>
 	<Files>
 		<Filter
@@ -3024,10 +2999,6 @@
 				RelativePath=".\browser\IEBrowserEngine.h"
 				>
 			</File>
-			<File
-				RelativePath=".\browser\stubs.cpp"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

data/rakefile.rb

@@ -74,7 +74,6 @@ end
 #------------------------------------------------------------------------
 
 $app_basedir = pwd
-$is_webkit_engine = false
 $startdir = File.dirname(__FILE__)
 $startdir.gsub!('\\', '/')
 
@@ -2487,10 +2486,6 @@ def init_extensions(dest, mode = "")
 
   $app_config["extensions"].each do |extname|
     puts 'ext - ' + extname
-    
-    if extname == "webkit"
-		$is_webkit_engine = true
-    end
 
     extpath = nil
     extpaths.each do |p|
@@ -2675,23 +2670,6 @@ def init_extensions(dest, mode = "")
 
   end
 
-  stubs = File.join($startdir, "platform", "wm", "rhodes", "browser", "stubs.cpp")
-  if $is_webkit_engine == false
-	File.open(stubs, "w+") do |f|
-        f.puts "// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!"
-        f.puts "#include \"StdAfx.h\""
-        f.puts "#include \"common/RhoStd.h\""
-        f.puts "#include \"IBrowserEngine.h\""
-        f.puts "rho::IBrowserEngine* rho_wmimpl_get_webkitBrowserEngine(HWND hwndParent, HINSTANCE rhoAppInstance) {return 0;}"
-        Jake.modify_file_if_content_changed( stubs, f )
-    end
-  else
-	File.open(stubs, "w+") do |f|
-        f.puts "// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!"
-        f.puts "#include \"StdAfx.h\""
-        Jake.modify_file_if_content_changed( stubs, f )
-    end
-  end
 
   if ($ruby_only_extensions_list)
     BuildOutput.warning([

data/res/generators/templates/application/app/Settings/home.erb

@@ -14,7 +14,7 @@
         </div>
         <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
           <%% if SyncEngine::logged_in > 0 %>
-          <a href="<%%= url_for :controller => :Settings, :action => :logout %>" class="btn btn-default btn-sm pull-right">
+          <a href="<%%= url_for :controller => :Settings, :action => :logout %" class="btn btn-default btn-sm pull-right">
             Logout
           </a>
           <%% else %>

data/res/generators/templates/application/build.yml

@@ -1,43 +1,13 @@
-## Note: sdk is full path to Rhodes root. If not defined - automatically find latest installed Rhodes gem
 #sdk: "<%=@sdk_path%>"
 sdkversion: <%=Rhodes::VERSION%>
 name: <%=@app_name%>
 version: 1.0
 vendor: rhomobile
-## Note: rho_app_id send to RhoConnect server for identify application (used in multi-push configuration only)
-## we recommend make it same with BundleIdentifier
-rho_app_id: com.rhomobile.<%=@app_name_cleared%>
 build: debug
 applog: rholog.txt
-
-## Note: enable specific device capabilities for aplication
-#capabilities:
-  ## allows use of audio hardware (record audio, modify audio settings)
-  #- audio
-  ## allows use of hardware camera
-  #- camera
-  ## allows use of geo location service
-  #- gps
-  ## allows read device network state (connected/disconnected)
-  #- network_state
-  ## allow make calls/read phone state
-  #- phone
-  ## allow read/modify personal information and contacts
-  #- pim
-  ## allows use of PUSH on device
-  #- push
-  ## allows use of hardware vibration mechanism
-  #- vibrate
-  ## allows use of bluetooth hardware
-  #- bluetooth
-  ## allows access to default device calendar
-  #- calendar
-  ## allows writing to the SD card on Android devices
-  #- sdcard
-
 iphone:
   configuration: Release
-  sdk: iphonesimulator10.2
+  sdk: iphonesimulator10.0
   #provisionprofile:
   #codesignidentity:
   #entitlements:
@@ -45,41 +15,14 @@ iphone:
   BundleURLScheme: <%=@app_name_cleared%>
   production:
     ipa_itunesartwork_image: "./production/iTunesArtwork.png"
-  ## Note: Specifies the URL schemes the app is able to call using Rho.System.runApplication
-  #ApplicationQueriesSchemes: ['scheme1', 'scheme2']
-  ## Note: Specifies list of HTTP domains for connect from application
-  #http_connection_domains: ['domain1.com', 'domain2.org']
-  ## Note: Specify remove of Info.plist keys - use this if you need to remove some keys from Info.plist
-  ## This example remove two keys with unsupported screen orientation and also remove UIRequiredDeviceCapabilities key
-  #info_plist_data_remove:
-  #- UIRequiredDeviceCapabilities
-  #- UISupportedInterfaceOrientations: ['UIInterfaceOrientationLandscapeLeft', 'UIInterfaceOrientationLandscapeRight']
-  ## Note: Specifies set/modify of Info.plist keys with content(hash) - all of this items will be apply to final Info.plist of application. You can specify any Ino.plist data in this parameter.
-  ## this example content is equal of two upper parameters content (URLS schemes and HTTP domains) - you can use manually setup this parameters for more detailed setup instead default.
-  ## in this example we show additional disable of perfect forward secrecy (PFS) for domain3(https)
-  #info_plist_data:
-  #  LSApplicationQueriesSchemes: ['scheme1', 'scheme2']
-  #  NSAppTransportSecurity:
-  #    NSAllowsArbitraryLoads: true
-  #    NSExceptionDomains:
-  #      domain1.com:
-  #        NSIncludesSubdomains: true
-  #        NSTemporaryExceptionAllowsInsecureHTTPLoads: true
-  #        NSTemporaryExceptionMinimumTLSVersion: 'TLSv1.0'
-  #      domain2.org:
-  #        NSIncludesSubdomains: true
-  #        NSTemporaryExceptionAllowsInsecureHTTPLoads: true
-  #        NSTemporaryExceptionMinimumTLSVersion: 'TLSv1.0'
-  #      domain3.com:
-  #        NSExceptionRequiresForwardSecrecy: false
-
+  # Note: Specifies the URL schemes the app is able to call using Rho.System.runApplication
+  #ApplicationQueriesSchemes: ["scheme1", "scheme2"]
 wp8:
   productid: '<%=@productid%>'
-
 android:
   #manifest_template: 'AndroidManifest.erb'
   version: 4.1.0
-  ## Note: in order to simplify debugging only app messages and system channels with priority informative and higher, and any errors are enabled by default
+  # Note: in order to simplify debugging only app messages and system channels with priority informative and higher, and any errors are enabled by default
   logcatFilter: APP:I StrictMode:I DEBUG:I *:E
 
 wm:

data/res/generators/templates/iphone_project/buildRhoBundle

@@ -1,42 +1,26 @@
 #!/bin/sh
 
-echo "START buildRhoBundle script"
 
-if [ "$RHO_BUNDLE_ALREADY_BUILDED" = "YES" ]
-then
+if [ "$RHO_BUNDLE_ALREADY_BUILDED" = "YES" ]; then
 
 RHO_BUNDLE_ALREADY_BUILDED="NO"
-echo "RhoBundle already builded !" 
 
-else
+echo "RhoBundle already builded !"
 
-echo "RhoBundle should BUILD !"
+elif [ "$ACTION" = "build" -o "$ACTION" = "" ]; then
 
-RHO_BUNDLE_ALREADY_BUILDED="NO"
-
-. ~/.profile
+source ~/.profile
 cd ../..
 
-echo "START Prepare build bundle - switch app"
-
-ruby --version 
-
+RHO_BUNDLE_ALREADY_BUILDED="NO"
 rake switch_app
-
-echo "FINISH Prepare build bundle - switch app"
-
 TARGET_RHODESLIBS_DIR=${SRCROOT}
-
 cd <%= rhodes_root_path %>
-
-echo "START build bundle ..."
-
 rake build:iphone:rhobundle
 
-echo "FINISH build bundle ..."
-
 RHO_BUNDLE_ALREADY_BUILDED="NO"
 
 fi
 
-echo "FINISH buildRhoBundle script"
+
+

data/res/generators/templates/iphone_project/root/Info.plist

@@ -151,6 +151,8 @@
      <dict>
           <key>NSAllowsArbitraryLoads</key>
 		  <true/>
+		  <key>NSAllowsArbitraryLoadsInWebContent</key>
+    	  <true/>
      </dict>
      <key>UIRequiresFullScreen</key>
      <true/>

data/rhodes.gemspec

@@ -20,20 +20,17 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rhodes}
   s.rubygems_version = %q{1.3.5}
-  s.required_ruby_version = '>= 1.9.1'
   s.add_dependency('templater', '1.0.0')
-  s.add_dependency('rake', '12.0.0')
+  s.add_dependency('rake', '>= 0.9.2')
   s.add_dependency('uuid', '2.3.7')
   s.add_dependency('systemu', '2.6.4')
-  s.add_dependency('json', '1.8.3')
+  s.add_dependency('json', '>= 1.8.1')
   s.add_dependency('rest-client', '1.6.8')
   s.add_dependency('CFPropertyList', '2.2.8')
   s.add_dependency('simctl', '1.5.6')
   s.add_dependency('listen', '3.0.6')
-  s.add_dependency('rubyzip', '1.2.0')
-  s.add_dependency('ffi', '1.9.14')
-  s.add_dependency('rdoc', '4.2.2')
-  s.post_install_message = "Thanks for installing Rhodes ! Please visit our website: http://tau-technologies.com" if s.respond_to? :post_install_message=
+  s.add_dependency('rubyzip', '>= 1.1.7')
+  #s.add_dependency('rdoc', '4.1.2')
   s.executables << 'rhogen'
   s.executables << 'rhodes'
   s.executables << 'upgrade-rhodes-app'
@@ -44,6 +41,7 @@ Gem::Specification.new do |s|
   #this is a hack, we dont have an extension, but we want to run postinstall code. It's done via the 'building' of an extension
   s.extensions << 'ext/extconf.rb'
   s.summary = %q{The Rhodes framework is the easiest way to develop NATIVE apps with full device capabilities (GPS, PIM, camera, etc.) for any smartphone.}
+
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
@@ -57,3 +55,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<diff-lcs>, [">= 1.1.2"])
   end
 end
+

data/version

@@ -1 +1 @@
-5.5.0.22
+5.5.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhodes
 version: !ruby/object:Gem::Version
-  version: 5.5.0.22
+  version: 5.5.2
 platform: ruby
 authors:
 - TAU Technologies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: templater
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -140,44 +140,16 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.9.14
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.9.14
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: 1.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -5887,7 +5859,6 @@ files:
 - platform/iphone/rbuild/findRhodesGuid.rb
 - platform/iphone/rbuild/iphone.rake
 - platform/iphone/rbuild/iphonecommon.rb
-- platform/iphone/rbuild/putsOverride.rake
 - platform/iphone/rhoextlib/dosyscall.c
 - platform/iphone/rhoextlib/rhoextlib.xcodeproj/project.pbxproj
 - platform/iphone/rhoextlib/rhoextlib_Prefix.pch
@@ -8402,7 +8373,6 @@ files:
 - platform/wm/rhodes/browser/IEBrowserEngine.cpp
 - platform/wm/rhodes/browser/IEBrowserEngine.h
 - platform/wm/rhodes/browser/htmlctrl.h
-- platform/wm/rhodes/browser/stubs.cpp
 - platform/wm/rhodes/camera/Camera.cpp
 - platform/wm/rhodes/camera/Camera.h
 - platform/wm/rhodes/memory_helper.cpp
@@ -13641,7 +13611,7 @@ homepage: http://tau-technologies.com/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 'Thanks for installing Rhodes ! Please visit our website: http://tau-technologies.com'
+post_install_message: 
 rdoc_options:
 - "--inline-source"
 - "--charset=UTF-8"
@@ -13664,7 +13634,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.1
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="