ruboss4ruby 1.1.1 → 1.1.2

data/test/rails/models/task.rb

@@ -2,9 +2,7 @@ class Task < ActiveRecord::Base
   belongs_to :project
   belongs_to :location
   belongs_to :user
-  
-  default_methods :is_active
-  
+    
   def is_active
     case
     when start_time && end_time 

data/test/rails/models/user.rb

@@ -3,9 +3,7 @@ class User < ActiveRecord::Base
   has_many :tasks
   has_many :projects
   has_many :locations
-  
-  default_methods :full_name, :has_nothing_to_do
-  
+    
   validates_length_of :login, :maximum => 10
   
   def full_name

data/test/rails/test_active_foo.rb

@@ -15,7 +15,7 @@ class ActiveFooTest < Test::Unit::TestCase
   end
   
   def test_task_fxml_has_default_method
-     set_response_to tasks(:haydn).to_fxml
+     set_response_to tasks(:haydn).to_fxml(:methods => :is_active)
      assert_xml_select 'task is_active'
    end
    
@@ -25,57 +25,12 @@ class ActiveFooTest < Test::Unit::TestCase
    end
    
    def test_user_fxml_has_nothing_to_do_method
-     set_response_to users(:ludwig).to_fxml
+     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(:include => :tasks)
+     set_response_to users(:ludwig).to_fxml(:methods => :is_active, :include => :tasks)
      assert_xml_select 'user tasks task is_active'
    end
-  #  
-  #  def test_projects_fxml_includes_tasks
-  #    set_response_to projects(:music).to_fxml
-  #    assert_xml_select 'project tasks task'
-  #  end
-  #  
-  #  def test_projects_with_user_included_as_symbol
-  #    set_response_to projects(:music).to_fxml(:include => :user)
-  #    assert_xml_select 'project user'
-  #  end
-  #  
-  #  def test_includes_as_hash_returns_hashes
-  #    assert_equal Hash.new, User.includes_as_hash
-  #    assert_equal ({:one => 1, :two => 2}), User.includes_as_hash({:one => 1, :two => 2})
-  #    assert_equal ({:test => {}}), User.includes_as_hash(:test)
-  #    assert_equal ({:test1 => {}, :test2 => {}}), User.includes_as_hash([:test1, :test2])
-  #  end
-  #  
-  #  def test_validates_length_of_validates_length
-  #    assert_nothing_raised do
-  #      @shakespeare.login = 'william_shakespeare'
-  #      @shakespeare.save
-  #      assert !@shakespeare.errors.empty?
-  #    end
-  #    @shakespeare.login = 'william'
-  #    @shakespeare.save
-  #    assert @shakespeare.errors.empty?
-  #  end
-  #  
-  #  def test_you_can_do_to_fxml_with_validates_length
-  #    assert_nothing_raised do
-  #      @shakespeare.to_fxml
-  #    end
-  #  end
-  #  
-  #  def test_array_of_users_includes_default_fxml_includes
-  #    set_response_to User.find(:all).to_fxml
-  #    assert_xml_select 'users user tasks task'
-  #  end
-  #  
-  #  def test_to_fxml_should_take_a_block
-  #    set_response_to users(:ludwig).to_fxml {|xml| xml.test 42}
-  #    assert_xml_select 'test', '42'
-  #  end
-
 end

data/test/rails/test_to_fxml.rb

@@ -21,57 +21,15 @@ class ToFxmlTest < Test::Unit::TestCase
   end
   
   def test_default_xml_methods_on_user_are_included_in_fxml
-    set_response_to users(:ludwig).to_fxml
+    set_response_to users(:ludwig).to_fxml(:methods => [:has_nothing_to_do, :full_name])
     assert_xml_select 'user full_name', 'Ludwig van Beethoven'
     assert_xml_select 'user has_nothing_to_do'
   end
   
   def test_default_xml_methods_on_user_are_included_in_fxml_if_you_call_it_twice
-    set_response_to users(:ludwig).to_fxml
-    set_response_to users(:ludwig).to_fxml
+    set_response_to users(:ludwig).to_fxml(:methods => [:has_nothing_to_do, :full_name])
+    set_response_to users(:ludwig).to_fxml(:methods => [:has_nothing_to_do, :full_name])
     assert_xml_select 'user full_name', 'Ludwig van Beethoven'
     assert_xml_select 'user has_nothing_to_do'
   end
-  
-  def test_default_xml_methods_exists
-    assert User.respond_to?(:default_methods_array)
-    assert_equal [:full_name, :has_nothing_to_do], User.default_methods_array
-  end
-  # 
-  # def test_default_xml_methods_on_dependencies
-  #   t = users(:ludwig).tasks.first
-  #   assert t.class.respond_to?(:default_xml_methods_array)
-  #   assert_equal [:is_active], t.class.default_xml_methods_array
-  # end
-  # 
-  # def test_default_xml_methods_are_included_in_includes
-  #   set_response_to users(:ludwig).to_fxml(:include => :tasks)
-  #   assert_xml_select 'tasks task is_active'
-  # end
-  # 
-  # def test_model_without_default_xml_methods_still_works
-  #   assert_nothing_raised{ locations(:vienna).to_fxml }
-  # end
-  # 
-  # def test_user_with_non_default_methods_in_to_xml
-  #   set_response_to users(:ludwig).to_fxml(:methods => :email_host)
-  #   assert_xml_select 'user email_host', 'vienna.de'
-  #   assert_xml_select 'user full_name'
-  # end
-  # 
-  # def test_model_with_default_xml_includes
-  #   set_response_to users(:ludwig).to_fxml
-  #   assert_xml_select 'user tasks task'
-  # end
-  # 
-  # def test_simple_properies
-  #   puts simple_properties
-  # end
-  
-  # Test type=.... stuff for has_many, booleans, integers, dates, date-times
-  
-  # Test empty arrays
-  
-  # Test options[:except]
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruboss4ruby
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Dima Berastau
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-09 00:00:00 -08:00
+date: 2009-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,7 +104,6 @@ files:
 - gpl-3.0.txt
 - lib/ruboss4ruby.rb
 - lib/ruboss4ruby/active_foo.rb
-- lib/ruboss4ruby/active_record_default_methods.rb
 - lib/ruboss4ruby/active_record_tasks.rb
 - lib/ruboss4ruby/configuration.rb
 - lib/ruboss4ruby/datamapper_foo.rb
@@ -177,7 +176,9 @@ files:
 - test/rails/fixtures/simple_properties.yml
 - test/rails/fixtures/tasks.yml
 - test/rails/fixtures/users.yml
+- test/rails/helpers/controllers.log
 - test/rails/helpers/functional_test_helper.rb
+- test/rails/helpers/models.log
 - test/rails/helpers/test_helper.rb
 - test/rails/helpers/unit_test_helper.rb
 - test/rails/model.yml

data/lib/ruboss4ruby/active_record_default_methods.rb

@@ -1,66 +0,0 @@
-module ActiveRecord
-  #
-  # We also add support for serializing model methods along the lines of:
-  #
-  #   class Project < ActiveRecord::Base
-  #     default_methods :foobar
-  #
-  #     def foobar
-  #       'foobar'
-  #     end
-  #   end
-  #
-  # When you do +to_fxml+ on this model method foobar will be automatically
-  # serialized as a simple attribute
-  class Base
-    class << self
-            
-      # default methods hook
-      def default_methods(*args)
-        methods = *args.dup
-        module_eval <<-END 
-            def self.default_methods_array
-              return [#{methods.inspect}].flatten
-            end
-          END
-      end
-      
-      # default methods hook
-      def defaults_hash(already_included = [], ignore_default_methods = nil)
-        defaults_hash = {:include => {}}
-        unless ignore_default_methods
-          defaults_hash[:methods] = self.default_methods_array if self.respond_to?(:default_methods_array)
-        end
-        defaults_hash
-      end 
-    end
-  end    
-  
-  # Flex-friendly serialization patches
-  module Serialization
-    
-    alias_method :xml_defaults_old_to_xml, :to_xml unless method_defined?(:xml_defaults_old_to_xml)
-    
-    alias_method :json_defaults_old_to_json, :to_json unless method_defined?(:json_defaults_old_to_json)
-    
-    # adds support for default_methods to standard +to_xml+
-    def to_xml(options = {}, &block)
-      unless options[:ignore_defaults]
-        unless options[:ignore_default_methods]
-          options[:methods] = [options[:methods] || []].flatten + (self.class.defaults_hash[:methods] || [])
-        end
-      end
-      xml_defaults_old_to_xml(options, &block)
-    end
-    
-    # adds support for default_methods to standard +to_json+
-    def to_json(options = {}, &block)
-      unless options[:ignore_defaults]
-        unless options[:ignore_default_methods]
-          options[:methods] = [options[:methods] || []].flatten + (self.class.defaults_hash[:methods] || [])
-        end
-      end
-      json_defaults_old_to_json(options, &block)      
-    end
-  end
-end