restfulx 1.2.5 → 1.3.0

data/rails_generators/rx_yaml_scaffold/rx_yaml_scaffold_generator.rb

@@ -34,7 +34,8 @@ class RxYamlScaffoldGenerator < Rails::Generator::Base
               Rails::Generator::Scripts::Generate.new.run(["rx_scaffold"] + line.split, 
                 :flex_only => options[:flex_only],
                 :flex_view_only => options[:flex_view_only],
-                :rails_only => options[:rails_only])
+                :rails_only => options[:rails_only],
+                :collision => options[:collision])
               puts 'done ...'
               sleep 1
             end
@@ -44,13 +45,14 @@ class RxYamlScaffoldGenerator < Rails::Generator::Base
           Rails::Generator::Scripts::Generate.new.run(["rx_scaffold"] + line.split, 
             :flex_only => options[:flex_only],
             :flex_view_only => options[:flex_view_only],
-            :rails_only => options[:rails_only])
+            :rails_only => options[:rails_only],
+            :collision => options[:collision])
           puts 'done ...'
           sleep 1
         end
       end
       
-      Rails::Generator::Scripts::Generate.new.run(["rx_main_app"])
+      Rails::Generator::Scripts::Generate.new.run(["rx_main_app"], :collision => options[:collision])
     end
   end
 

data/rxgen_generators/rx_config/rx_config_generator.rb

@@ -5,7 +5,7 @@ class RxConfigGenerator < RubiGen::Base
 
   def manifest
     record do |m|        
-      framework_release = RestfulX::FRAMEWORK_VERSION
+      framework_release = RestfulX::VERSION
       framework_distribution_url = "http://restfulx.github.com/releases/restfulx-#{framework_release}.swc"
       framework_destination_file = "lib/restfulx-#{framework_release}.swc"
       

data/test/rails/fixtures/locations.yml

@@ -1,8 +1,7 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-vienna:
-  name: Vienna
-  user: ludwig
   
-stratford:
-  name: Stratford Upon Avon
-  user: shakespeare
+<% for i in 1..1000 %>
+  location_<%= i %>:
+    name: Location<%= i %>
+    user_id: <%= i %>
+<% end %>

data/test/rails/fixtures/notes.yml

@@ -1,17 +1,7 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 
-note_one:
-  content: Note1ContentText
-  user: user_one
-
-note_two:
-  content: Note2ContentText
-  user: user_two
-
-note_three:
-  content: Note3ContentText
-  user: user_three
-
-note_four:
-  content: Note4ContentText
-  user: user_four
+<% for i in 1..1000 %>
+  note_<%= i %>:
+    content: SomeNote<%= i %>
+    user_id: <%= i %>
+<% end %>

data/test/rails/fixtures/projects.yml

@@ -1,25 +1,9 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 
-health:
-  name: Health
-  start_date: <%= 20.days.ago %>
-  completed: false
-  user: ludwig
-
-music:
-  name: Music
-  start_date: <%= 20.days.ago %>
-  completed: false
-  user: ludwig
-
-hamlet:
-  name: Hamlet
-  start_date: <%= 2.years.ago %>
-  completed: false
-  user: shakespeare
-
-othello:
-  name: Othello
-  start_date: <%= 20.days.ago %>
-  completed: false
-  user: shakespeare
+<% for i in 1..1000 %>
+  project_<%= i %>:
+    name: Project<%= i %>
+    start_date: <%= 20.days.ago %>
+    completed: false
+    user_id: <%= i %>
+<% end %>

data/test/rails/fixtures/tasks.yml

@@ -1,46 +1,20 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 
-haydn:
-  name: Get piano lessons from Haydn
-  location: vienna
-  user: ludwig
-  project: music
-  start_time: <%= 30.days.ago %>
-  end_time: <%= 100.days.from_now %>
-  
-salieri:
-  name: Arrange lessions with Antonio Salieri
-  location: vienna
-  user: ludwig
-  project: music
-  start_time: <%= 30.days.ago %>  
-  
-hearing:
-  name: See doctor about hearing again
-  location: vienna
-  user: ludwig
-  project: health
-  start_time: <%= 30.days.ago %>  
-  
-sound_board:
-  name: Get a new sound board made
-  location: vienna
-  user: ludwig
-  project: health
-  start_time: <%= 30.days.ago %>  
-  
-hamlet_soliloquy:
-  name: "Edit Hamlet's soliloquy"
-  notes: "'That is the question' or 'is that the question?'"
-  location: stratford
-  user: shakespeare
-  project: hamlet
-  start_time: <%= 30.days.ago %>  
-  
-othello_outline:
-  name: Outline Othello
-  location: stratford
-  user: shakespeare
-  project: othello
-  start_time: <%= 30.days.ago %>  
+<% for i in 1..1000 %>
+  task_one_<%= i %>:
+    name: TaskOne<%= i %>
+    location_id: <%= i %>
+    user_id: <%= i %>
+    project_id: <%= i %>
+    start_time: <%= 30.days.ago %>
+    end_time: <%= 100.days.from_now %>
+    
+  task_two_<%= i %>:
+    name: TaskTwo<%= i %>
+    location_id: <%= i %>
+    user_id: <%= i %>
+    project_id: <%= i %>
+    start_time: <%= 30.days.ago %>
+    end_time: <%= 100.days.from_now %>
+<% end %>
   

data/test/rails/fixtures/users.yml

@@ -1,13 +1,9 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 
-ludwig:
-  login: ludwig
-  first_name: Ludwig
-  last_name: van Beethoven
-  email: ludwig@vienna.de
-  
-shakespeare:
-  login: william
-  first_name: William
-  last_name: Shakespeare
-  email: will@theglobetheater.com
+<% for i in 1..1000 %>
+  user_<%= i %>:
+    login: user<%= i %>
+    first_name: Foo<%= i %>
+    last_name: Bar<%= i %>
+    email: foo@bar.com
+<% end %>

data/test/rails/helpers/functional_test_helper.rb

@@ -3,6 +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__), 'test_helper')
 require File.join(File.dirname(__FILE__), '..', 'controllers', 'application_controller')
 require File.join(File.dirname(__FILE__), '..', 'controllers', 'notes_controller')
 
@@ -11,11 +12,11 @@ puts "config:\n#{config.inspect}"
 ActiveRecord::Base.configurations = config
 ActiveRecord::Base.establish_connection(config)
 
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/models.log")
-ActionController::Base.logger = Logger.new(File.dirname(__FILE__) + "/controllers.log")
+ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/../models.log")
+ActionController::Base.logger = Logger.new(File.dirname(__FILE__) + "/../controllers.log")
 ApplicationController.append_view_path File.join(File.dirname(__FILE__), '..', 'views')
 
 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 = File.join(File.dirname(__FILE__), '..', 'fixtures')
+$:.unshift(ActiveSupport::TestCase.fixture_path)

data/test/rails/helpers/performance_test_helper.rb

@@ -0,0 +1,5 @@
+require File.join(File.dirname(__FILE__), 'test_helper')
+require 'action_controller/performance_test'
+
+ActionController::Base.perform_caching = true
+ActiveSupport::Dependencies.mechanism = :require

data/test/rails/helpers/test_helper.rb

@@ -3,7 +3,13 @@ RAILS_ROOT = File.join(File.dirname(__FILE__), '..') unless defined? RAILS_ROOT
 require 'rubygems'
 require 'test/unit'
 
+gem 'activesupport', '= 2.3.2'
+gem 'activerecord', '= 2.3.2'
+gem 'actionpack', '= 2.3.2'
+gem 'rails', '= 2.3.2'
+
 require 'active_support'
+require 'active_support/core_ext'
 require 'active_support/test_case'
 require 'active_record'
 require 'active_record/fixtures'
@@ -11,7 +17,10 @@ require 'action_controller'
 require 'action_controller/test_case'
 require 'action_controller/test_process'
 require 'action_controller/integration'
+require 'action_controller/assertions/selector_assertions'
+require 'action_controller/assertions/response_assertions'
 require 'sqlite3'
+
 require File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'restfulx')
 require File.join(File.dirname(__FILE__), '..',  'models', 'note')
 require File.join(File.dirname(__FILE__), '..', 'models', 'user')
@@ -30,6 +39,21 @@ class MockResponse
 
 end
 
+class ActiveSupport::TestCase
+  include ActiveRecord::TestFixtures
+  include ActionController::TestProcess
+  include ActionController::Assertions::SelectorAssertions
+  include ActionController::Assertions::ResponseAssertions
+
+  self.fixture_path = File.join(File.dirname(__FILE__), "../fixtures")
+
+  self.use_transactional_fixtures = false
+  self.use_instantiated_fixtures = false
+
+  # load up fixtures
+  # fixtures :all
+end
+
 class ActiveRecord::TestCase #:nodoc:
   # Add more helper methods to be used by all tests here...
 
@@ -51,4 +75,7 @@ class ActiveRecord::TestCase #:nodoc:
     assert_select(*args, &block)
   end
   
+  def assert_invalid(record)
+    assert !record.valid?
+  end
 end

data/test/rails/helpers/unit_test_helper.rb

@@ -4,19 +4,7 @@ $:.unshift(File.dirname(__FILE__) + '/../..')
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 schema_file = File.join(File.dirname(__FILE__), '..', 'schema.rb')
 
-require 'rubygems'
-require 'test/unit'
-
-require 'active_support'
-require 'active_support/test_case'
-require 'active_record'
-require 'active_record/fixtures'
-require 'action_controller'
-require 'action_controller/test_case'
-require 'action_controller/test_process'
-require 'action_controller/integration'
-require 'sqlite3'
-
+require File.join(File.dirname(__FILE__), 'test_helper')
 require File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'restfulx')
 
 config = YAML::load(IO.read(File.join(File.dirname(__FILE__), '..', 'database.yml')))[ENV['DB'] || 'test']
@@ -25,5 +13,5 @@ ActiveRecord::Base.establish_connection(config)
 
 load(schema_file) if File.exist?(schema_file)
 
-ActiveSupport::TestCase.fixture_path.fixture_path = File.join(File.dirname(__FILE__), '..', 'fixtures')
-$:.unshift(ActiveSupport::TestCase.fixture_path.fixture_path)
+ActiveSupport::TestCase.fixture_path = File.join(File.dirname(__FILE__), '..', 'fixtures')
+$:.unshift(ActiveSupport::TestCase.fixture_path)

data/test/rails/test_active_foo.rb

@@ -3,34 +3,30 @@ require File.join(File.dirname(__FILE__), 'helpers', 'test_helper')
 require File.join(File.dirname(__FILE__), 'helpers', 'unit_test_helper')
 
 class ActiveFooTest < ActiveRecord::TestCase
-  fixtures :all
-  
-  def setup
-    @shakespeare = users(:shakespeare)
-  end
+  fixtures :users, :tasks
   
   def test_user_fxml
-    set_response_to users(:ludwig).to_fxml
+    set_response_to users(:user_1).to_fxml
     assert_xml_select 'user'
   end
   
-  def test_task_fxml_has_default_method
-     set_response_to tasks(:haydn).to_fxml(:methods => :is_active)
-     assert_xml_select 'task is_active'
-   end
-   
-   def test_user_fxml_includes_tasks
-     set_response_to users(:ludwig).to_fxml(:include => :tasks)
-     assert_xml_select 'user tasks task'
-   end
-   
-   def test_user_fxml_has_nothing_to_do_method
-     set_response_to users(:ludwig).to_fxml(:methods => :has_nothing_to_do)
-     assert_xml_select 'user has_nothing_to_do'    
-   end
-   
-   def test_user_fxml_includes_default_method_from_task
-     set_response_to users(:ludwig).to_fxml(:methods => :is_active, :include => :tasks)
-     assert_xml_select 'user tasks task is_active'
-   end
+  # def test_task_fxml_has_default_method
+  #    set_response_to tasks(:task_one_1).to_fxml(:methods => :is_active)
+  #    assert_xml_select 'task is_active'
+  #  end
+  #  
+  #  def test_user_fxml_includes_tasks
+  #    set_response_to users(:user_1).to_fxml(:include => :tasks)
+  #    assert_xml_select 'user tasks task'
+  #  end
+  #  
+  #  def test_user_fxml_has_nothing_to_do_method
+  #    set_response_to users(:user_1).to_fxml(:methods => :has_nothing_to_do)
+  #    assert_xml_select 'user has_nothing_to_do'    
+  #  end
+  #  
+  #  def test_user_fxml_includes_default_method_from_task
+  #    set_response_to users(:user_1).to_fxml(:methods => :is_active, :include => :tasks)
+  #    assert_xml_select 'user tasks task is_active'
+  #  end
 end

data/test/rails/{test_rails_integration_functional.rb → test_notes_controller_functional.rb}

@@ -5,7 +5,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect ':controller/:action/:id'
 end
 
-class RailsIntegrationFunctionalTest < ActiveRecord::TestCase
+class NotesControllerFunctionalTest < ActionController::TestCase
   fixtures :all
   
   def setup    
@@ -14,9 +14,9 @@ class RailsIntegrationFunctionalTest < ActiveRecord::TestCase
     @response = ActionController::TestResponse.new    
   end
 
-  # def test_render_with_an_empty_params_hash_should_not_blow_up
-  #   get :empty_params_action
-  #   assert_response :success
-  # end
+  def test_render_with_an_empty_params_hash_should_not_blow_up
+    get :index
+    assert_response :success
+  end
 
 end

data/test/rails/test_serialiazation_performance.rb

@@ -0,0 +1,32 @@
+$:.unshift(File.dirname(__FILE__))
+
+require 'helpers/unit_test_helper'
+require 'helpers/performance_test_helper'
+
+class SerializationPerformanceTest < ActionController::PerformanceTest
+  fixtures :users
+  
+  def test_all_to_fxml
+    users.to_fxml
+  end
+  
+  def test_one_to_fxml
+    users(:user_1).to_fxml
+  end
+  
+  def test_all_to_json
+    users.to_json
+  end
+  
+  def test_one_to_json
+    users(:user_1).to_json
+  end
+  
+  def test_all_to_amf
+    users.to_amf
+  end
+  
+  def test_one_to_amf
+    users(:user_1).to_amf
+  end
+end

data/test/rails/test_to_amf.rb

@@ -0,0 +1,30 @@
+$:.unshift(File.dirname(__FILE__))
+
+require 'helpers/unit_test_helper'
+require 'ruby-prof'
+require 'perftools'
+
+class ToAMFTest < ActiveRecord::TestCase
+  fixtures :users
+  
+  def test_to_amf_sanity
+    assert_nothing_raised { users(:user_1).to_amf }
+  end
+  
+  def test_ruby_profile_all_to_amf
+    ruby_profile { users.to_amf }
+  end
+  
+  def test_perftools_all_to_amf
+    PerfTools::CpuProfiler.start("/tmp/to_amf") { users.to_amf }
+  end
+  
+  private
+  def ruby_profile
+    RubyProf.start
+    yield
+    result = RubyProf.stop
+    printer = RubyProf::GraphPrinter.new(result)
+    printer.print(STDOUT, 0)
+  end
+end