From c1304098cca8a9247a9ad1461a1a343354650843 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Wed, 2 Dec 2009 20:01:01 -0800
Subject: Reorganize autoloads:

  * A new module (ActiveSupport::Autoload) is provide that extends
    autoloading with new behavior.
  * All autoloads in modules that have extended ActiveSupport::Autoload
    will be eagerly required in threadsafe environments
  * Autoloads can optionally leave off the path if the path is the same
    as full_constant_name.underscore
  * It is possible to specify that a group of autoloads live under an
    additional path. For instance, all of ActionDispatch's middlewares
    are ActionDispatch::MiddlewareName, but they live under
    "action_dispatch/middlewares/middleware_name"
  * It is possible to specify that a group of autoloads are all found
    at the same path. For instance, a number of exceptions might all
    be declared there.
  * One consequence of this is that testing-related constants are not
    autoloaded. To get the testing helpers for a given component,
    require "component_name/test_case". For instance, "action_controller/test_case".
  * test_help.rb, which is automatically required by a Rails application's
    test helper, requires the test_case.rb for all active components, so
    this change will not be disruptive in existing or new applications.
---
 activeresource/lib/active_resource.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'activeresource/lib')

diff --git a/activeresource/lib/active_resource.rb b/activeresource/lib/active_resource.rb
index fd4c199b48..9357dd852f 100644
--- a/activeresource/lib/active_resource.rb
+++ b/activeresource/lib/active_resource.rb
@@ -30,11 +30,13 @@ $:.unshift(activemodel_path) if File.directory?(activemodel_path)
 require 'active_model'
 
 module ActiveResource
-  autoload :Base, 'active_resource/base'
-  autoload :Connection, 'active_resource/connection'
-  autoload :CustomMethods, 'active_resource/custom_methods'
-  autoload :Formats, 'active_resource/formats'
-  autoload :Observing, 'active_resource/observing'
-  autoload :Validations, 'active_resource/validations'
-  autoload :HttpMock, 'active_resource/http_mock'
+  extend ActiveSupport::Autoload
+
+  autoload :Base
+  autoload :Connection
+  autoload :CustomMethods
+  autoload :Formats
+  autoload :Observing
+  autoload :Validations
+  autoload :HttpMock
 end
-- 
cgit v1.2.3


From 7ee5843c3cedfe36a680d5b28aa31eef45296c50 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Wed, 16 Dec 2009 11:56:51 -0600
Subject: Fully expand relative rails framework paths and make sure we aren't
 adding any to the load path more than once.

---
 activeresource/lib/active_resource.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'activeresource/lib')

diff --git a/activeresource/lib/active_resource.rb b/activeresource/lib/active_resource.rb
index 9357dd852f..84baf4227a 100644
--- a/activeresource/lib/active_resource.rb
+++ b/activeresource/lib/active_resource.rb
@@ -21,12 +21,13 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
-$:.unshift(activesupport_path) if File.directory?(activesupport_path)
-require 'active_support'
+activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
+$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
+
+activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__)
+$:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include?(activemodel_path)
 
-activemodel_path = "#{File.dirname(__FILE__)}/../../activemodel/lib"
-$:.unshift(activemodel_path) if File.directory?(activemodel_path)
+require 'active_support'
 require 'active_model'
 
 module ActiveResource
-- 
cgit v1.2.3


From fc9b3e4a45a81b7526f8154049c825e3755903ad Mon Sep 17 00:00:00 2001
From: Taryn East <git@taryneast.org>
Date: Sun, 20 Dec 2009 18:42:16 -0600
Subject: define_schema for Active Resource

Signed-off-by: Joshua Peek <josh@joshpeek.com>
---
 activeresource/lib/active_resource/base.rb         | 144 ++++++++++++++++++++-
 .../lib/active_resource/schema_definition.rb       |  58 +++++++++
 2 files changed, 200 insertions(+), 2 deletions(-)
 create mode 100644 activeresource/lib/active_resource/schema_definition.rb

(limited to 'activeresource/lib')

diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index 18105e8887..60bd573911 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -13,6 +13,7 @@ require 'set'
 require 'uri'
 
 require 'active_resource/exceptions'
+require 'active_resource/schema_definition'
 
 module ActiveResource
   # ActiveResource::Base is the main class for mapping RESTful resources as models in a Rails application.
@@ -241,6 +242,127 @@ module ActiveResource
     cattr_accessor :logger
 
     class << self
+      # This will shortly disappear to be replaced by the migration-style
+      # usage of this for defining a schema. At that point, all the doc
+      # currenlty on <tt>schema=</tt> will move back here...
+      def schema # :nodoc:
+        @schema ||= nil
+      end
+      # Creates a schema for this resource - setting the attributes that are
+      # known prior to fetching an instance from the remote system.
+      #
+      # The schema helps define the set of <tt>known_attributes</tt> of the
+      # current resource.
+      #
+      # There is no need to specify a schema for your Active Resource. If
+      # you do not, the <tt>known_attributes</tt> will be guessed from the
+      # instance attributes returned when an instance is fetched from the
+      # remote system.
+      #
+      # example:
+      # class Person < ActiveResource::Base
+      #   define_schema do |s|
+      #     # define each attribute separately
+      #     s.attribute 'name', :string
+      #
+      #     # or use the convenience methods and pass >=1 attribute names
+      #     s.string  'eye_colour', 'hair_colour'
+      #     s.integer 'age'
+      #     s.float   'height', 'weight'
+      #
+      #     # unsupported types should be left as strings 
+      #     # overload the accessor methods if you need to convert them
+      #     s.attribute 'created_at', 'string' 
+      #   end
+      # end
+      #
+      # p = Person.new
+      # p.respond_to? :name   # => true
+      # p.respond_to? :age    # => true
+      # p.name                # => nil
+      # p.age                 # => nil
+      #
+      # j = Person.find_by_name('John') # <person><name>John</name><age>34</age><num_children>3</num_children></person>
+      # j.respond_to? :name   # => true
+      # j.respond_to? :age    # => true
+      # j.name                # => 'John'
+      # j.age                 # => '34'  # note this is a string!
+      # j.num_children        # => '3'  # note this is a string!
+      #
+      # p.num_children        # => NoMethodError
+      #
+      # Attribute-types must be one of:
+      #  string, integer, float
+      #
+      # Note: at present the attribute-type doesn't do anything, but stay
+      # tuned...  
+      # Shortly it will also *cast* the value of the returned attribute.
+      # ie:
+      # j.age                 # => 34   # cast to an integer
+      # j.weight              # => '65' # still a string!
+      #
+      def define_schema
+        schema_definition = SchemaDefinition.new
+        yield schema_definition if block_given?
+
+        # skip out if we didn't define anything
+        return unless schema_definition.attrs.present?
+
+        @schema ||= {}.with_indifferent_access
+        @known_attributes ||= []
+
+        schema_definition.attrs.each do |k,v|
+          @schema[k] = v
+          @known_attributes << k
+        end
+
+        schema
+      end  
+
+
+      # Alternative, direct way to specify a <tt>schema</tt> for this
+      # Resource. <tt>define_schema</tt> is more flexible, but this is quick
+      # for a very simple schema.
+      #
+      # Pass the schema as a hash with the keys being the attribute-names
+      # and the value being one of the accepted attribute types (as defined
+      # in <tt>define_schema</tt>) 
+      #
+      # example:
+      #
+      # class Person < ActiveResource::Base
+      #   schema = {'name' => :string, 'age' => :integer }
+      # end
+      #
+      # The keys/values can be strings or symbols. They will be converted to
+      # strings.
+      #
+      def schema=(the_schema)
+        unless the_schema.present?
+          # purposefully nulling out the schema
+          @schema = nil
+          @known_attributes = []
+          return 
+        end
+
+        raise ArgumentError, "Expected a hash" unless the_schema.kind_of? Hash
+
+        define_schema do |s|
+          the_schema.each {|k,v| s.attribute(k,v) }
+        end
+      end
+
+      # Returns the list of known attributes for this resource, gathered
+      # from the provided <tt>schema</tt>
+      # Attributes that are known will cause your resource to return 'true'
+      # when <tt>respond_to?</tt> is called on them. A known attribute will
+      # return nil if not set (rather than <t>MethodNotFound</tt>); thus
+      # known attributes can be used with <tt>validates_presence_of</tt>
+      # without a getter-method.
+      def known_attributes
+        @known_attributes ||= []
+      end
+
       # Gets the URI of the REST resources to map for this class.  The site variable is required for
       # Active Resource's mapping to work.
       def site
@@ -776,6 +898,21 @@ module ActiveResource
     attr_accessor :attributes #:nodoc:
     attr_accessor :prefix_options #:nodoc:
 
+    # If no schema has been defined for the class (see
+    # <tt>ActiveResource::schema=</tt>), the default automatic schema is
+    # generated from the current instance's attributes
+    def schema
+      self.class.schema || self.attributes
+    end
+
+    # This is a list of known attributes for this resource. Either
+    # gathered fromthe provided <tt>schema</tt>, or from the attributes
+    # set on this instance after it has been fetched from the remote system.
+    def known_attributes
+      self.class.known_attributes + self.attributes.keys.map(&:to_s)
+    end
+
+
     # Constructor method for \new resources; the optional +attributes+ parameter takes a \hash
     # of attributes for the \new resource.
     #
@@ -1157,7 +1294,7 @@ module ActiveResource
       method_name = method.to_s
       if attributes.nil?
         super
-      elsif attributes.has_key?(method_name)
+      elsif known_attributes.include?(method_name)
         true
       elsif method_name =~ /(?:=|\?)$/ && attributes.include?($`)
         true
@@ -1262,7 +1399,10 @@ module ActiveResource
             attributes[$`]
           end
         else
-          attributes.include?(method_name) ? attributes[method_name] : super
+          return attributes[method_name] if attributes.include?(method_name)
+          # not set right now but we know about it
+          return nil if known_attributes.include?(method_name)
+          super
         end
       end
   end
diff --git a/activeresource/lib/active_resource/schema_definition.rb b/activeresource/lib/active_resource/schema_definition.rb
new file mode 100644
index 0000000000..abcbf3ba4e
--- /dev/null
+++ b/activeresource/lib/active_resource/schema_definition.rb
@@ -0,0 +1,58 @@
+require 'active_resource/exceptions'
+
+module ActiveResource # :nodoc:
+  class SchemaDefinition # :nodoc:
+
+    # attributes can be known to be one of these types. They are easy to
+    # cast to/from.
+    KNOWN_ATTRIBUTE_TYPES = %w( string integer float )
+
+    # An array of attribute definitions, representing the attributes that
+    # have been defined.
+    attr_accessor :attrs
+
+    # The internals of an Active Resource SchemaDefinition are very simple -
+    # unlike an Active Record TableDefinition (on which it is based).
+    # It provides a set of convenience methods for people to define their
+    # schema using the syntax:
+    #  define_schema do |s|
+    #    s.string :foo
+    #    s.integer :bar
+    #  end
+    #
+    #  The schema stores the name and type of each attribute. That is then
+    #  read out by the define_schema method to populate the actual
+    #  Resource's schema
+    def initialize
+      @attrs = {}
+    end
+
+    def attribute(name, type, options = {})
+      raise ArgumentError, "Unknown Attribute type: #{type.inspect} for key: #{name.inspect}" unless type.nil? || SchemaDefinition::KNOWN_ATTRIBUTE_TYPES.include?(type.to_s) 
+
+      the_type = type.to_s
+      # TODO: add defaults
+      #the_attr = [type.to_s]
+      #the_attr << options[:default] if options.has_key? :default
+      @attrs[name.to_s] = the_type
+      self
+    end
+
+    # The following are the attribute types supported by Active Resource
+    # migrations. 
+    # 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
+        def #{attr_type.to_s}(*args)                                                # def string(*args)
+          options = args.extract_options!                                      #   options = args.extract_options!
+          attr_names = args                                                    #   attr_names = args
+                                                                               #
+          attr_names.each { |name| attribute(name, '#{attr_type}', options) }  #   attr_names.each { |name| attribute(name, 'string', options) }
+        end                                                                    # end
+      EOV
+
+    end
+
+  end
+end
-- 
cgit v1.2.3


From 669c5eec445ff097b765c387b92ae1f174134f75 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sun, 20 Dec 2009 18:44:13 -0600
Subject: Rename SchemaDefinition => Schema

---
 activeresource/lib/active_resource.rb              |  3 +-
 activeresource/lib/active_resource/base.rb         | 15 +++---
 activeresource/lib/active_resource/schema.rb       | 58 ++++++++++++++++++++++
 .../lib/active_resource/schema_definition.rb       | 58 ----------------------
 4 files changed, 67 insertions(+), 67 deletions(-)
 create mode 100644 activeresource/lib/active_resource/schema.rb
 delete mode 100644 activeresource/lib/active_resource/schema_definition.rb

(limited to 'activeresource/lib')

diff --git a/activeresource/lib/active_resource.rb b/activeresource/lib/active_resource.rb
index 84baf4227a..3e4a1dd4a1 100644
--- a/activeresource/lib/active_resource.rb
+++ b/activeresource/lib/active_resource.rb
@@ -37,7 +37,8 @@ module ActiveResource
   autoload :Connection
   autoload :CustomMethods
   autoload :Formats
+  autoload :HttpMock
   autoload :Observing
+  autoload :Schema
   autoload :Validations
-  autoload :HttpMock
 end
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index 60bd573911..b39f8fbd48 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -13,7 +13,6 @@ require 'set'
 require 'uri'
 
 require 'active_resource/exceptions'
-require 'active_resource/schema_definition'
 
 module ActiveResource
   # ActiveResource::Base is the main class for mapping RESTful resources as models in a Rails application.
@@ -270,9 +269,9 @@ module ActiveResource
       #     s.integer 'age'
       #     s.float   'height', 'weight'
       #
-      #     # unsupported types should be left as strings 
+      #     # unsupported types should be left as strings
       #     # overload the accessor methods if you need to convert them
-      #     s.attribute 'created_at', 'string' 
+      #     s.attribute 'created_at', 'string'
       #   end
       # end
       #
@@ -295,14 +294,14 @@ module ActiveResource
       #  string, integer, float
       #
       # Note: at present the attribute-type doesn't do anything, but stay
-      # tuned...  
+      # tuned...
       # Shortly it will also *cast* the value of the returned attribute.
       # ie:
       # j.age                 # => 34   # cast to an integer
       # j.weight              # => '65' # still a string!
       #
       def define_schema
-        schema_definition = SchemaDefinition.new
+        schema_definition = Schema.new
         yield schema_definition if block_given?
 
         # skip out if we didn't define anything
@@ -317,7 +316,7 @@ module ActiveResource
         end
 
         schema
-      end  
+      end
 
 
       # Alternative, direct way to specify a <tt>schema</tt> for this
@@ -326,7 +325,7 @@ module ActiveResource
       #
       # Pass the schema as a hash with the keys being the attribute-names
       # and the value being one of the accepted attribute types (as defined
-      # in <tt>define_schema</tt>) 
+      # in <tt>define_schema</tt>)
       #
       # example:
       #
@@ -342,7 +341,7 @@ module ActiveResource
           # purposefully nulling out the schema
           @schema = nil
           @known_attributes = []
-          return 
+          return
         end
 
         raise ArgumentError, "Expected a hash" unless the_schema.kind_of? Hash
diff --git a/activeresource/lib/active_resource/schema.rb b/activeresource/lib/active_resource/schema.rb
new file mode 100644
index 0000000000..498b00ffef
--- /dev/null
+++ b/activeresource/lib/active_resource/schema.rb
@@ -0,0 +1,58 @@
+require 'active_resource/exceptions'
+
+module ActiveResource # :nodoc:
+  class Schema # :nodoc:
+
+    # attributes can be known to be one of these types. They are easy to
+    # cast to/from.
+    KNOWN_ATTRIBUTE_TYPES = %w( string integer float )
+
+    # An array of attribute definitions, representing the attributes that
+    # have been defined.
+    attr_accessor :attrs
+
+    # The internals of an Active Resource Schema are very simple -
+    # unlike an Active Record TableDefinition (on which it is based).
+    # It provides a set of convenience methods for people to define their
+    # schema using the syntax:
+    #  define_schema do |s|
+    #    s.string :foo
+    #    s.integer :bar
+    #  end
+    #
+    #  The schema stores the name and type of each attribute. That is then
+    #  read out by the define_schema method to populate the actual
+    #  Resource's schema
+    def initialize
+      @attrs = {}
+    end
+
+    def attribute(name, type, options = {})
+      raise ArgumentError, "Unknown Attribute type: #{type.inspect} for key: #{name.inspect}" unless type.nil? || Schema::KNOWN_ATTRIBUTE_TYPES.include?(type.to_s)
+
+      the_type = type.to_s
+      # TODO: add defaults
+      #the_attr = [type.to_s]
+      #the_attr << options[:default] if options.has_key? :default
+      @attrs[name.to_s] = the_type
+      self
+    end
+
+    # The following are the attribute types supported by Active Resource
+    # migrations.
+    # 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
+        def #{attr_type.to_s}(*args)                                                # def string(*args)
+          options = args.extract_options!                                      #   options = args.extract_options!
+          attr_names = args                                                    #   attr_names = args
+                                                                               #
+          attr_names.each { |name| attribute(name, '#{attr_type}', options) }  #   attr_names.each { |name| attribute(name, 'string', options) }
+        end                                                                    # end
+      EOV
+
+    end
+
+  end
+end
diff --git a/activeresource/lib/active_resource/schema_definition.rb b/activeresource/lib/active_resource/schema_definition.rb
deleted file mode 100644
index abcbf3ba4e..0000000000
--- a/activeresource/lib/active_resource/schema_definition.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require 'active_resource/exceptions'
-
-module ActiveResource # :nodoc:
-  class SchemaDefinition # :nodoc:
-
-    # attributes can be known to be one of these types. They are easy to
-    # cast to/from.
-    KNOWN_ATTRIBUTE_TYPES = %w( string integer float )
-
-    # An array of attribute definitions, representing the attributes that
-    # have been defined.
-    attr_accessor :attrs
-
-    # The internals of an Active Resource SchemaDefinition are very simple -
-    # unlike an Active Record TableDefinition (on which it is based).
-    # It provides a set of convenience methods for people to define their
-    # schema using the syntax:
-    #  define_schema do |s|
-    #    s.string :foo
-    #    s.integer :bar
-    #  end
-    #
-    #  The schema stores the name and type of each attribute. That is then
-    #  read out by the define_schema method to populate the actual
-    #  Resource's schema
-    def initialize
-      @attrs = {}
-    end
-
-    def attribute(name, type, options = {})
-      raise ArgumentError, "Unknown Attribute type: #{type.inspect} for key: #{name.inspect}" unless type.nil? || SchemaDefinition::KNOWN_ATTRIBUTE_TYPES.include?(type.to_s) 
-
-      the_type = type.to_s
-      # TODO: add defaults
-      #the_attr = [type.to_s]
-      #the_attr << options[:default] if options.has_key? :default
-      @attrs[name.to_s] = the_type
-      self
-    end
-
-    # The following are the attribute types supported by Active Resource
-    # migrations. 
-    # 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
-        def #{attr_type.to_s}(*args)                                                # def string(*args)
-          options = args.extract_options!                                      #   options = args.extract_options!
-          attr_names = args                                                    #   attr_names = args
-                                                                               #
-          attr_names.each { |name| attribute(name, '#{attr_type}', options) }  #   attr_names.each { |name| attribute(name, 'string', options) }
-        end                                                                    # end
-      EOV
-
-    end
-
-  end
-end
-- 
cgit v1.2.3


From c0ad3f6cc618f42eae0c5d5ceefde32ff3342c20 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sun, 20 Dec 2009 18:48:01 -0600
Subject: Rename define_schema => schema

---
 activeresource/lib/active_resource/base.rb   | 43 +++++++++++++---------------
 activeresource/lib/active_resource/schema.rb |  4 +--
 2 files changed, 22 insertions(+), 25 deletions(-)

(limited to 'activeresource/lib')

diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index b39f8fbd48..d07571e1d7 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -241,12 +241,6 @@ module ActiveResource
     cattr_accessor :logger
 
     class << self
-      # This will shortly disappear to be replaced by the migration-style
-      # usage of this for defining a schema. At that point, all the doc
-      # currenlty on <tt>schema=</tt> will move back here...
-      def schema # :nodoc:
-        @schema ||= nil
-      end
       # Creates a schema for this resource - setting the attributes that are
       # known prior to fetching an instance from the remote system.
       #
@@ -260,7 +254,7 @@ module ActiveResource
       #
       # example:
       # class Person < ActiveResource::Base
-      #   define_schema do |s|
+      #   schema do |s|
       #     # define each attribute separately
       #     s.attribute 'name', :string
       #
@@ -300,32 +294,35 @@ module ActiveResource
       # j.age                 # => 34   # cast to an integer
       # j.weight              # => '65' # still a string!
       #
-      def define_schema
-        schema_definition = Schema.new
-        yield schema_definition if block_given?
+      def schema(&block)
+        if block_given?
+          schema_definition = Schema.new
+          yield schema_definition
 
-        # skip out if we didn't define anything
-        return unless schema_definition.attrs.present?
+          # skip out if we didn't define anything
+          return unless schema_definition.attrs.present?
 
-        @schema ||= {}.with_indifferent_access
-        @known_attributes ||= []
+          @schema ||= {}.with_indifferent_access
+          @known_attributes ||= []
 
-        schema_definition.attrs.each do |k,v|
-          @schema[k] = v
-          @known_attributes << k
-        end
+          schema_definition.attrs.each do |k,v|
+            @schema[k] = v
+            @known_attributes << k
+          end
 
-        schema
+          schema
+        else
+          @schema ||= nil
+        end
       end
 
-
       # Alternative, direct way to specify a <tt>schema</tt> for this
-      # Resource. <tt>define_schema</tt> is more flexible, but this is quick
+      # Resource. <tt>schema</tt> is more flexible, but this is quick
       # for a very simple schema.
       #
       # Pass the schema as a hash with the keys being the attribute-names
       # and the value being one of the accepted attribute types (as defined
-      # in <tt>define_schema</tt>)
+      # in <tt>schema</tt>)
       #
       # example:
       #
@@ -346,7 +343,7 @@ module ActiveResource
 
         raise ArgumentError, "Expected a hash" unless the_schema.kind_of? Hash
 
-        define_schema do |s|
+        schema do |s|
           the_schema.each {|k,v| s.attribute(k,v) }
         end
       end
diff --git a/activeresource/lib/active_resource/schema.rb b/activeresource/lib/active_resource/schema.rb
index 498b00ffef..6f0b229145 100644
--- a/activeresource/lib/active_resource/schema.rb
+++ b/activeresource/lib/active_resource/schema.rb
@@ -15,13 +15,13 @@ module ActiveResource # :nodoc:
     # unlike an Active Record TableDefinition (on which it is based).
     # It provides a set of convenience methods for people to define their
     # schema using the syntax:
-    #  define_schema do |s|
+    #  schema do |s|
     #    s.string :foo
     #    s.integer :bar
     #  end
     #
     #  The schema stores the name and type of each attribute. That is then
-    #  read out by the define_schema method to populate the actual
+    #  read out by the schema method to populate the actual
     #  Resource's schema
     def initialize
       @attrs = {}
-- 
cgit v1.2.3


From 2e9c7759984573944592fb1bda5aeb7c58edba55 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sun, 20 Dec 2009 19:03:22 -0600
Subject: Use instance_eval for schema block

---
 activeresource/lib/active_resource/base.rb   | 18 +++++++++---------
 activeresource/lib/active_resource/schema.rb | 11 ++++-------
 2 files changed, 13 insertions(+), 16 deletions(-)

(limited to 'activeresource/lib')

diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index d07571e1d7..b833e9c8ce 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -254,18 +254,18 @@ module ActiveResource
       #
       # example:
       # class Person < ActiveResource::Base
-      #   schema do |s|
+      #   schema do
       #     # define each attribute separately
-      #     s.attribute 'name', :string
+      #     attribute 'name', :string
       #
       #     # or use the convenience methods and pass >=1 attribute names
-      #     s.string  'eye_colour', 'hair_colour'
-      #     s.integer 'age'
-      #     s.float   'height', 'weight'
+      #     string  'eye_colour', 'hair_colour'
+      #     integer 'age'
+      #     float   'height', 'weight'
       #
       #     # unsupported types should be left as strings
       #     # overload the accessor methods if you need to convert them
-      #     s.attribute 'created_at', 'string'
+      #     attribute 'created_at', 'string'
       #   end
       # end
       #
@@ -297,7 +297,7 @@ module ActiveResource
       def schema(&block)
         if block_given?
           schema_definition = Schema.new
-          yield schema_definition
+          schema_definition.instance_eval(&block)
 
           # skip out if we didn't define anything
           return unless schema_definition.attrs.present?
@@ -343,8 +343,8 @@ module ActiveResource
 
         raise ArgumentError, "Expected a hash" unless the_schema.kind_of? Hash
 
-        schema do |s|
-          the_schema.each {|k,v| s.attribute(k,v) }
+        schema do
+          the_schema.each {|k,v| attribute(k,v) }
         end
       end
 
diff --git a/activeresource/lib/active_resource/schema.rb b/activeresource/lib/active_resource/schema.rb
index 6f0b229145..4ca83e404d 100644
--- a/activeresource/lib/active_resource/schema.rb
+++ b/activeresource/lib/active_resource/schema.rb
@@ -2,7 +2,6 @@ require 'active_resource/exceptions'
 
 module ActiveResource # :nodoc:
   class Schema # :nodoc:
-
     # attributes can be known to be one of these types. They are easy to
     # cast to/from.
     KNOWN_ATTRIBUTE_TYPES = %w( string integer float )
@@ -15,9 +14,9 @@ module ActiveResource # :nodoc:
     # unlike an Active Record TableDefinition (on which it is based).
     # It provides a set of convenience methods for people to define their
     # schema using the syntax:
-    #  schema do |s|
-    #    s.string :foo
-    #    s.integer :bar
+    #  schema do
+    #    string :foo
+    #    integer :bar
     #  end
     #
     #  The schema stores the name and type of each attribute. That is then
@@ -44,15 +43,13 @@ module ActiveResource # :nodoc:
     # %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
-        def #{attr_type.to_s}(*args)                                                # def string(*args)
+        def #{attr_type.to_s}(*args)                                            # def string(*args)
           options = args.extract_options!                                      #   options = args.extract_options!
           attr_names = args                                                    #   attr_names = args
                                                                                #
           attr_names.each { |name| attribute(name, '#{attr_type}', options) }  #   attr_names.each { |name| attribute(name, 'string', options) }
         end                                                                    # end
       EOV
-
     end
-
   end
 end
-- 
cgit v1.2.3


From bdccffc40eee1e11b7e5f3516bffa4c46bf97b30 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sun, 20 Dec 2009 19:03:47 -0600
Subject: Remove annoying and useless meta comments

---
 activeresource/lib/active_resource/schema.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'activeresource/lib')

diff --git a/activeresource/lib/active_resource/schema.rb b/activeresource/lib/active_resource/schema.rb
index 4ca83e404d..8368b652c2 100644
--- a/activeresource/lib/active_resource/schema.rb
+++ b/activeresource/lib/active_resource/schema.rb
@@ -43,12 +43,12 @@ module ActiveResource # :nodoc:
     # %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
-        def #{attr_type.to_s}(*args)                                            # def string(*args)
-          options = args.extract_options!                                      #   options = args.extract_options!
-          attr_names = args                                                    #   attr_names = args
-                                                                               #
-          attr_names.each { |name| attribute(name, '#{attr_type}', options) }  #   attr_names.each { |name| attribute(name, 'string', options) }
-        end                                                                    # end
+        def #{attr_type.to_s}(*args)
+          options = args.extract_options!
+          attr_names = args
+
+          attr_names.each { |name| attribute(name, '#{attr_type}', options) }
+        end
       EOV
     end
   end
-- 
cgit v1.2.3


From ace20bd25e3818b7f29c222643dd445c48b36425 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 22 Dec 2009 17:27:37 -0600
Subject: Flip deferrable autoload convention

---
 activeresource/lib/active_resource.rb | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'activeresource/lib')

diff --git a/activeresource/lib/active_resource.rb b/activeresource/lib/active_resource.rb
index 3e4a1dd4a1..e0a6ecbcce 100644
--- a/activeresource/lib/active_resource.rb
+++ b/activeresource/lib/active_resource.rb
@@ -33,12 +33,14 @@ require 'active_model'
 module ActiveResource
   extend ActiveSupport::Autoload
 
-  autoload :Base
-  autoload :Connection
-  autoload :CustomMethods
-  autoload :Formats
-  autoload :HttpMock
-  autoload :Observing
-  autoload :Schema
-  autoload :Validations
+  eager_autoload do
+    autoload :Base
+    autoload :Connection
+    autoload :CustomMethods
+    autoload :Formats
+    autoload :HttpMock
+    autoload :Observing
+    autoload :Schema
+    autoload :Validations
+  end
 end
-- 
cgit v1.2.3


From 22752ec27c4eeb50ec12ed2f147f1c066062cabd Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 22 Dec 2009 17:36:29 -0600
Subject: All ARes modules are safe to defer

---
 activeresource/lib/active_resource.rb      | 18 ++++++++----------
 activeresource/lib/active_resource/base.rb |  3 +++
 2 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'activeresource/lib')

diff --git a/activeresource/lib/active_resource.rb b/activeresource/lib/active_resource.rb
index e0a6ecbcce..3e4a1dd4a1 100644
--- a/activeresource/lib/active_resource.rb
+++ b/activeresource/lib/active_resource.rb
@@ -33,14 +33,12 @@ require 'active_model'
 module ActiveResource
   extend ActiveSupport::Autoload
 
-  eager_autoload do
-    autoload :Base
-    autoload :Connection
-    autoload :CustomMethods
-    autoload :Formats
-    autoload :HttpMock
-    autoload :Observing
-    autoload :Schema
-    autoload :Validations
-  end
+  autoload :Base
+  autoload :Connection
+  autoload :CustomMethods
+  autoload :Formats
+  autoload :HttpMock
+  autoload :Observing
+  autoload :Schema
+  autoload :Validations
 end
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index b833e9c8ce..a6243e7011 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -13,6 +13,9 @@ require 'set'
 require 'uri'
 
 require 'active_resource/exceptions'
+require 'active_resource/connection'
+require 'active_resource/formats'
+require 'active_resource/schema'
 
 module ActiveResource
   # ActiveResource::Base is the main class for mapping RESTful resources as models in a Rails application.
-- 
cgit v1.2.3


From a23f4b6aeed6b49f90f5c544c818798840f090b7 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Thu, 31 Dec 2009 11:46:56 -0800
Subject: Add a /rails.rb for each framework for consistency

---
 activeresource/lib/active_resource/rails.rb | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 activeresource/lib/active_resource/rails.rb

(limited to 'activeresource/lib')

diff --git a/activeresource/lib/active_resource/rails.rb b/activeresource/lib/active_resource/rails.rb
new file mode 100644
index 0000000000..e73444e6e7
--- /dev/null
+++ b/activeresource/lib/active_resource/rails.rb
@@ -0,0 +1 @@
+require "active_resource"
\ No newline at end of file
-- 
cgit v1.2.3


From e749424dfa38a0300a621b772eae96f9cc5d2555 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Thu, 31 Dec 2009 12:28:48 -0800
Subject: Rename rails.rb -> rails/all.rb and rails/core.rb -> rails.rb

---
 activeresource/lib/active_resource/rails.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'activeresource/lib')

diff --git a/activeresource/lib/active_resource/rails.rb b/activeresource/lib/active_resource/rails.rb
index e73444e6e7..4f264c82b8 100644
--- a/activeresource/lib/active_resource/rails.rb
+++ b/activeresource/lib/active_resource/rails.rb
@@ -1 +1,2 @@
-require "active_resource"
\ No newline at end of file
+require "active_resource"
+require "rails"
\ No newline at end of file
-- 
cgit v1.2.3


From ae7ada1fde1648a5c81b9e6adf74d515e0bbe0a5 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Thu, 31 Dec 2009 13:11:54 -0800
Subject: Some railties cleanup:

	* Rename <framework>/rails.rb -> <framework>/railtie.rb
	* Rails::Plugin -> Rails::Railtie
	* Rails::Plugin::Vendored -> Rails::Plugin
---
 activeresource/lib/active_resource/rails.rb   | 2 --
 activeresource/lib/active_resource/railtie.rb | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 activeresource/lib/active_resource/rails.rb
 create mode 100644 activeresource/lib/active_resource/railtie.rb

(limited to 'activeresource/lib')

diff --git a/activeresource/lib/active_resource/rails.rb b/activeresource/lib/active_resource/rails.rb
deleted file mode 100644
index 4f264c82b8..0000000000
--- a/activeresource/lib/active_resource/rails.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require "active_resource"
-require "rails"
\ No newline at end of file
diff --git a/activeresource/lib/active_resource/railtie.rb b/activeresource/lib/active_resource/railtie.rb
new file mode 100644
index 0000000000..4f264c82b8
--- /dev/null
+++ b/activeresource/lib/active_resource/railtie.rb
@@ -0,0 +1,2 @@
+require "active_resource"
+require "rails"
\ No newline at end of file
-- 
cgit v1.2.3