her 0.3.3 → 0.3.4

data/lib/her/version.rb

@@ -1,3 +1,3 @@
 module Her
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/api_spec.rb

@@ -4,20 +4,20 @@ require File.join(File.dirname(__FILE__), "spec_helper.rb")
 describe Her::API do
   context "initialization" do
     describe ".setup" do
-      it "creates a default connection" do # {{{
+      it "creates a default connection" do
         Her::API.setup :url => "https://api.example.com"
         Her::API.default_api.base_uri.should == "https://api.example.com"
-      end # }}}
+      end
     end
 
     describe "#setup" do
-      it "sets a base URI" do # {{{
+      it "sets a base URI" do
         @api = Her::API.new
         @api.setup :url => "https://api.example.com"
         @api.base_uri.should == "https://api.example.com"
-      end # }}}
+      end
 
-      it "sets custom middleware with #use" do # {{{
+      it "sets custom middleware with #use" do
         class Foo; end;
         class Bar; end;
 
@@ -27,17 +27,17 @@ describe Her::API do
           builder.use Bar
         end
         @api.connection.builder.handlers.should == [Foo, Bar]
-      end # }}}
+      end
 
-      it "takes custom options" do # {{{
+      it "takes custom options" do
         @api = Her::API.new
         @api.setup :foo => { :bar => "baz" }, :url => "https://api.example.com"
         @api.options.should == { :foo => { :bar => "baz" }, :url => "https://api.example.com" }
-      end # }}}
+      end
     end
 
     describe "#request" do
-      it "makes HTTP requests" do # {{{
+      it "makes HTTP requests" do
         class SimpleParser < Faraday::Response::Middleware
           def on_complete(env)
             env[:body] = { :data => env[:body] }
@@ -55,9 +55,9 @@ describe Her::API do
 
         parsed_data = @api.request(:_method => :get, :_path => "/foo")
         parsed_data[:data] == "Foo, it is."
-      end # }}}
+      end
 
-      it "makes HTTP requests while specifying custom HTTP headers" do # {{{
+      it "makes HTTP requests while specifying custom HTTP headers" do
         class SimpleParser < Faraday::Response::Middleware
           def on_complete(env)
             env[:body] = { :data => env[:body] }
@@ -75,9 +75,9 @@ describe Her::API do
 
         parsed_data = @api.request(:_method => :get, :_path => "/foo", :_headers => { "X-Page" => 2 })
         parsed_data[:data] == "Foo, it is page 2."
-      end # }}}
+      end
 
-      it "parses a request with the default parser" do # {{{
+      it "parses a request with the default parser" do
         @api = Her::API.new
         @api.setup :url => "https://api.example.com" do |builder|
           builder.use Her::Middleware::FirstLevelParseJSON
@@ -90,9 +90,9 @@ describe Her::API do
         parsed_data[:data].should == { :id => 1, :name => "George Michael Bluth" }
         parsed_data[:errors].should == ["This is a single error"]
         parsed_data[:metadata].should == { :page => 1, :per_page => 10 }
-      end # }}}
+      end
 
-      it "parses a request with a custom parser" do # {{{
+      it "parses a request with a custom parser" do
         class CustomParser < Faraday::Response::Middleware
           def on_complete(env)
             json = MultiJson.load(env[:body], :symbolize_keys => true)
@@ -118,7 +118,7 @@ describe Her::API do
         parsed_data[:data].should == { :id => 1, :name => "George Michael Bluth" }
         parsed_data[:errors].should == []
         parsed_data[:metadata].should == {}
-      end # }}}
+      end
     end
   end
 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

@@ -3,124 +3,124 @@ require File.join(File.dirname(__FILE__), "../spec_helper.rb")
 
 describe Her::Model::Hooks do
   context "adding hooks to a model" do
-    before do # {{{
+    before do
       spawn_model "Foo::User"
-    end # }}}
+    end
 
     describe "method hooks" do
-      it "handles “before save” method hooks" do # {{{
+      it "handles “before save” method hooks" do
         Foo::User.before_save :set_internal_id
         Foo::User.hooks[:before_save].length.should == 1
         Foo::User.hooks[:before_save].first.class.should == Symbol
-      end # }}}
+      end
 
-      it "handles “before create” method hooks" do # {{{
+      it "handles “before create” method hooks" do
         Foo::User.before_create :set_internal_id
         Foo::User.hooks[:before_create].length.should == 1
         Foo::User.hooks[:before_create].first.class.should == Symbol
-      end # }}}
+      end
 
-      it "handles “before update” method hooks" do # {{{
+      it "handles “before update” method hooks" do
         Foo::User.before_update :set_internal_id
         Foo::User.hooks[:before_update].length.should == 1
         Foo::User.hooks[:before_update].first.class.should == Symbol
-      end # }}}
+      end
 
-      it "handles “before destroy” method hooks" do # {{{
+      it "handles “before destroy” method hooks" do
         Foo::User.before_destroy :set_internal_id
         Foo::User.hooks[:before_destroy].length.should == 1
         Foo::User.hooks[:before_destroy].first.class.should == Symbol
-      end # }}}
+      end
 
-      it "handles “after save” method hooks" do # {{{
+      it "handles “after save” method hooks" do
         Foo::User.after_save :set_internal_id
         Foo::User.hooks[:after_save].length.should == 1
         Foo::User.hooks[:after_save].first.class.should == Symbol
-      end # }}}
+      end
 
-      it "handles “after create” method hooks" do # {{{
+      it "handles “after create” method hooks" do
         Foo::User.after_create :set_internal_id
         Foo::User.hooks[:after_create].length.should == 1
         Foo::User.hooks[:after_create].first.class.should == Symbol
-      end # }}}
+      end
 
-      it "handles “after update” method hooks" do # {{{
+      it "handles “after update” method hooks" do
         Foo::User.after_update :set_internal_id
         Foo::User.hooks[:after_update].length.should == 1
         Foo::User.hooks[:after_update].first.class.should == Symbol
-      end # }}}
+      end
 
-      it "handles “after destroy” method hooks" do # {{{
+      it "handles “after destroy” method hooks" do
         Foo::User.after_destroy :set_internal_id
         Foo::User.hooks[:after_destroy].length.should == 1
         Foo::User.hooks[:after_destroy].first.class.should == Symbol
-      end # }}}
+      end
     end
 
     describe "block hooks" do
-      it "handles “before save” block hooks" do # {{{
+      it "handles “before save” block hooks" do
         Foo::User.before_save { |record| record.internal_id = 42 }
         Foo::User.hooks[:before_save].length.should == 1
         Foo::User.hooks[:before_save].first.class.should == Proc
-      end # }}}
+      end
 
-      it "handles “before create” block hooks" do # {{{
+      it "handles “before create” block hooks" do
         Foo::User.before_create { |record| record.internal_id = 42 }
         Foo::User.hooks[:before_create].length.should == 1
         Foo::User.hooks[:before_create].first.class.should == Proc
-      end # }}}
+      end
 
-      it "handles “before update” block hooks" do # {{{
+      it "handles “before update” block hooks" do
         Foo::User.before_update { |record| record.internal_id = 42 }
         Foo::User.hooks[:before_update].length.should == 1
         Foo::User.hooks[:before_update].first.class.should == Proc
-      end # }}}
+      end
 
-      it "handles “before destroy” block hooks" do # {{{
+      it "handles “before destroy” block hooks" do
         Foo::User.before_destroy { |record| record.internal_id = 42 }
         Foo::User.hooks[:before_destroy].length.should == 1
         Foo::User.hooks[:before_destroy].first.class.should == Proc
-      end # }}}
+      end
 
-      it "handles “after save” block hooks" do # {{{
+      it "handles “after save” block hooks" do
         Foo::User.after_save { |record| record.internal_id = 42 }
         Foo::User.hooks[:after_save].length.should == 1
         Foo::User.hooks[:after_save].first.class.should == Proc
-      end # }}}
+      end
 
-      it "handles “after create” block hooks" do # {{{
+      it "handles “after create” block hooks" do
         Foo::User.after_create { |record| record.internal_id = 42 }
         Foo::User.hooks[:after_create].length.should == 1
         Foo::User.hooks[:after_create].first.class.should == Proc
-      end # }}}
+      end
 
-      it "handles “after update” block hooks" do # {{{
+      it "handles “after update” block hooks" do
         Foo::User.after_update { |record| record.internal_id = 42 }
         Foo::User.hooks[:after_update].length.should == 1
         Foo::User.hooks[:after_update].first.class.should == Proc
-      end # }}}
+      end
 
-      it "handles “after destroy” block hooks" do # {{{
+      it "handles “after destroy” block hooks" do
         Foo::User.after_destroy { |record| record.internal_id = 42 }
         Foo::User.hooks[:after_destroy].length.should == 1
         Foo::User.hooks[:after_destroy].first.class.should == Proc
-      end # }}}
+      end
     end
 
     context "inheriting hooks from a superclass" do
-      it "copies hooks to the subclass" 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
   end
 
   context "perform hooks on a model" do
-    before do # {{{
+    before do
       Her::API.setup :url => "https://api.example.com" do |builder|
         builder.use Her::Middleware::FirstLevelParseJSON
         builder.use Faraday::Request::UrlEncoded
@@ -146,10 +146,10 @@ describe Her::Model::Hooks do
         def change_internal_after_update_id; @internal_after_update_id = 102; end
         def change_internal_after_destroy_id; @internal_after_destroy_id = 103; end
       end
-    end # }}}
+    end
 
     describe "method hooks" do
-      before do # {{{
+      before do
         Foo::User.before_save :change_internal_save_id
         Foo::User.before_update :change_internal_update_id
         Foo::User.before_create :change_internal_create_id
@@ -159,66 +159,66 @@ describe Her::Model::Hooks do
         Foo::User.after_update :change_internal_after_update_id
         Foo::User.after_create :change_internal_after_create_id
         Foo::User.after_destroy :change_internal_after_destroy_id
-      end # }}}
+      end
 
-      it "perform “before save” “before create” method hook on Model#save without an ID" do # {{{
+      it "perform “before save” “before create” method hook on Model#save without an ID" do
         @user = Foo::User.new(:fullname => "Tobias Fünke")
         @user.save
         @user.internal_save_id.should == 100
         @user.internal_create_id.should == 101
         @user.internal_update_id.should == nil
-      end # }}}
+      end
 
-      it "perform “before save” and “before update” method hook on Model#save with an ID" do # {{{
+      it "perform “before save” and “before update” method hook on Model#save with an ID" do
         @user = Foo::User.find(1)
         @user.save
         @user.internal_save_id.should == 100
         @user.internal_create_id.should == nil
         @user.internal_update_id.should == 102
-      end # }}}
+      end
 
-      it "perform “before destroy” method hook on Model#destroy" do # {{{
+      it "perform “before destroy” method hook on Model#destroy" do
         @user = Foo::User.find(1)
         @user.destroy
         @user.internal_save_id.should == nil
         @user.internal_create_id.should == nil
         @user.internal_update_id.should == nil
         @user.internal_destroy_id.should == 103
-      end # }}}
+      end
 
-      it "perform “after save” “after create” method hook on Model#save without an ID" do # {{{
+      it "perform “after save” “after create” method hook on Model#save without an ID" do
         @user = Foo::User.new(:fullname => "Tobias Fünke")
         @user.save
         @user.internal_after_save_id.should == 100
         @user.internal_after_create_id.should == 101
         @user.internal_after_update_id.should == nil
-      end # }}}
+      end
 
-      it "perform “after save” “after update” method hook on Model#save with an ID" do # {{{
+      it "perform “after save” “after update” method hook on Model#save with an ID" do
         @user = Foo::User.find(1)
         @user.save
         @user.internal_after_save_id.should == 100
         @user.internal_after_create_id.should == nil
         @user.internal_after_update_id.should == 102
-      end # }}}
+      end
 
-      it "perform “after save” “after update” method hook on Model.save_existing" do # {{{
+      it "perform “after save” “after update” method hook on Model.save_existing" do
         @user = Foo::User.save_existing(1, { :fullname => "Tobias Fünke" })
         @user.internal_after_save_id.should == 100
         @user.internal_after_create_id.should == nil
         @user.internal_after_update_id.should == 102
-      end # }}}
+      end
 
-      it "perform “after save” “after create” method hook on Model.create" do # {{{
+      it "perform “after save” “after create” method hook on Model.create" do
         @user = Foo::User.create({ :fullname => "Tobias Fünke" })
         @user.internal_after_save_id.should == 100
         @user.internal_after_create_id.should == 101
         @user.internal_after_update_id.should == nil
-      end # }}}
+      end
     end
 
     describe "block hooks" do
-      before do # {{{
+      before do
         Foo::User.before_save { |record| record.internal_save_id = 200 }
         Foo::User.before_create { |record| record.internal_create_id = 201 }
         Foo::User.before_update { |record| record.internal_update_id = 202 }
@@ -228,48 +228,48 @@ describe Her::Model::Hooks do
         Foo::User.after_create { |record| record.internal_after_create_id = 201 }
         Foo::User.after_update { |record| record.internal_after_update_id = 202 }
         Foo::User.after_destroy { |record| record.internal_after_destroy_id = 203 }
-      end # }}}
+      end
 
-      it "perform “before save” and “before create” block hook on Model#save without an ID" do # {{{
+      it "perform “before save” and “before create” block hook on Model#save without an ID" do
         @user = Foo::User.new(:fullname => "Tobias Fünke")
         @user.save
         @user.internal_save_id.should == 200
         @user.internal_create_id.should == 201
         @user.internal_update_id.should == nil
-      end # }}}
+      end
 
-      it "perform “before save” and “before update” block hook on Model#save with an ID" do # {{{
+      it "perform “before save” and “before update” block hook on Model#save with an ID" do
         @user = Foo::User.find(1)
         @user.save
         @user.internal_save_id.should == 200
         @user.internal_create_id.should == nil
         @user.internal_update_id.should == 202
-      end # }}}
+      end
 
-      it "perform “before destroy” block hook on Model#destroy" do # {{{
+      it "perform “before destroy” block hook on Model#destroy" do
         @user = Foo::User.find(1)
         @user.destroy
         @user.internal_save_id.should == nil
         @user.internal_create_id.should == nil
         @user.internal_update_id.should == nil
         @user.internal_destroy_id.should == 203
-      end # }}}
+      end
 
-      it "perform “after save” “after create” block hook on Model#save without an ID" do # {{{
+      it "perform “after save” “after create” block hook on Model#save without an ID" do
         @user = Foo::User.new(:fullname => "Tobias Fünke")
         @user.save
         @user.internal_after_save_id.should == 200
         @user.internal_after_create_id.should == 201
         @user.internal_after_update_id.should == nil
-      end # }}}
+      end
 
-      it "perform “after save” “after update” block hook on Model#save with an ID" do # {{{
+      it "perform “after save” “after update” block hook on Model#save with an ID" do
         @user = Foo::User.find(1)
         @user.save
         @user.internal_after_save_id.should == 200
         @user.internal_after_create_id.should == nil
         @user.internal_after_update_id.should == 202
-      end # }}}
+      end
     end
   end
 end