her 1.0.0 → 1.1.1

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
@@ -85,6 +86,10 @@ describe Her::Model::Attributes do
       @user.assign_attributes active: true
       expect(@user).to be_active
     end
+
+    it "expects to receive hash" do
+      expect { @user.assign_attributes(1) }.to raise_error(ArgumentError, 'When assigning attributes, you must pass a hash as an argument.')
+    end
   end
 
   context "checking resource equality" do
@@ -164,11 +169,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 +209,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 +315,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
@@ -157,33 +158,43 @@ describe Her::Model::HTTP do
     subject { Foo::User }
 
     describe :custom_get do
-      context "without cache" do
-        before { Foo::User.custom_get :popular, :recent }
-        it { is_expected.to respond_to(:popular) }
-        it { is_expected.to respond_to(:recent) }
+      before do
+        Foo::User.custom_get :popular, :recent
+      end
 
-        context "making the HTTP request" do
-          subject { Foo::User.popular }
+      it { is_expected.to respond_to(:popular) }
+      it { is_expected.to respond_to(:recent) }
 
-          describe "#length" do
-            subject { super().length }
-            it { is_expected.to eq(2) }
-          end
-        end
+      it "makes HTTP request" do
+        expect(Foo::User.popular.length).to be 2
       end
     end
 
     describe :custom_post do
-      before { Foo::User.custom_post :from_default }
+      before do
+        Foo::User.custom_post :from_default
+      end
+
       it { is_expected.to respond_to(:from_default) }
 
-      context "making the HTTP request" do
-        subject { Foo::User.from_default(name: "Tobias Fünke") }
+      it "makes HTTP request" do
+        user = Foo::User.from_default(name: "Tobias Fünke")
+        expect(user.id).to be 4
+      end
+    end
+
+    context "with options" do
+      before do
+        allow(Foo::User).to receive(:warn)
+        Foo::User.custom_get :popular, foo: "bar"
+      end
 
-        describe "#id" do
-          subject { super().id }
-          it { is_expected.to eq(4) }
-        end
+      it "issues DEPRECATION warning" do
+        expect(Foo::User).to have_received(:warn).with("[DEPRECATION] options for custom request methods are deprecated and will be removed on or after January 2020.")
+      end
+
+      it "makes HTTP request" do
+        expect(Foo::User.popular.length).to be 2
       end
     end
   end

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
@@ -401,6 +402,7 @@ describe Her::Model::ORM do
         builder.adapter :test do |stub|
           stub.get("/users/1") { [200, {}, { id: 1, fullname: "Tobias Fünke", admin: false }.to_json] }
           stub.put("/users/1") { [200, {}, { id: 1, fullname: "Lindsay Fünke", admin: true }.to_json] }
+          stub.put("/users/2") { [200, {}, { id: 2, errors: ["fullname has already been taken"] }.to_json] }
           stub.get("/pages/1") { [200, {}, { id: 1, views: 1, unique_visitors: 4 }.to_json] }
           stub.put("/pages/1") { [200, {}, { id: 1, views: 2, unique_visitors: 3 }.to_json] }
         end
@@ -422,6 +424,15 @@ describe Her::Model::ORM do
       expect(@user.fullname).to eq("Lindsay Fünke")
     end
 
+    it "handle resource update through .save_existing!" do
+      @user = Foo::User.save_existing!(1, fullname: "Lindsay Fünke")
+      expect(@user.fullname).to eq("Lindsay Fünke")
+    end
+
+    it "raises ResourceInvalid when .save_existing! has errors" do
+      expect { Foo::User.save_existing!(2, fullname: "Lindsay Fünke") }.to raise_error(Her::Errors::ResourceInvalid)
+    end
+
     it "handle resource update through #save on an existing resource" do
       @user = Foo::User.find(1)
       @user.fullname = "Lindsay Fünke"
@@ -429,6 +440,13 @@ describe Her::Model::ORM do
       expect(@user.fullname).to eq("Lindsay Fünke")
     end
 
+    it "handle resource update through #update_attributes" do
+      @user = Foo::User.find(1)
+      expect(@user).to receive(:save).and_return(true)
+      @user.update_attributes(fullname: "Lindsay Fünke")
+      expect(@user.fullname).to eq("Lindsay Fünke")
+    end
+
     it "handles resource update through #toggle without saving it" do
       @user = Foo::User.find(1)
       expect(@user.admin).to be_falsey
@@ -492,10 +510,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 +670,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

data/spec/model/parse_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require File.join(File.dirname(__FILE__), "../spec_helper.rb")
 
 describe Her::Model::Parse do
@@ -251,6 +252,7 @@ describe Her::Model::Parse do
 
       it "parse the data with the symbol" do
         @new_user = Foo::User.create(fullname: "Lindsay Fünke")
+        expect(@new_user.id).to eq(1)
         expect(@new_user.fullname).to eq("Lindsay Fünke")
       end
     end
@@ -264,6 +266,7 @@ describe Her::Model::Parse do
 
         spawn_model("Foo::Model") { parse_root_in_json true, format: :active_model_serializers }
         class User < Foo::Model
+
           collection_path "/users"
         end
 
@@ -493,4 +496,25 @@ describe Her::Model::Parse do
       expect(user.to_params).to eq(model: { name: 'foo' })
     end
   end
+
+  context "when attribute uses the same name as root element" do
+    before do
+      Her::API.setup url: "https://api.example.com" do |builder|
+        builder.use Her::Middleware::FirstLevelParseJSON
+        builder.use Faraday::Request::UrlEncoded
+      end
+
+      Her::API.default_api.connection.adapter :test do |stub|
+        stub.post("/users") { |env| [200, {}, { user: "foobar", id: 1, fullname: params(env)[:fullname] }.to_json] }
+      end
+
+      spawn_model "Foo::User"
+    end
+
+    it "parses as attribute instead of root element" do
+      user = Foo::User.create(fullname: "barfoo")
+      expect(user.fullname).to eq "barfoo"
+      expect(user.user).to eq "foobar"
+    end
+  end
 end