simplemapper 0.0.2 → 0.0.4

data/doc/files/lib/simple_mapper/adapters/http_adapter_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Mar 17 16:10:48 -0400 2008</td>
+      <td>Tue Mar 18 11:39:39 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/simple_mapper/base_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Mar 17 16:26:21 -0400 2008</td>
+      <td>Thu Mar 20 14:54:00 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/simple_mapper/default_plugins/callbacks_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Mar 17 16:11:35 -0400 2008</td>
+      <td>Tue Mar 18 11:42:49 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/simple_mapper/default_plugins/oauth_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Mar 17 16:11:59 -0400 2008</td>
+      <td>Tue Mar 18 11:34:23 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/simple_mapper/default_plugins/options_to_query_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Mar 17 16:12:08 -0400 2008</td>
+      <td>Tue Mar 18 11:39:18 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/simple_mapper/formats/xml_format_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Mar 17 16:13:55 -0400 2008</td>
+      <td>Thu Mar 20 14:40:43 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/simple_mapper/support/bliss_serializer_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Mar 17 16:19:39 -0400 2008</td>
+      <td>Tue Mar 18 12:21:56 -0400 2008</td>
     </tr>
     </table>
   </div>

data/doc/fr_class_index.html

@@ -21,7 +21,6 @@
   <h1 class="section-bar">Classes</h1>
   <div id="index-entries">
     <a href="classes/Array.html">Array</a><br />
-    <a href="classes/Callbacks.html">Callbacks</a><br />
     <a href="classes/Enumerable.html">Enumerable</a><br />
     <a href="classes/Hash.html">Hash</a><br />
     <a href="classes/Inflector.html">Inflector</a><br />
@@ -39,6 +38,7 @@
     <a href="classes/Serialize.html">Serialize</a><br />
     <a href="classes/SimpleMapper.html">SimpleMapper</a><br />
     <a href="classes/SimpleMapper/Base.html">SimpleMapper::Base</a><br />
+    <a href="classes/SimpleMapper/CallbacksExtension.html">SimpleMapper::CallbacksExtension</a><br />
     <a href="classes/SimpleMapper/HttpAdapter.html">SimpleMapper::HttpAdapter</a><br />
     <a href="classes/SimpleMapper/HttpOAuthExtension.html">SimpleMapper::HttpOAuthExtension</a><br />
     <a href="classes/SimpleMapper/SimpleModel.html">SimpleMapper::SimpleModel</a><br />

data/doc/fr_file_index.html

@@ -20,6 +20,8 @@
 <div id="index">
   <h1 class="section-bar">Files</h1>
   <div id="index-entries">
+    <a href="files/LICENSE.html">LICENSE</a><br />
+    <a href="files/README.html">README</a><br />
     <a href="files/lib/simple_mapper_rb.html">lib/simple_mapper.rb</a><br />
     <a href="files/lib/simple_mapper/adapters/http_adapter_rb.html">lib/simple_mapper/adapters/http_adapter.rb</a><br />
     <a href="files/lib/simple_mapper/base_rb.html">lib/simple_mapper/base.rb</a><br />

data/doc/fr_method_index.html

@@ -20,95 +20,99 @@
 <div id="index">
   <h1 class="section-bar">Methods</h1>
   <div id="index-entries">
-    <a href="classes/Callbacks.html#M000041">add_callback (Callbacks)</a><br />
+    <a href="classes/SimpleMapper/CallbacksExtension.html#M000057">add_callback (SimpleMapper::CallbacksExtension)</a><br />
     <a href="classes/SimpleMapper/Base.html#M000070">add_connection_adapter (SimpleMapper::Base)</a><br />
     <a href="classes/OAuthController.html#M000011">authenticate! (OAuthController)</a><br />
     <a href="classes/OAuthController.html#M000009">authorized? (OAuthController)</a><br />
     <a href="classes/SimpleMapper/HttpAdapter.html#M000059">base_uri (SimpleMapper::HttpAdapter)</a><br />
-    <a href="classes/Callbacks.html#M000040">callbacks (Callbacks)</a><br />
+    <a href="classes/SimpleMapper/CallbacksExtension.html#M000056">callbacks (SimpleMapper::CallbacksExtension)</a><br />
     <a href="classes/Inflector.html#M000023">camelize (Inflector)</a><br />
     <a href="classes/Inflector.html#M000030">classify (Inflector)</a><br />
     <a href="classes/Inflector/Inflections.html#M000039">clear (Inflector::Inflections)</a><br />
-    <a href="classes/SimpleMapper/Base.html#M000073">connection (SimpleMapper::Base)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000071">clone_connection (SimpleMapper::Base)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000074">connection (SimpleMapper::Base)</a><br />
     <a href="classes/SimpleMapper/Base.html#M000069">connection_adapters (SimpleMapper::Base)</a><br />
-    <a href="classes/SimpleMapper/Base.html#M000072">connections (SimpleMapper::Base)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000073">connections (SimpleMapper::Base)</a><br />
     <a href="classes/Inflector.html#M000032">constantize (Inflector)</a><br />
-    <a href="classes/Array.html#M000006">crawl (Array)</a><br />
     <a href="classes/Hash.html#M000004">crawl (Hash)</a><br />
-    <a href="classes/SimpleMapper/Base.html#M000075">create (SimpleMapper::Base)</a><br />
+    <a href="classes/Array.html#M000006">crawl (Array)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000076">create (SimpleMapper::Base)</a><br />
     <a href="classes/Inflector.html#M000026">dasherize (Inflector)</a><br />
-    <a href="classes/SimpleMapper/Base.html#M000082">data (SimpleMapper::Base)</a><br />
-    <a href="classes/SimpleMapper/Base.html#M000081">data= (SimpleMapper::Base)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000085">data (SimpleMapper::Base)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000083">data= (SimpleMapper::Base)</a><br />
     <a href="classes/SimpleMapper/Base.html#M000068">debug! (SimpleMapper::Base)</a><br />
     <a href="classes/SimpleMapper/Base.html#M000067">debug? (SimpleMapper::Base)</a><br />
-    <a href="classes/SimpleMapper/Base.html#M000088">delete (SimpleMapper::Base)</a><br />
     <a href="classes/SimpleMapper/HttpAdapter.html#M000066">delete (SimpleMapper::HttpAdapter)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000092">delete (SimpleMapper::Base)</a><br />
     <a href="classes/Inflector.html#M000028">demodulize (Inflector)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000088">dirty? (SimpleMapper::Base)</a><br />
     <a href="classes/Array.html#M000005">except (Array)</a><br />
     <a href="classes/Object.html#M000013">extended (Object)</a><br />
-    <a href="classes/SimpleMapper/Base.html#M000077">extract_from (SimpleMapper::Base)</a><br />
-    <a href="classes/SimpleMapper/Base.html#M000078">extract_one (SimpleMapper::Base)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000078">extract_from (SimpleMapper::Base)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000079">extract_one (SimpleMapper::Base)</a><br />
     <a href="classes/Inflector.html#M000031">foreign_key (Inflector)</a><br />
-    <a href="classes/SimpleMapper/Base.html#M000071">format= (SimpleMapper::Base)</a><br />
-    <a href="classes/SimpleMapper/Base.html#M000084">formatted_data (SimpleMapper::Base)</a><br />
-    <a href="classes/SimpleMapper/XmlFormat/ClassMethods.html#M000058">from_xml (SimpleMapper::XmlFormat::ClassMethods)</a><br />
-    <a href="classes/SimpleMapper/Base.html#M000074">get (SimpleMapper::Base)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000072">format= (SimpleMapper::Base)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000087">formatted_data (SimpleMapper::Base)</a><br />
+    <a href="classes/SimpleMapper/XmlFormat/ClassMethods.html#M000055">from_xml (SimpleMapper::XmlFormat::ClassMethods)</a><br />
     <a href="classes/SimpleMapper/HttpAdapter.html#M000063">get (SimpleMapper::HttpAdapter)</a><br />
-    <a href="classes/Enumerable.html#M000043">group_by (Enumerable)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000075">get (SimpleMapper::Base)</a><br />
+    <a href="classes/Enumerable.html#M000040">group_by (Enumerable)</a><br />
     <a href="classes/Serialize.html#M000019">hash_from_xml (Serialize)</a><br />
     <a href="classes/SimpleMapper/HttpAdapter.html#M000060">headers (SimpleMapper::HttpAdapter)</a><br />
     <a href="classes/SimpleMapper/HttpAdapter.html#M000061">headers= (SimpleMapper::HttpAdapter)</a><br />
     <a href="classes/Inflector.html#M000027">humanize (Inflector)</a><br />
-    <a href="classes/SimpleMapper/SimpleModel/ClassMethods.html#M000050">identifier (SimpleMapper::SimpleModel::ClassMethods)</a><br />
-    <a href="classes/SimpleMapper/SimpleModel.html#M000047">identifier (SimpleMapper::SimpleModel)</a><br />
+    <a href="classes/SimpleMapper/SimpleModel.html#M000044">identifier (SimpleMapper::SimpleModel)</a><br />
+    <a href="classes/SimpleMapper/SimpleModel/ClassMethods.html#M000047">identifier (SimpleMapper::SimpleModel::ClassMethods)</a><br />
     <a href="classes/Proc.html#M000007">in_context (Proc)</a><br />
-    <a href="classes/SimpleMapper/XmlFormat.html#M000055">included (SimpleMapper::XmlFormat)</a><br />
-    <a href="classes/SimpleMapper/SimpleModel.html#M000045">included (SimpleMapper::SimpleModel)</a><br />
+    <a href="classes/SimpleMapper/SimpleModel.html#M000042">included (SimpleMapper::SimpleModel)</a><br />
+    <a href="classes/SimpleMapper/XmlFormat.html#M000052">included (SimpleMapper::XmlFormat)</a><br />
     <a href="classes/Inflector.html#M000020">inflections (Inflector)</a><br />
     <a href="classes/OAuth/RequestProxy/Base.html#M000015">inspect (OAuth::RequestProxy::Base)</a><br />
-    <a href="classes/SimpleMapper/Base.html#M000083">instantiate (SimpleMapper::Base)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000086">instantiate (SimpleMapper::Base)</a><br />
     <a href="classes/Inflector/Inflections.html#M000037">irregular (Inflector::Inflections)</a><br />
-    <a href="classes/SimpleMapper/SimpleModel.html#M000048">method_missing (SimpleMapper::SimpleModel)</a><br />
-    <a href="classes/SimpleMapper/XmlFormat.html#M000056">mime_type_headers (SimpleMapper::XmlFormat)</a><br />
-    <a href="classes/Inflector/Inflections.html#M000034">new (Inflector::Inflections)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000080">load (SimpleMapper::Base)</a><br />
+    <a href="classes/SimpleMapper/SimpleModel.html#M000045">method_missing (SimpleMapper::SimpleModel)</a><br />
+    <a href="classes/SimpleMapper/XmlFormat.html#M000053">mime_type_headers (SimpleMapper::XmlFormat)</a><br />
     <a href="classes/OAuthController.html#M000008">new (OAuthController)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000081">new (SimpleMapper::Base)</a><br />
+    <a href="classes/Inflector/Inflections.html#M000034">new (Inflector::Inflections)</a><br />
     <a href="classes/OAuth/Signature/Base.html#M000014">new (OAuth::Signature::Base)</a><br />
-    <a href="classes/SimpleMapper/Base.html#M000079">new (SimpleMapper::Base)</a><br />
-    <a href="classes/SimpleMapper/HttpOAuthExtension.html#M000053">oauth (SimpleMapper::HttpOAuthExtension)</a><br />
+    <a href="classes/SimpleMapper/HttpOAuthExtension.html#M000050">oauth (SimpleMapper::HttpOAuthExtension)</a><br />
     <a href="classes/Serialize.html#M000016">object_to_xml (Serialize)</a><br />
     <a href="classes/Inflector.html#M000033">ordinalize (Inflector)</a><br />
-    <a href="classes/SimpleMapper/Base.html#M000080">original_data= (SimpleMapper::Base)</a><br />
-    <a href="classes/SimpleMapper/Base.html#M000089">persisted? (SimpleMapper::Base)</a><br />
-    <a href="classes/SimpleMapper/Base.html#M000076">persistent? (SimpleMapper::Base)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000082">original_data= (SimpleMapper::Base)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000093">persisted? (SimpleMapper::Base)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000077">persistent? (SimpleMapper::Base)</a><br />
     <a href="classes/Inflector/Inflections.html#M000035">plural (Inflector::Inflections)</a><br />
     <a href="classes/Inflector.html#M000021">pluralize (Inflector)</a><br />
-    <a href="classes/SimpleMapper/Base.html#M000087">post (SimpleMapper::Base)</a><br />
     <a href="classes/SimpleMapper/HttpAdapter.html#M000065">post (SimpleMapper::HttpAdapter)</a><br />
-    <a href="classes/SimpleMapper/SimpleModel/ClassMethods.html#M000049">properties (SimpleMapper::SimpleModel::ClassMethods)</a><br />
-    <a href="classes/SimpleMapper/Base.html#M000086">put (SimpleMapper::Base)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000091">post (SimpleMapper::Base)</a><br />
+    <a href="classes/SimpleMapper/SimpleModel/ClassMethods.html#M000046">properties (SimpleMapper::SimpleModel::ClassMethods)</a><br />
     <a href="classes/SimpleMapper/HttpAdapter.html#M000064">put (SimpleMapper::HttpAdapter)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000090">put (SimpleMapper::Base)</a><br />
     <a href="classes/OAuthController.html#M000012">request_signed! (OAuthController)</a><br />
-    <a href="classes/SimpleMapper/HttpOAuthExtension.html#M000051">requires_oauth (SimpleMapper::HttpOAuthExtension)</a><br />
-    <a href="classes/Callbacks.html#M000042">run_callback (Callbacks)</a><br />
-    <a href="classes/SimpleMapper/Base.html#M000085">save (SimpleMapper::Base)</a><br />
+    <a href="classes/SimpleMapper/HttpOAuthExtension.html#M000048">requires_oauth (SimpleMapper::HttpOAuthExtension)</a><br />
+    <a href="classes/SimpleMapper/CallbacksExtension.html#M000058">run_callback (SimpleMapper::CallbacksExtension)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000089">save (SimpleMapper::Base)</a><br />
     <a href="classes/OAuthController.html#M000010">scriptable? (OAuthController)</a><br />
     <a href="classes/SimpleMapper/HttpAdapter.html#M000062">set_headers (SimpleMapper::HttpAdapter)</a><br />
-    <a href="classes/SimpleMapper/HttpOAuthExtension.html#M000054">set_oauth (SimpleMapper::HttpOAuthExtension)</a><br />
+    <a href="classes/SimpleMapper/HttpOAuthExtension.html#M000051">set_oauth (SimpleMapper::HttpOAuthExtension)</a><br />
     <a href="classes/Inflector/Inflections.html#M000036">singular (Inflector::Inflections)</a><br />
     <a href="classes/Inflector.html#M000022">singularize (Inflector)</a><br />
     <a href="classes/Hash.html#M000003">stringify_keys! (Hash)</a><br />
     <a href="classes/Inflector.html#M000029">tableize (Inflector)</a><br />
     <a href="classes/Inflector.html#M000024">titleize (Inflector)</a><br />
-    <a href="classes/SimpleMapper/SimpleModel.html#M000046">to_hash (SimpleMapper::SimpleModel)</a><br />
+    <a href="classes/SimpleMapper/SimpleModel.html#M000043">to_hash (SimpleMapper::SimpleModel)</a><br />
     <a href="classes/Time.html#M000001">to_param (Time)</a><br />
     <a href="classes/Hash.html#M000002">to_query (Hash)</a><br />
     <a href="classes/Serialize.html#M000018">to_string (Serialize)</a><br />
     <a href="classes/Serialize.html#M000017">to_xml (Serialize)</a><br />
-    <a href="classes/SimpleMapper/XmlFormat.html#M000057">to_xml (SimpleMapper::XmlFormat)</a><br />
+    <a href="classes/SimpleMapper/XmlFormat.html#M000054">to_xml (SimpleMapper::XmlFormat)</a><br />
     <a href="classes/Inflector/Inflections.html#M000038">uncountable (Inflector::Inflections)</a><br />
     <a href="classes/Inflector.html#M000025">underscore (Inflector)</a><br />
-    <a href="classes/SimpleMapper/HttpOAuthExtension.html#M000052">with_oauth (SimpleMapper::HttpOAuthExtension)</a><br />
-    <a href="classes/Merb/Request.html#M000044">xml_params (Merb::Request)</a><br />
+    <a href="classes/SimpleMapper/Base.html#M000084">update_data (SimpleMapper::Base)</a><br />
+    <a href="classes/SimpleMapper/HttpOAuthExtension.html#M000049">with_oauth (SimpleMapper::HttpOAuthExtension)</a><br />
+    <a href="classes/Merb/Request.html#M000041">xml_params (Merb::Request)</a><br />
   </div>
 </div>
 </body>

data/doc/index.html

@@ -19,6 +19,6 @@
         <frame src="fr_class_index.html"  name="Classes" />
         <frame src="fr_method_index.html" name="Methods" />
     </frameset>
-    <frame src="files/lib/simple_mapper/adapters/http_adapter_rb.html" name="docwin" />
+    <frame src="files/README.html" name="docwin" />
 </frameset>
 </html>

data/lib/simple_mapper/adapters/http_adapter.rb

@@ -11,8 +11,6 @@ require 'simple_mapper/default_plugins/options_to_query'
 # Simply perform the requests, with callbacks, to the appropriate http host.
 module SimpleMapper
   class HttpAdapter
-    include Callbacks
-
     attr_accessor :base_url
     alias :set_base_url :base_url=
     def base_uri

data/lib/simple_mapper/base.rb

@@ -26,6 +26,13 @@ module SimpleMapper
         [name, adapter]
       end
 
+      # This is only here to show you in the docs how to clone a connection
+      #   connection_adapters[adapter_name] = connection_adapters[adapter_name]
+      #   connections[adapter_name] = klass.connection(adapter_name)
+      def clone_connection(klass,adapter_name=nil)
+        raise 'Not Implemented!'
+      end
+
       # set_format :xml
       # self.format = :json
       def format=(format)
@@ -43,6 +50,7 @@ module SimpleMapper
       def connection(name=:default,refresh=false)
         connections[name] = begin
           # Initialize the connection with the connection adapter.
+          raise ArgumentError, "Must include :adapter!" unless connection_adapters[name][:adapter].to_s.camelize.length > 0
           adapter = Object.module_eval("::SimpleMapper::#{connection_adapters[name][:adapter].to_s.camelize}Adapter", __FILE__, __LINE__).new
           connection_adapters[name][:init_block].in_context(adapter).call if connection_adapters[name][:init_block].is_a?(Proc)
           adapter.set_headers format.mime_type_headers
@@ -77,12 +85,19 @@ module SimpleMapper
       def extract_one(formatted_data, identifier=nil)
         objs = extract_from(formatted_data)
         if objs.is_a?(Array)
-          identifier.nil? ? objs.first : objs.reject {|e| e.identifier != identifier}
+          identifier.nil? ? objs.first : objs.reject {|e| e.identifier != identifier}[0]
         else
           identifier.nil? ? objs : (objs.identifier == identifier ? objs : nil)
         end
       end
 
+      def load(data=nil)
+        obj = allocate
+        obj.original_data = data
+        obj.send(:initialize, data)
+        obj
+      end
+
       private
         def adapter_from_args(*args)
           adapter = nil
@@ -99,13 +114,14 @@ module SimpleMapper
     def original_data=(data)
       @original_data = data.freeze
       @original_attributes = data.keys
-      instantiate(@original_data)
     end
-    attr_reader :original_data, :original_attributes
+    attr_reader :original_data
+    attr_reader :original_attributes
 
     def data=(data)
       instantiate(data)
     end
+    alias :update_data :data=
     def data
       to_hash
     end
@@ -125,6 +141,10 @@ module SimpleMapper
       send("to_#{self.class.format_name}".to_sym)
     end
 
+    def dirty?
+      data != original_data
+    end
+
     # persisted? ? put : post
     def save
       persisted? ? put : post

data/lib/simple_mapper/default_plugins/callbacks.rb

@@ -1,12 +1,17 @@
-module Callbacks
-  def callbacks
-    @callbacks ||= Hash.new {|h,k| h[k] = []}
+module SimpleMapper
+  module CallbacksExtension
+    def callbacks
+      @callbacks ||= Hash.new {|h,k| h[k] = []}
+    end
+    def add_callback(name,&block)
+      callbacks[name] << block
+    end
+    def run_callback(name, *args)
+      args = args.first if args.length == 1
+      callbacks[name].inject(args) {|args,cb| cb.call(*args)}
+    end
   end
-  def add_callback(name,&block)
-    callbacks[name] << block
-  end
-  def run_callback(name, *args)
-    args = args.first if args.length == 1
-    callbacks[name].inject(args) {|args,cb| cb.call(*args)}
+  class HttpAdapter
+    include CallbacksExtension
   end
 end

data/lib/simple_mapper/default_plugins/oauth.rb

@@ -62,6 +62,10 @@ module SimpleMapper
       true
     end
   end
+
+  class HttpAdapter
+    include HttpOAuthExtension
+  end
 end
 
 # We'll have an instance of these for each controller-model pair.

data/lib/simple_mapper/formats/xml_format.rb

@@ -15,7 +15,7 @@ module SimpleMapper
 
     def to_xml
       xml = Serialize.object_to_xml(self, :key_name => 'self').to_s
-      puts "POST XML: #{xml}"
+      # puts "POST XML: #{xml}"
       xml
     end
 
@@ -42,10 +42,10 @@ module SimpleMapper
           puts "Several objects returned under key '#{key}'/'#{key.singularize}':" if @debug
           doc[key][key.singularize].collect do |e|
             puts "Obj: #{e.inspect}" if @debug
-            Object.module_eval("::#{key.singularize.camelize}", __FILE__, __LINE__).new(e)
+            Object.module_eval("::#{key.singularize.camelize}", __FILE__, __LINE__).load(e)
           end
         elsif doc[key] # top-level must be single object
-          Object.module_eval("::#{key.singularize.camelize}", __FILE__, __LINE__).new(Serialize.hash_from_xml(xml)[self.name.underscore])
+          Object.module_eval("::#{key.singularize.camelize}", __FILE__, __LINE__).load(Serialize.hash_from_xml(xml)[self.name.underscore])
         else
           nil
         end

data/lib/simple_mapper/support/bliss_serializer.rb

@@ -41,7 +41,7 @@ module Serialize
   end
   
   def self.hash_from_xml(xml,options={})
-    xml.format=(:xml).to_hash
+    xml.formatted(:xml).to_hash
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simplemapper
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors: 
 - Daniel Parker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-17 00:00:00 -04:00
+date: 2008-03-20 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -49,14 +49,9 @@ files:
 - doc/classes/Array.src
 - doc/classes/Array.src/M000005.html
 - doc/classes/Array.src/M000006.html
-- doc/classes/Callbacks.html
-- doc/classes/Callbacks.src
-- doc/classes/Callbacks.src/M000040.html
-- doc/classes/Callbacks.src/M000041.html
-- doc/classes/Callbacks.src/M000042.html
 - doc/classes/Enumerable.html
 - doc/classes/Enumerable.src
-- doc/classes/Enumerable.src/M000043.html
+- doc/classes/Enumerable.src/M000040.html
 - doc/classes/Hash.html
 - doc/classes/Hash.src
 - doc/classes/Hash.src/M000002.html
@@ -90,7 +85,7 @@ files:
 - doc/classes/Merb
 - doc/classes/Merb/Request.html
 - doc/classes/Merb/Request.src
-- doc/classes/Merb/Request.src/M000044.html
+- doc/classes/Merb/Request.src/M000041.html
 - doc/classes/Merb.html
 - doc/classes/OAuth
 - doc/classes/OAuth/RequestProxy
@@ -143,12 +138,20 @@ files:
 - doc/classes/SimpleMapper/Base.src/M000081.html
 - doc/classes/SimpleMapper/Base.src/M000082.html
 - doc/classes/SimpleMapper/Base.src/M000083.html
-- doc/classes/SimpleMapper/Base.src/M000084.html
 - doc/classes/SimpleMapper/Base.src/M000085.html
 - doc/classes/SimpleMapper/Base.src/M000086.html
 - doc/classes/SimpleMapper/Base.src/M000087.html
 - doc/classes/SimpleMapper/Base.src/M000088.html
 - doc/classes/SimpleMapper/Base.src/M000089.html
+- doc/classes/SimpleMapper/Base.src/M000090.html
+- doc/classes/SimpleMapper/Base.src/M000091.html
+- doc/classes/SimpleMapper/Base.src/M000092.html
+- doc/classes/SimpleMapper/Base.src/M000093.html
+- doc/classes/SimpleMapper/CallbacksExtension.html
+- doc/classes/SimpleMapper/CallbacksExtension.src
+- doc/classes/SimpleMapper/CallbacksExtension.src/M000056.html
+- doc/classes/SimpleMapper/CallbacksExtension.src/M000057.html
+- doc/classes/SimpleMapper/CallbacksExtension.src/M000058.html
 - doc/classes/SimpleMapper/HttpAdapter.html
 - doc/classes/SimpleMapper/HttpAdapter.src
 - doc/classes/SimpleMapper/HttpAdapter.src/M000059.html
@@ -160,30 +163,30 @@ files:
 - doc/classes/SimpleMapper/HttpAdapter.src/M000066.html
 - doc/classes/SimpleMapper/HttpOAuthExtension.html
 - doc/classes/SimpleMapper/HttpOAuthExtension.src
+- doc/classes/SimpleMapper/HttpOAuthExtension.src/M000048.html
+- doc/classes/SimpleMapper/HttpOAuthExtension.src/M000049.html
+- doc/classes/SimpleMapper/HttpOAuthExtension.src/M000050.html
 - doc/classes/SimpleMapper/HttpOAuthExtension.src/M000051.html
-- doc/classes/SimpleMapper/HttpOAuthExtension.src/M000052.html
-- doc/classes/SimpleMapper/HttpOAuthExtension.src/M000053.html
-- doc/classes/SimpleMapper/HttpOAuthExtension.src/M000054.html
 - doc/classes/SimpleMapper/SimpleModel
 - doc/classes/SimpleMapper/SimpleModel/ClassMethods.html
 - doc/classes/SimpleMapper/SimpleModel/ClassMethods.src
-- doc/classes/SimpleMapper/SimpleModel/ClassMethods.src/M000049.html
-- doc/classes/SimpleMapper/SimpleModel/ClassMethods.src/M000050.html
+- doc/classes/SimpleMapper/SimpleModel/ClassMethods.src/M000046.html
+- doc/classes/SimpleMapper/SimpleModel/ClassMethods.src/M000047.html
 - doc/classes/SimpleMapper/SimpleModel.html
 - doc/classes/SimpleMapper/SimpleModel.src
+- doc/classes/SimpleMapper/SimpleModel.src/M000042.html
+- doc/classes/SimpleMapper/SimpleModel.src/M000043.html
+- doc/classes/SimpleMapper/SimpleModel.src/M000044.html
 - doc/classes/SimpleMapper/SimpleModel.src/M000045.html
-- doc/classes/SimpleMapper/SimpleModel.src/M000046.html
-- doc/classes/SimpleMapper/SimpleModel.src/M000047.html
-- doc/classes/SimpleMapper/SimpleModel.src/M000048.html
 - doc/classes/SimpleMapper/XmlFormat
 - doc/classes/SimpleMapper/XmlFormat/ClassMethods.html
 - doc/classes/SimpleMapper/XmlFormat/ClassMethods.src
-- doc/classes/SimpleMapper/XmlFormat/ClassMethods.src/M000058.html
+- doc/classes/SimpleMapper/XmlFormat/ClassMethods.src/M000055.html
 - doc/classes/SimpleMapper/XmlFormat.html
 - doc/classes/SimpleMapper/XmlFormat.src
-- doc/classes/SimpleMapper/XmlFormat.src/M000055.html
-- doc/classes/SimpleMapper/XmlFormat.src/M000056.html
-- doc/classes/SimpleMapper/XmlFormat.src/M000057.html
+- doc/classes/SimpleMapper/XmlFormat.src/M000052.html
+- doc/classes/SimpleMapper/XmlFormat.src/M000053.html
+- doc/classes/SimpleMapper/XmlFormat.src/M000054.html
 - doc/classes/SimpleMapper.html
 - doc/classes/String.html
 - doc/classes/Time.html
@@ -210,6 +213,8 @@ files:
 - doc/files/lib/simple_mapper/support/inflector_rb.html
 - doc/files/lib/simple_mapper/support_rb.html
 - doc/files/lib/simple_mapper_rb.html
+- doc/files/LICENSE.html
+- doc/files/README.html
 - doc/fr_class_index.html
 - doc/fr_file_index.html
 - doc/fr_method_index.html