ruboss4ruby 1.0.2 → 1.0.3

data/Generators

@@ -0,0 +1,5 @@
+scope 'merb-gen' do
+  dir = File.join(File.dirname(__FILE__), 'merb_generators/')
+  Merb.add_generators dir + 'ruboss_config', dir + 'ruboss_flex_app', dir + 'ruboss_controller', dir + 'ruboss_scaffold',
+    dir + 'ruboss_resource_controller'
+end

data/Manifest.txt

@@ -1,3 +1,4 @@
+Generators
 History.txt
 Manifest.txt
 README.txt
@@ -10,41 +11,16 @@ lib/ruboss4ruby/active_foo.rb
 lib/ruboss4ruby/active_record_tasks.rb
 lib/ruboss4ruby/configuration.rb
 lib/ruboss4ruby/generated_attribute.rb
+lib/ruboss4ruby/recipes.rb
+lib/ruboss4ruby/ruboss_helper.rb
+lib/ruboss4ruby/ruboss_test_helpers.rb
 lib/ruboss4ruby/tasks.rb
 lib/ruboss4ruby/version.rb
 merb_generators/ruboss_config.rb
-merb_generators/ruboss_config/USAGE
-merb_generators/ruboss_config/ruboss_config_generator.rb
-merb_generators/ruboss_config/templates/actionscript.properties
-merb_generators/ruboss_config/templates/actionscriptair.properties
-merb_generators/ruboss_config/templates/expressInstall.swf
-merb_generators/ruboss_config/templates/flex.properties
-merb_generators/ruboss_config/templates/html-template/AC_OETags.js
-merb_generators/ruboss_config/templates/html-template/history/history.css
-merb_generators/ruboss_config/templates/html-template/history/history.js
-merb_generators/ruboss_config/templates/html-template/history/historyFrame.html
-merb_generators/ruboss_config/templates/html-template/index.template.html
-merb_generators/ruboss_config/templates/html-template/playerProductInstall.swf
-merb_generators/ruboss_config/templates/index.html.erb
-merb_generators/ruboss_config/templates/mainair-app.xml
-merb_generators/ruboss_config/templates/mainapp.mxml
-merb_generators/ruboss_config/templates/project.properties
-merb_generators/ruboss_config/templates/projectair.properties
-merb_generators/ruboss_config/templates/swfobject.js
 merb_generators/ruboss_controller.rb
-merb_generators/ruboss_controller/USAGE
-merb_generators/ruboss_controller/ruboss_controller_generator.rb
 merb_generators/ruboss_flex_app.rb
 merb_generators/ruboss_resource_controller.rb
-merb_generators/ruboss_resource_controller/USAGE
-merb_generators/ruboss_resource_controller/ruboss_resource_controller_generator.rb
-merb_generators/ruboss_resource_controller/templates/app/controllers/%controller_file_name%.rb
-merb_generators/ruboss_resource_controller/templates/app/helpers/%controller_file_name%_helper.rb
 merb_generators/ruboss_scaffold.rb
-merb_generators/ruboss_scaffold/USAGE
-merb_generators/ruboss_scaffold/ruboss_scaffold_generator.rb
-merb_generators/ruboss_yaml_scaffold/USAGE
-merb_generators/ruboss_yaml_scaffold/ruboss_yaml_scaffold_generator.rb
 merb_generators/templates/ruboss_config/actionscript.properties
 merb_generators/templates/ruboss_config/actionscriptair.properties
 merb_generators/templates/ruboss_config/expressInstall.swf
@@ -64,11 +40,6 @@ merb_generators/templates/ruboss_config/swfobject.js
 merb_generators/templates/ruboss_controller/controller.as.erb
 merb_generators/templates/ruboss_flex_app/mainapp.mxml
 merb_generators/templates/ruboss_resource_controller/controller.rb.erb
-merb_generators/templates/ruboss_scaffold/component.mxml.erb
-merb_generators/templates/ruboss_scaffold/fixtures.yml.erb
-merb_generators/templates/ruboss_scaffold/migration.rb.erb
-merb_generators/templates/ruboss_scaffold/model.as.erb
-merb_generators/templates/ruboss_scaffold/model.rb.erb
 rails_generators/ruboss_config/USAGE
 rails_generators/ruboss_config/ruboss_config_generator.rb
 rails_generators/ruboss_config/templates/actionscript.properties
@@ -83,7 +54,9 @@ rails_generators/ruboss_config/templates/html-template/index.template.html
 rails_generators/ruboss_config/templates/html-template/playerProductInstall.swf
 rails_generators/ruboss_config/templates/index.html.erb
 rails_generators/ruboss_config/templates/mainair-app.xml
+rails_generators/ruboss_config/templates/mainapp-config.xml
 rails_generators/ruboss_config/templates/mainapp.mxml
+rails_generators/ruboss_config/templates/project-textmate.erb
 rails_generators/ruboss_config/templates/project.properties
 rails_generators/ruboss_config/templates/projectair.properties
 rails_generators/ruboss_config/templates/ruboss.yml
@@ -111,14 +84,39 @@ setup.rb
 tasks/deployment.rake
 tasks/environment.rake
 tasks/website.rake
-test/active_foo_test.rb
-test/test_generator_helper.rb
-test/test_helper.rb
-test/test_ruboss_config_generator.rb
-test/test_ruboss_controller_generator.rb
-test/test_ruboss_on_ruby.rb
-test/test_ruboss_scaffold_generator.rb
-test/test_ruboss_yaml_scaffold_generator.rb
+test/controllers/application.rb
+test/controllers/locations_controller.rb
+test/controllers/notes_controller.rb
+test/controllers/projects_controller.rb
+test/controllers/tasks_controller.rb
+test/controllers/users_controller.rb
+test/database.yml
+test/fixtures/locations.yml
+test/fixtures/notes.yml
+test/fixtures/projects.yml
+test/fixtures/tasks.yml
+test/fixtures/users.yml
+test/helpers/controllers.log
+test/helpers/functional_test_helper.rb
+test/helpers/models.log
+test/helpers/test_helper.rb
+test/helpers/unit_test_helper.rb
+test/model.yml
+test/models/location.rb
+test/models/note.rb
+test/models/project.rb
+test/models/task.rb
+test/models/user.rb
+test/playing_around_in_a_console.txt
+test/schema.rb
+test/test.sqlite3
+test/test.swf
+test/test_active_foo.rb
+test/test_ruboss_rails_integration_functional.rb
+test/test_swfobject_helper.rb
+test/to_fxml_test.rb
+test/views/notes/empty_params_action.html.erb
+test/views/notes/index.html.erb
 website/index.html
 website/index.txt
 website/javascripts/rounded_corners_lite.inc.js

data/Rakefile

@@ -1,4 +1,5 @@
 require 'config/requirements'
 require 'config/hoe' # setup Hoe + all gem configuration
 
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+Dir['tasks/**/*.rake'].each { |rake| load rake }
+

data/lib/ruboss4ruby.rb

@@ -4,12 +4,12 @@ if defined?(Merb::Plugins)
   Merb::BootLoader.before_app_loads do
     Merb.add_mime_type(:fxml,  :to_fxml,  %w[application/xml text/xml application/x-xml], :charset => "utf-8")
 
-    generators = File.join(File.dirname(__FILE__), '..', 'merb_generators')
-    Merb.add_generators generators / :ruboss_config
-    Merb.add_generators generators / :ruboss_flex_app
-    Merb.add_generators generators / :ruboss_controller
-    Merb.add_generators generators / :ruboss_scaffold
-    Merb.add_generators generators / :ruboss_resource_controller
+    # generators = File.join(File.dirname(__FILE__), '..', 'merb_generators')
+    # Merb.add_generators generators / :ruboss_config
+    # Merb.add_generators generators / :ruboss_flex_app
+    # Merb.add_generators generators / :ruboss_controller
+    # Merb.add_generators generators / :ruboss_scaffold
+    # Merb.add_generators generators / :ruboss_resource_controller
     
     require 'ruboss4ruby/version'
     require 'ruboss4ruby/configuration'
@@ -22,9 +22,13 @@ elsif defined?(ActionController::Base)
   # if we are not running in Merb, we've got to be running in Rails
   Mime::Type.register_alias "application/xml", :fxml
 
-  require 'ruboss4ruby/version'
-  require 'ruboss4ruby/configuration'
-  require 'ruboss4ruby/active_foo'
+  require File.join(File.dirname(__FILE__),'ruboss4ruby', 'version')
+  require File.join(File.dirname(__FILE__),'ruboss4ruby', 'configuration')
+  require File.join(File.dirname(__FILE__),'ruboss4ruby', 'active_foo')
+  require File.join(File.dirname(__FILE__), 'ruboss4ruby', 'ruboss_helper')
+  ActionView::Base.send :include, RubossHelper unless ActionView::Base.included_modules.include?(RubossHelper)
+  require File.join(File.dirname(__FILE__), 'ruboss4ruby', 'ruboss_test_helpers')  
+  Test::Unit::TestCase.send :include, RubossTestHelpers unless Test::Unit::TestCase.included_modules.include?(RubossTestHelpers)
 
   module ActionController
     class Base
@@ -60,9 +64,9 @@ elsif defined?(ActionController::Base)
     end  
   end
 
+  ActionController::Base.send :include, RubossController  
+  ActionController::Base.send :prepend_before_filter, :extract_metadata_from_params  
+
   # temporarily disable forgery protection site-wise
   ActionController::Base.allow_forgery_protection = false
-
-  ActionController::Base.send :include, RubossController
-  ActionController::Base.send :prepend_before_filter, :extract_metadata_from_params
 end

data/lib/ruboss4ruby/active_foo.rb

@@ -41,7 +41,7 @@ module ActiveRecord
   # Flex friendly XML serialization patches
   class Base
     class << self
-      alias_method :old_find, :find
+      alias_method :old_find, :find unless method_defined?(:old_find)
 
       def find(*args)
         result = old_find(*args)
@@ -69,6 +69,41 @@ module ActiveRecord
           end
         END
       end
+            
+      def default_fxml_hash(already_included = [])
+        # return {} unless self.class.respond_to?(:default_fxml_include_params) || self.class.respond_to?(:default_fxml_methods_array)
+        default_hash = {:include => {}}
+        default_hash[:methods] = self.default_fxml_methods_array if self.respond_to?(:default_fxml_methods_array)
+        if self.respond_to?(:default_fxml_include_params)
+          default_includes = self.default_fxml_include_params
+          default_hash[:include] = default_includes.inject({}) do |include_hash, included|
+            next if already_included.include?(included) # We only want to include things once, to avoid infinite loops
+            included_class = included.to_s.singularize.camelize.constantize
+            include_hash[included] = included_class.default_fxml_hash(already_included + default_includes) 
+            include_hash
+          end
+        end
+        default_hash
+      end 
+      
+    # options[:include] can be a Hash, Array, Symbol or nil.
+    # We always want it as a Hash.  This translates includes to a Hash like this:
+    # If it's a nil, return an empty Hash ({})
+    # If it's a Hash, then it is just returned
+    # If it's an array, then it returns a Hash with each array element as a key, and values of empty Hashes.
+    # If it's a symbol, then it returns a Hash with a single key/value pair, with the symbol as the key and an empty Hash as the value.
+    def includes_as_hash(includes = nil)      
+      res = case
+        when includes.is_a?(Hash)
+          includes      
+        when includes.nil?
+         {}  
+        else #Deal with arrays and symbols
+          res = [includes].flatten.inject({}) {|include_hash, included| include_hash[included] = {} ; include_hash}
+      end
+      res
+    end           
+      
     end
   end
 
@@ -77,10 +112,11 @@ module ActiveRecord
       options.merge!(:dasherize => false)
       default_except = [:crypted_password, :salt, :remember_token, :remember_token_expires_at]
       options[:except] = (options[:except] ? options[:except] + default_except : default_except)
-      options[:methods] = [options[:methods] || []].flatten + self.class.default_fxml_methods_array if self.class.respond_to?(:default_fxml_methods_array)      
-      options[:include] = [options[:include] || []].flatten + self.class.default_fxml_include_params if self.class.respond_to?(:default_fxml_include_params)
+      options[:methods] = [options[:methods] || []].flatten + (self.class.default_fxml_hash[:methods] || [])
+      options[:include] = self.class.default_fxml_hash[:include].merge(self.class.includes_as_hash(options[:include]))
       to_xml(options)
     end
+    
   end
 
   # Change the xml serializer so that '?'s are stripped from attribute names.

data/lib/ruboss4ruby/recipes.rb

@@ -0,0 +1,62 @@
+require 'find'
+
+# To use these recipes, add the following to your Capfile:
+# require 'ruboss4ruby/recipes'
+
+Capistrano::Configuration.instance(:must_exist).load do
+
+  after "deploy:setup", "deploy:flex:setup"
+
+  namespace :db do
+    desc "runs db:refresh in the latest release directory."  
+    task :refresh, :roles => :db do
+       run("cd #{latest_release} && rake db:refresh RAILS_ENV=production")
+    end
+  end
+
+  namespace :deploy do
+  
+    namespace :flex do
+    
+      desc "Creates the flex_files directory in the shared directory"
+      task :setup do
+        flex_dir = File.join(shared_path, 'flex_files')
+        run "#{try_sudo} mkdir -p #{flex_dir} && #{try_sudo} chmod g+w #{flex_dir}"
+      end    
+
+      desc "uploads everything in public/bin up to the server"
+      task :via_dumb_copy, :roles => :app do
+        # the -p flag on mkdir makes intermediate directories (i.e. both /bin and /bin/history), 
+        # and doesn't raise an error if any of the directories already exist.
+        rails_root = File.join(File.dirname(__FILE__), '..', '..', '..', '..')
+        base_dir = File.join(rails_root, 'public', 'bin')
+        ec2_base_dir = File.join(shared_path, 'flex_files')
+    
+        Find.find(base_dir) do |file| 
+          filename_without_base_dir = file.sub(base_dir, '')
+          if File.directory?(file)
+            run "mkdir -p #{File.join(ec2_base_dir, filename_without_base_dir)}"
+          else
+            content = File.open(file, 'rb') {|f| f.read}
+            put content, File.join(ec2_base_dir, filename_without_base_dir)
+          end
+        end
+      end
+
+      desc "synchronizes the local and remote public/bin directories using rsync"
+      task :via_rsync, :roles => :app do      
+        username = user || ENV['USER']
+        rails_root = File.join(File.dirname(__FILE__), '..', '..', '..', '..')
+        execute_on_servers do |server|
+          `rsync -r -p -v -e \"ssh -i #{ssh_options[:keys]}\" #{File.join(rails_root, 'public', 'bin')}/ #{username}@#{server}:#{File.join(shared_path, 'flex_files')}/`
+        end
+      end
+  
+      task :make_symlink, :roles => :app do
+        run "ln -s #{shared_path}/flex_files #{release_path}/public/bin"
+      end
+  
+    end
+  end
+  
+end

data/lib/ruboss4ruby/ruboss_helper.rb

@@ -0,0 +1,54 @@
+module RubossHelper
+  
+  # Creates a swfObject Javascript call.  You must include swfobject.js to use this.
+  # See http://code.google.com/p/swfobject/wiki/documentation for full details and documentation
+  # of the swfobject js library.
+  def swfobject(swf_url, params = {})
+    params.reverse_merge!({:width => '100%',
+                           :height => '100%',
+                           :id => 'flashContent',
+                           :version => '9.0.0',
+                           :express_install_swf => '/expressInstall.swf',
+                           :flash_vars => nil,
+                           :params => nil,
+                           :attributes => nil,
+                           :create_div => false, 
+                           :include_authenticity_token => true
+                          })                       
+    arg_order = [:id, :width, :height, :version, :express_install_swf]
+    js_params = ["'#{swf_url}?#{rails_asset_id(swf_url)}'"]
+    js_params += arg_order.collect {|arg| "'#{params[arg]}'" }
+    
+    # Add authenticity_token to flashVars.  This will only work if flashVars is a Hash or nil
+    # If it's a string representing the name of a Javascript variable, then you need to add it yourself 
+    # like this:
+    # <script>
+    #   ... other code that defines flashVars and sets some of its parameters
+    #   flashVars['authenticity_token'] = <%= form_authenticity_token -%>
+    # </script>
+    # If you include an authenticity_token parameter in flashVars, 
+    # then the Flex app will add it to Ruboss.defaultMetadata, so that it will be sent
+    # back up to your Rails app with every request.
+    if params[:include_authenticity_token] && ActionController::Base.allow_forgery_protection
+      params[:flash_vars] = {} if params[:flash_vars].nil?
+      if params[:flash_vars].is_a?(Hash)
+        params[:flash_vars].reverse_merge!(:authenticity_token => form_authenticity_token)
+      end
+    end
+    
+    js_params += [params[:flash_vars], params[:params], params[:attributes]].collect do |hash_or_string|
+      if hash_or_string.is_a?(Hash)
+        hash_or_string.to_json
+      else # If it's not a hash, then it should be a string giving the name of the Javascript variable to use
+        hash_or_string
+      end
+    end.compact
+
+    swf_tag = javascript_tag do 
+      "swfobject.embedSWF(#{js_params.join(',')})"
+    end 
+    swf_tag += content_tag(:div, nil, :id => params[:id]) if params[:create_div]    
+    swf_tag
+  end
+  
+end

data/lib/ruboss4ruby/ruboss_test_helpers.rb

@@ -0,0 +1,31 @@
+module RubossTestHelpers
+
+  # Use this to test xml or fxml responses in unit tests.  For example,
+  # set_response_to user.to_fxml
+  # assert_xml_select 'user name', 'quentin'
+  def set_response_to(response, content_type = 'xml')
+    @response = MockResponse.new(response, content_type)
+  end
+  
+  # Make xml functional testing work.
+  # From http://weblog.jamisbuck.org/2007/1/4/assert_xml_select
+  def xml_document
+    @xml_document ||= HTML::Document.new(@response.body, false, true)
+  end  
+  
+  def assert_xml_select(*args, &block)
+    @html_document = xml_document
+    assert_select(*args, &block)
+  end   
+  
+end
+
+class MockResponse
+  attr_reader :body, :content_type
+    
+  def initialize(body, content_type = 'xml')
+    @body = body
+    @content_type = content_type
+  end
+  
+end

data/lib/ruboss4ruby/tasks.rb

@@ -1,8 +1,6 @@
 require 'rake'
 require 'ftools'
 require 'rexml/document'
-require 'ruboss4ruby/version'
-require 'ruboss4ruby/configuration'
 
 APP_ROOT = Ruboss::Configuration::APP_ROOT
 

data/lib/ruboss4ruby/version.rb

@@ -1,10 +1,10 @@
 module Ruboss
-  RUBOSS_FRAMEWORK_VERSION = '1.0.2'
+  RUBOSS_FRAMEWORK_VERSION = '1.0.3'
 
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/merb_generators/ruboss_config.rb

@@ -49,36 +49,30 @@ module Merb::Generators
       File.join(File.dirname(__FILE__), 'templates', 'ruboss_config')
     end
 
-    desc <<-DESC
-      Generates the primary Ruboss directory structure. 
-      Sets up Flex Builder specific descriptor files and options fetches 
-      the latest published Ruboss Framework SWC file.
-    DESC
-
     empty_directory :bin, File.join('public', 'bin')
     empty_directory :javascripts, File.join('public', 'javascripts')
     empty_directory :schema, 'schema'
     
     file :flex_properties, 'flex.properties', '.flexProperties'
     
-    template :actionscript_properties do
-      source("#{extract_config('actionscript')}.properties")
-      destination('.actionScriptProperties')
+    template :actionscript_properties do |t|
+      t.source = "#{extract_config('actionscript')}.properties"
+      t.destination = '.actionScriptProperties'
     end
     
-    template :project_properties do
-      source("#{extract_config('project')}.properties")
-      destination('.project')
+    template :project_properties do |t|
+      t.source = "#{extract_config('project')}.properties"
+      t.destination = '.project'
     end
     
     %w(components controllers commands models events).each do |dir|
-      empty_directory dir.to_sym do
-        destination(File.join('app', 'flex', base_folder, dir))
+      empty_directory dir.to_sym do |t|
+        t.destination = File.join('app', 'flex', base_folder, dir)
       end
     end
     
-    empty_directory :generated do
-       File.join('app', 'flex', base_folder, 'components', 'generated')
+    empty_directory :generated do |t|
+       t.destination = File.join('app', 'flex', base_folder, 'components', 'generated')
     end
     
     glob!('html-template')
@@ -93,10 +87,16 @@ module Merb::Generators
     
     invoke :ruboss_flex_app
 
-    template :air_descriptor, :air => true do
-      source('mainair-app.xml')
-      destination(File.join('app', 'flex', "#{project_name}-app.xml"))
+    template :air_descriptor, :air => true do |t|
+      t.source = 'mainair-app.xml'
+      t.destination = File.join('app', 'flex', "#{project_name}-app.xml")
     end
+
+    desc <<-DESC
+      Generates the primary Ruboss directory structure. 
+      Sets up Flex Builder specific descriptor files and options fetches 
+      the latest published Ruboss Framework SWC file.
+    DESC
     
     invoke :ruboss_controller
   end