her 0.1.8.1 → 0.2

data/README.md

@@ -75,16 +75,18 @@ Her::API.setup :base_uri => "https://api.example.com", :add_middleware => [MyAut
 
 Now, each HTTP request made by Her will have the `X-API-Token` header.
 
-### Parsing data
+### Parsing JSON data
 
-By default, Her handles JSON data. It expects the data to be formatted in a certain structure. The default is this:
+By default, Her handles JSON data. It expects the resource/collection data to be returned at the first level.
+
+**Note**: *Before 0.2, Her expected the resource/collection data to be returned in a `data` key within the JSON object. If you want the old behavior, you can use the `Her::Middleware::SecondLevelParseJSON` middleware.*
 
 ```javascript
 // The response of GET /users/1
-{ "data" : { "id" : 1, "name" : "Tobias Fünke" } }
+{ "id" : 1, "name" : "Tobias Fünke" }
 
 // The response of GET /users
-{ "data" : [{ "id" : 1, "name" : "Tobias Fünke" }] }
+[{ "id" : 1, "name" : "Tobias Fünke" }]
 ```
 
 However, you can define your own parsing method, using a response middleware. The middleware is expected to set `env[:body]` to a hash with three keys: `data`, `errors` and `metadata`. The following code enables parsing JSON data and treating the result as first-level properties. Using the `parse_middleware` key, we then replace the default parser.
@@ -92,15 +94,17 @@ However, you can define your own parsing method, using a response middleware. Th
 ```ruby
 class MyCustomParser < Faraday::Response::Middleware
   def on_complete(env)
-    json = JSON.parse(env[:body], :symbolize_names => true)
-    errors = json.delete(:errors) || []
-    metadata = json.delete(:metadata) || []
-    env[:body] = { :data => json, :errors => errors, :metadata => metadata }
+    json = MultiJson.load(body, :symbolize_keys => true)
+    env[:body] = {
+      :data => json[:data],
+      :errors => json[:errors],
+      :metadata => json[:metadata]
+    }
   end
 end
 
 Her::API.setup :base_uri => "https://api.example.com", :parse_middleware => MyCustomParser
-# User.find(1) will now expect "https://api.example.com/users/1" to return something like '{ "id": 1, "name": "Tobias Fünke" }'
+# User.find(1) will now expect "https://api.example.com/users/1" to return something like '{ "data" => { "id": 1, "name": "Tobias Fünke" }, "errors" => [] }'
 ```
 
 ## Relationships
@@ -302,4 +306,4 @@ Take a look at the `spec` folder before you do, and make sure `bundle exec rake
 
 ## License
 
-Her is © 2012 [Rémi Prévost](http://exomel.com) and may be freely distributed under the [LITL license](https://github.com/remiprev/her/blob/master/LICENSE). See the `LICENSE` file.
+Her is © 2012 [Rémi Prévost](http://exomel.com) and may be freely distributed under the [MIT license](https://github.com/remiprev/her/blob/master/LICENSE). See the `LICENSE` file.

data/lib/her/api.rb

@@ -17,7 +17,7 @@ module Her
     # @option attrs [String] :base_uri The main HTTP API root (eg. `https://api.example.com`)
     # @option attrs [Array, Class] :middleware A list of the only middleware Her will use
     # @option attrs [Array, Class] :add_middleware A list of middleware to add to Her’s default middleware
-    # @option attrs [Class] :parse_middleware A middleware that will replace {Her::Middleware::DefaultParseJSON} to parse the received JSON
+    # @option attrs [Class] :parse_middleware A middleware that will replace {Her::Middleware::FirstLevelParseJSON} to parse the received JSON
     #
     # @example Setting up the default API connection
     #   Her::API.setup :base_uri => "https://api.example"
@@ -47,7 +47,7 @@ module Her
 
       @middleware = [attrs[:middleware]] if attrs[:middleware]
       @middleware = [attrs[:add_middleware]] + @middleware if attrs[:add_middleware]
-      @middleware = [attrs[:parse_middleware]] + @middleware.reject { |item| item == Her::Middleware::DefaultParseJSON } if attrs[:parse_middleware]
+      @middleware = [attrs[:parse_middleware]] + @middleware.reject { |item| item == Her::Middleware::FirstLevelParseJSON } if attrs[:parse_middleware]
 
       @middleware.flatten!
       middleware = @middleware
@@ -85,7 +85,7 @@ module Her
 
     # @private
     def self.default_middleware # {{{
-      [Her::Middleware::DefaultParseJSON, Faraday::Request::UrlEncoded, Faraday::Adapter::NetHttp]
+      [Her::Middleware::FirstLevelParseJSON, Faraday::Request::UrlEncoded, Faraday::Adapter::NetHttp]
     end # }}}
   end
 end

data/lib/her/middleware.rb

@@ -1,5 +1,6 @@
 module Her
   module Middleware
-    autoload :DefaultParseJSON, "her/middleware/default_parse_json"
+    autoload :FirstLevelParseJSON,  "her/middleware/first_level_parse_json"
+    autoload :SecondLevelParseJSON, "her/middleware/second_level_parse_json"
   end
 end

data/lib/her/middleware/first_level_parse_json.rb

@@ -0,0 +1,29 @@
+module Her
+  module Middleware
+    # This middleware treat the received first-level JSON structure as the resource data.
+    class FirstLevelParseJSON < Faraday::Response::Middleware
+      # Parse the response body
+      #
+      # @param [String] body The response body
+      # @return [Mixed] the parsed response
+      def parse(body) # {{{
+        json = MultiJson.load(body, :symbolize_keys => true)
+        errors = json.delete(:errors) || []
+        metadata = json.delete(:metadata) || []
+        {
+          :data => json,
+          :errors => errors,
+          :metadata => metadata
+        }
+      end # }}}
+
+      # This method is triggered when the response has been received. It modifies
+      # the value of `env[:body]`.
+      #
+      # @param [Hash] env The response environment
+      def on_complete(env) # {{{
+        env[:body] = parse(env[:body])
+      end # }}}
+    end
+  end
+end

data/lib/her/middleware/{default_parse_json.rb → second_level_parse_json.rb}

@@ -1,8 +1,8 @@
 module Her
   module Middleware
-    # This is the default middleware used to parse JSON responses. It returns
-    # a Hash with three elements: `data`, `errors` and `metadata`.
-    class DefaultParseJSON < Faraday::Response::Middleware
+    # This middleware expects the resource/collection data to be contained in the `data`
+    # key of the JSON object
+    class SecondLevelParseJSON < Faraday::Response::Middleware
       # Parse the response body
       #
       # @param [String] body The response body

data/lib/her/version.rb

@@ -1,3 +1,3 @@
 module Her
-  VERSION = "0.1.8.1"
+  VERSION = "0.2"
 end

data/spec/api_spec.rb

@@ -23,11 +23,11 @@ describe Her::API do
 
         @api = Her::API.new
         @api.setup :base_uri => "https://api.example.com", :add_middleware => [Foo, Bar]
-        @api.middleware.should == [Foo, Bar, Her::Middleware::DefaultParseJSON, Faraday::Request::UrlEncoded, Faraday::Adapter::NetHttp]
+        @api.middleware.should == [Foo, Bar, Her::Middleware::FirstLevelParseJSON, Faraday::Request::UrlEncoded, Faraday::Adapter::NetHttp]
 
         @api = Her::API.new
         @api.setup :base_uri => "https://api.example.com", :add_middleware => Foo
-        @api.middleware.should == [Foo, Her::Middleware::DefaultParseJSON, Faraday::Request::UrlEncoded, Faraday::Adapter::NetHttp]
+        @api.middleware.should == [Foo, Her::Middleware::FirstLevelParseJSON, Faraday::Request::UrlEncoded, Faraday::Adapter::NetHttp]
       end # }}}
 
       it "overrides middleware" do # {{{

data/spec/middleware/first_level_parse_json_spec.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+require "spec_helper"
+
+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
+    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
+
+  it "parses :body key as json in the env hash" do
+    env = { :body => body }
+    subject.on_complete(env)
+    env[:body].tap do |json|
+      json[:data].should == { :id => 1, :name => "Tobias Fünke" }
+      json[:errors].should == 2
+      json[:metadata].should == 3
+    end
+  end
+end

data/spec/middleware/{default_parse_json_spec.rb → second_level_parse_json_spec.rb}

@@ -1,6 +1,7 @@
+# encoding: utf-8
 require "spec_helper"
 
-describe Her::Middleware::DefaultParseJSON do
+describe Her::Middleware::SecondLevelParseJSON do
   subject { described_class.new }
   let(:body) { "{\"data\": 1, \"errors\": 2, \"metadata\": 3}" }
 

data/spec/model/hooks_spec.rb

@@ -4,10 +4,7 @@ require File.join(File.dirname(__FILE__), "../spec_helper.rb")
 describe Her::Model::Hooks do
   context "adding hooks to a model" do
     before do # {{{
-      Object.instance_eval { remove_const :User } if Object.const_defined?(:User)
-      class User
-        include Her::Model
-      end
+      spawn_model :User
     end # }}}
 
     describe "method hooks" do
@@ -114,14 +111,13 @@ describe Her::Model::Hooks do
   context "perform hooks on a model" do
       before do # {{{
         Her::API.setup :base_uri => "https://api.example.com"
-        FakeWeb.register_uri(:post, "https://api.example.com/users", :body => { :data => { :id => 1, :name => "Tobias Fünke" } }.to_json)
-        FakeWeb.register_uri(:get, "https://api.example.com/users/1", :body => { :data => { :id => 1, :name => "Tobias Fünke" } }.to_json)
-        FakeWeb.register_uri(:put, "https://api.example.com/users/1", :body => { :data => { :id => 1, :name => "Tobias Fünke" } }.to_json)
-        FakeWeb.register_uri(:delete, "https://api.example.com/users/1", :body => { :data => { :id => 1, :name => "Tobias Fünke" } }.to_json)
+        FakeWeb.register_uri(:post, "https://api.example.com/users", :body => { :id => 1, :name => "Tobias Fünke" }.to_json)
+        FakeWeb.register_uri(:get, "https://api.example.com/users/1", :body => { :id => 1, :name => "Tobias Fünke" }.to_json)
+        FakeWeb.register_uri(:put, "https://api.example.com/users/1", :body => { :id => 1, :name => "Tobias Fünke" }.to_json)
+        FakeWeb.register_uri(:delete, "https://api.example.com/users/1", :body => { :id => 1, :name => "Tobias Fünke" }.to_json)
 
-        Object.instance_eval { remove_const :User } if Object.const_defined?(:User)
+        spawn_model :User
         class User
-          include Her::Model
           attr_accessor :internal_save_id, :internal_create_id, :internal_update_id, :internal_destroy_id
           attr_accessor :internal_after_save_id, :internal_after_create_id, :internal_after_update_id, :internal_after_destroy_id
 

data/spec/model/http_spec.rb

@@ -7,10 +7,7 @@ describe Her::Model::HTTP do
       @api = Her::API.new
       @api.setup :base_uri => "https://api.example.com"
 
-      Object.instance_eval { remove_const :User } if Object.const_defined?(:User)
-      class User
-        include Her::Model
-      end
+      spawn_model :User
       User.uses_api @api
 
       User.class_eval do
@@ -22,10 +19,7 @@ describe Her::Model::HTTP do
     it "binds a model directly to Her::API" do # {{{
       Her::API.setup :base_uri => "https://api.example.com"
 
-      Object.instance_eval { remove_const :User } if Object.const_defined?(:User)
-      class User
-        include Her::Model
-      end
+      spawn_model :User
 
       User.class_eval do
         @her_api.should_not == nil
@@ -37,8 +31,7 @@ describe Her::Model::HTTP do
       @api1 = Her::API.new
       @api1.setup :base_uri => "https://api1.example.com"
 
-      Object.instance_eval { remove_const :User } if Object.const_defined?(:User)
-      class User; include Her::Model; end
+      spawn_model :User
       User.uses_api @api1
 
       User.class_eval do
@@ -48,8 +41,7 @@ describe Her::Model::HTTP do
       @api2 = Her::API.new
       @api2.setup :base_uri => "https://api2.example.com"
 
-      Object.instance_eval { remove_const :Comment } if Object.const_defined?(:Comment)
-      class Comment; include Her::Model; end
+      spawn_model :Comment
       Comment.uses_api @api2
 
       Comment.class_eval do
@@ -59,8 +51,7 @@ describe Her::Model::HTTP do
 
     it "binds one model to Her::API and another one to an instance of Her::API" do # {{{
       Her::API.setup :base_uri => "https://api1.example.com"
-      Object.instance_eval { remove_const :User } if Object.const_defined?(:User)
-      class User; include Her::Model; end
+      spawn_model :User
 
       User.class_eval do
         @her_api.base_uri.should == "https://api1.example.com"
@@ -69,8 +60,7 @@ describe Her::Model::HTTP do
       @api = Her::API.new
       @api.setup :base_uri => "https://api2.example.com"
 
-      Object.instance_eval { remove_const :Comment } if Object.const_defined?(:Comment)
-      class Comment; include Her::Model; end
+      spawn_model :Comment
       Comment.uses_api @api
 
       Comment.class_eval do
@@ -83,19 +73,16 @@ describe Her::Model::HTTP do
     before do # {{{
       @api = Her::API.new
       @api.setup :base_uri => "https://api.example.com"
-      FakeWeb.register_uri(:get, "https://api.example.com/users", :body => { :data => [{ :id => 1 }] }.to_json)
-      FakeWeb.register_uri(:get, "https://api.example.com/users?page=2", :body => { :data => [{ :id => 2 }] }.to_json)
-      FakeWeb.register_uri(:get, "https://api.example.com/users/popular", :body => { :data => [{ :id => 1 }, { :id => 2 }] }.to_json)
-      FakeWeb.register_uri(:get, "https://api.example.com/users/1", :body => { :data => { :id => 1 } }.to_json)
-      FakeWeb.register_uri(:post, "https://api.example.com/users", :body => { :data => [{ :id => 3 }] }.to_json)
-      FakeWeb.register_uri(:put, "https://api.example.com/users/4", :body => { :data => [{ :id => 4 }] }.to_json)
-      FakeWeb.register_uri(:patch, "https://api.example.com/users/6", :body => { :data => [{ :id => 6 }] }.to_json)
-      FakeWeb.register_uri(:delete, "https://api.example.com/users/5", :body => { :data => [{ :id => 5 }] }.to_json)
-
-      Object.instance_eval { remove_const :User } if Object.const_defined?(:User)
-      class User
-        include Her::Model
-      end
+      FakeWeb.register_uri(:get, "https://api.example.com/users", :body => [{ :id => 1 }].to_json)
+      FakeWeb.register_uri(:get, "https://api.example.com/users?page=2", :body => [{ :id => 2 }].to_json)
+      FakeWeb.register_uri(:get, "https://api.example.com/users/popular", :body => [{ :id => 1 }, { :id => 2 }].to_json)
+      FakeWeb.register_uri(:get, "https://api.example.com/users/1", :body => { :id => 1 }.to_json)
+      FakeWeb.register_uri(:post, "https://api.example.com/users", :body => [{ :id => 3 }].to_json)
+      FakeWeb.register_uri(:put, "https://api.example.com/users/4", :body => [{ :id => 4 }].to_json)
+      FakeWeb.register_uri(:patch, "https://api.example.com/users/6", :body => [{ :id => 6 }].to_json)
+      FakeWeb.register_uri(:delete, "https://api.example.com/users/5", :body => [{ :id => 5 }].to_json)
+
+      spawn_model :User
       User.uses_api @api
     end # }}}
 
@@ -177,8 +164,8 @@ describe Her::Model::HTTP do
     before do # {{{
       @api = Her::API.new
       @api.setup :base_uri => "https://api.example.com"
-      FakeWeb.register_uri(:get, "https://api.example.com/users/popular", :body => { :data => [{ :id => 1 }, { :id => 2 }] }.to_json)
-      FakeWeb.register_uri(:post, "https://api.example.com/users/from_default", :body => { :data => { :id => 4 } }.to_json)
+      FakeWeb.register_uri(:get, "https://api.example.com/users/popular", :body => [{ :id => 1 }, { :id => 2 }].to_json)
+      FakeWeb.register_uri(:post, "https://api.example.com/users/from_default", :body => { :id => 4 }.to_json)
 
       class User
         include Her::Model

data/spec/model/introspection_spec.rb

@@ -5,11 +5,8 @@ describe Her::Model::Introspection do
   context "introspecting a resource" do
     before do # {{{
       Her::API.setup :base_uri => "https://api.example.com"
-      FakeWeb.register_uri(:get, "https://api.example.com/users/1", :body => { :data => { :id => 1, :name => "Tobias Fünke" } }.to_json)
-      Object.instance_eval { remove_const :User } if Object.const_defined?(:User)
-      class User
-        include Her::Model
-      end
+      FakeWeb.register_uri(:get, "https://api.example.com/users/1", :body => { :id => 1, :name => "Tobias Fünke" }.to_json)
+      spawn_model :User
     end # }}}
 
     describe "#inspect" do

data/spec/model/orm_spec.rb

@@ -6,13 +6,10 @@ describe Her::Model::ORM do
     before do # {{{
       @api = Her::API.new
       @api.setup :base_uri => "https://api.example.com"
-      FakeWeb.register_uri(:get, "https://api.example.com/users/1", :body => { :data => { :id => 1, :name => "Tobias Fünke" } }.to_json)
-      FakeWeb.register_uri(:get, "https://api.example.com/users", :body => { :data => [{ :id => 1, :name => "Tobias Fünke" }, { :id => 2, :name => "Lindsay Fünke" }] }.to_json)
+      FakeWeb.register_uri(:get, "https://api.example.com/users/1", :body => { :id => 1, :name => "Tobias Fünke" }.to_json)
+      FakeWeb.register_uri(:get, "https://api.example.com/users", :body => [{ :id => 1, :name => "Tobias Fünke" }, { :id => 2, :name => "Lindsay Fünke" }].to_json)
 
-      Object.instance_eval { remove_const :User } if Object.const_defined?(:User)
-      class User
-        include Her::Model
-      end
+      spawn_model :User
       User.uses_api @api
     end # }}}
 
@@ -40,12 +37,9 @@ describe Her::Model::ORM do
   context "creating resources" do
     before do # {{{
       Her::API.setup :base_uri => "https://api.example.com"
-      FakeWeb.register_uri(:post, "https://api.example.com/users", :body => { :data => { :id => 1, :fullname => "Tobias Fünke" } }.to_json)
+      FakeWeb.register_uri(:post, "https://api.example.com/users", :body => { :id => 1, :fullname => "Tobias Fünke" }.to_json)
 
-      Object.instance_eval { remove_const :User } if Object.const_defined?(:User)
-      class User
-        include Her::Model
-      end
+      spawn_model :User
     end # }}}
 
     it "handle one-line resource creation" do # {{{
@@ -65,13 +59,10 @@ describe Her::Model::ORM do
     before do # {{{
       @api = Her::API.new
       @api.setup :base_uri => "https://api.example.com"
-      FakeWeb.register_uri(:get, "https://api.example.com/users/1", :body => { :data => { :id => 1, :fullname => "Tobias Fünke" } }.to_json)
-      FakeWeb.register_uri(:put, "https://api.example.com/users/1", :body => { :data => { :id => 1, :fullname => "Lindsay Fünke" } }.to_json)
+      FakeWeb.register_uri(:get, "https://api.example.com/users/1", :body => { :id => 1, :fullname => "Tobias Fünke" }.to_json)
+      FakeWeb.register_uri(:put, "https://api.example.com/users/1", :body => { :id => 1, :fullname => "Lindsay Fünke" }.to_json)
 
-      Object.instance_eval { remove_const :User } if Object.const_defined?(:User)
-      class User
-        include Her::Model
-      end
+      spawn_model :User
     end # }}}
 
     it "handle resource data update without saving it" do # {{{
@@ -98,13 +89,10 @@ describe Her::Model::ORM do
     before do # {{{
       @api = Her::API.new
       @api.setup :base_uri => "https://api.example.com"
-      FakeWeb.register_uri(:get, "https://api.example.com/users/1", :body => { :data => { :id => 1, :fullname => "Tobias Fünke", :active => true } }.to_json)
-      FakeWeb.register_uri(:delete, "https://api.example.com/users/1", :body => { :data => { :id => 1, :fullname => "Lindsay Fünke", :active => false } }.to_json)
+      FakeWeb.register_uri(:get, "https://api.example.com/users/1", :body => { :id => 1, :fullname => "Tobias Fünke", :active => true }.to_json)
+      FakeWeb.register_uri(:delete, "https://api.example.com/users/1", :body => { :id => 1, :fullname => "Lindsay Fünke", :active => false }.to_json)
 
-      Object.instance_eval { remove_const :User } if Object.const_defined?(:User)
-      class User
-        include Her::Model
-      end
+      spawn_model :User
     end # }}}
 
     it "handle resource deletion through the .destroy class method" do # {{{

data/spec/model/relationships_spec.rb

@@ -4,10 +4,7 @@ require File.join(File.dirname(__FILE__), "../spec_helper.rb")
 describe Her::Model::Relationships do
   context "setting relationships" do
     before do # {{{
-      Object.instance_eval { remove_const :User } if Object.const_defined?(:User)
-      class User
-        include Her::Model
-      end
+      spawn_model :User
     end # }}}
 
     it "handles a single 'has_many' relationship" do # {{{
@@ -47,34 +44,20 @@ describe Her::Model::Relationships do
   context "handling relationships" do
     before do # {{{
       Her::API.setup :base_uri => "https://api.example.com"
-      FakeWeb.register_uri(:get, "https://api.example.com/users/1", :body => { :data => { :id => 1, :name => "Tobias Fünke", :comments => [{ :id => 2, :body => "Tobias, you blow hard!" }, { :id => 3, :body => "I wouldn't mind kissing that man between the cheeks, so to speak" }], :role => { :id => 1, :body => "Admin" }, :organization => { :id => 1, :name => "Bluth Company" }, :organization_id => 1 } }.to_json)
-      FakeWeb.register_uri(:get, "https://api.example.com/users/2", :body => { :data => { :id => 2, :name => "Lindsay Fünke", :organization_id => 1 } }.to_json)
-      FakeWeb.register_uri(:get, "https://api.example.com/users/2/comments", :body => { :data => [{ :id => 4, :body => "They're having a FIRESALE?" }, { :id => 5, :body => "Is this the tiny town from Footloose?" }] }.to_json)
-      FakeWeb.register_uri(:get, "https://api.example.com/users/2/role", :body => { :data => { :id => 2, :body => "User" } }.to_json)
-      FakeWeb.register_uri(:get, "https://api.example.com/organizations/1", :body => { :data => { :id => 1, :name => "Bluth Company" } }.to_json)
-
-      Object.instance_eval { remove_const :User } if Object.const_defined?(:User)
-      class User
-        include Her::Model
-        has_many :comments
-        has_one :role
-        belongs_to :organization
-      end
-
-      Object.instance_eval { remove_const :Organization } if Object.const_defined?(:Organization)
-      class Organization
-        include Her::Model
-      end
-
-      Object.instance_eval { remove_const :Comment } if Object.const_defined?(:Comment)
-      class Comment
-        include Her::Model
-      end
-
-      Object.instance_eval { remove_const :Role } if Object.const_defined?(:Role)
-      class Role
-        include Her::Model
-      end
+      FakeWeb.register_uri(:get, "https://api.example.com/users/1", :body => { :id => 1, :name => "Tobias Fünke", :comments => [{ :id => 2, :body => "Tobias, you blow hard!" }, { :id => 3, :body => "I wouldn't mind kissing that man between the cheeks, so to speak" }], :role => { :id => 1, :body => "Admin" }, :organization => { :id => 1, :name => "Bluth Company" }, :organization_id => 1 }.to_json)
+      FakeWeb.register_uri(:get, "https://api.example.com/users/2", :body => { :id => 2, :name => "Lindsay Fünke", :organization_id => 1 }.to_json)
+      FakeWeb.register_uri(:get, "https://api.example.com/users/2/comments", :body => [{ :id => 4, :body => "They're having a FIRESALE?" }, { :id => 5, :body => "Is this the tiny town from Footloose?" }].to_json)
+      FakeWeb.register_uri(:get, "https://api.example.com/users/2/role", :body => { :id => 2, :body => "User" }.to_json)
+      FakeWeb.register_uri(:get, "https://api.example.com/organizations/1", :body => { :id => 1, :name => "Bluth Company" }.to_json)
+
+      spawn_model :User
+      spawn_model :Organization
+      spawn_model :Comment
+      spawn_model :Role
+
+      User.has_many :comments
+      User.has_one :role
+      User.belongs_to :organization
 
       @user_with_included_data = User.find(1)
       @user_without_included_data = User.find(2)

data/spec/spec_helper.rb

@@ -12,7 +12,14 @@ RSpec.configure do |c|
 end
 
 class Hash
-  def to_json
-    MultiJson.dump(self)
-  end
+  def to_json; MultiJson.dump(self); end
+end
+
+class Array
+  def to_json; MultiJson.dump(self); end
+end
+
+def spawn_model(klass, attrs={})
+  Object.instance_eval { remove_const klass } if Object.const_defined?(klass)
+  eval "class #{klass}; include Her::Model; end"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: her
 version: !ruby/object:Gem::Version
-  version: 0.1.8.1
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000Z
+date: 2012-04-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -172,7 +172,8 @@ files:
 - lib/her.rb
 - lib/her/api.rb
 - lib/her/middleware.rb
-- lib/her/middleware/default_parse_json.rb
+- lib/her/middleware/first_level_parse_json.rb
+- lib/her/middleware/second_level_parse_json.rb
 - lib/her/model.rb
 - lib/her/model/base.rb
 - lib/her/model/hooks.rb
@@ -182,7 +183,8 @@ files:
 - lib/her/model/relationships.rb
 - lib/her/version.rb
 - spec/api_spec.rb
-- spec/middleware/default_parse_json_spec.rb
+- spec/middleware/first_level_parse_json_spec.rb
+- spec/middleware/second_level_parse_json_spec.rb
 - spec/model/hooks_spec.rb
 - spec/model/http_spec.rb
 - spec/model/introspection_spec.rb
@@ -203,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3701075745278308572
+      hash: -2358268706124465287
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -212,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3701075745278308572
+      hash: -2358268706124465287
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.18
@@ -222,7 +224,8 @@ summary: A simple Representational State Transfer-based Hypertext Transfer Proto
   Object Relational Mapper. Her?
 test_files:
 - spec/api_spec.rb
-- spec/middleware/default_parse_json_spec.rb
+- spec/middleware/first_level_parse_json_spec.rb
+- spec/middleware/second_level_parse_json_spec.rb
 - spec/model/hooks_spec.rb
 - spec/model/http_spec.rb
 - spec/model/introspection_spec.rb