aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Breedt <bitserf@gmail.com>2005-03-31 09:12:10 +0000
committerLeon Breedt <bitserf@gmail.com>2005-03-31 09:12:10 +0000
commit0f198eb58ece74409827f3d4a739e49a1a0ecab5 (patch)
tree9b4a9d4b9ea01b3c191100b0da2261e4469a2c92
parentcfef86c6454482993872557eb57b2a37e0fefdd5 (diff)
downloadrails-0f198eb58ece74409827f3d4a739e49a1a0ecab5.tar.gz
rails-0f198eb58ece74409827f3d4a739e49a1a0ecab5.tar.bz2
rails-0f198eb58ece74409827f3d4a739e49a1a0ecab5.zip
remove ActiveRecordSoapMarshallable, can't reproduce the problem it was intended to fix.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1043 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionwebservice/CHANGELOG2
-rw-r--r--actionwebservice/lib/action_web_service/vendor/ws/marshaling/soap_marshaling.rb14
2 files changed, 2 insertions, 14 deletions
diff --git a/actionwebservice/CHANGELOG b/actionwebservice/CHANGELOG
index 6fcdaf971e..fc50e0a7b9 100644
--- a/actionwebservice/CHANGELOG
+++ b/actionwebservice/CHANGELOG
@@ -1,5 +1,7 @@
*0.7.0* (Unreleased)
+* Remove ActiveRecordSoapMarshallable workaround, see #912 for details
+
* Add scaffolding via ActionController::Base.web_service_scaffold for quick testing using a web browser
* Generalize casting code to be used by both SOAP and XML-RPC (previously, it was only XML-RPC)
diff --git a/actionwebservice/lib/action_web_service/vendor/ws/marshaling/soap_marshaling.rb b/actionwebservice/lib/action_web_service/vendor/ws/marshaling/soap_marshaling.rb
index 287a64291b..14c8d8401d 100644
--- a/actionwebservice/lib/action_web_service/vendor/ws/marshaling/soap_marshaling.rb
+++ b/actionwebservice/lib/action_web_service/vendor/ws/marshaling/soap_marshaling.rb
@@ -279,19 +279,5 @@ module WS
return false
end
end
-
- module ActiveRecordSoapMarshallable
- def allocate
- obj = super
- attrs = {}
- self.columns.each{|c| attrs[c.name.to_s] = c.default}
- obj.instance_variable_set('@attributes', attrs)
- obj
- end
- end
-
- if Object.const_defined?('ActiveRecord')
- ActiveRecord::Base.extend(ActiveRecordSoapMarshallable)
- end
end
end