rhodes 1.5.5 → 2.0.0.beta1

data/lib/extensions/digest-sha1/ext.yml

@@ -1,2 +1,2 @@
 entry: Init_sha1
-libraries: [ "libdigest-sha1.a" ]
+libraries: [ "digest-sha1" ]

data/lib/extensions/digest/ext.yml

@@ -1,2 +1,2 @@
 entry: Init_digest
-libraries: [ "libdigest.a" ]
+libraries: [ "digest" ]

data/lib/extensions/digest/ext/Rakefile

@@ -2,22 +2,23 @@ require 'fileutils'
 
 def build_extension(name, arch)
   objects = []
-  mkdir_p $tempdir unless File.exist? $tempdir
+  mkdir_p $tempdir unless File.exists? $tempdir
+
   Dir.glob("*.c").each do |f|
     objname = File.join( $tempdir, File.basename( f.gsub(/\.c$/, '.o') ) )
     objects << objname
 
-      args = []
-      args << "-I."
-      args << "-I#{$rootdir}/platform/shared/ruby/include"
-      args << "-I#{$rootdir}/platform/shared"
+    args = []
+    args << "-I."
+    args << "-I#{$rootdir}/platform/shared/ruby/include"
+    args << "-I#{$rootdir}/platform/shared"
 
-    if $android
+    if ENV['RHO_PLATFORM'] == 'android'
       args << "-I#{$rootdir}/platform/shared/ruby/linux"
       args << "-I#{$rootdir}/platform/shared/ruby/generated"
       cc_compile f, $tempdir, args or exit 1
 
-    else
+    elsif ENV['RHO_PLATFORM'] == 'iphone'
       args << "-I#{$rootdir}/platform/shared/ruby/iphone"
       args << "-D_XOPEN_SOURCE"
       args << "-D_DARWIN_C_SOURCE"
@@ -38,10 +39,10 @@ def build_extension(name, arch)
 
   mkdir_p $targetdir unless File.exist? $targetdir
 
-  if $android
+  if ENV['RHO_PLATFORM'] == 'android'
     cc_ar File.join( $targetdir, 'lib' + name + '.a' ), Dir.glob($tempdir + "/**/*.o") or exit 1
 
-  else
+  elsif ENV['RHO_PLATFORM'] == 'iphone'
     args = []
     args << 'rcs'
     args << File.join( $targetdir, 'lib' + name + '.a' )
@@ -51,54 +52,49 @@ def build_extension(name, arch)
     puts `#{cmdline}`
     exit unless $? == 0
 
-  end
-end
+  elsif ENV['RHO_PLATFORM'] == 'wm'
+    args = []
+    args << "/M4"
+    args << name + ".vcproj"
+    args << "\"Release|#{$sdk}\""
+    cmdline = $vcbuild + ' ' + args.join(' ')
+    puts cmdline
+    puts `#{cmdline}`
+    exit unless $? == 0
 
-def build_fat_file(name, archs)
-  archs.each do |arch|
-    build_extension(name, arch)
-  end
-  
-  args = []
-  args << "-create"
-  args << "-output lib#{name}.a"
-  archs.each do |arch|
-    args << "lib#{name}-#{arch}.a"
+    cp_r File.join($tempdir, "Release", name + ".lib"), $targetdir
   end
-  cmdline = $lipobin + ' ' + args.join(' ')
-  puts `#{cmdline}`
-  exit unless $? == 0
 end
 
 namespace "build" do
   task :config do
-    if ENV['ANDROID_API_LEVEL'] != nil
-      $targetdir = ENV['TARGET_TEMP_DIR']
-      raise "TARGET_TEMP_DIR is not set" if $targetdir.nil?
-      $tempdir = ENV['TEMP_FILES_DIR']
-      raise "TEMP_FILES_DIR is not set" if $tempdir.nil?
-      $rootdir = ENV['RHO_ROOT']
-      raise "RHO_ROOT is not set" if $rootdir.nil?
-
+    $targetdir = ENV['TARGET_TEMP_DIR']
+    raise "TARGET_TEMP_DIR is not set" if $targetdir.nil?
+    $tempdir = ENV['TEMP_FILES_DIR']
+    raise "TEMP_FILES_DIR is not set" if $tempdir.nil?
+    $rootdir = ENV['RHODES_ROOT_DIR']
+    raise "RHODES_ROOT_DIR is not set" if $rootdir.nil?
+
+    if ENV['RHO_PLATFORM'] == 'android'
       require File.join($rootdir, 'platform/android/build/androidcommon.rb')
 
       setup_ndk(ENV['ANDROID_NDK'],ENV['ANDROID_API_LEVEL'])
 
-      $android = true
-    else
+    elsif ENV['RHO_PLATFORM'] == 'iphone'
       $bindir = ENV['PLATFORM_DEVELOPER_BIN_DIR']
       raise "PLATFORM_DEVELOPER_BIN_DIR is not set" if $bindir.nil?
       $sdkroot = ENV['SDKROOT']
       raise "SDKROOT is not set" if $sdkroot.nil?
-      $targetdir = ENV['TARGET_TEMP_DIR']
-      raise "TARGET_TEMP_DIR is not set" if $targetdir.nil?
-      $tempdir = ENV['TEMP_FILES_DIR']
-      raise "TEMP_FILES_DIR is not set" if $tempdir.nil?
       $arch = ENV['ARCHS']
       raise "ARCHS is not set" if $arch.nil?
       $gccbin = $bindir + '/gcc-4.0'
       $arbin = $bindir + '/ar'
-      $lipobin = 'lipo'
+
+    elsif ENV['RHO_PLATFORM'] == 'wm'
+      $vcbuild = ENV['VCBUILD']
+      raise "VCBUILD is not set" if $vcbuild.nil?
+      $sdk = ENV['SDK']
+      raise "SDK is not set" if $sdk.nil?
 
     end
   end

data/lib/extensions/digest/ext/build.bat

@@ -1,2 +1 @@
-rake --trace
-
+rake --trace

data/lib/extensions/digest/ext/digest.vcproj

@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="digest"
+	ProjectGUID="{73453E27-E84A-40C4-BD6A-51A8373D7044}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Windows Mobile 6 Professional SDK (ARMV4I)"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+			OutputDirectory="$(TEMP_FILES_DIR)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP_FILES_DIR)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="0"
+				AdditionalIncludeDirectories="$(RHO_ROOT)\platform\shared\ruby\wince;$(RHO_ROOT)\platform\shared\ruby\include;$(RHO_ROOT)\platform\shared"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
+				Culture="1033"
+				AdditionalIncludeDirectories="$(IntDir)"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalOptions=" /subsystem:windowsce,5.02"
+				OutputFile="$(OutDir)/digest.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+			OutputDirectory="$(TEMP_FILES_DIR)\$(ConfigurationName)"
+			IntermediateDirectory="$(TEMP_FILES_DIR)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="2"
+				AdditionalIncludeDirectories="$(RHO_ROOT)\platform\shared\ruby\wince;$(RHO_ROOT)\platform\shared\ruby\include;$(RHO_ROOT)\platform\shared"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
+				Culture="1033"
+				AdditionalIncludeDirectories="$(IntDir)"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalOptions=" /subsystem:windowsce,5.02"
+				OutputFile="$(OutDir)/digest.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="digest.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\defs.h"
+				>
+			</File>
+			<File
+				RelativePath=".\digest.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

data/lib/framework/rho/render.rb

@@ -3,6 +3,14 @@ require 'rho/rhocontroller'
 
 module Rho
   class RhoController
+    begin
+      require 'rhodes_translator'
+      include RhodesTranslator::Translator
+      include RhodesTranslator::Binding
+      include RhodesTranslator::Validation
+
+    rescue Exception => e
+    end
 
     def self.layout(name)
       @layout = name
@@ -52,36 +60,49 @@ module Rho
       options = {} if options.nil? or !options.is_a?(Hash)
       options = options.symbolize_keys
 
-      unless options[:string].nil?
+      metaenabled = false
+
+      action = nil
+      action = options[:action] if options[:action]
+      action = @request['action'].nil? ? default_action : @request['action'] unless action
+
+
+      if $".include? "rhodes_translator" and @request['model'] != nil
+        model = nil
+        begin
+          model = Object.const_get(@request['model'].to_sym)
+        rescue
+        end
+        if model.respond_to?( :metadata ) and model.metadata != nil and model.metadata[action.to_s] != nil
+          metaenabled = true
+        end
+      end
+
+      if not options[:string].nil?
         @content = options[:string]
         @back_action = options[:back] if options[:back]
-        @rendered = true
-        return @content
-      end
+        options[:layout] = false if options[:layout].nil?
 
-      unless options[:partial].nil?  # render the file and return, don't set rendered true for a partial.
-        @content = render_partial(options)
-        return @content
-      end
+      elsif metaenabled
+        @content = render_metadata(action,model.metadata)
 
-      if options[:file].nil? or !options[:file].is_a?(String)
-        if options[:action].nil?
-          called_action = @request['action'].nil? ? default_action : @request['action']
-          if File.exist?(@request[:modelpath]+called_action.to_s+'_erb.iseq')
-            @content = eval_compiled_file(@request[:modelpath]+called_action.to_s+'_erb.iseq', getBinding() )
+      elsif not options[:partial].nil?  # render the file and return, don't set rendered true for a partial.
+        @content = render_partial(options)
+        options[:layout] = false
+      else
+        if options[:file].nil? or !options[:file].is_a?(String)
+          if File.exist?(@request[:modelpath]+action.to_s+'_erb.iseq')
+            @content = eval_compiled_file(@request[:modelpath]+action+'_erb.iseq', getBinding() )
           else
             @content = ""
           end
         else
-          @content = eval_compiled_file(@request[:modelpath]+options[:action].to_s+'_erb.iseq', getBinding() )
+          options[:file] = options[:file].gsub(/\.erb$/,"").gsub(/^\/app/,"")
+          @content = eval_compiled_file(RhoApplication::get_app_path(@request['application'])+options[:file]+'_erb.iseq', getBinding() )
+          options[:layout] = false if options[:layout].nil?
         end
-      else
-        options[:file] = options[:file].gsub(/\.erb$/,"").gsub(/^\/app/,"")
-        @content = eval_compiled_file(RhoApplication::get_app_path(@request['application'])+options[:file]+'_erb.iseq', getBinding() )
-        options[:layout] = false if options[:layout].nil?
       end
-
-      rho_info 'render content: ' + @content.length.to_s
+      #rho_info 'render content: ' + @content.length.to_s
       if xhr? and options[:use_layout_on_ajax] != true
         options[:layout] = false
       elsif options[:layout].nil? or options[:layout] == true
@@ -101,6 +122,35 @@ module Rho
       @content
     end
 
+    def render_metadata(action = nil,metadata = nil)
+      if metadata.nil?
+        begin
+          model = Object.const_get(@request['model'].to_sym)
+        rescue
+        end
+        if model.respond_to?( :metadata ) and model.metadata != nil
+          metadata = model.metadata
+        end
+      end
+
+      if action.nil?
+          action = @request['action'].nil? ? default_action : @request['action']
+      end
+
+      return "" if metadata.nil?
+      
+      action = action.to_s
+      data = {}
+      self.instance_variables.each do |sym|
+        data[sym.to_s] = self.instance_variable_get sym
+      end
+
+      prepared = bind(data,metadata[action])
+
+      translate(prepared,action)
+
+    end
+
     def render_partial(options = nil)
       options = {} if options.nil? or !options.is_a?(Hash)
       options = options.symbolize_keys
@@ -130,14 +180,21 @@ module Rho
         end
       end
 
-      partial_name = options[:partial].split('/')[-1]
+      splitpartial = options[:partial].split('/')
+      partial_name = splitpartial[-1]
+      model = nil
+      if splitpartial.length > 1
+        model = splitpartial[-2]
+      end
 
       options[:locals] = {} if options[:locals].nil? or !options[:locals].is_a?(Hash)
        
       content = ""
       if options[:collection].nil?
         locals = localclass.new(options[:locals])
-        content = eval_compiled_file(@request[:modelpath]+'_' + options[:partial].to_s+'_erb.iseq', locals.get_binding )
+        modelpath = @request[:modelpath]
+        modelpath = Rho::RhoFSConnector.get_model_path("app",model) if model
+        content = eval_compiled_file(modelpath+'_' + partial_name.to_s+'_erb.iseq', locals.get_binding )
       else
         i = 0
         options[:collection].each do |x|