her 0.3.1 → 0.3.2

data/lib/her/model/paths.rb

@@ -1,51 +1,7 @@
 module Her
   module Model
     module Paths
-      # Defines a custom collection path for the resource
-      #
-      # @example
-      #  class User
-      #    include Her::Model
-      #    collection_path "/users"
-      #  end
-      def collection_path(path=nil) # {{{
-        return @her_collection_path unless path
-        @her_resource_path = "#{path}/:id"
-        @her_collection_path = path
-      end # }}}
-
-      # Defines a custom resource path for the resource
-      #
-      # @example
-      #  class User
-      #    include Her::Model
-      #    resource_path "/users/:id"
-      #  end
-      def resource_path(path=nil) # {{{
-        return @her_resource_path unless path
-        @her_resource_path = path
-      end # }}}
-
-      # Return a custom path based on the collection path and variable parameters
-      #
-      # @example
-      #   class User
-      #     include Her::Model
-      #     collection_path "/utilisateurs"
-      #   end
-      #
-      #   User.all # Fetched via GET /utilisateurs
-      def build_request_path(path=nil, parameters={}) # {{{
-        unless path.is_a?(String)
-          parameters = path || {}
-          path = parameters.include?(:id) ? @her_resource_path : @her_collection_path
-        end
-        path.gsub(/:([\w_]+)/) do
-          # Look for :key or :_key, otherwise raise an exception
-          parameters[$1.to_sym] || parameters["_#{$1}".to_sym] || raise(Her::Errors::PathError.new("Missing :_#{$1} parameter to build the request path (#{path})."))
-        end
-      end # }}}
-
+      extend ActiveSupport::Concern
       # Return a path based on the collection path and a resource data
       #
       # @example
@@ -56,8 +12,64 @@ module Her
       #
       #   User.find(1) # Fetched via GET /utilisateurs/1
       def request_path # {{{
-        self.class.build_request_path(@data)
+        self.class.build_request_path(@data.dup)
       end # }}}
+
+      module ClassMethods
+        # Defines a custom collection path for the resource
+        #
+        # @example
+        #  class User
+        #    include Her::Model
+        #    collection_path "/users"
+        #  end
+        def collection_path(path=nil) # {{{
+          @her_collection_path ||= begin
+            superclass.collection_path.dup if superclass.respond_to?(:collection_path)
+          end
+
+          return @her_collection_path unless path
+          @her_resource_path = "#{path}/:id"
+          @her_collection_path = path
+        end # }}}
+
+        # Defines a custom resource path for the resource
+        #
+        # @example
+        #  class User
+        #    include Her::Model
+        #    resource_path "/users/:id"
+        #  end
+        def resource_path(path=nil) # {{{
+          @her_resource_path ||= begin
+            superclass.resource_path.dup if superclass.respond_to?(:resource_path)
+          end
+
+          return @her_resource_path unless path
+          @her_resource_path = path
+        end # }}}
+
+        # Return a custom path based on the collection path and variable parameters
+        #
+        # @example
+        #   class User
+        #     include Her::Model
+        #     collection_path "/utilisateurs"
+        #   end
+        #
+        #   User.all # Fetched via GET /utilisateurs
+        def build_request_path(path=nil, parameters={}) # {{{
+          unless path.is_a?(String)
+            parameters = path || {}
+            path = parameters.include?(:id) ? resource_path : collection_path
+          end
+
+          path.gsub(/:([\w_]+)/) do
+            # Look for :key or :_key, otherwise raise an exception
+            parameters.delete($1.to_sym) || parameters.delete("_#{$1}".to_sym) || raise(Her::Errors::PathError.new("Missing :_#{$1} parameter to build the request path (#{path})."))
+          end
+        end # }}}
+      end
     end
   end
 end

data/lib/her/model/relationships.rb

@@ -2,18 +2,24 @@ module Her
   module Model
     # This module adds relationships to models
     module Relationships
-      # Return relationships
+      # Return @her_relationships, lazily initialized with copy of the
+      # superclass' her_relationships, or an empty hash.
       # @private
       def relationships # {{{
-        @her_relationships
+        @her_relationships ||= begin
+          if superclass.respond_to?(:relationships)
+            superclass.relationships.dup
+          else
+            {}
+          end
+        end
       end # }}}
 
       # Parse relationships data after initializing a new object
       # @private
       def parse_relationships(data) # {{{
-        @her_relationships ||= {}
-        @her_relationships.each_pair do |type, relationships|
-          relationships.each do |relationship|
+        relationships.each_pair do |type, definitions|
+          definitions.each do |relationship|
             name = relationship[:name]
             klass = self.nearby_class(relationship[:class_name])
             next if !data.include?(name) or data[name].nil?
@@ -49,17 +55,21 @@ module Her
       #   @user.articles # => [#<Article(articles/2) id=2 title="Hello world.">]
       #   # Fetched via GET "/users/1/articles"
       def has_many(name, attrs={}) # {{{
-        @her_relationships ||= {}
         attrs = {
           :class_name => name.to_s.classify,
           :name => name,
           :path => "/#{name}"
         }.merge(attrs)
-        (@her_relationships[:has_many] ||= []) << attrs
+        (relationships[:has_many] ||= []) << attrs
 
-        define_method(name) do
+        define_method(name) do |*method_attrs|
+          method_attrs = method_attrs[0] || {}
           klass = self.class.nearby_class(attrs[:class_name])
-          @data[name] ||= klass.get_collection("#{self.class.build_request_path(:id => id)}#{attrs[:path]}")
+          if method_attrs.any?
+            klass.get_collection("#{self.class.build_request_path(method_attrs.merge(:id => id))}#{attrs[:path]}")
+          else
+            @data[name] ||= klass.get_collection("#{self.class.build_request_path(:id => id)}#{attrs[:path]}")
+          end
         end
       end # }}}
 
@@ -82,17 +92,21 @@ module Her
       #   @user.organization # => #<Organization(organizations/2) id=2 name="Foobar Inc.">
       #   # Fetched via GET "/users/1/organization"
       def has_one(name, attrs={}) # {{{
-        @her_relationships ||= {}
         attrs = {
           :class_name => name.to_s.classify,
           :name => name,
           :path => "/#{name}"
         }.merge(attrs)
-        (@her_relationships[:has_one] ||= []) << attrs
+        (relationships[:has_one] ||= []) << attrs
 
-        define_method(name) do
+        define_method(name) do |*method_attrs|
+          method_attrs = method_attrs[0] || {}
           klass = self.class.nearby_class(attrs[:class_name])
-          @data[name] ||= klass.get_resource("#{self.class.build_request_path(:id => id)}#{attrs[:path]}")
+          if method_attrs.any?
+            klass.get_resource("#{self.class.build_request_path(method_attrs.merge(:id => id))}#{attrs[:path]}")
+          else
+            @data[name] ||= klass.get_resource("#{self.class.build_request_path(:id => id)}#{attrs[:path]}")
+          end
         end
       end # }}}
 
@@ -115,20 +129,24 @@ module Her
       #   @user.team # => #<Team(teams/2) id=2 name="Developers">
       #   # Fetched via GET "/teams/2"
       def belongs_to(name, attrs={}) # {{{
-        @her_relationships ||= {}
         attrs = {
           :class_name => name.to_s.classify,
           :name => name,
           :foreign_key => "#{name}_id",
           :path => "/#{name.to_s.pluralize}/:id"
         }.merge(attrs)
-        (@her_relationships[:belongs_to] ||= []) << attrs
+        (relationships[:belongs_to] ||= []) << attrs
 
-        define_method(name) do
+        define_method(name) do |*method_attrs|
+          method_attrs = method_attrs[0] || {}
           klass = self.class.nearby_class(attrs[:class_name])
-          @data[name] ||= klass.get_resource("#{klass.build_request_path(:id => @data[attrs[:foreign_key].to_sym])}")
+          if method_attrs.any?
+            klass.get_resource("#{klass.build_request_path(method_attrs.merge(:id => @data[attrs[:foreign_key].to_sym]))}")
+          else
+            @data[name] ||= klass.get_resource("#{klass.build_request_path(:id => @data[attrs[:foreign_key].to_sym])}")
+          end
         end
-      end
+      end # }}}
 
       # @private
       def relationship_accessor(type, attrs) # {{{

data/lib/her/version.rb

@@ -1,3 +1,3 @@
 module Her
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/middleware/accept_json_spec.rb

@@ -2,9 +2,9 @@
 require "spec_helper"
 
 describe Her::Middleware::AcceptJSON do
-  it "adds an Accept header" do
+  it "adds an Accept header" do # {{{
     described_class.new.add_header({}).tap do |headers|
       headers["Accept"].should == "application/json"
     end
-  end
+  end # }}}
 end

data/spec/middleware/first_level_parse_json_spec.rb

@@ -5,15 +5,15 @@ describe Her::Middleware::FirstLevelParseJSON do
   subject { described_class.new }
   let(:body) { "{\"id\": 1, \"name\": \"Tobias Fünke\", \"errors\": 2, \"metadata\": 3}" }
 
-  it "parses body as json" do
+  it "parses body as json" do # {{{
     subject.parse(body).tap do |json|
       json[:data].should == { :id => 1, :name => "Tobias Fünke" }
       json[:errors].should == 2
       json[:metadata].should == 3
     end
-  end
+  end # }}}
 
-  it "parses :body key as json in the env hash" do
+  it "parses :body key as json in the env hash" do # {{{
     env = { :body => body }
     subject.on_complete(env)
     env[:body].tap do |json|
@@ -21,5 +21,5 @@ describe Her::Middleware::FirstLevelParseJSON do
       json[:errors].should == 2
       json[:metadata].should == 3
     end
-  end
+  end # }}}
 end

data/spec/middleware/second_level_parse_json_spec.rb

@@ -5,15 +5,15 @@ describe Her::Middleware::SecondLevelParseJSON do
   subject { described_class.new }
   let(:body) { "{\"data\": 1, \"errors\": 2, \"metadata\": 3}" }
 
-  it "parses body as json" do
+  it "parses body as json" do # {{{
     subject.parse(body).tap do |json|
       json[:data].should == 1
       json[:errors].should == 2
       json[:metadata].should == 3
     end
-  end
+  end # }}}
 
-  it "parses :body key as json in the env hash" do
+  it "parses :body key as json in the env hash" do # {{{
     env = { :body => body }
     subject.on_complete(env)
     env[:body].tap do |json|
@@ -21,5 +21,5 @@ describe Her::Middleware::SecondLevelParseJSON do
       json[:errors].should == 2
       json[:metadata].should == 3
     end
-  end
+  end # }}}
 end

data/spec/model/hooks_spec.rb

@@ -10,100 +10,111 @@ describe Her::Model::Hooks do
     describe "method hooks" do
       it "handles “before save” method hooks" do # {{{
         Foo::User.before_save :set_internal_id
-        Foo::User.send(:hooks)[:before_save].length.should == 1
-        Foo::User.send(:hooks)[:before_save].first.class.should == Symbol
+        Foo::User.hooks[:before_save].length.should == 1
+        Foo::User.hooks[:before_save].first.class.should == Symbol
       end # }}}
 
       it "handles “before create” method hooks" do # {{{
         Foo::User.before_create :set_internal_id
-        Foo::User.send(:hooks)[:before_create].length.should == 1
-        Foo::User.send(:hooks)[:before_create].first.class.should == Symbol
+        Foo::User.hooks[:before_create].length.should == 1
+        Foo::User.hooks[:before_create].first.class.should == Symbol
       end # }}}
 
       it "handles “before update” method hooks" do # {{{
         Foo::User.before_update :set_internal_id
-        Foo::User.send(:hooks)[:before_update].length.should == 1
-        Foo::User.send(:hooks)[:before_update].first.class.should == Symbol
+        Foo::User.hooks[:before_update].length.should == 1
+        Foo::User.hooks[:before_update].first.class.should == Symbol
       end # }}}
 
       it "handles “before destroy” method hooks" do # {{{
         Foo::User.before_destroy :set_internal_id
-        Foo::User.send(:hooks)[:before_destroy].length.should == 1
-        Foo::User.send(:hooks)[:before_destroy].first.class.should == Symbol
+        Foo::User.hooks[:before_destroy].length.should == 1
+        Foo::User.hooks[:before_destroy].first.class.should == Symbol
       end # }}}
 
       it "handles “after save” method hooks" do # {{{
         Foo::User.after_save :set_internal_id
-        Foo::User.send(:hooks)[:after_save].length.should == 1
-        Foo::User.send(:hooks)[:after_save].first.class.should == Symbol
+        Foo::User.hooks[:after_save].length.should == 1
+        Foo::User.hooks[:after_save].first.class.should == Symbol
       end # }}}
 
       it "handles “after create” method hooks" do # {{{
         Foo::User.after_create :set_internal_id
-        Foo::User.send(:hooks)[:after_create].length.should == 1
-        Foo::User.send(:hooks)[:after_create].first.class.should == Symbol
+        Foo::User.hooks[:after_create].length.should == 1
+        Foo::User.hooks[:after_create].first.class.should == Symbol
       end # }}}
 
       it "handles “after update” method hooks" do # {{{
         Foo::User.after_update :set_internal_id
-        Foo::User.send(:hooks)[:after_update].length.should == 1
-        Foo::User.send(:hooks)[:after_update].first.class.should == Symbol
+        Foo::User.hooks[:after_update].length.should == 1
+        Foo::User.hooks[:after_update].first.class.should == Symbol
       end # }}}
 
       it "handles “after destroy” method hooks" do # {{{
         Foo::User.after_destroy :set_internal_id
-        Foo::User.send(:hooks)[:after_destroy].length.should == 1
-        Foo::User.send(:hooks)[:after_destroy].first.class.should == Symbol
+        Foo::User.hooks[:after_destroy].length.should == 1
+        Foo::User.hooks[:after_destroy].first.class.should == Symbol
       end # }}}
     end
 
     describe "block hooks" do
       it "handles “before save” block hooks" do # {{{
         Foo::User.before_save { |record| record.internal_id = 42 }
-        Foo::User.send(:hooks)[:before_save].length.should == 1
-        Foo::User.send(:hooks)[:before_save].first.class.should == Proc
+        Foo::User.hooks[:before_save].length.should == 1
+        Foo::User.hooks[:before_save].first.class.should == Proc
       end # }}}
 
       it "handles “before create” block hooks" do # {{{
         Foo::User.before_create { |record| record.internal_id = 42 }
-        Foo::User.send(:hooks)[:before_create].length.should == 1
-        Foo::User.send(:hooks)[:before_create].first.class.should == Proc
+        Foo::User.hooks[:before_create].length.should == 1
+        Foo::User.hooks[:before_create].first.class.should == Proc
       end # }}}
 
       it "handles “before update” block hooks" do # {{{
         Foo::User.before_update { |record| record.internal_id = 42 }
-        Foo::User.send(:hooks)[:before_update].length.should == 1
-        Foo::User.send(:hooks)[:before_update].first.class.should == Proc
+        Foo::User.hooks[:before_update].length.should == 1
+        Foo::User.hooks[:before_update].first.class.should == Proc
       end # }}}
 
       it "handles “before destroy” block hooks" do # {{{
         Foo::User.before_destroy { |record| record.internal_id = 42 }
-        Foo::User.send(:hooks)[:before_destroy].length.should == 1
-        Foo::User.send(:hooks)[:before_destroy].first.class.should == Proc
+        Foo::User.hooks[:before_destroy].length.should == 1
+        Foo::User.hooks[:before_destroy].first.class.should == Proc
       end # }}}
 
       it "handles “after save” block hooks" do # {{{
         Foo::User.after_save { |record| record.internal_id = 42 }
-        Foo::User.send(:hooks)[:after_save].length.should == 1
-        Foo::User.send(:hooks)[:after_save].first.class.should == Proc
+        Foo::User.hooks[:after_save].length.should == 1
+        Foo::User.hooks[:after_save].first.class.should == Proc
       end # }}}
 
       it "handles “after create” block hooks" do # {{{
         Foo::User.after_create { |record| record.internal_id = 42 }
-        Foo::User.send(:hooks)[:after_create].length.should == 1
-        Foo::User.send(:hooks)[:after_create].first.class.should == Proc
+        Foo::User.hooks[:after_create].length.should == 1
+        Foo::User.hooks[:after_create].first.class.should == Proc
       end # }}}
 
       it "handles “after update” block hooks" do # {{{
         Foo::User.after_update { |record| record.internal_id = 42 }
-        Foo::User.send(:hooks)[:after_update].length.should == 1
-        Foo::User.send(:hooks)[:after_update].first.class.should == Proc
+        Foo::User.hooks[:after_update].length.should == 1
+        Foo::User.hooks[:after_update].first.class.should == Proc
       end # }}}
 
       it "handles “after destroy” block hooks" do # {{{
         Foo::User.after_destroy { |record| record.internal_id = 42 }
-        Foo::User.send(:hooks)[:after_destroy].length.should == 1
-        Foo::User.send(:hooks)[:after_destroy].first.class.should == Proc
+        Foo::User.hooks[:after_destroy].length.should == 1
+        Foo::User.hooks[:after_destroy].first.class.should == Proc
+      end # }}}
+    end
+
+    context "inheriting hooks from a superclass" do
+      it "copies hooks to the subclass" do # {{{
+        Foo::User.before_save :set_internal_id
+        Foo::User.after_create { |record| record.internal_id = 42 }
+        subclass = Class.new(Foo::User)
+        subclass.hooks.object_id.should_not == Foo::User.hooks.object_id
+        subclass.hooks[:before_save].should == [:set_internal_id]
+        subclass.hooks[:after_create].length.should == 1
       end # }}}
     end
   end

data/spec/model/http_spec.rb

@@ -9,11 +9,8 @@ describe Her::Model::HTTP do
 
       spawn_model "Foo::User"
       Foo::User.uses_api api
-
-      Foo::User.class_eval do
-        @her_api.should_not == nil
-        @her_api.base_uri.should == "https://api.example.com"
-      end
+      Foo::User.her_api.should_not == nil
+      Foo::User.her_api.base_uri.should == "https://api.example.com"
     end # }}}
 
     it "binds a model directly to Her::API" do # {{{
@@ -21,10 +18,8 @@ describe Her::Model::HTTP do
 
       spawn_model "Foo::User"
 
-      Foo::User.class_eval do
-        @her_api.should_not == nil
-        @her_api.base_uri.should == "https://api.example.com"
-      end
+      Foo::User.her_api.should_not == nil
+      Foo::User.her_api.base_uri.should == "https://api.example.com"
     end # }}}
 
     it "binds two models to two different instances of Her::API" do # {{{
@@ -36,10 +31,7 @@ describe Her::Model::HTTP do
 
       spawn_model "Foo::User"
       Foo::User.uses_api api1
-
-      Foo::User.class_eval do
-        @her_api.base_uri.should == "https://api1.example.com"
-      end
+      Foo::User.her_api.base_uri.should == "https://api1.example.com"
 
       api2 = Her::API.new
       api2.setup :url => "https://api2.example.com" do |builder|
@@ -49,10 +41,7 @@ describe Her::Model::HTTP do
 
       spawn_model "Foo::Comment"
       Foo::Comment.uses_api api2
-
-      Foo::Comment.class_eval do
-        @her_api.base_uri.should == "https://api2.example.com"
-      end
+      Foo::Comment.her_api.base_uri.should == "https://api2.example.com"
     end # }}}
 
     it "binds one model to Her::API and another one to an instance of Her::API" do # {{{
@@ -63,9 +52,7 @@ describe Her::Model::HTTP do
 
       spawn_model "Foo::User"
 
-      Foo::User.class_eval do
-        @her_api.base_uri.should == "https://api1.example.com"
-      end
+      Foo::User.her_api.base_uri.should == "https://api1.example.com"
 
       api = Her::API.new
       api.setup :url => "https://api2.example.com" do |builder|
@@ -75,10 +62,46 @@ describe Her::Model::HTTP do
 
       spawn_model "Foo::Comment"
       Foo::Comment.uses_api api
+      Foo::Comment.her_api.base_uri.should == "https://api2.example.com"
+    end # }}}
 
-      Foo::Comment.class_eval do
-        @her_api.base_uri.should == "https://api2.example.com"
+    it "binds a a model to it's superclass' her_api" do # {{{
+      api = Her::API.new
+      api.setup :url => "http://api.example.com" do |builder|
+        builder.use Her::Middleware::FirstLevelParseJSON
+        builder.use Faraday::Request::UrlEncoded
+      end
+
+      spawn_model "Foo::Superclass" do
+        uses_api api
       end
+
+      Foo::Subclass = Class.new(Foo::Superclass)
+      Foo::Subclass.her_api.should == Foo::Superclass.her_api
+    end # }}}
+
+    it "allows subclasses to change her_api without changing the parent class' her_api" do # {{{
+      api1 = Her::API.new
+      api1.setup :url => "http://api.example.com" do |builder|
+        builder.use Her::Middleware::FirstLevelParseJSON
+        builder.use Faraday::Request::UrlEncoded
+      end
+
+      spawn_model "Foo::Superclass" do
+        uses_api api1
+      end
+
+      api2 = Her::API.new
+      api2.setup :url => "http://api.example.com" do |builder|
+        builder.use Her::Middleware::FirstLevelParseJSON
+        builder.use Faraday::Request::UrlEncoded
+      end
+
+      Foo::Subclass = Class.new(Foo::Superclass) do
+        uses_api api2
+      end
+
+      Foo::Subclass.her_api.should_not == Foo::Superclass.her_api
     end # }}}
   end
 
@@ -107,7 +130,7 @@ describe Her::Model::HTTP do
       spawn_model "Foo::User"
     end # }}}
 
-    it "handle GET wrapper method" do # {{{
+    it "handles GET wrapper method" do # {{{
       @users = Foo::User.get(:popular)
       @users.length.should == 2
       @users.first.id.should == 1
@@ -116,65 +139,90 @@ describe Her::Model::HTTP do
       @user.id.should == 1
     end # }}}
 
-    it "handle raw GET" do # {{{
+    it "handles raw GET with a block" do # {{{
       Foo::User.get_raw("/users") do |parsed_data|
         parsed_data[:data].should == [{ :id => 1 }]
       end
     end # }}}
 
-    it "handle raw POST" do # {{{
+    it "handles raw GET with return value" do # {{{
+      parsed_data = Foo::User.get_raw("/users")
+      parsed_data[:data].should == [{ :id => 1 }]
+    end # }}}
+
+    it "handles raw POST with a block" do # {{{
       Foo::User.post_raw("/users") do |parsed_data|
         parsed_data[:data].should == [{ :id => 3 }]
       end
     end # }}}
 
-    it "handle raw PUT" do # {{{
+    it "handles raw POST with return value" do # {{{
+      parsed_data = Foo::User.post_raw("/users")
+      parsed_data[:data].should == [{ :id => 3 }]
+    end # }}}
+
+    it "handles raw PUT with a block" do # {{{
       Foo::User.put_raw("/users/4") do |parsed_data|
         parsed_data[:data].should == [{ :id => 4 }]
       end
     end # }}}
 
-    it "handle raw PATCH" do # {{{
+    it "handles raw PUT with return value" do # {{{
+      parsed_data = Foo::User.put_raw("/users/4")
+      parsed_data[:data].should == [{ :id => 4 }]
+    end # }}}
+
+    it "handles raw PATCH with a block" do # {{{
       Foo::User.patch_raw("/users/6") do |parsed_data|
         parsed_data[:data].should == [{ :id => 6 }]
       end
     end # }}}
 
-    it "handle raw DELETE" do # {{{
+    it "handles raw PATCH with return value" do # {{{
+      parsed_data = Foo::User.patch_raw("/users/6")
+      parsed_data[:data].should == [{ :id => 6 }]
+    end # }}}
+
+    it "handles raw DELETE with a block" do # {{{
       Foo::User.delete_raw("/users/5") do |parsed_data|
         parsed_data[:data].should == [{ :id => 5 }]
       end
     end # }}}
 
-    it "handle querystring parameters" do # {{{
+    it "handles raw DELETE with return value" do # {{{
+      parsed_data = Foo::User.delete_raw("/users/5")
+      parsed_data[:data].should == [{ :id => 5 }]
+    end # }}}
+
+    it "handles querystring parameters" do # {{{
       Foo::User.get_raw("/users", :page => 2) do |parsed_data|
         parsed_data[:data].should == [{ :id => 2 }]
       end
     end # }}}
 
-    it "handle GET collection" do # {{{
+    it "handles GET collection" do # {{{
       @users = Foo::User.get_collection("/users/popular")
       @users.length.should == 2
       @users.first.id.should == 1
     end # }}}
 
-    it "handle GET resource" do # {{{
+    it "handles GET resource" do # {{{
       @user = Foo::User.get_resource("/users/1")
       @user.id.should == 1
     end # }}}
 
-    it "handle GET collection through a symbol" do # {{{
+    it "handles GET collection through a symbol" do # {{{
       @users = Foo::User.get_collection(:popular)
       @users.length.should == 2
       @users.first.id.should == 1
     end # }}}
 
-    it "handle GET resource through a symbol" do # {{{
+    it "handles GET resource through a symbol" do # {{{
       @user = Foo::User.get_resource(:"1")
       @user.id.should == 1
     end # }}}
 
-    it "handle raw GET through a symbol" do # {{{
+    it "handles raw GET through a symbol" do # {{{
       Foo::User.get_raw(:popular) do |parsed_data|
         parsed_data[:data].should == [{ :id => 1 }, { :id => 2 }]
       end