activeresource 3.0.0.beta3 → 3.0.0.beta4

data/CHANGELOG

@@ -1,3 +1,8 @@
+*Rails 3.0.0 [beta 4] (June 8th, 2010)*
+
+* JSON: set Base.include_root_in_json = true to include a root value in the JSON: {"post": {"title": ...}}. Mirrors the Active Record option.  [Santiago Pastorino]
+
+
 *Rails 3.0.0 [beta 3] (April 13th, 2010)*
 
 * No changes

data/lib/active_resource/base.rb

@@ -251,9 +251,6 @@ module ActiveResource
     # The logger for diagnosing and tracing Active Resource calls.
     cattr_accessor :logger
 
-    # Controls the top-level behavior of JSON serialization
-    cattr_accessor :include_root_in_json, :instance_writer => false
-
     class << self
       # Creates a schema for this resource - setting the attributes that are
       # known prior to fetching an instance from the remote system.
@@ -554,11 +551,9 @@ module ActiveResource
         @headers ||= {}
       end
 
-      # Do not include any modules in the default element name. This makes it easier to seclude ARes objects
-      # in a separate namespace without having to set element_name repeatedly.
-      attr_accessor_with_default(:element_name)    { ActiveSupport::Inflector.underscore(to_s.split("::").last) } #:nodoc:
-
+      attr_accessor_with_default(:element_name)    { model_name.element } #:nodoc:
       attr_accessor_with_default(:collection_name) { ActiveSupport::Inflector.pluralize(element_name) } #:nodoc:
+
       attr_accessor_with_default(:primary_key, 'id') #:nodoc:
 
       # Gets the \prefix for a resource's nested URL (e.g., <tt>prefix/collectionname/1.xml</tt>)
@@ -587,12 +582,13 @@ module ActiveResource
         # Clear prefix parameters in case they have been cached
         @prefix_parameters = nil
 
-        # Redefine the new methods.
-        code, line = <<-end_code, __LINE__ + 1
-          def prefix_source() "#{value}" end
-          def prefix(options={}) "#{prefix_call}" end
-        end_code
-        silence_warnings { instance_eval code, __FILE__, line }
+        silence_warnings do
+          # Redefine the new methods.
+          instance_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+            def prefix_source() "#{value}" end
+            def prefix(options={}) "#{prefix_call}" end
+          RUBY_EVAL
+        end
       rescue
         logger.error "Couldn't set prefix: #{$!}\n  #{code}" if logger
         raise
@@ -1048,11 +1044,6 @@ module ActiveResource
       attributes[self.class.primary_key] = id
     end
 
-    # Allows Active Resource objects to be used as parameters in Action Pack URL generation.
-    def to_param
-      id && id.to_s
-    end
-
     # Test for equality.  Resource are equal if and only if +other+ is the same object or
     # is an instance of the same class, is not <tt>new?</tt>, and has the same +id+.
     #
@@ -1179,79 +1170,11 @@ module ActiveResource
       !new? && self.class.exists?(to_param, :params => prefix_options)
     end
 
-    # Converts the resource to an XML string representation.
-    #
-    # ==== Options
-    # The +options+ parameter is handed off to the +to_xml+ method on each
-    # attribute, so it has the same options as the +to_xml+ methods in
-    # Active Support.
-    #
-    # * <tt>:indent</tt> - Set the indent level for the XML output (default is +2+).
-    # * <tt>:dasherize</tt> - Boolean option to determine whether or not element names should
-    #   replace underscores with dashes (default is <tt>false</tt>).
-    # * <tt>:skip_instruct</tt> - Toggle skipping the +instruct!+ call on the XML builder
-    #   that generates the XML declaration (default is <tt>false</tt>).
-    #
-    # ==== Examples
-    #   my_group = SubsidiaryGroup.find(:first)
-    #   my_group.to_xml
-    #   # => <?xml version="1.0" encoding="UTF-8"?>
-    #   #    <subsidiary_group> [...] </subsidiary_group>
-    #
-    #   my_group.to_xml(:dasherize => true)
-    #   # => <?xml version="1.0" encoding="UTF-8"?>
-    #   #    <subsidiary-group> [...] </subsidiary-group>
-    #
-    #   my_group.to_xml(:skip_instruct => true)
-    #   # => <subsidiary_group> [...] </subsidiary_group>
-    def to_xml(options={})
-      attributes.to_xml({:root => self.class.element_name}.merge(options))
-    end
-
-    # Coerces to a hash for JSON encoding.
-    #
-    # ==== Options
-    # The +options+ are passed to the +to_json+ method on each
-    # attribute, so the same options as the +to_json+ methods in
-    # Active Support.
-    #
-    # * <tt>:only</tt> - Only include the specified attribute or list of
-    #   attributes in the serialized output. Attribute names must be specified
-    #   as strings.
-    # * <tt>:except</tt> - Do not include the specified attribute or list of
-    #   attributes in the serialized output. Attribute names must be specified
-    #   as strings.
-    #
-    # ==== Examples
-    #   person = Person.new(:first_name => "Jim", :last_name => "Smith")
-    #   person.to_json
-    #   # => {"first_name": "Jim", "last_name": "Smith"}
-    #
-    #   person.to_json(:only => ["first_name"])
-    #   # => {"first_name": "Jim"}
-    #
-    #   person.to_json(:except => ["first_name"])
-    #   # => {"last_name": "Smith"}
-    def as_json(options = nil)
-      attributes.as_json(options)
-    end
-
     # Returns the serialized string representation of the resource in the configured
     # serialization format specified in ActiveResource::Base.format. The options
     # applicable depend on the configured encoding format.
     def encode(options={})
-      case self.class.format
-        when ActiveResource::Formats::XmlFormat
-          self.class.format.encode(attributes, {:root => self.class.element_name}.merge(options))
-        when ActiveResource::Formats::JsonFormat 
-          if ActiveResource::Base.include_root_in_json
-            self.class.format.encode({self.class.element_name => attributes}, options)
-          else
-            self.class.format.encode(attributes, options)
-          end
-        else
-          self.class.format.encode(attributes, options)
-      end
+      send("to_#{self.class.format.extension}", options)
     end
 
     # A method to \reload the attributes of this object from the remote web service.
@@ -1366,6 +1289,14 @@ module ActiveResource
       end
     end
 
+    def to_json(options={})
+      super({ :root => self.class.element_name }.merge(options))
+    end
+
+    def to_xml(options={})
+      super({ :root => self.class.element_name }.merge(options))
+    end
+
     protected
       def connection(refresh = false)
         self.class.connection(refresh)
@@ -1475,5 +1406,8 @@ module ActiveResource
   class Base
     extend ActiveModel::Naming
     include CustomMethods, Observing, Validations
+    include ActiveModel::Conversion
+    include ActiveModel::Serializers::JSON
+    include ActiveModel::Serializers::Xml
   end
 end

data/lib/active_resource/connection.rb

@@ -106,7 +106,7 @@ module ActiveResource
     private
       # Makes a request to the remote service.
       def request(method, path, *arguments)
-        result = ActiveSupport::Notifications.instrument("active_resource.request") do |payload|
+        result = ActiveSupport::Notifications.instrument("request.active_resource") do |payload|
           payload[:method]      = method
           payload[:request_uri] = "#{site.scheme}://#{site.host}:#{site.port}#{path}"
           payload[:result]      = http.send(method, path, *arguments)

data/lib/active_resource/schema.rb

@@ -42,7 +42,7 @@ module ActiveResource # :nodoc:
     # TODO:  We should eventually support all of these:
     # %w( string text integer float decimal datetime timestamp time date binary boolean ).each do |attr_type|
     KNOWN_ATTRIBUTE_TYPES.each do |attr_type|
-      class_eval <<-EOV
+      class_eval <<-EOV, __FILE__, __LINE__ + 1
         def #{attr_type.to_s}(*args)
           options = args.extract_options!
           attr_names = args

data/lib/active_resource/version.rb

@@ -3,7 +3,7 @@ module ActiveResource
     MAJOR = 3
     MINOR = 0
     TINY  = 0
-    BUILD = "beta3"
+    BUILD = "beta4"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
   end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 3
   - 0
   - 0
-  - beta3
-  version: 3.0.0.beta3
+  - beta4
+  version: 3.0.0.beta4
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 -07:00
+date: 2010-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,8 +29,8 @@ dependencies:
         - 3
         - 0
         - 0
-        - beta3
-        version: 3.0.0.beta3
+        - beta4
+        version: 3.0.0.beta4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,8 +44,8 @@ dependencies:
         - 3
         - 0
         - 0
-        - beta3
-        version: 3.0.0.beta3
+        - beta4
+        version: 3.0.0.beta4
   type: :runtime
   version_requirements: *id002
 description: REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.