her 0.1.7 → 0.1.8

data/lib/her/version.rb

@@ -1,3 +1,3 @@
 module Her
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/spec/api_spec.rb

@@ -17,7 +17,20 @@ describe Her::API do
         @api.base_uri.should == "https://api.example.com"
       end # }}}
 
-      it "sets middleware" do # {{{
+      it "sets additional middleware" do # {{{
+        class Foo < Faraday::Response::Middleware; end;
+        class Bar < Faraday::Response::Middleware; end;
+
+        @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 = 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]
+      end # }}}
+
+      it "overrides middleware" do # {{{
         class Foo < Faraday::Response::Middleware; end;
         class Bar < Faraday::Response::Middleware; end;
 
@@ -25,6 +38,14 @@ describe Her::API do
         @api.setup :base_uri => "https://api.example.com", :middleware => [Foo, Bar]
         @api.middleware.should == [Foo, Bar]
       end # }}}
+
+      it "sets a parse middleware" do # {{{
+        class Foo < Faraday::Response::Middleware; end;
+
+        @api = Her::API.new
+        @api.setup :base_uri => "https://api.example.com", :parse_middleware => Foo
+        @api.middleware.should == [Foo, Faraday::Request::UrlEncoded, Faraday::Adapter::NetHttp]
+      end # }}}
     end
 
     describe "#request" do
@@ -45,7 +66,7 @@ describe Her::API do
       end # }}}
 
       it "parses a request with the default parser" do # {{{
-        FakeWeb.register_uri(:get, "https://api.example.com/users/1", :body => { :data => { :id => 1, :name => "George Michael Bluth" }, :errors => ["This is a single error"], :metadata => { :page => 1, :per_page => 10 }}.to_json)
+        FakeWeb.register_uri(:get, "https://api.example.com/users/1", :body => MultiJson.dump(:data => { :id => 1, :name => "George Michael Bluth" }, :errors => ["This is a single error"], :metadata => { :page => 1, :per_page => 10 }))
 
         @api = Her::API.new
         @api.setup :base_uri => "https://api.example.com"
@@ -57,7 +78,7 @@ describe Her::API do
       end # }}}
 
       it "parses a request with a custom parser" do # {{{
-        FakeWeb.register_uri(:get, "https://api.example.com/users/1", :body => { :id => 1, :name => "George Michael Bluth" }.to_json)
+        FakeWeb.register_uri(:get, "https://api.example.com/users/1", :body => MultiJson.dump(:id => 1, :name => "George Michael Bluth"))
 
         class CustomParser < Faraday::Response::Middleware
           def on_complete(env)
@@ -73,7 +94,7 @@ describe Her::API do
         end
 
         @api = Her::API.new
-        @api.setup :base_uri => "https://api.example.com", :middleware => [CustomParser] + Her::API.default_middleware
+        @api.setup :base_uri => "https://api.example.com", :parse_middleware => CustomParser
         @api.request(:_method => :get, :_path => "users/1") do |parsed_data|
           parsed_data[:data].should == { :id => 1, :name => "George Michael Bluth" }
           parsed_data[:errors].should == []

data/spec/middleware/default_parse_json_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+describe Her::Middleware::DefaultParseJSON do
+  subject { described_class.new }
+  let(:body) { "{\"data\": 1, \"errors\": 2, \"metadata\": 3}" }
+
+  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
+
+  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 == 1
+      json[:errors].should == 2
+      json[:metadata].should == 3
+    end
+  end
+end

data/spec/model/hooks_spec.rb

@@ -11,103 +11,103 @@ describe Her::Model::Hooks do
     end # }}}
 
     describe "method hooks" do
-    it "handles “before save” method hooks" do # {{{
-      User.before_save :set_internal_id
-      User.hooks[:before_save].length.should == 1
-      User.hooks[:before_save].first.class.should == Symbol
-    end # }}}
+      it "handles “before save” method hooks" do # {{{
+        User.before_save :set_internal_id
+        User.send(:hooks)[:before_save].length.should == 1
+        User.send(:hooks)[:before_save].first.class.should == Symbol
+      end # }}}
 
-    it "handles “before create” method hooks" do # {{{
-      User.before_create :set_internal_id
-      User.hooks[:before_create].length.should == 1
-      User.hooks[:before_create].first.class.should == Symbol
-    end # }}}
+      it "handles “before create” method hooks" do # {{{
+        User.before_create :set_internal_id
+        User.send(:hooks)[:before_create].length.should == 1
+        User.send(:hooks)[:before_create].first.class.should == Symbol
+      end # }}}
 
-    it "handles “before update” method hooks" do # {{{
-      User.before_update :set_internal_id
-      User.hooks[:before_update].length.should == 1
-      User.hooks[:before_update].first.class.should == Symbol
-    end # }}}
+      it "handles “before update” method hooks" do # {{{
+        User.before_update :set_internal_id
+        User.send(:hooks)[:before_update].length.should == 1
+        User.send(:hooks)[:before_update].first.class.should == Symbol
+      end # }}}
 
-    it "handles “before destroy” method hooks" do # {{{
-      User.before_destroy :set_internal_id
-      User.hooks[:before_destroy].length.should == 1
-      User.hooks[:before_destroy].first.class.should == Symbol
-    end # }}}
+      it "handles “before destroy” method hooks" do # {{{
+        User.before_destroy :set_internal_id
+        User.send(:hooks)[:before_destroy].length.should == 1
+        User.send(:hooks)[:before_destroy].first.class.should == Symbol
+      end # }}}
 
-    it "handles “after save” method hooks" do # {{{
-      User.after_save :set_internal_id
-      User.hooks[:after_save].length.should == 1
-      User.hooks[:after_save].first.class.should == Symbol
-    end # }}}
+      it "handles “after save” method hooks" do # {{{
+        User.after_save :set_internal_id
+        User.send(:hooks)[:after_save].length.should == 1
+        User.send(:hooks)[:after_save].first.class.should == Symbol
+      end # }}}
 
-    it "handles “after create” method hooks" do # {{{
-      User.after_create :set_internal_id
-      User.hooks[:after_create].length.should == 1
-      User.hooks[:after_create].first.class.should == Symbol
-    end # }}}
+      it "handles “after create” method hooks" do # {{{
+        User.after_create :set_internal_id
+        User.send(:hooks)[:after_create].length.should == 1
+        User.send(:hooks)[:after_create].first.class.should == Symbol
+      end # }}}
 
-    it "handles “after update” method hooks" do # {{{
-      User.after_update :set_internal_id
-      User.hooks[:after_update].length.should == 1
-      User.hooks[:after_update].first.class.should == Symbol
-    end # }}}
+      it "handles “after update” method hooks" do # {{{
+        User.after_update :set_internal_id
+        User.send(:hooks)[:after_update].length.should == 1
+        User.send(:hooks)[:after_update].first.class.should == Symbol
+      end # }}}
 
-    it "handles “after destroy” method hooks" do # {{{
-      User.after_destroy :set_internal_id
-      User.hooks[:after_destroy].length.should == 1
-      User.hooks[:after_destroy].first.class.should == Symbol
-    end # }}}
+      it "handles “after destroy” method hooks" do # {{{
+        User.after_destroy :set_internal_id
+        User.send(:hooks)[:after_destroy].length.should == 1
+        User.send(:hooks)[:after_destroy].first.class.should == Symbol
+      end # }}}
     end
 
     describe "block hooks" do
-    it "handles “before save” block hooks" do # {{{
-      User.before_save { |record| record.internal_id = 42 }
-      User.hooks[:before_save].length.should == 1
-      User.hooks[:before_save].first.class.should == Proc
-    end # }}}
+      it "handles “before save” block hooks" do # {{{
+        User.before_save { |record| record.internal_id = 42 }
+        User.send(:hooks)[:before_save].length.should == 1
+        User.send(:hooks)[:before_save].first.class.should == Proc
+      end # }}}
 
-    it "handles “before create” block hooks" do # {{{
-      User.before_create { |record| record.internal_id = 42 }
-      User.hooks[:before_create].length.should == 1
-      User.hooks[:before_create].first.class.should == Proc
-    end # }}}
+      it "handles “before create” block hooks" do # {{{
+        User.before_create { |record| record.internal_id = 42 }
+        User.send(:hooks)[:before_create].length.should == 1
+        User.send(:hooks)[:before_create].first.class.should == Proc
+      end # }}}
 
-    it "handles “before update” block hooks" do # {{{
-      User.before_update { |record| record.internal_id = 42 }
-      User.hooks[:before_update].length.should == 1
-      User.hooks[:before_update].first.class.should == Proc
-    end # }}}
+      it "handles “before update” block hooks" do # {{{
+        User.before_update { |record| record.internal_id = 42 }
+        User.send(:hooks)[:before_update].length.should == 1
+        User.send(:hooks)[:before_update].first.class.should == Proc
+      end # }}}
 
-    it "handles “before destroy” block hooks" do # {{{
-      User.before_destroy { |record| record.internal_id = 42 }
-      User.hooks[:before_destroy].length.should == 1
-      User.hooks[:before_destroy].first.class.should == Proc
-    end # }}}
+      it "handles “before destroy” block hooks" do # {{{
+        User.before_destroy { |record| record.internal_id = 42 }
+        User.send(:hooks)[:before_destroy].length.should == 1
+        User.send(:hooks)[:before_destroy].first.class.should == Proc
+      end # }}}
 
-    it "handles “after save” block hooks" do # {{{
-      User.after_save { |record| record.internal_id = 42 }
-      User.hooks[:after_save].length.should == 1
-      User.hooks[:after_save].first.class.should == Proc
-    end # }}}
+      it "handles “after save” block hooks" do # {{{
+        User.after_save { |record| record.internal_id = 42 }
+        User.send(:hooks)[:after_save].length.should == 1
+        User.send(:hooks)[:after_save].first.class.should == Proc
+      end # }}}
 
-    it "handles “after create” block hooks" do # {{{
-      User.after_create { |record| record.internal_id = 42 }
-      User.hooks[:after_create].length.should == 1
-      User.hooks[:after_create].first.class.should == Proc
-    end # }}}
+      it "handles “after create” block hooks" do # {{{
+        User.after_create { |record| record.internal_id = 42 }
+        User.send(:hooks)[:after_create].length.should == 1
+        User.send(:hooks)[:after_create].first.class.should == Proc
+      end # }}}
 
-    it "handles “after update” block hooks" do # {{{
-      User.after_update { |record| record.internal_id = 42 }
-      User.hooks[:after_update].length.should == 1
-      User.hooks[:after_update].first.class.should == Proc
-    end # }}}
+      it "handles “after update” block hooks" do # {{{
+        User.after_update { |record| record.internal_id = 42 }
+        User.send(:hooks)[:after_update].length.should == 1
+        User.send(:hooks)[:after_update].first.class.should == Proc
+      end # }}}
 
-    it "handles “after destroy” block hooks" do # {{{
-      User.after_destroy { |record| record.internal_id = 42 }
-      User.hooks[:after_destroy].length.should == 1
-      User.hooks[:after_destroy].first.class.should == Proc
-    end # }}}
+      it "handles “after destroy” block hooks" do # {{{
+        User.after_destroy { |record| record.internal_id = 42 }
+        User.send(:hooks)[:after_destroy].length.should == 1
+        User.send(:hooks)[:after_destroy].first.class.should == Proc
+      end # }}}
     end
   end
 

data/spec/model/http_spec.rb

@@ -99,6 +99,15 @@ describe Her::Model::HTTP do
       User.uses_api @api
     end # }}}
 
+    it "handle GET wrapper method" do # {{{
+      @users = User.get(:popular)
+      @users.length.should == 2
+      @users.first.id.should == 1
+
+      @user = User.get(:"1")
+      @user.id.should == 1
+    end # }}}
+
     it "handle raw GET" do # {{{
       User.get_raw("/users") do |parsed_data|
         parsed_data[:data].should == [{ :id => 1 }]
@@ -145,5 +154,54 @@ describe Her::Model::HTTP do
       @user = User.get_resource("/users/1")
       @user.id.should == 1
     end # }}}
+
+    it "handle GET collection through a symbol" do # {{{
+      @users = User.get_collection(:popular)
+      @users.length.should == 2
+      @users.first.id.should == 1
+    end # }}}
+
+    it "handle GET resource through a symbol" do # {{{
+      @user = User.get_resource(:"1")
+      @user.id.should == 1
+    end # }}}
+
+    it "handle raw GET through a symbol" do # {{{
+      User.get_raw(:popular) do |parsed_data|
+        parsed_data[:data].should == [{ :id => 1 }, { :id => 2 }]
+      end
+    end # }}}
+  end
+
+  context "setting custom requests" 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)
+
+      class User
+        include Her::Model
+      end
+      User.custom_get :popular, :foobar
+      User.custom_post :from_default
+    end # }}}
+
+    it "handles custom methods" do # {{{
+      User.respond_to?(:popular).should be_true
+      User.respond_to?(:foobar).should be_true
+      User.respond_to?(:from_default).should be_true
+    end # }}}
+
+    it "handles custom GET requests" do # {{{
+      @users = User.popular
+      @users.length.should == 2
+      @users.first.id.should == 1
+    end # }}}
+
+    it "handles custom POST requests" do # {{{
+      @user = User.from_default(:name => "Tobias Fünke")
+      @user.id.should be_true
+    end # }}}
   end
 end

data/spec/model/introspection_spec.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+require File.join(File.dirname(__FILE__), "../spec_helper.rb")
+
+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
+    end # }}}
+
+    describe "#inspect" do
+      it "outputs resource attributs for an existing resource" do # {{{
+        @user = User.find(1)
+        @user.inspect.should == "#<User(users/1) id=1 name=\"Tobias Fünke\">"
+      end # }}}
+
+      it "outputs resource attributs for an not-saved-yet resource" do # {{{
+        @user = User.new(:name => "Tobias Fünke")
+        @user.inspect.should == "#<User(users) name=\"Tobias Fünke\">"
+      end # }}}
+    end
+  end
+end

data/spec/model/orm_spec.rb

@@ -27,6 +27,14 @@ describe Her::Model::ORM do
       @users.length.should == 2
       @users.first.name.should == "Tobias Fünke"
     end # }}}
+
+    it "handles new resource" do # {{{
+      @new_user = User.new(:fullname => "Tobias Fünke")
+      @new_user.new?.should be_true
+
+      @existing_user = User.find(1)
+      @existing_user.new?.should be_false
+    end # }}}
   end
 
   context "creating resources" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: her
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-15 00:00:00.000000000Z
+date: 2012-04-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -60,21 +60,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: maruku
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.17.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.17.2
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -177,12 +177,15 @@ files:
 - lib/her/model/base.rb
 - lib/her/model/hooks.rb
 - lib/her/model/http.rb
+- lib/her/model/introspection.rb
 - lib/her/model/orm.rb
 - lib/her/model/relationships.rb
 - lib/her/version.rb
 - spec/api_spec.rb
+- spec/middleware/default_parse_json_spec.rb
 - spec/model/hooks_spec.rb
 - spec/model/http_spec.rb
+- spec/model/introspection_spec.rb
 - spec/model/orm_spec.rb
 - spec/model/relationships_spec.rb
 - spec/spec_helper.rb
@@ -200,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2767021996149695300
+      hash: -3580311510675037650
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -209,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2767021996149695300
+      hash: -3580311510675037650
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.18
@@ -219,8 +222,10 @@ 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/model/hooks_spec.rb
 - spec/model/http_spec.rb
+- spec/model/introspection_spec.rb
 - spec/model/orm_spec.rb
 - spec/model/relationships_spec.rb
 - spec/spec_helper.rb