her 0.10.0 → 0.10.1

data/spec/model/attributes_spec.rb

@@ -204,7 +204,7 @@ describe Her::Model::Attributes do
 
         spawn_model "Foo::User" do
           def document
-            @attributes[:document][:url]
+            self.attributes[:document][:url]
           end
         end
       end
@@ -229,7 +229,7 @@ describe Her::Model::Attributes do
 
         spawn_model "Foo::User" do
           def document=(document)
-            @attributes[:document] = document[:url]
+            @_her_attributes[:document] = document[:url]
           end
         end
       end
@@ -288,19 +288,19 @@ describe Her::Model::Attributes do
       it { is_expected.to respond_to(:fullname?) }
     end
 
-    it "defines setter that affects @attributes" do
+    it "defines setter that affects attributes" do
       user = Foo::User.new
       user.fullname = "Tobias Fünke"
       expect(user.attributes[:fullname]).to eq("Tobias Fünke")
     end
 
-    it "defines getter that reads @attributes" do
+    it "defines getter that reads attributes" do
       user = Foo::User.new
       user.assign_attributes(fullname: "Tobias Fünke")
       expect(user.fullname).to eq("Tobias Fünke")
     end
 
-    it "defines predicate that reads @attributes" do
+    it "defines predicate that reads attributes" do
       user = Foo::User.new
       expect(user.fullname?).to be_falsey
       user.assign_attributes(fullname: "Tobias Fünke")
@@ -335,19 +335,19 @@ describe Her::Model::Attributes do
         expect(Foo::User.generated_attribute_methods.instance_methods).to include(:fullname?)
       end
 
-      it "defines setter that affects @attributes" do
+      it "defines setter that affects attributes" do
         user = Foo::User.new
         user.fullname = "Tobias Fünke"
         expect(user.attributes[:fullname]).to eq("Tobias Fünke")
       end
 
-      it "defines getter that reads @attributes" do
+      it "defines getter that reads attributes" do
         user = Foo::User.new
         user.attributes[:fullname] = "Tobias Fünke"
         expect(user.fullname).to eq("Tobias Fünke")
       end
 
-      it "defines predicate that reads @attributes" do
+      it "defines predicate that reads attributes" do
         user = Foo::User.new
         expect(user.fullname?).to be_falsey
         user.attributes[:fullname] = "Tobias Fünke"

data/spec/model/callbacks_spec.rb

@@ -58,7 +58,7 @@ describe "Her::Model and ActiveModel::Callbacks" do
         end
       end
 
-      it "should call the server with the canged value" do
+      it "should call the server with the changed value" do
         expect(subject.name).to eq("Tobias Funke")
         subject.save
         expect(subject.name).to eq("Lumberjack")

data/spec/model/dirty_spec.rb

@@ -8,16 +8,24 @@ describe "Her::Model and ActiveModel::Dirty" do
         builder.use Her::Middleware::FirstLevelParseJSON
         builder.use Faraday::Request::UrlEncoded
         builder.adapter :test do |stub|
+          stub.get("/users")   { [200, {}, [{ id: 1, fullname: "Lindsay Fünke" }, { id: 2, fullname: "Maeby Fünke" }].to_json] }
           stub.get("/users/1") { [200, {}, { id: 1, fullname: "Lindsay Fünke" }.to_json] }
           stub.get("/users/2") { [200, {}, { id: 2, fullname: "Maeby Fünke" }.to_json] }
           stub.get("/users/3") { [200, {}, { user_id: 3, fullname: "Maeby Fünke" }.to_json] }
           stub.put("/users/1") { [200, {}, { id: 1, fullname: "Tobias Fünke" }.to_json] }
           stub.put("/users/2") { [400, {}, { errors: ["Email cannot be blank"] }.to_json] }
           stub.post("/users")  { [200, {}, { id: 1, fullname: "Tobias Fünke" }.to_json] }
+          stub.get("/users/1/posts") { [200, {}, [{ id: 1, user_id: 1, body: "Hello" }].to_json] }
+          stub.get("/users/1/posts/1") { [200, {}, { id: 1, user_id: 1, body: "Hello" }.to_json] }
         end
       end
 
+      spawn_model "Foo::Post" do
+        belongs_to :user
+        attributes :body
+      end
       spawn_model "Foo::User" do
+        has_many :posts
         attributes :fullname, :email
       end
       spawn_model "Dynamic::User" do
@@ -74,6 +82,32 @@ describe "Her::Model and ActiveModel::Dirty" do
       end
     end
 
+    context "for an existing resource from an association" do
+      let(:post) { Foo::User.find(1).posts.find(1) }
+      it "has no changes" do
+        expect(post.changes).to be_empty
+        expect(post).to_not be_changed
+      end
+    end
+
+    context "for an existing resource from an association collection" do
+      let(:post) { Foo::User.find(1).posts.first }
+      it "has no changes" do
+        expect(post.changes).to be_empty
+        expect(post).to_not be_changed
+      end
+    end
+
+    context "for resources from a collection" do
+      let(:users) { Foo::User.all.fetch }
+      it "has no changes" do
+        users.each do |user|
+          expect(user.changes).to be_empty
+          expect(user).to_not be_changed
+        end
+      end
+    end
+
     context "for new resource" do
       let(:user) { Foo::User.new(fullname: "Lindsay Fünke") }
       it "has changes" do
@@ -87,6 +121,12 @@ describe "Her::Model and ActiveModel::Dirty" do
         expect(user).not_to be_changed
       end
     end
+
+    context "for a new resource from an association" do
+      let(:post) { Foo::User.find(1).posts.build }
+      it "has changes" do
+        expect(post).to be_changed
+      end
+    end
   end
 end
-#

data/spec/model/introspection_spec.rb

@@ -73,7 +73,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 be_nil
+        expect{Foo::User.her_nearby_class("X")}.to raise_error(NameError)
       end
     end
   end

data/spec/model/orm_spec.rb

@@ -172,11 +172,11 @@ describe Her::Model::ORM do
 
         def friends=(val)
           val = val.delete("\r").split("\n").map { |friend| friend.gsub(/^\s*\*\s*/, "") } if val && val.is_a?(String)
-          @attributes[:friends] = val
+          @_her_attributes[:friends] = val
         end
 
         def friends
-          @attributes[:friends].map { |friend| "* #{friend}" }.join("\n")
+          @_her_attributes[:friends].map { |friend| "* #{friend}" }.join("\n")
         end
       end
     end
@@ -185,7 +185,7 @@ describe Her::Model::ORM do
       @user = User.find(1)
       expect(@user.friends).to eq("* Maeby\n* GOB\n* Anne")
       @user.instance_eval do
-        @attributes[:friends] = %w(Maeby GOB Anne)
+        @_her_attributes[:friends] = %w(Maeby GOB Anne)
       end
     end
 
@@ -194,7 +194,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
-        @attributes[:friends] = %w(George Oscar Lucille)
+        @_her_attributes[:friends] = %w(George Oscar Lucille)
       end
     end
   end
@@ -491,12 +491,30 @@ describe Her::Model::ORM do
         builder.adapter :test do |stub|
           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] }
         end
       end
 
       spawn_model "Foo::User"
     end
 
+    it "handles proper resource deletion on a child model class" do
+      child_user_klass = Class.new(Foo::User) do
+        def self.name
+          "ChildUser"
+        end
+      end
+
+      child_user_klass.destroy_existing(1)
+      @child_user = child_user_klass.create(name: "George Michael Bluth")
+
+      expect { @child_user.save! }.to raise_error(Her::Errors::ResourceInvalid)
+    end
+
     it "handle resource deletion through the .destroy class method" do
       @user = Foo::User.destroy_existing(1)
       expect(@user.active).to be_falsey

data/spec/model/parse_spec.rb

@@ -24,6 +24,21 @@ describe Her::Model::Parse do
         end
       end
 
+      it "inherits attributes from parent class" do
+        spawn_model "Foo::ChildUser", super_class: Foo::User do
+        end
+
+        expect(Foo::ChildUser).to be_include_root_in_json
+      end
+
+      it "allows `include_root_in_json` to be set to `false` on a child model" do
+        spawn_model "Foo::ChildUser", super_class: Foo::User do
+          include_root_in_json false
+        end
+
+        expect(Foo::ChildUser).to_not be_include_root_in_json
+      end
+
       it "wraps params in the element name in `to_params`" do
         @new_user = Foo::User.new(fullname: "Tobias Fünke")
         expect(@new_user.to_params).to eq(user: { fullname: "Tobias Fünke" })
@@ -35,6 +50,29 @@ describe Her::Model::Parse do
       end
     end
 
+    context "to false" do
+      before do
+        spawn_model "Foo::User" do
+          include_root_in_json false
+        end
+      end
+
+      it "inherits attributes from parent class" do
+        spawn_model "Foo::ChildUser", super_class: Foo::User do
+        end
+
+        expect(Foo::ChildUser).to_not be_include_root_in_json
+      end
+
+      it "allows `include_root_in_json` to be set to `true` on a child model" do
+        spawn_model "Foo::ChildUser", super_class: Foo::User do
+          include_root_in_json true
+        end
+
+        expect(Foo::ChildUser).to be_include_root_in_json
+      end
+    end
+
     context "to a symbol" do
       before do
         spawn_model "Foo::User" do
@@ -64,6 +102,54 @@ describe Her::Model::Parse do
     end
   end
 
+  context "when `request_new_object_on_build` is set" do
+    context "to true" do
+      before do
+        spawn_model "Foo::User" do
+          request_new_object_on_build true
+        end
+      end
+
+      it "inherits attributes from parent class" do
+        spawn_model "Foo::ChildUser", super_class: Foo::User do
+        end
+
+        expect(Foo::ChildUser).to be_request_new_object_on_build
+      end
+
+      it "allows `request_new_object_on_build` to be set to `false` on a child model" do
+        spawn_model "Foo::ChildUser", super_class: Foo::User do
+          request_new_object_on_build false
+        end
+
+        expect(Foo::ChildUser).to_not be_request_new_object_on_build
+      end
+    end
+
+    context "to false" do
+      before do
+        spawn_model "Foo::User" do
+          request_new_object_on_build false
+        end
+      end
+
+      it "inherits attributes from parent class" do
+        spawn_model "Foo::ChildUser", super_class: Foo::User do
+        end
+
+        expect(Foo::ChildUser).to_not be_request_new_object_on_build
+      end
+
+      it "allows `request_new_object_on_build` to be set to `true` on a child model" do
+        spawn_model "Foo::ChildUser", super_class: Foo::User do
+          request_new_object_on_build true
+        end
+
+        expect(Foo::ChildUser).to be_request_new_object_on_build
+      end
+    end
+  end
+
   context "when parse_root_in_json is set" do
     before do
       Her::API.setup url: "https://api.example.com" do |builder|
@@ -88,6 +174,21 @@ describe Her::Model::Parse do
         end
       end
 
+      it "inherits attributes from parent class" do
+        spawn_model "Foo::ChildUser", super_class: Foo::User do
+        end
+
+        expect(Foo::ChildUser).to be_parse_root_in_json
+      end
+
+      it "allows `parse_root_in_json` to be set to `false` on a child model" do
+        spawn_model "Foo::ChildUser", super_class: Foo::User do
+          parse_root_in_json false
+        end
+
+        expect(Foo::ChildUser).to_not be_parse_root_in_json
+      end
+
       it "parse the data from the JSON root element after .create" do
         @new_user = Foo::User.create(fullname: "Lindsay Fünke")
         expect(@new_user.fullname).to eq("Lindsay Fünke")
@@ -116,6 +217,29 @@ describe Her::Model::Parse do
       end
     end
 
+    context "to false" do
+      before do
+        spawn_model "Foo::User" do
+          parse_root_in_json false
+        end
+      end
+
+      it "inherits attributes from parent class" do
+        spawn_model "Foo::ChildUser", super_class: Foo::User do
+        end
+
+        expect(Foo::ChildUser).to_not be_parse_root_in_json
+      end
+
+      it "allows `parse_root_in_json` to be set to `true` on a child model" do
+        spawn_model "Foo::ChildUser", super_class: Foo::User do
+          parse_root_in_json true
+        end
+
+        expect(Foo::ChildUser).to be_parse_root_in_json
+      end
+    end
+
     context "to a symbol" do
       before do
         Her::API.default_api.connection.adapter :test do |stub|
@@ -342,4 +466,31 @@ describe Her::Model::Parse do
       expect(user.to_params).to eql(user: { first_name: "Someone" })
     end
   end
+
+  context 'when passed a non-Her ActiveModel instance' do
+    before do
+      klass = Class.new do
+        include ActiveModel::Serialization
+
+        def attributes
+          { 'name' => nil }
+        end
+
+        def name
+          'foo'
+        end
+      end
+
+      @model = klass.new
+
+      Her::API.setup
+      spawn_model 'Foo::User'
+    end
+
+    it 'serializes the instance in `to_params`' do
+      attributes = { model: @model }
+      user = Foo::User.new(attributes)
+      expect(user.to_params).to eq(model: { name: 'foo' })
+    end
+  end
 end

data/spec/model/relation_spec.rb

@@ -79,8 +79,8 @@ describe Her::Model::Relation do
       end
 
       it "propagates the scopes through its children" do
-        @users = User.page(2)
-        expect(@users.length).to eq(2)
+        expect(User.page(2).length).to eq(2)
+        expect(User.scoped.page(2).length).to eq(2)
       end
     end
   end
@@ -135,6 +135,7 @@ describe Her::Model::Relation do
           stub.get("/users?what=4&where=3") { ok! [{ id: 3, fullname: "Maeby Fünke" }] }
           stub.get("/users?what=2") { ok! [{ id: 2, fullname: "Lindsay Fünke" }] }
           stub.get("/users?where=6") { ok! [{ id: 4, fullname: "Tobias Fünke" }] }
+          stub.get('/bar/users') { ok! [] }
         end
       end
 
@@ -143,6 +144,11 @@ describe Her::Model::Relation do
         scope :bar, ->(v) { where(where: v) }
         scope :baz, -> { bar(6) }
       end
+
+      spawn_model "Bar::User" do
+        collection_path '/bar/users'
+        scope :baz, -> { where(where: 7) }
+      end
     end
 
     it "passes query parameters" do
@@ -159,6 +165,12 @@ describe Her::Model::Relation do
       @user = Foo::User.baz.first
       expect(@user.id).to eq(4)
     end
+
+    it "does not share scope with other models" do
+      expect(Bar::User.scoped).not_to respond_to(:foo, :bar)
+      expect(Foo::User.scoped.baz.params[:where]).to eq(6)
+      expect(Bar::User.scoped.baz.params[:where]).to eq(7)
+    end
   end
 
   describe :default_scope do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: her
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-04 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,9 +59,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,9 +69,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -79,9 +79,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -89,9 +89,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A simple Representational State Transfer-based Hypertext Transfer Protocol-powered