her 1.0.1 → 1.0.2

data/lib/her/model/relation.rb

@@ -1,6 +1,7 @@
 module Her
   module Model
     class Relation
+
       # @private
       attr_accessor :params
       attr_writer :parent
@@ -32,7 +33,7 @@ module Her
       #   # Fetched via GET "/users?approved=1"
       def where(params = {})
         return self if params.blank? && !@_fetch.nil?
-        self.clone.tap do |r|
+        clone.tap do |r|
           r.params = r.params.merge(params)
           r.clear_fetch_cache!
         end
@@ -58,7 +59,7 @@ module Her
 
       # @private
       def kind_of?(thing)
-        fetch.kind_of?(thing)
+        fetch.is_a?(thing)
       end
 
       # Fetch a collection of resources
@@ -68,7 +69,7 @@ module Her
         @_fetch ||= begin
           path = @parent.build_request_path(@parent.collection_path, @params)
           method = @parent.method_for(:find)
-          @parent.request(@params.merge(:_method => method, :_path => path)) do |parsed_data, response|
+          @parent.request(@params.merge(:_method => method, :_path => path)) do |parsed_data, _|
             @parent.new_collection(parsed_data)
           end
         end
@@ -106,7 +107,7 @@ module Her
           resource
         end
 
-        ids.length > 1 || ids.first.kind_of?(Array) ? results : results.first
+        ids.length > 1 || ids.first.is_a?(Array) ? results : results.first
       end
 
       # Fetch first resource with the given attributes.

data/lib/her/version.rb

@@ -1,3 +1,3 @@
 module Her
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/api_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require File.join(File.dirname(__FILE__), "spec_helper.rb")
 
 describe Her::API do
@@ -32,6 +33,7 @@ describe Her::API do
     describe "#request" do
       before do
         class SimpleParser < Faraday::Response::Middleware
+
           def on_complete(env)
             env[:body] = { data: env[:body] }
           end
@@ -85,6 +87,7 @@ describe Her::API do
         let(:parsed_data) { subject.request(_method: :get, _path: "users/1")[:parsed_data] }
         before do
           class CustomParser < Faraday::Response::Middleware
+
             def on_complete(env)
               json = MultiJson.load(env[:body], symbolize_keys: true)
               errors = json.delete(:errors) || []

data/spec/middleware/accept_json_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require "spec_helper"
 
 describe Her::Middleware::AcceptJSON do

data/spec/middleware/first_level_parse_json_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require "spec_helper"
 
 describe Her::Middleware::FirstLevelParseJSON do
@@ -31,7 +32,7 @@ describe Her::Middleware::FirstLevelParseJSON do
   end
 
   it "ensures the errors are a hash if there are no errors" do
-    expect(subject.parse(body_with_errors)[:errors]).to eq(name: %w(not_valid should_be_present))
+    expect(subject.parse(body_with_errors)[:errors]).to eq(name: %w[not_valid should_be_present])
   end
 
   it "ensures that malformed JSON throws an exception" do

data/spec/middleware/json_api_parser_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require "spec_helper"
 
 describe Her::Middleware::JsonApiParser do

data/spec/middleware/second_level_parse_json_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require "spec_helper"
 
 describe Her::Middleware::SecondLevelParseJSON do

data/spec/model/associations/association_proxy_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require "spec_helper"
 
 describe Her::Model::Associations::AssociationProxy do

data/spec/model/associations_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require File.join(File.dirname(__FILE__), "../spec_helper.rb")
 
 describe Her::Model::Associations do
@@ -296,7 +297,7 @@ describe Her::Model::Associations do
             stub.get("/users/1/comments") { [200, {}, [{ comment: { id: 4, body: "They're having a FIRESALE?" } }].to_json] }
             stub.get("/users/1/role") { [200, {}, { id: 3, body: "User" }.to_json] }
             stub.get("/users/1/posts") { [200, {}, [{ id: 1, body: "blogging stuff", admin_id: 1 }].to_json] }
-            stub.get("/organizations/1") { [200, {}, { organization:  { id: 1, name: "Bluth Company Foo" } }.to_json] }
+            stub.get("/organizations/1") { [200, {}, { organization: { id: 1, name: "Bluth Company Foo" } }.to_json] }
           end
         end
       end
@@ -558,7 +559,7 @@ describe Her::Model::Associations do
           builder.adapter :test do |stub|
             stub.get("/users/1") { [200, {}, { user: { id: 1, name: "Tobias Fünke", comments: [{ id: 2, body: "Tobias, you blow hard!", user_id: 1 }, { id: 3, body: "I wouldn't mind kissing that man between the cheeks, so to speak", user_id: 1 }], role: { id: 1, body: "Admin" }, organization: { id: 1, name: "Bluth Company" }, organization_id: 1 } }.to_json] }
             stub.get("/users/1/comments") { [200, {}, { comments: [{ id: 4, body: "They're having a FIRESALE?" }] }.to_json] }
-            stub.get("/organizations/1") { [200, {}, { organization:  { id: 1, name: "Bluth Company Foo" } }.to_json] }
+            stub.get("/organizations/1") { [200, {}, { organization: { id: 1, name: "Bluth Company Foo" } }.to_json] }
           end
         end
       end
@@ -616,7 +617,7 @@ describe Her::Model::Associations do
             stub.get("/users/2") { [200, {}, { user: { id: 2, name: "Lindsay Fünke", organization_id: 1 } }.to_json] }
             stub.get("/users/2/comments") { [200, {}, { comments: [{ id: 4, body: "They're having a FIRESALE?" }, { id: 5, body: "Is this the tiny town from Footloose?" }] }.to_json] }
             stub.get("/users/2/comments/5") { [200, {}, { comment: { id: 5, body: "Is this the tiny town from Footloose?" } }.to_json] }
-            stub.get("/organizations/1") { [200, {}, { organization:  { id: 1, name: "Bluth Company Foo" } }.to_json] }
+            stub.get("/organizations/1") { [200, {}, { organization: { id: 1, name: "Bluth Company Foo" } }.to_json] }
           end
         end
       end

data/spec/model/attributes_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require File.join(File.dirname(__FILE__), "../spec_helper.rb")
 
 describe Her::Model::Attributes do
@@ -164,11 +165,11 @@ describe Her::Model::Attributes do
         store_metadata :my_data
       end
 
-      @user = Foo::User.new(_errors: %w(Foo Bar), _metadata: { secret: true })
+      @user = Foo::User.new(_errors: %w[Foo Bar], _metadata: { secret: true })
     end
 
     it "should return response_errors stored in the method provided by `store_response_errors`" do
-      expect(@user.errors).to eq(%w(Foo Bar))
+      expect(@user.errors).to eq(%w[Foo Bar])
     end
 
     it "should remove the default method for errors" do
@@ -204,7 +205,7 @@ describe Her::Model::Attributes do
 
         spawn_model "Foo::User" do
           def document
-            self.attributes[:document][:url]
+            attributes[:document][:url]
           end
         end
       end
@@ -310,6 +311,7 @@ describe Her::Model::Attributes do
     context "when attribute methods are already defined" do
       before do
         class AbstractUser
+
           def fullname
             raise NotImplementedError
           end

data/spec/model/callbacks_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require File.join(File.dirname(__FILE__), "../spec_helper.rb")
 
 describe "Her::Model and ActiveModel::Callbacks" do
@@ -6,12 +7,10 @@ describe "Her::Model and ActiveModel::Callbacks" do
     Her::API.setup url: "https://api.example.com" do |builder|
       builder.use Her::Middleware::FirstLevelParseJSON
     end
-
-    spawn_model "Foo::User"
   end
 
   context :before_save do
-    subject { Foo::User.create(name: "Tobias Funke") }
+    subject { User.create(name: "Tobias Funke") }
     before do
       Her::API.default_api.connection.adapter :test do |stub|
         stub.post("/users") { |env| [200, {}, { id: 1, name: env[:body][:name] }.to_json] }
@@ -21,7 +20,7 @@ describe "Her::Model and ActiveModel::Callbacks" do
 
     context "when using a symbol callback" do
       before do
-        class Foo::User
+        spawn_model "User" do
           before_save :alter_name
           def alter_name
             name.upcase!
@@ -37,7 +36,7 @@ describe "Her::Model and ActiveModel::Callbacks" do
 
     context "when using a block callback" do
       before do
-        class Foo::User
+        spawn_model "User" do
           before_save -> { name.upcase! }
         end
       end
@@ -50,7 +49,7 @@ describe "Her::Model and ActiveModel::Callbacks" do
 
     context "when changing a value of an existing resource in a callback" do
       before do
-        class Foo::User
+        spawn_model "User" do
           before_save :alter_name
           def alter_name
             self.name = "Lumberjack" if persisted?
@@ -67,7 +66,7 @@ describe "Her::Model and ActiveModel::Callbacks" do
   end
 
   context :before_create do
-    subject { Foo::User.create(name: "Tobias Funke") }
+    subject { User.create(name: "Tobias Funke") }
     before do
       Her::API.default_api.connection.adapter :test do |stub|
         stub.post("/users") { |env| [200, {}, { id: 1, name: env[:body][:name] }.to_json] }
@@ -76,7 +75,7 @@ describe "Her::Model and ActiveModel::Callbacks" do
 
     context "when using a symbol callback" do
       before do
-        class Foo::User
+        spawn_model "User" do
           before_create :alter_name
           def alter_name
             name.upcase!
@@ -92,7 +91,7 @@ describe "Her::Model and ActiveModel::Callbacks" do
 
     context "when using a block callback" do
       before do
-        class Foo::User
+        spawn_model "User" do
           before_create -> { name.upcase! }
         end
       end
@@ -105,7 +104,7 @@ describe "Her::Model and ActiveModel::Callbacks" do
   end
 
   context :after_find do
-    subject { Foo::User.find(1) }
+    subject { User.find(1) }
     before do
       Her::API.default_api.connection.adapter :test do |stub|
         stub.get("/users/1") { [200, {}, { id: 1, name: "Tobias Funke" }.to_json] }
@@ -114,7 +113,7 @@ describe "Her::Model and ActiveModel::Callbacks" do
 
     context "when using a symbol callback" do
       before do
-        class Foo::User
+        spawn_model "User" do
           after_find :alter_name
           def alter_name
             name.upcase!
@@ -130,7 +129,7 @@ describe "Her::Model and ActiveModel::Callbacks" do
 
     context "when using a block callback" do
       before do
-        class Foo::User
+        spawn_model "User" do
           after_find -> { name.upcase! }
         end
       end
@@ -143,11 +142,11 @@ describe "Her::Model and ActiveModel::Callbacks" do
   end
 
   context :after_initialize do
-    subject { Foo::User.new(name: "Tobias Funke") }
+    subject { User.new(name: "Tobias Funke") }
 
     context "when using a symbol callback" do
       before do
-        class Foo::User
+        spawn_model "User" do
           after_initialize :alter_name
           def alter_name
             name.upcase!
@@ -163,7 +162,7 @@ describe "Her::Model and ActiveModel::Callbacks" do
 
     context "when using a block callback" do
       before do
-        class Foo::User
+        spawn_model "User" do
           after_initialize -> { name.upcase! }
         end
       end

data/spec/model/dirty_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require File.join(File.dirname(__FILE__), "../spec_helper.rb")
 
 describe "Her::Model and ActiveModel::Dirty" do

data/spec/model/http_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require File.join(File.dirname(__FILE__), "../spec_helper.rb")
 
 describe Her::Model::HTTP do

data/spec/model/introspection_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require File.join(File.dirname(__FILE__), "../spec_helper.rb")
 
 describe Her::Model::Introspection do
@@ -38,7 +39,7 @@ describe Her::Model::Introspection do
         @user.instance_eval do
           def password
             "filtered"
-                             end
+          end
         end
         expect(@user.inspect).to include("name=\"Tobias Funke\"")
         expect(@user.inspect).to include("password=\"filtered\"")
@@ -73,7 +74,7 @@ describe Her::Model::Introspection do
         expect(Foo::User.her_nearby_class("AccessRecord")).to eq(Foo::AccessRecord)
         expect(AccessRecord.her_nearby_class("Log")).to eq(Log)
         expect(Foo::User.her_nearby_class("Log")).to eq(Log)
-        expect{Foo::User.her_nearby_class("X")}.to raise_error(NameError)
+        expect { Foo::User.her_nearby_class("X") }.to raise_error(NameError)
       end
     end
   end

data/spec/model/nested_attributes_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require File.join(File.dirname(__FILE__), "../spec_helper.rb")
 
 describe Her::Model::NestedAttributes do

data/spec/model/orm_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require File.join(File.dirname(__FILE__), "../spec_helper.rb")
 
 describe Her::Model::ORM do
@@ -73,10 +74,10 @@ describe Her::Model::ORM do
         builder.use Her::Middleware::SecondLevelParseJSON
         builder.use Faraday::Request::UrlEncoded
         builder.adapter :test do |stub|
-          stub.get("/users") { [200, {}, { data: [{ id: 1, name: "Tobias Fünke" }, { id: 2, name: "Lindsay Fünke" }], metadata: { total_pages: 10, next_page: 2 }, errors: %w(Oh My God) }.to_json] }
-          stub.get("/users") { |env| [200, {}, { :data => [{ :id => 1, :name => "Tobias Fünke" }, { :id => 2, :name => "Lindsay Fünke" }], :metadata => { :total_pages => 10, :next_page => 2 }, :errors => ["Oh", "My", "God"] }.to_json] }
-          stub.post("/users") { |env| [200, {}, { :data => { :name => "George Michael Bluth" }, :metadata => { :foo => "bar" }, :errors => ["Yes", "Sir"] }.to_json] }
-          stub.delete("/users/1") { |env| [200, {}, { :data => { :id => 1 }, :metadata => { :foo => "bar" }, :errors => ["Yes", "Sir"] }.to_json] }
+          stub.get("/users") { [200, {}, { data: [{ id: 1, name: "Tobias Fünke" }, { id: 2, name: "Lindsay Fünke" }], metadata: { total_pages: 10, next_page: 2 }, errors: %w[Oh My God] }.to_json] }
+          stub.get("/users") { [200, {}, { :data => [{ :id => 1, :name => "Tobias Fünke" }, { :id => 2, :name => "Lindsay Fünke" }], :metadata => { :total_pages => 10, :next_page => 2 }, :errors => ["Oh", "My", "God"] }.to_json] }
+          stub.post("/users") { [200, {}, { :data => { :name => "George Michael Bluth" }, :metadata => { :foo => "bar" }, :errors => ["Yes", "Sir"] }.to_json] }
+          stub.delete("/users/1") { [200, {}, { :data => { :id => 1 }, :metadata => { :foo => "bar" }, :errors => ["Yes", "Sir"] }.to_json] }
         end
       end
 
@@ -102,7 +103,7 @@ describe Her::Model::ORM do
 
     it "handles error data on a resource" do
       @user = User.create(name: "George Michael Bluth")
-      expect(@user.response_errors).to eq(%w(Yes Sir))
+      expect(@user.response_errors).to eq(%w[Yes Sir])
     end
 
     it "handles metadata on a destroyed resource" do
@@ -112,7 +113,7 @@ describe Her::Model::ORM do
 
     it "handles error data on a destroyed resource" do
       @user = User.destroy_existing(1)
-      expect(@user.response_errors).to eq(%w(Yes Sir))
+      expect(@user.response_errors).to eq(%w[Yes Sir])
     end
   end
 
@@ -123,8 +124,8 @@ describe Her::Model::ORM do
         builder.use Her::Middleware::SecondLevelParseJSON
         builder.use Faraday::Request::UrlEncoded
         builder.adapter :test do |stub|
-          stub.get("/users") { [200, {}, { data: [{ id: 1, name: "Tobias Fünke" }, { id: 2, name: "Lindsay Fünke" }], metadata: { total_pages: 10, next_page: 2 }, errors: %w(Oh My God) }.to_json] }
-          stub.post("/users") { [200, {}, { data: { name: "George Michael Bluth" }, metadata: { foo: "bar" }, errors: %w(Yes Sir) }.to_json] }
+          stub.get("/users") { [200, {}, { data: [{ id: 1, name: "Tobias Fünke" }, { id: 2, name: "Lindsay Fünke" }], metadata: { total_pages: 10, next_page: 2 }, errors: %w[Oh My God] }.to_json] }
+          stub.post("/users") { [200, {}, { data: { name: "George Michael Bluth" }, metadata: { foo: "bar" }, errors: %w[Yes Sir] }.to_json] }
         end
       end
 
@@ -150,7 +151,7 @@ describe Her::Model::ORM do
 
     it "handles error data on a resource" do
       @user = User.create(name: "George Michael Bluth")
-      expect(@user.response_errors).to eq(%w(Yes Sir))
+      expect(@user.response_errors).to eq(%w[Yes Sir])
     end
   end
 
@@ -161,7 +162,7 @@ describe Her::Model::ORM do
         builder.use Her::Middleware::FirstLevelParseJSON
         builder.use Faraday::Request::UrlEncoded
         builder.adapter :test do |stub|
-          stub.get("/users/1") { [200, {}, { id: 1, friends: %w(Maeby GOB Anne) }.to_json] }
+          stub.get("/users/1") { [200, {}, { id: 1, friends: %w[Maeby GOB Anne] }.to_json] }
           stub.get("/users/2") { [200, {}, { id: 1 }.to_json] }
         end
       end
@@ -185,7 +186,7 @@ describe Her::Model::ORM do
       @user = User.find(1)
       expect(@user.friends).to eq("* Maeby\n* GOB\n* Anne")
       @user.instance_eval do
-        @_her_attributes[:friends] = %w(Maeby GOB Anne)
+        @_her_attributes[:friends] = %w[Maeby GOB Anne]
       end
     end
 
@@ -194,7 +195,7 @@ describe Her::Model::ORM do
       @user.friends = "* George\n* Oscar\n* Lucille"
       expect(@user.friends).to eq("* George\n* Oscar\n* Lucille")
       @user.instance_eval do
-        @_her_attributes[:friends] = %w(George Oscar Lucille)
+        @_her_attributes[:friends] = %w[George Oscar Lucille]
       end
     end
   end
@@ -492,10 +493,10 @@ describe Her::Model::ORM do
           stub.get("/users/1") { [200, {}, { id: 1, fullname: "Tobias Fünke", active: true }.to_json] }
           stub.delete("/users/1") { [status, {}, { id: 1, fullname: "Lindsay Fünke", active: false }.to_json] }
 
-          stub.get("/child_users") { [200, {}, { data: [{ id: 1, name: "Tobias Fünke" }, { id: 2, name: "Lindsay Fünke" }], metadata: { total_pages: 10, next_page: 2 }, errors: %w(Oh My God) }.to_json] }
-          stub.get("/child_users") { |env| [200, {}, { :data => [{ :id => 1, :name => "Tobias Fünke" }, { :id => 2, :name => "Lindsay Fünke" }], :metadata => { :total_pages => 10, :next_page => 2 }, :errors => ["Oh", "My", "God"] }.to_json] }
-          stub.post("/child_users") { |env| [200, {}, { :data => { :name => "George Michael Bluth" }, :metadata => { :foo => "bar" }, :errors => ["Yes", "Sir"] }.to_json] }
-          stub.delete("/child_users/1") { |env| [200, {}, { :data => { :id => 1 }, :metadata => { :foo => "bar" }, :errors => ["Yes", "Sir"] }.to_json] }
+          stub.get("/child_users") { [200, {}, { data: [{ id: 1, name: "Tobias Fünke" }, { id: 2, name: "Lindsay Fünke" }], metadata: { total_pages: 10, next_page: 2 }, errors: %w[Oh My God] }.to_json] }
+          stub.get("/child_users") { [200, {}, { :data => [{ :id => 1, :name => "Tobias Fünke" }, { :id => 2, :name => "Lindsay Fünke" }], :metadata => { :total_pages => 10, :next_page => 2 }, :errors => ["Oh", "My", "God"] }.to_json] }
+          stub.post("/child_users") { [200, {}, { :data => { :name => "George Michael Bluth" }, :metadata => { :foo => "bar" }, :errors => ["Yes", "Sir"] }.to_json] }
+          stub.delete("/child_users/1") { [200, {}, { :data => { :id => 1 }, :metadata => { :foo => "bar" }, :errors => ["Yes", "Sir"] }.to_json] }
         end
       end
 
@@ -652,10 +653,15 @@ describe Her::Model::ORM do
         after_create :after_create_callback
         after_save :after_save_callback
         def before_save_callback; end
+
         def before_create_callback; end
+
         def before_update_callback; end
+
         def after_update_callback; end
+
         def after_create_callback; end
+
         def after_save_callback; end
       end
     end