restfulie 0.8.0 → 0.8.1

data/lib/restfulie/common/converter/atom/builder.rb

@@ -1,109 +1,111 @@
-module Restfulie::Common::Converter::Atom
-  class Builder
-    attr_accessor :atom_type
-
-    def initialize(atom_type, obj)
-      @doc    = Nokogiri::XML::Document.new
-      @obj    = obj
-      @parent = @doc.create_element(atom_type.to_s)
-      @parent.add_namespace_definition(nil, "http://www.w3.org/2005/Atom")
-      @parent.parent = @doc
-    end
-
-    def values(options = nil, &block)
-      options.each do |key,value|
-        attr = key.to_s
-        if attr =~ /^xmlns(:\w+)?$/
-          ns = attr.split(":", 2)[1]
-          @parent.add_namespace_definition(ns, value)
-        end
-      end if options
+module Restfulie
+  module Common
+    module Converter
+      module Atom
+        class Builder
+          attr_accessor :atom_type
+          def initialize(atom_type, obj)
+            @doc    = Nokogiri::XML::Document.new
+            @obj    = obj
+            @parent = @doc.create_element(atom_type.to_s)
+            @parent.add_namespace_definition(nil, "http://www.w3.org/2005/Atom")
+            @parent.parent = @doc
+          end
       
-      yield Restfulie::Common::Converter::Components::Values.new(self)
-    end
-    
-    def members(a_collection = nil, &block)
-      collection = a_collection || @obj 
-      raise Restfulie::Common::Error::BuilderError("Members method require a collection to execute") unless collection.respond_to?(:each)
-      collection.each do |member|
-        entry = @doc.create_element("entry")
-        entry.parent = @parent
-        @parent = entry
-        block.call(self, member)
-        @parent = entry.parent
-      end
-    end
-    
-    def link(relationship, uri, options = {})
-      options["rel"] = relationship.to_s
-      options["href"] = uri
-      insert_value("link", nil, options)
-    end
-
-    def insert_value(name, prefix, *args, &block)
-      node = create_element(name.to_s, prefix, *args)
-      node.parent = @parent
+          def values(options = {}, &block)
+            options.each do |key,value|
+              attr = key.to_s
+              if attr =~ /^xmlns(:\w+)?$/
+                ns = attr.split(":", 2)[1]
+                @parent.add_namespace_definition(ns, value)
+              end
+            end            
+            yield Values.new(self)
+          end
+          
+          def members(options = {}, &block)
+            collection = options[:collection] || @obj 
+            raise Error::BuilderError.new("Members method require a collection to execute") unless collection.respond_to?(:each)
+            collection.each do |member|
+              entry = @doc.create_element("entry")
+              entry.parent = @parent
+              @parent = entry
+              block.call(self, member)
+              @parent = entry.parent
+            end
+          end
+          
+          def link(relationship, uri, options = {})
+            options["rel"] = relationship.to_s
+            options["href"] = uri
+            options["type"] ||= "application/atom+xml"
+            insert_value("link", nil, options)
+          end
       
-      if block_given?
-        @parent = node
-        block.call
-        @parent = node.parent
-      end
-    end
-
-    def representation
-      Restfulie::Common::Representation::Atom::Factory.create(@doc)
-    end
-    
-  private
-  
-    def create_element(node, prefix, *args)
-      node = @doc.create_element(node) do |n|
-        if prefix
-          if namespace = prefix_valid?(prefix)
-            # Adding namespace prefix
-            n.namespace = namespace
-            namespace = nil
+          def insert_value(name, prefix, *args, &block)
+            node = create_element(name.to_s, prefix, *args)
+            node.parent = @parent            
+            if block_given?
+              @parent = node
+              block.call
+              @parent = node.parent
+            end
           end
-        end
-
-        args.each do |arg|
-          case arg
-          # Adding XML attributes
-          when Hash
-            arg.each { |k,v|
-              key = k.to_s
-              if key =~ /^xmlns(:\w+)?$/
-                ns_name = key.split(":", 2)[1]
-                n.add_namespace_definition(ns_name, v)
-                next
+      
+          def representation
+            Representation::Atom::Factory.create(@doc)
+          end
+          
+        private
+        
+          def create_element(node, prefix, *args)
+            node = @doc.create_element(node) do |n|
+              if prefix
+                if namespace = prefix_valid?(prefix)
+                  # Adding namespace prefix
+                  n.namespace = namespace
+                  namespace = nil
+                end
+              end
+      
+              args.each do |arg|
+                case arg
+                # Adding XML attributes
+                when Hash
+                  arg.each { |k,v|
+                    key = k.to_s
+                    if key =~ /^xmlns(:\w+)?$/
+                      ns_name = key.split(":", 2)[1]
+                      n.add_namespace_definition(ns_name, v)
+                      next
+                    end
+                    n[k.to_s] = v.to_s
+                  }
+                # Adding XML node content
+                else            
+                  arg.kind_of?(Time) || arg.kind_of?(DateTime) ? content = arg.xmlschema : content = arg
+                  n.content = content
+                end
               end
-              n[k.to_s] = v.to_s
-            }
-          # Adding XML node content
-          else            
-            arg.kind_of?(Time) || arg.kind_of?(DateTime) ? content = arg.xmlschema : content = arg
-            n.content = content
+            end
+          end
+          
+          def prefix_valid?(prefix)
+            ns = @parent.namespace_definitions.find { |x| x.prefix == prefix.to_s }
+            
+            unless ns
+              @parent.ancestors.each do |a|
+                next if a == @doc
+                ns = a.namespace_definitions.find { |x| x.prefix == prefix.to_s }
+                break if ns
+              end      
+            end
+            
+            return ns
+            #TODO: raise ArgumentError, "Namespace #{prefix} has not been defined" if wanted
           end
         end
       end
     end
-    
-    def prefix_valid?(prefix)
-      ns = @parent.namespace_definitions.find { |x| x.prefix == prefix.to_s }
-      
-      unless ns
-        @parent.ancestors.each do |a|
-          next if a == @doc
-          ns = a.namespace_definitions.find { |x| x.prefix == prefix.to_s }
-          break if ns
-        end      
-      end
-      
-      return ns
-      #TODO: raise ArgumentError, "Namespace #{prefix} has not been defined" if wanted
-    end
-    
   end
-
 end

data/lib/restfulie/common/converter/atom/helpers.rb

@@ -1,9 +1,17 @@
-module Restfulie::Common::Converter::Atom::Helpers
-  def collection(obj, *args, &block)
-    Restfulie::Common::Converter::Atom.to_atom(obj, :atom_type => :feed, &block)
+module Restfulie
+  module Common
+    module Converter
+      module Atom
+        module Helpers
+          def collection(obj, *args, &block)
+            Restfulie::Common::Converter::Atom.to_atom(obj, :atom_type => :feed, &block)
+          end
+      
+          def member(obj, *args, &block)
+            Restfulie::Common::Converter::Atom.to_atom(obj, :atom_type => :entry, &block)
+          end
+        end
+      end
+    end
   end
-
-  def member(obj, *args, &block)
-    Restfulie::Common::Converter::Atom.to_atom(obj, :atom_type => :entry, &block)
-  end
-end
+end

data/lib/restfulie/common/converter/json.rb

@@ -0,0 +1,12 @@
+module Restfulie
+  module Common
+    module Converter
+      module Json
+        autoload :Base, 'restfulie/common/converter/json/base'
+        autoload :Builder, 'restfulie/common/converter/json/builder'
+        autoload :Helpers, 'restfulie/common/converter/json/helpers'
+        extend Base::ClassMethods
+      end
+    end
+  end
+end

data/lib/restfulie/common/converter/json/base.rb

@@ -0,0 +1,84 @@
+module Restfulie
+  module Common
+    module Converter
+      module Json
+        module Base
+          module ClassMethods
+            mattr_reader :media_type_name
+            @@media_type_name = 'application/json'
+        
+            mattr_reader :headers
+            @@headers = { 
+              :get  => { 'Accept'       => media_type_name },
+              :post => { 'Content-Type' => media_type_name }
+            }
+        
+            mattr_reader :recipes
+            @@recipes = {}
+        
+            def describe_recipe(recipe_name, options={}, &block)
+              raise 'Undefined recipe' unless block_given?
+              raise 'Undefined recipe_name'   unless recipe_name
+              @@recipes[recipe_name] = block
+            end
+      
+            def to_json(obj = nil, options = {:root => {}}, &block)
+              # just instantiate the string with the atom factory
+              return Restfulie::Common::Representation::Json.create(obj) if obj.kind_of?(String)
+              
+              if block_given?
+                recipe = block
+              else
+                recipe = options[:recipe]     
+              end
+              
+              # Check if the object is already an json
+              unless recipe
+                return Restfulie::Common::Representation::Json.create(obj) if obj.kind_of?(Hash) || obj.kind_of?(Array)
+                raise Restfulie::Common::Error::ConverterError.new("Recipe required")
+              end
+                      
+              # Get recipe already described
+              recipe = @@recipes[recipe] unless recipe.respond_to?(:call)
+      
+              # Create representation and proxy
+              builder = Restfulie::Common::Converter::Json::Builder.new(obj, (options[:root] || {}))
+      
+              # Check recipe arity size before calling it
+              recipe.call(*[builder, obj, options][0,recipe.arity])
+      
+              builder.representation
+            end
+            
+            alias_method :unmarshal, :to_json
+      
+            def to_hash(obj)
+              return obj if obj.kind_of?(Hash) || obj.kind_of?(Array)
+              
+              if obj.kind_of?(::String)
+                Restfulie::Common::Representation::Json.create(obj)
+              else
+                raise Restfulie::Common::Error::ConverterError.new("It was not possible to convert this object to a Hash")
+              end
+            end
+      
+            def to_s(obj)
+              return obj if obj.kind_of?(String)
+              Restfulie::Common::Representation::Json.create(obj).to_s
+            end
+      
+            def marshal(obj, options = nil)
+              return obj if obj.kind_of? String
+              to_json(obj, options).to_json
+            end
+            
+            # returns the current helper
+            def helper
+              Helpers
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/restfulie/common/converter/json/builder.rb

@@ -0,0 +1,102 @@
+module Restfulie
+  module Common
+    module Converter
+      module Json
+        class Builder
+          def initialize(obj, initial_obj = {})
+            @doc     = initial_obj
+            @obj     = obj
+            @current = @doc
+          end
+      
+          def values(options = nil, &block)
+            yield Values.new(self)
+          end
+          
+          def members(options = {}, &block)
+            collection = options[:collection] || @obj 
+            raise Error::BuilderError.new("Members method require a collection to execute") unless collection.respond_to?(:each)
+            root = options[:root] || Restfulie::Common::Converter.root_element_for(collection)
+            
+            collection.each do |member|
+              node = {}
+              
+              parent = @current
+              @current = node
+              block.call(self, member)
+              @current = parent
+              
+              add_to_current(root, node)
+            end
+          end
+          
+          def link(relationship, uri, options = {})
+            options["rel"] = relationship.to_s
+            options["href"] = uri
+            options["type"] ||= "application/json"
+            insert_value("link", nil, options)
+          end
+      
+          def insert_value(name, prefix, *args, &block)
+            node = create_element(block_given?, *args)
+            
+            if block_given?
+              parent = @current
+              @current = node
+              block.call
+              @current = parent
+            end
+            
+            add_to_current(name, node)
+          end
+      
+          def representation
+            Representation::Json.create(@doc).to_json
+          end
+          
+        private
+        
+          def create_element(has_block, *args)
+            vals = []
+            hashes = []
+            
+            args.each do |arg|
+              arg.kind_of?(Hash) ? hashes << arg : vals << arg
+            end
+            
+            if hashes.empty?
+              # only simple values
+              unless vals.empty?
+                vals = vals.first if vals.size == 1
+                node = has_block ? {} : vals
+              else
+                node = has_block ? {} : nil
+              end
+            else
+              # yes we have hashes
+              node = {} 
+              hashes.each { |hash| node.merge!(hash) }
+              unless vals.empty?
+                vals = vals.first if vals.size == 1
+                node = has_block ? {} : [node, vals]
+              end
+              node
+            end
+          end
+          
+          def add_to_current(name, value)
+            if @current[name]
+              if @current[name].kind_of?(Array)
+                @current[name] << value
+              else
+                @current[name] = [@current[name], value]
+              end
+            else
+              @current[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/restfulie/common/converter/json/helpers.rb

@@ -0,0 +1,17 @@
+module Restfulie
+  module Common
+    module Converter
+      module Json
+        module Helpers
+          def collection(obj, *args, &block)
+            Restfulie::Common::Converter::Json.to_json(obj, &block)
+          end
+        
+          def member(obj, *args, &block)
+            Restfulie::Common::Converter::Json.to_json(obj, &block)
+          end
+        end
+      end
+    end
+  end
+end