rlmattax-restfulx 1.2.4.1

data/README.rdoc

@@ -0,0 +1,50 @@
+= RestfulX Framework: The RESTful way to develop Adobe Flex and AIR applications
+
+== Description
+
+Here's some of the things you can do with *RestfulX*:
+
+* *Create* a complete _Adobe_ _Flex_ or _AIR_ application in less than 5 minutes.
+
+  Use our lightweight Ruby-based code generation toolkit to create a fully functional
+  CRUD application. Simply do:
+  
+    sudo gem install restfulx
+  
+  And then run:
+  
+    rx-gen -h
+
+* *Integrate* with _Ruby_ _On_ _Rails_, _Merb_ or _Sinatra_ applications 
+  that use _ActiveRecord_, _DataMapper_, _CouchRest_, _ActiveCouch_ and so on.
+
+* *Communicate* between your Flex/AIR Rich Internet Application and service providers 
+  using either _XML_ or _JSON_.
+  
+* *Persist* your data directly in Adobe AIR _SQLite_ database or _CouchDB_ 
+  without any additional infrastructure or intermediate servers.
+  
+* *Deploy* your RestfulX application on the Google App Engine and use Google
+  DataStore for persistence.
+  
+* *Synchronize* your data between AIR _SQLite_ and other service providers. 
+
+== Getting Started
+
+For details on how to get started with the RestfulX framework refer to:
+    
+    http://restfulx.org
+    
+== Getting Involved
+
+Report bugs or track framework development progress:
+
+    http://github.com/dima/restfulx_framework/issues
+  
+Get involved with the community:
+      
+    http://groups.google.com/group/restfulx-framework
+    
+== License
+
+Copyright (c) 2008-2009 Dima Berastau and Contributors, released under MIT License

data/Rakefile

@@ -0,0 +1,79 @@
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "restfulx"
+    gem.summary = "RestfulX Framework Code Generation Engine / Rails 2.1+ Integration Support"
+    gem.email = "dima.berastau@gmail.com"
+    gem.homepage = "http://restfulx.org"
+    gem.rubyforge_project = "restfulx"
+    gem.authors = ["Dima Berastau"]
+    gem.files =  FileList["[A-Z]*", "{bin,app_generators,rails_generators,rxgen_generators,lib,test,spec,tasks}/**/*"]
+    gem.files.exclude 'test/**/*.log', 'test/**/*.sqlite3'
+    gem.test_files.exclude 'test/**/*.log', 'test/**/*.sqlite3'
+    gem.add_dependency('rubigen', '>= 1.5.0')
+    gem.add_dependency('activesupport', '>=2.0.0')
+  end
+rescue LoadError
+  puts "jeweler not available. Install it with: sudo gem install jeweler"
+end
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  config = YAML.load(File.read('VERSION.yml'))
+  rdoc.rdoc_dir = 'doc/api'
+  rdoc.title = "RestfulX #{config[:major]}.#{config[:minor]}.#{config[:patch]}"
+  rdoc.options << '--line-numbers' << '--inline-source' #<< '-Tjamis'
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+begin
+  require 'rake/contrib/sshpublisher'
+  namespace :rubyforge do
+    namespace :release do
+      desc "Publish RDoc to RubyForge."
+      task :docs => [:rdoc] do
+        config = YAML.load(
+            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+        )
+
+        host = "#{config['username']}@rubyforge.org"
+        remote_dir = "/var/www/gforge-projects/restfulx/"
+        local_dir = 'doc/api'
+
+        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
+      end
+    end
+  end
+rescue LoadError
+  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib' << 'test'
+  t.pattern = 'test/**/test_*.rb'
+  t.verbose = false
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |t|
+    t.libs << 'test'
+    t.test_files = FileList['test/**/test_*.rb']
+    t.verbose = true
+  end
+rescue LoadError
+  puts "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+end
+
+begin
+  require 'cucumber/rake/task'
+  Cucumber::Rake::Task.new(:features)
+rescue LoadError
+  puts "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
+end
+
+task :default => :test

data/VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:major: 1
+:minor: 2
+:patch: 4

data/app_generators/rx_app/USAGE

@@ -0,0 +1,22 @@
+Description:
+    Generates the primary RestfulX project directory structure and sets 
+    up Flex Builder and TextMate specific descriptor files
+    
+    You can generate Flex Builder configuration for either *pure* Flex
+    project or an AIR project. To generate AIR configuration pass the -a
+    (--air) option to the generator.
+    
+    You can also choose to generate a simple Google App Engine back-end
+    along with your Flex front-end by passing the --gae option.
+
+Examples:
+    `rx-gen pomodo`     # generates project structure and a 
+                        # default Flex app configuration.
+    `rx-gen -a pomodo`  # as above but generates an AIR app
+                        # and configuration
+    `rx-gen --gae pomodo` # generate Flex + GAE application
+                          # configuration
+                           
+Next Steps:
+    In your new RestfulX project folder run `ruby script/generate` for
+    a list of available generators.

data/app_generators/rx_app/rx_app_generator.rb

@@ -0,0 +1,110 @@
+class RxAppGenerator < RubiGen::Base
+  include RestfulX::Configuration
+
+  attr_reader :project_name, 
+              :flex_project_name, 
+              :base_package, 
+              :base_folder, 
+              :command_controller_name, 
+              :component_names, 
+              :application_tag,
+              :use_air,
+              :use_gae,
+              :flex_root,
+              :base_flex_package,
+              :distributed
+
+  def initialize(runtime_args, runtime_options = {})
+    super
+    usage if args.empty?
+    @destination_root = File.expand_path(args.shift)
+    
+    @project_name, @flex_project_name, @command_controller_name, 
+      @base_package, @base_folder, @flex_root, @distributed = extract_names(base_name)
+
+    @base_package = options[:base_flex_package] if options[:base_flex_package]
+    @base_folder = options[:base_flex_package].gsub('.', '/').gsub(/\W/, '') if options[:base_flex_package]
+    @flex_root = options[:flex_root] if options[:flex_root]
+    @use_gae = options[:gae]
+    @use_air = options[:air_config]
+    @distributed = options[:distributed] unless @distributed
+    if @use_air
+      @application_tag = 'WindowedApplication'
+    else
+      @application_tag = 'Application'
+    end
+
+    @component_names = []
+  end
+
+  def manifest
+    record do |m|
+      m.directory ''
+      
+      %w(script lib db config bin-debug).each { |dir| m.directory dir }
+      
+      if options[:gae]
+        m.file 'index.yaml', 'index.yaml' unless File.exist?('index.yaml')
+        m.template 'app.yaml.erb', 'app.yaml' unless File.exist?('app.yaml')
+        m.directory 'app/controllers'
+        m.file 'empty.txt', 'app/__init__.py'
+        m.file 'empty.txt', 'app/controllers/__init__.py'
+        m.directory 'app/models'
+        m.file 'empty.txt', 'app/models/__init__.py'
+      end
+
+      m.template 'restfulx.yml', 'config/restfulx.yml'
+      m.file 'default_tasks.rake', 'Rakefile' unless File.exist?('Rakefile')      
+      m.file 'flex.properties', '.flexProperties'
+      m.file 'generate.rb', 'script/generate', { :chmod => 0755 }
+      if @use_air
+        m.template 'actionscriptair.properties', '.actionScriptProperties'
+        m.template 'projectair.properties', '.project'
+      else
+        m.template 'actionscript.properties', '.actionScriptProperties'
+        m.template 'project.properties', '.project'
+        
+        m.directory 'html-template/history'      
+        %w(index.template.html AC_OETags.js playerProductInstall.swf).each do |file|
+          m.file "html-template/#{file}", "html-template/#{file}"
+        end
+        
+        %w(history.css history.js historyFrame.html).each do |file|
+          m.file "html-template/history/#{file}", "html-template/history/#{file}"
+        end
+        
+        m.directory 'public/javascripts'
+        m.file 'swfobject.js', 'public/javascripts/swfobject.js'
+        m.file 'expressInstall.swf', 'public/expressInstall.swf'
+        m.template 'index.html.erb', 'public/index.html'
+      end
+      
+      %w(views controllers commands models events helpers).each do |dir|
+        m.directory "#{flex_root}/#{base_folder}/#{dir}"
+      end
+      
+      m.directory "#{flex_root}/#{base_folder}/views/generated"
+
+      m.template 'project-textmate.erb', "#{project_name}.tmproj"
+      m.template 'mainapp.mxml', File.join("#{flex_root}", "#{flex_project_name}.mxml")
+      m.template 'mainapp-config.xml', File.join("#{flex_root}", "#{flex_project_name}-config.xml")
+      m.template 'mainair-app.xml', File.join("#{flex_root}", "#{flex_project_name}-app.xml") if @use_air      
+    end
+  end
+
+  protected
+  def add_options!(opt)
+    opt.separator ''
+    opt.separator 'Options:'
+    opt.on("-a", "--air", "Configure AIR project instead of Flex. Flex is default.", 
+      "Default: false") { |v| options[:air_config] = v }
+    opt.on("--gae", "Generate Google App Engine Python classes in addition to RestfulX Flex resources.", 
+      "Default: false") { |v| options[:gae] = v }
+    opt.on("--flex-root [FOLDER]", "Root folder for generated flex code.", 
+      "Default: app/flex") { |v| options[:flex_root] = v }
+    opt.on("--base-flex-package [PACKAGE]", "Base package for your application.", 
+      "Default: #{flex_project_name}") { |v| options[:base_flex_package] = v }
+    opt.on("--distributed", "Creates migrations, controllers and models that use UUIDs and are distribution ready", 
+      "Default: false") { |v| options[:distributed] = v }
+  end
+end

data/app_generators/rx_app/templates/actionscript.properties

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actionScriptProperties mainApplicationPath="<%= flex_project_name %>.mxml" version="3">
+<compiler additionalCompilerArguments="-locale en_US -keep-as3-metadata+=Resource,HasOne,HasMany,BelongsTo,DateTime,Lazy,Ignored,Nested" copyDependentFiles="true" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="true" outputFolderPath="public/bin" rootURL="http://localhost:3000/bin" sourceFolderPath="<%= flex_root %>" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
+  <compilerSourcePath/>
+  <libraryPath defaultLinkType="1">
+    <libraryPathEntry kind="4" path=""/>
+    <libraryPathEntry kind="1" linkType="1" path="lib"/>
+  </libraryPath>
+  <sourceAttachmentPath/>
+</compiler>
+<applications>
+  <application path="<%= flex_project_name %>.mxml"/>
+</applications>
+<modules/>
+<buildCSSFiles/>
+</actionScriptProperties>

data/app_generators/rx_app/templates/actionscriptair.properties

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actionScriptProperties mainApplicationPath="<%= flex_project_name %>.mxml" version="3">
+<compiler additionalCompilerArguments="-locale en_US -keep-as3-metadata+=Resource,HasOne,HasMany,BelongsTo,DateTime,Lazy,Ignored,Nested" copyDependentFiles="true" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="true" outputFolderPath="bin-debug" sourceFolderPath="<%= flex_root %>" strict="true" useApolloConfig="true" verifyDigests="true" warn="true">
+  <compilerSourcePath/>
+  <libraryPath defaultLinkType="1">
+    <libraryPathEntry kind="4" path=""/>
+    <libraryPathEntry kind="1" linkType="1" path="lib"/>
+  </libraryPath>
+  <sourceAttachmentPath/>
+</compiler>
+<applications>
+  <application path="<%= flex_project_name %>.mxml"/>
+</applications>
+<modules/>
+<buildCSSFiles/>
+</actionScriptProperties>

data/app_generators/rx_app/templates/app.yaml.erb

@@ -0,0 +1,12 @@
+application: <%= project_name %>
+version: 1
+runtime: python
+api_version: 1
+
+handlers:
+- url: /public
+  static_dir: public
+- url: .*
+  script: main.py
+
+

data/app_generators/rx_app/templates/default_tasks.rake

@@ -0,0 +1,38 @@
+# this will use the latest version of restfulx gem
+require 'restfulx/tasks'
+
+TEST_APP_NAME = 'TestApp.mxml'
+
+namespace :air do
+  desc "Build and run the AIR application"
+  task :run => ["rx:air:build", "rx:air:run"]
+end
+
+namespace :flex do
+  desc "Test flex application"
+  task :test => ["rx:test:build", "rx:test:run"]
+  
+  desc "Build flex application"
+  task :build do
+    libs = [] # you can add libraries that are not in lib folder here
+    compile_application(:destination => 'bin-debug', :opts => "-library-path+=#{libs.join(',')}")  
+  end
+end
+
+namespace :rx do 
+  namespace :test do
+    desc "Build flex test swf file"
+    task :build do
+      libs = Dir.glob(File.join(APP_ROOT, 'lib', '*.swc'))
+      #libs << 'foobar' # you can add libraries that not in lib folder here
+      
+      compile_application(:application => TEST_APP_NAME, :destination => 'bin-debug', 
+        :opts => "+configname=air -library-path+=#{libs.join(',')}")
+    end
+    
+    desc "Run flex test application"
+    task :run do
+      run_air_application(:application => TEST_APP_NAME)
+    end
+  end
+end

data/app_generators/rx_app/templates/flex.properties

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<flexProperties flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="1"/>

data/app_generators/rx_app/templates/generate.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.join(File.dirname(__FILE__), '..')
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/generate'
+require 'activesupport'
+require 'restfulx'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+
+RubiGen::Base.use_component_sources! [:rxgen]
+RubiGen::Scripts::Generate.new.run(ARGV)

data/app_generators/rx_app/templates/html-template/AC_OETags.js

@@ -0,0 +1,276 @@
+// Flash Player Version Detection - Rev 1.6
+// Detect Client Browser type
+// Copyright(c) 2005-2006 Adobe Macromedia Software, LLC. All rights reserved.
+var isIE  = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false;
+var isWin = (navigator.appVersion.toLowerCase().indexOf("win") != -1) ? true : false;
+var isOpera = (navigator.userAgent.indexOf("Opera") != -1) ? true : false;
+
+function ControlVersion()
+{
+	var version;
+	var axo;
+	var e;
+
+	// NOTE : new ActiveXObject(strFoo) throws an exception if strFoo isn't in the registry
+
+	try {
+		// version will be set for 7.X or greater players
+		axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");
+		version = axo.GetVariable("$version");
+	} catch (e) {
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 6.X players only
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");
+			
+			// installed player is some revision of 6.0
+			// GetVariable("$version") crashes for versions 6.0.22 through 6.0.29,
+			// so we have to be careful. 
+			
+			// default to the first public version
+			version = "WIN 6,0,21,0";
+
+			// throws if AllowScripAccess does not exist (introduced in 6.0r47)		
+			axo.AllowScriptAccess = "always";
+
+			// safe to call for 6.0r47 or greater
+			version = axo.GetVariable("$version");
+
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 4.X or 5.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
+			version = axo.GetVariable("$version");
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 3.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
+			version = "WIN 3,0,18,0";
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 2.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
+			version = "WIN 2,0,0,11";
+		} catch (e) {
+			version = -1;
+		}
+	}
+	
+	return version;
+}
+
+// JavaScript helper required to detect Flash Player PlugIn version information
+function GetSwfVer(){
+	// NS/Opera version >= 3 check for Flash plugin in plugin array
+	var flashVer = -1;
+	
+	if (navigator.plugins != null && navigator.plugins.length > 0) {
+		if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) {
+			var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
+			var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
+			var descArray = flashDescription.split(" ");
+			var tempArrayMajor = descArray[2].split(".");			
+			var versionMajor = tempArrayMajor[0];
+			var versionMinor = tempArrayMajor[1];
+			var versionRevision = descArray[3];
+			if (versionRevision == "") {
+				versionRevision = descArray[4];
+			}
+			if (versionRevision[0] == "d") {
+				versionRevision = versionRevision.substring(1);
+			} else if (versionRevision[0] == "r") {
+				versionRevision = versionRevision.substring(1);
+				if (versionRevision.indexOf("d") > 0) {
+					versionRevision = versionRevision.substring(0, versionRevision.indexOf("d"));
+				}
+			}
+			var flashVer = versionMajor + "." + versionMinor + "." + versionRevision;
+		}
+	}
+	// MSN/WebTV 2.6 supports Flash 4
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.6") != -1) flashVer = 4;
+	// WebTV 2.5 supports Flash 3
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.5") != -1) flashVer = 3;
+	// older WebTV supports Flash 2
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv") != -1) flashVer = 2;
+	else if ( isIE && isWin && !isOpera ) {
+		flashVer = ControlVersion();
+	}	
+	return flashVer;
+}
+
+// When called with reqMajorVer, reqMinorVer, reqRevision returns true if that version or greater is available
+function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
+{
+	versionStr = GetSwfVer();
+	if (versionStr == -1 ) {
+		return false;
+	} else if (versionStr != 0) {
+		if(isIE && isWin && !isOpera) {
+			// Given "WIN 2,0,0,11"
+			tempArray         = versionStr.split(" "); 	// ["WIN", "2,0,0,11"]
+			tempString        = tempArray[1];			// "2,0,0,11"
+			versionArray      = tempString.split(",");	// ['2', '0', '0', '11']
+		} else {
+			versionArray      = versionStr.split(".");
+		}
+		var versionMajor      = versionArray[0];
+		var versionMinor      = versionArray[1];
+		var versionRevision   = versionArray[2];
+
+        	// is the major.revision >= requested major.revision AND the minor version >= requested minor
+		if (versionMajor > parseFloat(reqMajorVer)) {
+			return true;
+		} else if (versionMajor == parseFloat(reqMajorVer)) {
+			if (versionMinor > parseFloat(reqMinorVer))
+				return true;
+			else if (versionMinor == parseFloat(reqMinorVer)) {
+				if (versionRevision >= parseFloat(reqRevision))
+					return true;
+			}
+		}
+		return false;
+	}
+}
+
+function AC_AddExtension(src, ext)
+{
+  if (src.indexOf('?') != -1)
+    return src.replace(/\?/, ext+'?'); 
+  else
+    return src + ext;
+}
+
+function AC_Generateobj(objAttrs, params, embedAttrs) 
+{ 
+    var str = '';
+    if (isIE && isWin && !isOpera)
+    {
+  		str += '<object ';
+  		for (var i in objAttrs)
+  			str += i + '="' + objAttrs[i] + '" ';
+  		str += '>';
+  		for (var i in params)
+  			str += '<param name="' + i + '" value="' + params[i] + '" /> ';
+  		str += '</object>';
+    } else {
+  		str += '<embed ';
+  		for (var i in embedAttrs)
+  			str += i + '="' + embedAttrs[i] + '" ';
+  		str += '> </embed>';
+    }
+
+    document.write(str);
+}
+
+function AC_FL_RunContent(){
+  var ret = 
+    AC_GetArgs
+    (  arguments, ".swf", "movie", "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
+     , "application/x-shockwave-flash"
+    );
+  AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
+}
+
+function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
+  var ret = new Object();
+  ret.embedAttrs = new Object();
+  ret.params = new Object();
+  ret.objAttrs = new Object();
+  for (var i=0; i < args.length; i=i+2){
+    var currArg = args[i].toLowerCase();    
+
+    switch (currArg){	
+      case "classid":
+        break;
+      case "pluginspage":
+        ret.embedAttrs[args[i]] = args[i+1];
+        break;
+      case "src":
+      case "movie":	
+        args[i+1] = AC_AddExtension(args[i+1], ext);
+        ret.embedAttrs["src"] = args[i+1];
+        ret.params[srcParamName] = args[i+1];
+        break;
+      case "onafterupdate":
+      case "onbeforeupdate":
+      case "onblur":
+      case "oncellchange":
+      case "onclick":
+      case "ondblClick":
+      case "ondrag":
+      case "ondragend":
+      case "ondragenter":
+      case "ondragleave":
+      case "ondragover":
+      case "ondrop":
+      case "onfinish":
+      case "onfocus":
+      case "onhelp":
+      case "onmousedown":
+      case "onmouseup":
+      case "onmouseover":
+      case "onmousemove":
+      case "onmouseout":
+      case "onkeypress":
+      case "onkeydown":
+      case "onkeyup":
+      case "onload":
+      case "onlosecapture":
+      case "onpropertychange":
+      case "onreadystatechange":
+      case "onrowsdelete":
+      case "onrowenter":
+      case "onrowexit":
+      case "onrowsinserted":
+      case "onstart":
+      case "onscroll":
+      case "onbeforeeditfocus":
+      case "onactivate":
+      case "onbeforedeactivate":
+      case "ondeactivate":
+      case "type":
+      case "codebase":
+        ret.objAttrs[args[i]] = args[i+1];
+        break;
+      case "id":
+      case "width":
+      case "height":
+      case "align":
+      case "vspace": 
+      case "hspace":
+      case "class":
+      case "title":
+      case "accesskey":
+      case "name":
+      case "tabindex":
+        ret.embedAttrs[args[i]] = ret.objAttrs[args[i]] = args[i+1];
+        break;
+      default:
+        ret.embedAttrs[args[i]] = ret.params[args[i]] = args[i+1];
+    }
+  }
+  ret.objAttrs["classid"] = classid;
+  if (mimeType) ret.embedAttrs["type"] = mimeType;
+  return ret;
+}
+
+