simplemapper 0.0.5 → 0.0.6

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
 PKG_NAME = 'simplemapper'
-PKG_VERSION = "0.0.5"
+PKG_VERSION = "0.0.6"
 
 PKG_FILES = FileList[
     "lib/**/*", "rspec/**/*", "[A-Z]*", "Rakefile", "doc/**/*"

data/lib/simple_mapper.rb

@@ -13,4 +13,4 @@
 # "finder" options, like converting an options hash to a sql SELECT request, or mapping an options hash to an HTTP request.
 # It is purposed to make it as light and simple as possible to plug these in.
 
-require 'simple_mapper/base'
+require File.expand_path(File.dirname(__FILE__) + '/simple_mapper/base')

data/lib/simple_mapper/adapters/http_adapter.rb

@@ -87,7 +87,8 @@ module SimpleMapper
         request.body = body
         request.initialize_http_header headers.merge(options[:headers] || {})
         # - - - after_request_instantiate callback
-        request = run_callback('initialize_request', request)
+        res = run_callback('initialize_request', request)
+        request = res if res.is_a?(request.class)
         # - - -
         request
       end

data/lib/simple_mapper/base.rb

@@ -1,11 +1,9 @@
-require File.expand_path('simple_mapper/support')
-require File.expand_path('simple_mapper/plugin_support')
-
+require File.expand_path(File.dirname(__FILE__) + '/persistence')
 module SimpleMapper
   class Base
     def self.inherited(klass)
-      klass.send(:include, SimpleMapper::Persistence)
       SimpleMapper::Persistence::prepare_for_inheritance(klass)
+      klass.send(:include, SimpleMapper::Persistence)
     end
   end
 end

data/lib/simple_mapper/default_plugins/oauth.rb

@@ -2,6 +2,8 @@ gem 'oauth'
 require 'oauth'
 require 'oauth/consumer'
 require 'oauth/client/net_http'
+
+# First some fixes...
 module OAuth
   module Signature
     class Base
@@ -28,7 +30,7 @@ module OAuth
 end
 
 module SimpleMapper
-  module HttpOAuthExtension
+  module Oauth
     def requires_oauth(consumer_key, consumer_secret, options={})
       @consumer_key = consumer_key
       @consumer_secret = consumer_secret
@@ -64,7 +66,7 @@ module SimpleMapper
   end
 
   class HttpAdapter
-    include HttpOAuthExtension
+    include Oauth
   end
 end
 

data/lib/simple_mapper/default_plugins/properties.rb

@@ -43,7 +43,7 @@ module SimpleMapper
     # way you want. For example, you could set the data to some other object type, or to a Marshalled storage.
     # The type of data you receive will depend on the format and parser you use. Of course you could make up
     # your own spin-off of one of those, too.
-    def data=(hash)
+    def data=(data)
       raise TypeError, "data must be a hash" unless data.is_a?(Hash)
       data.each {|k,v| instance_variable_set("@#{k}", v)}
     end

data/lib/simple_mapper/formats/json_format.rb

@@ -0,0 +1,50 @@
+require 'simple_mapper/support/bliss_serializer'
+require 'rubygems'
+gem 'formattedstring'
+require 'formatted_string'
+
+module SimpleMapper
+  module JsonFormat
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    def self.mime_type_headers
+      {'Accept' => 'application/json', 'Content-type' => 'application/json'}
+    end
+
+    def to_json
+      json = Serialize.object_to_json(self, :key_name => 'self').to_s
+      # puts "POST JSON: #{json}"
+      json
+    end
+
+    module ClassMethods
+      # This assumes a standard json format:
+      #   {'person':{'attribute':'','another_att':'value'}}
+      # And for a collection of objects:
+      #   {'people':[{'person':{'attribute':'','another_att':'value 1'}},{'person':{'attribute':'','another_att':'value'}}]}
+      def from_json(json)
+        doc = Serialize.hash_from_json(json)
+        # doc could include a single 'model' element, or a 'models' wrapper around several.
+        puts "Top-level JSON key(s): #{doc.keys.inspect}" if @debug
+        if doc.is_a?(Hash)
+          key = doc.keys.first
+          if doc[key] && doc[key].keys.uniq == [key.singularize] && doc[key][key.singularize].is_a?(Array)
+            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__).load(e)
+            end
+          elsif doc[key] # top-level must be single object
+            Object.module_eval("::#{key.singularize.camelize}", __FILE__, __LINE__).load(doc[self.name.underscore])
+          else
+            nil
+          end
+        else # doc isn't a hash, probably nil
+          doc
+        end
+      end
+    end
+  end
+end

data/lib/simple_mapper/formats/xml_format.rb

@@ -37,17 +37,21 @@ module SimpleMapper
         doc = Serialize.hash_from_xml(xml)
         # doc could include a single 'model' element, or a 'models' wrapper around several.
         puts "Top-level XML key(s): #{doc.keys.inspect}" if @debug
-        key = doc.keys.first
-        if doc[key] && doc[key].keys.uniq == [key.singularize] && doc[key][key.singularize].is_a?(Array)
-          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__).load(e)
+        if doc.is_a?(Hash)
+          key = doc.keys.first
+          if doc[key] && doc[key].keys.uniq == [key.singularize] && doc[key][key.singularize].is_a?(Array)
+            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__).load(e)
+            end
+          elsif doc[key] # top-level must be single object
+            Object.module_eval("::#{key.singularize.camelize}", __FILE__, __LINE__).load(doc[self.name.underscore])
+          else
+            nil
           end
-        elsif doc[key] # top-level must be single object
-          Object.module_eval("::#{key.singularize.camelize}", __FILE__, __LINE__).load(Serialize.hash_from_xml(xml)[self.name.underscore])
-        else
-          nil
+        else # doc isn't a hash, probably nil
+          doc
         end
       end
     end

data/lib/simple_mapper/persistence.rb

@@ -1,10 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/support')
 module SimpleMapper
   module Persistence
-    include PluginSupport
-
     # TODO: Write in inheritability for models. Should this instead be a place that plugins can plug in a callback?
     def self.prepare_for_inheritance(klass)
-      
+    end
+
+    def self.included(klass)
+      klass.extend ClassMethods
+      require File.expand_path(File.dirname(__FILE__) + '/plugin_support')
+      klass.send(:include, SimpleMapper::PluginSupport)
     end
 
     module ClassMethods
@@ -83,7 +87,7 @@ module SimpleMapper
       end
 
       def extract_from(formatted_data)
-        objs = send("from_#{format_name}".to_sym, formatted_data)
+        objs = send(:"from_#{format_name}", formatted_data)
         objs.is_a?(Array) ? objs.collect {|e| e.extended {@persisted = true}} : objs.extended {@persisted = true}
       end
 
@@ -98,8 +102,8 @@ module SimpleMapper
 
       def load(data=nil)
         obj = allocate
-        obj.original_data = data
         obj.send(:initialize, data)
+        obj.original_data = data
         obj
       end
 

data/lib/simple_mapper/support/bliss_serializer.rb

@@ -48,7 +48,7 @@ module Serialize
         if value.respond_to?(:to_xml)
           assoc_options = {}
           assoc_options = {:exclude => value.association.foreign_key_column.name} if value.respond_to?(:association)
-          root_element.add_element(REXML::Document.new(value.to_xml(assoc_options.merge(:root => key)).to_s))
+          root_element.add_element(REXML::Document.new(value.to_xml(assoc_options.merge(:root => key.to_s)).to_s))
         else
           root_element.add_element(key.to_s) << REXML::Text.new(value.to_s.dup)
         end
@@ -57,16 +57,43 @@ module Serialize
 
     root ? doc.to_s : doc.children[0].children.to_s
   end
-  
   def self.hash_from_xml(xml,options={})
-    xml.formatted(:xml).to_hash
+    xml.to_s.formatted(:xml).to_hash
+  end
+
+  JSON_OPTIONS = {
+    :include_key => false, # Can be true or false
+    :key_name => :id, # Default key name
+    :instance_columns => :visible_properties,
+    :class_columns => :visible_properties,
+  }
+  def self.object_to_json(obj, options={})
+    # Automatically set the key_name for DataMapper objects
+    options.merge!(:key_name => obj.class.table.key.name) if obj.class.respond_to?(:table) && obj.class.respond_to?(:persistent?) && obj.class.persistent?
+    # Should do the above also for ActiveRecord...
+    options = options.reverse_merge!(obj.class.json_options) if obj.class.respond_to?(:json_options)
+    options = options.reverse_merge!(obj.json_options) if obj.respond_to?(:json_options)
+    to_json(obj.to_hash(options), {:root => Inflector.underscore(obj.class.name)}.merge(options))
+  end
+  def self.to_json(attributes={}, options={})
+# max-results=25 || limit=25
+# start-index=26 || offset=26
+    raise NotImplemented
+    options = JSON_OPTIONS.merge(options)
+    root = options[:root]
+    options[:exclude] = [options[:exclude]].flatten.compact.collect {|e| e.to_s}
+    attributes.reject! {|k,v| options[:exclude].include?(k)}
+  end
+  def self.hash_from_json(json,options={})
+    json.to_s.formatted(:json).to_hash
   end
 end
 
 class Hash
   def to_xml(options={})
-    options[:root] = keys.length == 1 ? keys[0] : nil if !options.has_key?(:root)
-    Serialize.to_xml(self.slashed, options.merge(:root => (options.has_key?(:root) ? options[:root] : 'xml')))
+    options[:root] = keys[0] if keys.length == 1 && (!options.has_key?(:root) || options[:root].to_s == '')
+    options[:root] = 'xml' if options[:root].to_s == ''
+    Serialize.to_xml(self.slashed, options)
   end
 end
 
@@ -76,6 +103,12 @@ class Array
   end
 end
 
+class Time
+  def to_xml
+    xmlschema
+  end
+end
+
 module Merb
   class Request
     def xml_params

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simplemapper
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Daniel Parker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-15 00:00:00 -04:00
+date: 2008-05-09 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,7 @@ files:
 - lib/simple_mapper/default_plugins/options_to_query.rb
 - lib/simple_mapper/default_plugins/properties.rb
 - lib/simple_mapper/formats
+- lib/simple_mapper/formats/json_format.rb
 - lib/simple_mapper/formats/xml_format.rb
 - lib/simple_mapper/persistence.rb
 - lib/simple_mapper/plugin_support.rb