restfulx 1.2.2 → 1.2.3

data/rxgen_generators/rx_scaffold/templates/model.as.erb

@@ -1,12 +1,19 @@
 package <%= base_package %>.models {
-<% if has_manies.length > 0 -%>
+<% if has_manies.length > 0 || has_many_through.length > 0 -%>
   import org.restfulx.collections.ModelsCollection;
 <% end -%>
+<% if tree_model.size > 0 -%>
+  <% @tree_or_no_tree = 'RxTreeModel' %>
+  import org.restfulx.models.RxTreeModel
+<% end -%>
+<% unless tree_model.size > 0 -%>
+  <% @tree_or_no_tree = 'RxModel' %>
   import org.restfulx.models.RxModel;
+<% end -%>
   
   [Resource(name="<%= resource_controller_name %>")]
   [Bindable]
-  public class <%= class_name %> extends RxModel {
+  public class <%= class_name %> extends <%= @tree_or_no_tree %> {
 <% if attributes && !attributes.empty? && attributes[0].flex_type != "Boolean" -%>
     public static const LABEL:String = "<%= attributes[0].flex_name %>";
 <% else -%>
@@ -24,6 +31,25 @@ package <%= base_package %>.models {
     [BelongsTo]
     public var <%= model.camelcase(:lower) %>:<%= model.camelcase %>;
 
+<% end -%>
+<% if tree_model.size > 0 -%>
+    [BelongsTo]
+    public var <%= tree_model[0].camelcase(:lower) %>:<%= class_name %>;
+
+<% end -%>
+<% for model in polymorphic -%>
+    [BelongsTo(polymorphic="true", dependsOn="Model1, Model2")]
+    public var <%= model.camelcase(:lower) %>:Object;
+      
+<% end -%>
+<% if has_many_through.size > 0 -%>
+<% has_many_through.each do |k,v| %>
+    [HasMany]
+    public var <%= k.camelcase(:lower) %>:ModelsCollection;
+    
+    [HasMany(through="<%= k.camelcase %>")]
+    public var <%= v.camelcase(:lower) %>:ModelsCollection;
+<% end -%>
 <% end -%>
 <% for model in has_ones -%>
     [HasOne]
@@ -34,6 +60,11 @@ package <%= base_package %>.models {
     [HasMany]
     public var <%= model.camelcase(:lower) %>:ModelsCollection;
     
+<% end -%>
+<% if attachment_field.size > 0 -%>
+    [Ignored]
+    public var attachmentUrl:String;
+    
 <% end -%>
     public function <%= class_name %>() {
       super(LABEL);

data/test/rails/helpers/functional_test_helper.rb

@@ -3,7 +3,7 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib')
 schema_file = File.join(File.dirname(__FILE__), '..', 'schema.rb')
 ENV["RAILS_ENV"] = "test"
 
-require File.join(File.dirname(__FILE__), '..', 'controllers', 'application')
+require File.join(File.dirname(__FILE__), '..', 'controllers', 'application_controller')
 require File.join(File.dirname(__FILE__), '..', 'controllers', 'notes_controller')
 
 config = YAML::load(IO.read(File.join(File.dirname(__FILE__), '..', 'database.yml')))['test']

data/test/rails/helpers/test_helper.rb

@@ -9,7 +9,6 @@ require 'active_record'
 require 'active_record/fixtures'
 require 'action_controller'
 require 'action_controller/test_case'
-require 'action_controller/assertions'
 require 'action_controller/test_process'
 require 'action_controller/integration'
 require 'sqlite3'
@@ -31,13 +30,7 @@ class MockResponse
 
 end
 
-class Test::Unit::TestCase #:nodoc:
-  # Turn off transactional fixtures if you're working with MyISAM tables in MySQL
-  self.use_transactional_fixtures = true
-
-  # Instantiated fixtures are slow, but give you @david where you otherwise would need people(:david)
-  self.use_instantiated_fixtures  = true
-
+class ActiveRecord::TestCase #:nodoc:
   # Add more helper methods to be used by all tests here...
 
   # Use this to test xml or fxml responses in unit tests.  For example,

data/test/rails/helpers/unit_test_helper.rb

@@ -13,7 +13,6 @@ require 'active_record'
 require 'active_record/fixtures'
 require 'action_controller'
 require 'action_controller/test_case'
-require 'action_controller/assertions'
 require 'action_controller/test_process'
 require 'action_controller/integration'
 require 'sqlite3'
@@ -26,5 +25,5 @@ ActiveRecord::Base.establish_connection(config)
 
 load(schema_file) if File.exist?(schema_file)
 
-Test::Unit::TestCase.fixture_path = File.join(File.dirname(__FILE__), '..', 'fixtures')
-$:.unshift(Test::Unit::TestCase.fixture_path)
+ActiveSupport::TestCase.fixture_path.fixture_path = File.join(File.dirname(__FILE__), '..', 'fixtures')
+$:.unshift(ActiveSupport::TestCase.fixture_path.fixture_path)

data/test/rails/test_active_foo.rb

@@ -2,7 +2,7 @@ RAILS_ROOT = File.dirname(__FILE__) unless defined? RAILS_ROOT
 require File.join(File.dirname(__FILE__), 'helpers', 'test_helper')
 require File.join(File.dirname(__FILE__), 'helpers', 'unit_test_helper')
 
-class ActiveFooTest < Test::Unit::TestCase
+class ActiveFooTest < ActiveRecord::TestCase
   fixtures :all
   
   def setup

data/test/rails/test_rails_integration_functional.rb

@@ -5,7 +5,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect ':controller/:action/:id'
 end
 
-class RailsIntegrationFunctionalTest < Test::Unit::TestCase
+class RailsIntegrationFunctionalTest < ActiveRecord::TestCase
   fixtures :all
   
   def setup    

data/test/rails/test_to_fxml.rb

@@ -8,7 +8,7 @@ require 'models/task'
 require 'models/user'
 require 'models/simple_property'
 
-class ToFxmlTest < Test::Unit::TestCase
+class ToFxmlTest < ActiveRecord::TestCase
   fixtures :locations, :notes, :projects, :tasks, :users, :simple_properties
   
   def test_to_fxml_sanity

data/test/rails/test_to_json.rb

@@ -8,7 +8,7 @@ require 'models/task'
 require 'models/user'
 require 'models/simple_property'
 
-class ToJsonTest < Test::Unit::TestCase
+class ToJsonTest < ActiveRecord::TestCase
   fixtures :locations, :notes, :projects, :tasks, :users, :simple_properties
   
   def test_to_json_sanity

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: restfulx
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
 - Dima Berastau
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-19 00:00:00 -07:00
+date: 2009-07-16 00:00:00 -07:00
 default_executable: rx-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,13 +41,11 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- Rakefile
 - README.rdoc
+- Rakefile
 - VERSION.yml
-- bin/rx-gen
-- app_generators/rx_app
+- app_generators/rx_app/USAGE
 - app_generators/rx_app/rx_app_generator.rb
-- app_generators/rx_app/templates
 - app_generators/rx_app/templates/actionscript.properties
 - app_generators/rx_app/templates/actionscriptair.properties
 - app_generators/rx_app/templates/app.yaml.erb
@@ -56,9 +54,7 @@ files:
 - app_generators/rx_app/templates/expressInstall.swf
 - app_generators/rx_app/templates/flex.properties
 - app_generators/rx_app/templates/generate.rb
-- app_generators/rx_app/templates/html-template
 - app_generators/rx_app/templates/html-template/AC_OETags.js
-- app_generators/rx_app/templates/html-template/history
 - app_generators/rx_app/templates/html-template/history/history.css
 - app_generators/rx_app/templates/html-template/history/history.js
 - app_generators/rx_app/templates/html-template/history/historyFrame.html
@@ -74,18 +70,28 @@ files:
 - app_generators/rx_app/templates/projectair.properties
 - app_generators/rx_app/templates/restfulx.yml
 - app_generators/rx_app/templates/swfobject.js
-- app_generators/rx_app/USAGE
-- rails_generators/rx_config
+- bin/rx-gen
+- lib/restfulx.rb
+- lib/restfulx/active_foo.rb
+- lib/restfulx/active_record_tasks.rb
+- lib/restfulx/active_record_uuid_helper.rb
+- lib/restfulx/configuration.rb
+- lib/restfulx/datamapper_foo.rb
+- lib/restfulx/rails/recipes.rb
+- lib/restfulx/rails/schema_to_yaml.rb
+- lib/restfulx/rails/schema_to_yaml/extensions/enumerable.rb
+- lib/restfulx/rails/schema_to_yaml/settings/config.rb
+- lib/restfulx/rails/schema_to_yaml/settings/core.rb
+- lib/restfulx/rails/swf_helper.rb
+- lib/restfulx/tasks.rb
+- rails_generators/rx_config/USAGE
 - rails_generators/rx_config/rx_config_generator.rb
-- rails_generators/rx_config/templates
 - rails_generators/rx_config/templates/actionscript.properties
 - rails_generators/rx_config/templates/actionscriptair.properties
 - rails_generators/rx_config/templates/expressInstall.swf
 - rails_generators/rx_config/templates/flex.properties
 - rails_generators/rx_config/templates/flex_controller.erb
-- rails_generators/rx_config/templates/html-template
 - rails_generators/rx_config/templates/html-template/AC_OETags.js
-- rails_generators/rx_config/templates/html-template/history
 - rails_generators/rx_config/templates/html-template/history/history.css
 - rails_generators/rx_config/templates/html-template/history/history.js
 - rails_generators/rx_config/templates/html-template/history/historyFrame.html
@@ -102,102 +108,67 @@ files:
 - rails_generators/rx_config/templates/restfulx.yml
 - rails_generators/rx_config/templates/restfulx_tasks.rake
 - rails_generators/rx_config/templates/routes.erb
+- rails_generators/rx_config/templates/session_store_flash.erb
 - rails_generators/rx_config/templates/swfobject.js
-- rails_generators/rx_config/USAGE
-- rails_generators/rx_controller
+- rails_generators/rx_controller/USAGE
 - rails_generators/rx_controller/rx_controller_generator.rb
-- rails_generators/rx_controller/templates
 - rails_generators/rx_controller/templates/controller.as.erb
-- rails_generators/rx_controller/USAGE
-- rails_generators/rx_main_app
+- rails_generators/rx_main_app/USAGE
 - rails_generators/rx_main_app/rx_main_app_generator.rb
-- rails_generators/rx_main_app/templates
 - rails_generators/rx_main_app/templates/mainapp.mxml
-- rails_generators/rx_main_app/USAGE
-- rails_generators/rx_scaffold
+- rails_generators/rx_scaffold/USAGE
 - rails_generators/rx_scaffold/rx_scaffold_generator.rb
-- rails_generators/rx_scaffold/templates
-- rails_generators/rx_scaffold/templates/controllers
 - rails_generators/rx_scaffold/templates/controllers/default.rb.erb
 - rails_generators/rx_scaffold/templates/controllers/resource_controller.rb.erb
 - rails_generators/rx_scaffold/templates/fixtures.yml.erb
-- rails_generators/rx_scaffold/templates/layouts
+- rails_generators/rx_scaffold/templates/functional_test.rb
+- rails_generators/rx_scaffold/templates/helper_test.rb
 - rails_generators/rx_scaffold/templates/layouts/default.erb
 - rails_generators/rx_scaffold/templates/migration.rb.erb
 - rails_generators/rx_scaffold/templates/model.as.erb
 - rails_generators/rx_scaffold/templates/model.rb.erb
-- rails_generators/rx_scaffold/USAGE
-- rails_generators/rx_yaml_scaffold
-- rails_generators/rx_yaml_scaffold/rx_yaml_scaffold_generator.rb
 - rails_generators/rx_yaml_scaffold/USAGE
-- rxgen_generators/rx_config
-- rxgen_generators/rx_config/rx_config_generator.rb
+- rails_generators/rx_yaml_scaffold/rx_yaml_scaffold_generator.rb
 - rxgen_generators/rx_config/USAGE
-- rxgen_generators/rx_controller
+- rxgen_generators/rx_config/rx_config_generator.rb
+- rxgen_generators/rx_controller/USAGE
 - rxgen_generators/rx_controller/rx_controller_generator.rb
-- rxgen_generators/rx_controller/templates
 - rxgen_generators/rx_controller/templates/assist.py
 - rxgen_generators/rx_controller/templates/controller.as.erb
 - rxgen_generators/rx_controller/templates/iso8601.py
 - rxgen_generators/rx_controller/templates/restful.py
-- rxgen_generators/rx_controller/USAGE
-- rxgen_generators/rx_main_app
+- rxgen_generators/rx_main_app/USAGE
 - rxgen_generators/rx_main_app/rx_main_app_generator.rb
-- rxgen_generators/rx_main_app/templates
 - rxgen_generators/rx_main_app/templates/main.py.erb
 - rxgen_generators/rx_main_app/templates/mainapp.mxml
-- rxgen_generators/rx_main_app/USAGE
-- rxgen_generators/rx_scaffold
+- rxgen_generators/rx_scaffold/USAGE
 - rxgen_generators/rx_scaffold/rx_scaffold_generator.rb
-- rxgen_generators/rx_scaffold/templates
-- rxgen_generators/rx_scaffold/templates/component.mxml.erb
 - rxgen_generators/rx_scaffold/templates/controller.py.erb
+- rxgen_generators/rx_scaffold/templates/layouts/default.erb
 - rxgen_generators/rx_scaffold/templates/model.as.erb
 - rxgen_generators/rx_scaffold/templates/model.py.erb
-- rxgen_generators/rx_scaffold/USAGE
-- rxgen_generators/rx_yaml_scaffold
-- rxgen_generators/rx_yaml_scaffold/rx_yaml_scaffold_generator.rb
 - rxgen_generators/rx_yaml_scaffold/USAGE
-- lib/restfulx
-- lib/restfulx/active_foo.rb
-- lib/restfulx/active_record_tasks.rb
-- lib/restfulx/active_record_uuid_helper.rb
-- lib/restfulx/configuration.rb
-- lib/restfulx/datamapper_foo.rb
-- lib/restfulx/rails
-- lib/restfulx/rails/recipes.rb
-- lib/restfulx/rails/schema_to_yaml
-- lib/restfulx/rails/schema_to_yaml/extensions
-- lib/restfulx/rails/schema_to_yaml/extensions/enumerable.rb
-- lib/restfulx/rails/schema_to_yaml/settings
-- lib/restfulx/rails/schema_to_yaml/settings/config.rb
-- lib/restfulx/rails/schema_to_yaml/settings/core.rb
-- lib/restfulx/rails/schema_to_yaml.rb
-- lib/restfulx/rails/swf_helper.rb
-- lib/restfulx/tasks.rb
-- lib/restfulx.rb
-- test/rails
-- test/rails/controllers
-- test/rails/controllers/application.rb
+- rxgen_generators/rx_yaml_scaffold/rx_yaml_scaffold_generator.rb
+- spec/restfulx_spec.rb
+- spec/spec_helper.rb
+- tasks/restfulx.rake
+- test/rails/controllers/application_controller.rb
 - test/rails/controllers/locations_controller.rb
 - test/rails/controllers/notes_controller.rb
 - test/rails/controllers/projects_controller.rb
 - test/rails/controllers/tasks_controller.rb
 - test/rails/controllers/users_controller.rb
 - test/rails/database.yml
-- test/rails/fixtures
 - test/rails/fixtures/locations.yml
 - test/rails/fixtures/notes.yml
 - test/rails/fixtures/projects.yml
 - test/rails/fixtures/simple_properties.yml
 - test/rails/fixtures/tasks.yml
 - test/rails/fixtures/users.yml
-- test/rails/helpers
 - test/rails/helpers/functional_test_helper.rb
 - test/rails/helpers/test_helper.rb
 - test/rails/helpers/unit_test_helper.rb
 - test/rails/model.yml
-- test/rails/models
 - test/rails/models/location.rb
 - test/rails/models/note.rb
 - test/rails/models/project.rb
@@ -210,18 +181,12 @@ files:
 - test/rails/test_rails_integration_functional.rb
 - test/rails/test_to_fxml.rb
 - test/rails/test_to_json.rb
-- test/rails/views
-- test/rails/views/notes
 - test/rails/views/notes/empty_params_action.html.erb
 - test/rails/views/notes/index.html.erb
-- spec/restfulx_spec.rb
-- spec/spec_helper.rb
-- tasks/restfulx.rake
 has_rdoc: true
 homepage: http://restfulx.org
 post_install_message: 
 rdoc_options: 
-- --inline-source
 - --charset=UTF-8
 require_paths: 
 - lib
@@ -244,5 +209,26 @@ rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: RestfulX Framework Code Generation Engine / Rails 2.1+ Integration Support
-test_files: []
-
+test_files: 
+- spec/restfulx_spec.rb
+- spec/spec_helper.rb
+- test/rails/controllers/application_controller.rb
+- test/rails/controllers/locations_controller.rb
+- test/rails/controllers/notes_controller.rb
+- test/rails/controllers/projects_controller.rb
+- test/rails/controllers/tasks_controller.rb
+- test/rails/controllers/users_controller.rb
+- test/rails/helpers/functional_test_helper.rb
+- test/rails/helpers/test_helper.rb
+- test/rails/helpers/unit_test_helper.rb
+- test/rails/models/location.rb
+- test/rails/models/note.rb
+- test/rails/models/project.rb
+- test/rails/models/simple_property.rb
+- test/rails/models/task.rb
+- test/rails/models/user.rb
+- test/rails/schema.rb
+- test/rails/test_active_foo.rb
+- test/rails/test_rails_integration_functional.rb
+- test/rails/test_to_fxml.rb
+- test/rails/test_to_json.rb