restfulx 1.2.2 → 1.2.3

data/README.rdoc

@@ -39,7 +39,7 @@ For details on how to get started with the RestfulX framework refer to:
 
 Report bugs or track framework development progress:
 
-    http://restfulx.lighthouseapp.com/dashboard
+    http://github.com/dima/restfulx_framework/issues
   
 Get involved with the community:
       

data/Rakefile

@@ -10,11 +10,13 @@ begin
     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 dima-jeweler -s http://gems.github.com"
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end
 
 require 'rake/rdoctask'

data/VERSION.yml

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

data/app_generators/rx_app/rx_app_generator.rb

@@ -79,11 +79,11 @@ class RxAppGenerator < RubiGen::Base
         m.template 'index.html.erb', 'public/index.html'
       end
       
-      %w(components controllers commands models events).each do |dir|
+      %w(views controllers commands models events helpers).each do |dir|
         m.directory "#{flex_root}/#{base_folder}/#{dir}"
       end
       
-      m.directory "#{flex_root}/#{base_folder}/components/generated"
+      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")

data/app_generators/rx_app/templates/actionscript.properties

@@ -1,6 +1,6 @@
 <?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" 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">
+<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=""/>

data/app_generators/rx_app/templates/actionscriptair.properties

@@ -1,6 +1,6 @@
 <?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" 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">
+<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=""/>

data/app_generators/rx_app/templates/mainapp-config.xml

@@ -11,6 +11,7 @@
        <name>DateTime</name>
        <name>Lazy</name>
        <name>Ignored</name>
+       <name>Nested</name>
     </keep-as3-metadata>
     <optimize>true</optimize>
     <keep-generated-actionscript>false</keep-generated-actionscript>

data/app_generators/rx_app/templates/mainapp.mxml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:<%= application_tag %> xmlns:mx="http://www.adobe.com/2006/mxml"
-  xmlns:generated="<%= base_package %>.components.generated.*"
+  xmlns:generated="<%= base_package %>.views.generated.*"
   paddingBottom="8" paddingLeft="8" paddingRight="8" paddingTop="8"
   layout="horizontal" styleName="plain" initialize="init()">
   <mx:Script>

data/app_generators/rx_app/templates/restfulx.yml

@@ -2,24 +2,45 @@
 
 # This option controls what the main Flex application file will be called.
 # By default it will be equal to the name of your rails project camelized
-project-name: <%= project_name %>
+project_name: <%= project_name %>
 
 # This options determines what the root folder for generated Flex code is.
 # By default 'app/flex'
-flex-root: <%= flex_root %>
+flex_root: <%= flex_root %>
 
 # By default flex models, commands, controllers and components are genearated into
 # <flex-root>/<your rails project name> folder. If you'd like to customize the target folder 
 # (to say append a "com" package before your rails project name) uncomment the line below
 # base-package must follow the usual flex package notation (a string separated by ".")
-base-package: <%= base_package %>
+base_package: <%= base_package %>
 
 # Main RestfulX controller is typically named AppicationController. This controller is created in 
 # <base-package>.controllers folder. You can customize the name by uncommenting the following line 
 # and changing the controller name.
-controller-name: <%= command_controller_name %>
+controller_name: <%= command_controller_name %>
 
 # If you are using Rails on the back-end and Adobe AIR as the client you can generate Rails/Flex/AIR
 # code to take advantage of synchronization (online/offline) support in RestfulX by changing the following
 # option to true. By default distribution is disabled.
-distributed: <%= distributed %>
+distributed: <%= distributed %>
+
+# Choose the layout to use for generated Flex view components
+layouts:
+  default: 'default'
+  
+# The following special model.yml fields are supported.
+#
+# For example:
+# attachment_field: [avatar]
+#   * arg takes Paperclip field name, or takes [uploaded_data] for Attachment_Fu
+# belongs_to: [account, profile]
+# has_many: [announcements, files, folders, users]
+# has_many_through: [permissions, roles]
+#   * has_many :roles, :through => :permissions
+# has_one:  [suitcase]
+# polymorphic: [commentable]
+# tree_model: [parent]
+# layout: [default]
+#   * default template is the only current theme, with more coming soon
+# ignored_fields: [children_count, ancestors_count, descendants_count, position]
+#   * specify fields you don't want generated for your template

data/lib/restfulx.rb

@@ -5,7 +5,7 @@
 module RestfulX
 
   # :stopdoc:
-  FRAMEWORK_VERSION = '1.2.2'
+  FRAMEWORK_VERSION = '1.2.3'
   LIB_DIR = File.join(File.dirname(__FILE__), 'restfulx/')
   # :startdoc:
 

data/lib/restfulx/active_foo.rb

@@ -88,6 +88,9 @@ module ActiveSupport
           options[:indent]   ||= 2
           options[:builder]  ||= Builder::XmlMarkup.new(:indent => options[:indent])
           options.merge!(:dasherize => false)
+          
+          options[:attributes] ||= {}
+          options[:attributes].merge!(:type => "array")
 
           root     = options.delete(:root).to_s
           children = options.delete(:children)
@@ -102,9 +105,9 @@ module ActiveSupport
 
           xml = options[:builder]
           if empty?
-            xml.tag!(root, options[:skip_types] ? {} : {:type => "array"})
+            xml.tag!(root, options[:attributes])
           else
-            xml.tag!(root, options[:skip_types] ? {} : {:type => "array"}) {
+            xml.tag!(root, options[:attributes]) {
               yield xml if block_given?
               each { |e| e.to_fxml(opts.merge!({ :skip_instruct => true })) }
             }

data/lib/restfulx/active_record_uuid_helper.rb

@@ -11,7 +11,7 @@ module RestfulX
     end
   
     def generate_uuid
-      self.id = UUID.random_create.to_s.gsub("-", "") unless self.id
+      self.id = UUIDTools::UUID.random_create.to_s.gsub("-", "") unless self.id
     end
   end
 end

data/lib/restfulx/configuration.rb

@@ -1,6 +1,15 @@
 # Interestingly enough there's no way to *just* upper-case or down-case first letter of a given
 # string. Ruby's own +capitalize+ actually downcases all the rest of the characters in the string
 # We patch the class to add our own implementation.
+require "yaml" 
+require "erb" 
+require File.dirname(__FILE__) + "/rails/schema_to_yaml/settings/config" 
+require File.dirname(__FILE__) + "/rails/schema_to_yaml/settings/core" 
+
+Dir[File.dirname(__FILE__) + "/rails/schema_to_yaml/extensions/*.rb"].each do |f|
+  require f
+end
+
 class String
   # Upper-case first character of a string leave the rest of the string intact
   def ucfirst
@@ -20,6 +29,8 @@ module RestfulX
   module Configuration
     # We try to figure out the application root using a number of possible options
     APP_ROOT = defined?(RAILS_ROOT) ? RAILS_ROOT : defined?(Merb) ? Merb.root : File.expand_path(".")
+    
+    RxSettings = SchemaToYaml::Settings::Core
 
     # Extract project, package, controller name, etc from the environment. This will respect
     # config/restfulx.yml if it exists, you can override all of the defaults there.
@@ -35,12 +46,12 @@ module RestfulX
       # give a chance to override the settings via restfulx.yml
       begin      
         config = YAML.load(File.open("#{APP_ROOT}/config/restfulx.yml"))
-        base_package = config['base-package'] || flex_project_name.downcase
+        base_package = config['base_package'] || flex_project_name.downcase
         base_folder = base_package.gsub('.', '/')
-        project_name = config['project-name'].downcase.gsub(/\W/, '') || project_name
+        project_name = config['project_name'].downcase.gsub(/\W/, '') || project_name
         flex_project_name = project_name.camelize
-        controller_name = config['controller-name'] || "ApplicationController"
-        flex_root = config['flex-root'] || "app/flex"
+        controller_name = config['controller_name'] || "ApplicationController"
+        flex_root = config['flex_root'] || "app/flex"
         distributed = config['distributed'] || false
       rescue
         base_folder = base_package = flex_project_name.downcase

data/lib/restfulx/rails/schema_to_yaml.rb

@@ -1,18 +1,7 @@
 # Used for analyzing your schema and exporting a model.yml file for Rx
-require "yaml" 
-require "erb" 
-require File.dirname(__FILE__) + "/schema_to_yaml/settings/config" 
-require File.dirname(__FILE__) + "/schema_to_yaml/settings/core" 
-
-Dir[File.dirname(__FILE__) + "/schema_to_yaml/extensions/*.rb"].each do |f|
-  require f
-end
-
 # Provides facilities to convert an existing Rails application schema.rb file to 
 # RestfulX model.yml file
 module SchemaToYaml
-  RxSettings = SchemaToYaml::Settings::Core
-
   # SchemaToYaml.schema_to_yaml
   #  - set of commands that introspects your database and formats your model.yml for export
   def self.schema_to_yaml

data/lib/restfulx/rails/schema_to_yaml/settings/core.rb

@@ -2,6 +2,9 @@
 # Used to read in settings from restfulx.yml for use in code generation
 module SchemaToYaml
   module Settings
+    # We try to figure out the application root using a number of possible options
+    APP_ROOT = defined?(RAILS_ROOT) ? RAILS_ROOT : defined?(Merb) ? Merb.root : File.expand_path(".")
+    
     class Core
       class << self
         def name
@@ -29,7 +32,7 @@ module SchemaToYaml
         when Hash
           self._settings = name_or_hash
         when String, Symbol
-          root_path = defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/config/" : ""
+          root_path = defined?(APP_ROOT) ? "#{APP_ROOT}/config/" : ""
           file_path = name_or_hash.is_a?(Symbol) ? "#{root_path}#{name_or_hash}.yml" : name_or_hash
           self._settings = YAML.load(ERB.new(File.read(file_path)).result)
           self._settings = _settings[RAILS_ENV] if defined?(RAILS_ENV)

data/lib/restfulx/rails/swf_helper.rb

@@ -10,8 +10,8 @@ module SWFHelper
                            :version => '9.0.0',
                            :express_install_swf => '/expressInstall.swf',
                            :flash_vars => nil,
-                           :params => nil,
-                           :attributes => nil,
+                           :params => { },
+                           :attributes => { },
                            :create_div => false, 
                            :include_authenticity_token => true,
                            :include_session_token => true
@@ -34,7 +34,11 @@ module SWFHelper
         params[:flash_vars].reverse_merge!(:authenticity_token => form_authenticity_token)
       end
       if params[:include_session_token]
-        params[:flash_vars].reverse_merge!(:session_token => session.session_id)
+        if RAILS_GEM_VERSION =~ /^2.3/
+          params[:flash_vars].reverse_merge!(:session_token => request.session_options[:id])
+        else
+          params[:flash_vars].reverse_merge!(:session_token => session.session_id)
+        end
       end        
     end          
     

data/lib/restfulx/tasks.rb

@@ -1,6 +1,5 @@
 # Rake tasks for building RestfulX-based Flex and AIR applications
 require 'rake'
-require 'ftools'
 require 'rexml/document'
 require 'activesupport'
 require File.join(File.dirname(__FILE__), 'configuration')

data/rails_generators/rx_config/rx_config_generator.rb

@@ -49,8 +49,8 @@ class RxConfigGenerator < Rails::Generator::Base
     end
         
     @component_names = []
-    if File.exists?("#{flex_root}/#{base_folder}/components/generated")
-      @component_names = list_mxml_files("#{flex_root}/#{base_folder}/components/generated")
+    if File.exists?("#{flex_root}/#{base_folder}/views/generated")
+      @component_names = list_mxml_files("#{flex_root}/#{base_folder}/views/generated")
     end
   end
 
@@ -61,6 +61,8 @@ class RxConfigGenerator < Rails::Generator::Base
       m.template 'restfulx.yml', 'config/restfulx.yml'
       m.template 'restfulx.erb', 'config/initializers/restfulx.rb'
       
+      m.template 'session_store_flash.erb', 'config/initializers/session_store_flash.rb' if RAILS_GEM_VERSION =~ /2.3/
+      
       m.directory "#{flex_root}"
       
       if @use_air
@@ -85,19 +87,26 @@ class RxConfigGenerator < Rails::Generator::Base
         m.file "html-template/history/#{file}", "html-template/history/#{file}"
       end
       
-      %w(components controllers commands models events).each do |dir|
+      %w(views controllers commands models events helpers).each do |dir|
         m.directory "#{flex_root}/#{base_folder}/#{dir}"
       end
       
-      m.directory "#{flex_root}/#{base_folder}/components/generated"
+      m.directory "#{flex_root}/#{base_folder}/views/generated"
       
       framework_release = RestfulX::FRAMEWORK_VERSION
       framework_distribution_url = "http://restfulx.github.com/releases/restfulx-#{framework_release}.swc"
       framework_destination_file = "lib/restfulx-#{framework_release}.swc"
       
       if !options[:skip_framework] && !File.exist?(framework_destination_file)
-        puts "fetching #{framework_release} framework binary from: #{framework_distribution_url} ..."
-        open(framework_destination_file, "wb").write(open(framework_distribution_url).read)
+        puts "Fetching #{framework_release} framework binary from: #{framework_distribution_url} ..."
+        begin
+          framework_swc = open(framework_distribution_url).read
+        rescue
+          puts "ERROR: Unable to download and install #{framework_distribution_url}."
+          puts "Please check your internet connectivity and try again."
+          exit
+        end
+        open(framework_destination_file, "wb").write(framework_swc) unless framework_swc.blank?
         puts "done. saved to #{framework_destination_file}"
       end
 
@@ -110,7 +119,7 @@ class RxConfigGenerator < Rails::Generator::Base
       
       m.template 'index.erb', 'app/views/flex/index.html.erb'
       
-      m.file 'routes.erb', 'config/routes.rb', :collision => :force
+      m.file 'routes.erb', 'config/routes.rb', :collision => :ask
       
       FileUtils.rm 'public/index.html' if File.exist?('public/index.html')
               

data/rails_generators/rx_config/templates/actionscript.properties

@@ -1,6 +1,6 @@
 <?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" 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">
+<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=""/>

data/rails_generators/rx_config/templates/actionscriptair.properties

@@ -1,6 +1,6 @@
 <?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" 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">
+<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=""/>

data/rails_generators/rx_config/templates/mainapp-config.xml

@@ -11,6 +11,7 @@
        <name>DateTime</name>
        <name>Lazy</name>
        <name>Ignored</name>
+       <name>Nested</name>
     </keep-as3-metadata>
     <optimize>true</optimize>
     <keep-generated-actionscript>false</keep-generated-actionscript>

data/rails_generators/rx_config/templates/restfulx.erb

@@ -1,11 +1,47 @@
-# When you do file uploads from Flash with File.upload() that, unfortunately generates a new session id,
-# which will fail to authenticate if you are using restful-authentication plugin or equivalent.
-#
-# The following code is a work-around for the Flash bug that prevents file uploader
-# from sending correct session_id. Here, we hack the Session#initialize method and force the session_id
-# to load from the query string via the request URI.
-#
-# Based on the code from http://seventytwo.co.uk/posts/making-swfupload-and-rails-work-together
+# the following patches allow us to overwrite session key on file uploads from Flash, 
+# which ends up creating a new session for every File.upload() invocation.
+
+<% if RAILS_GEM_VERSION =~ /^2.3/ -%>
+require 'rack/utils'
+
+class FlashSessionCookieMiddleware
+  def initialize(app, session_key = '_session_id')
+    @app = app
+    @session_key = session_key
+    @session_token = "_session_id"
+  end
+
+  def call(env)
+    if env['HTTP_USER_AGENT'] =~ /^(Adobe|Shockwave) Flash/
+      params = ::Rack::Utils.parse_query(env['QUERY_STRING'])
+      env['HTTP_COOKIE'] = [ @session_key, params[@session_token] ].join('=').freeze unless params[@session_token].nil?
+    end
+    @app.call(env)
+  end
+end
+
+class FlexNestedAttributeMiddleware
+  def initialize(app)
+    @app = app
+  end
+  
+  def call(env)
+    req = Rack::Request.new(env)
+    if req && req.path_info =~ /\.fxml$/
+      if req.put? || req.post? || req.delete?
+        req.params.each do |key,value|
+          value.select { |k,v| k =~ /\_attributes$/ }.each do |match|
+            env['rack.request.form_hash'][key][match[0]] = ActiveSupport::JSON.decode(match[1])
+          end
+        end
+      end
+    end
+    @app.call(env)
+  end
+end
+
+ActionController::Dispatcher.middleware.insert_after 'ActionController::ParamsParser', FlexNestedAttributeMiddleware
+<% else -%>
 class CGI::Session
   alias original_initialize initialize
 
@@ -26,6 +62,7 @@ class CGI::Session
     return option
   end
 end
+<% end -%>
 
 # If you have configured your Rails/Flex/AIR application to share authenticity_token
 # comment this out to enable forgery protection. By default, this is disabled to allow

data/rails_generators/rx_config/templates/restfulx.yml

@@ -2,22 +2,22 @@
 
 # This option controls what the main Flex application file will be called.
 # By default it will be equal to the name of your rails project camelized
-project-name: <%= project_name %>
+project_name: <%= project_name %>
 
 # This options determines what the root folder for generated Flex code is.
 # By default 'app/flex'
-flex-root: <%= flex_root %>
+flex_root: <%= flex_root %>
 
 # By default flex models, commands, controllers and components are genearated into
 # <flex-root>/<your rails project name> folder. If you'd like to customize the target folder 
 # (to say append a "com" package before your rails project name) uncomment the line below
 # base-package must follow the usual flex package notation (a string separated by ".")
-base-package: <%= base_package %>
+base_package: <%= base_package %>
 
 # Main RestfulX controller is typically named AppicationController. This controller is created in 
 # <base-package>.controllers folder. You can customize the name by uncommenting the following line 
 # and changing the controller name.
-controller-name: <%= command_controller_name %>
+controller_name: <%= command_controller_name %>
 
 # If you are using Rails on the back-end and Adobe AIR as the client you can generate Rails/Flex/AIR
 # code to take advantage of synchronization (online/offline) support in RestfulX by changing the following