her 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c0f87d36e43920519c831bffab58456dd03219dd
-  data.tar.gz: 8f347722b32acb8f9a7f8f372683b09e9c305d8f
+SHA256:
+  metadata.gz: 58af9f15de50854cfb0920b84a7cb76ec1869f50d9d92a2e9db08bf296340438
+  data.tar.gz: 441585f5ccc641455c402db3c8fbbb9a67cbb6b6cbb37beaa9a1ab63f69def89
 SHA512:
-  metadata.gz: 4a239ac856dd17577b9adcfbf96d454a20ec12cdfa605bd45625261aeb93a31b04d95712b2ed5c7901f48371eadbfb08076a4318cc85276373e3e0dfb6de31a8
-  data.tar.gz: 9a9b886cc0050fecb2d3bff8fcec90dddd3ffac98c1af8c61c177ef5314036f19939ab29542a52305c427ebd6f8b78100199d2fddf66a4031299cbb800dff9fa
+  metadata.gz: 7a4433d1d5999b70b14130b39d8817b97b873f259988c0bbf091e83a3e7795e5413b95fd0abb0b61d012982d498149678475f89133ad7d28c0deed9bc3b5637b
+  data.tar.gz: 1f834a4c000b91a5605653f3e3bd19b3849ef05f82d77d8626b671cd3f42719a312d429cf645a66a8ece087d790f61266816868be35c8404bb629ba55e22bd27

data/.travis.yml

@@ -6,15 +6,18 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.6
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
+  - 2.2.10
+  - 2.3.7
+  - 2.4.3
+  - 2.5.1
+  - 2.6.6
 
 gemfile:
   - gemfiles/Gemfile.activemodel-4.2
   - gemfiles/Gemfile.activemodel-5.0
   - gemfiles/Gemfile.activemodel-5.1
   - gemfiles/Gemfile.activemodel-5.2
+  - gemfiles/Gemfile.faraday-1.0
 
 matrix:
   exclude:
@@ -36,6 +39,14 @@ matrix:
       rvm: 2.0.0
     - gemfile: gemfiles/Gemfile.activemodel-5.2
       rvm: 2.1.6
+    - gemfile: gemfiles/Gemfile.faraday-1.0
+      rvm: 1.9.3
+    - gemfile: gemfiles/Gemfile.faraday-1.0
+      rvm: 2.0.0
+    - gemfile: gemfiles/Gemfile.faraday-1.0
+      rvm: 2.1.6
+    - gemfile: gemfiles/Gemfile.faraday-1.0
+      rvm: 2.2.10
 
 before_install:
   - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true

data/README.md

@@ -675,7 +675,7 @@ class User
   include Her::Model
 
   custom_get :popular, :unpopular
-  custom_post :from_default
+  custom_post :from_default, :activate
 end
 
 User.popular
@@ -689,6 +689,10 @@ User.unpopular
 User.from_default(name: "Maeby Fünke")
 # POST "/users/from_default" with `name=Maeby+Fünke`
 # => #<User id=5 name="Maeby Fünke">
+
+User.activate(id: 6)
+# POST "/users/6/activate"
+# => #<User id=6>
 ```
 
 You can also use `get`, `post`, `put` or `delete` (which maps the returned data to either a collection or a resource).

data/gemfiles/Gemfile.faraday-1.0

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gemspec :path => "../"
+
+gem 'activemodel', '~> 4.2.1'
+gem 'faraday', '~> 1.0'

data/her.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", "~> 3.5"
 
   s.add_runtime_dependency "activemodel", ">= 4.2.1"
-  s.add_runtime_dependency "faraday", ">= 0.8", "< 1.0"
+  s.add_runtime_dependency "faraday", ">= 0.8"
   s.add_runtime_dependency "multi_json", "~> 1.7"
 end

data/lib/her/model/http.rb

@@ -97,7 +97,12 @@ module Her
 
             def custom_#{method}(*paths)
               metaclass = (class << self; self; end)
-              opts = paths.last.is_a?(Hash) ? paths.pop : Hash.new
+
+              # TODO: Remove this check after January 2020
+              if paths.last.is_a?(Hash)
+                warn("[DEPRECATION] options for custom request methods are deprecated and will be removed on or after January 2020.")
+                paths.pop
+              end
 
               paths.each do |path|
                 metaclass.send(:define_method, path) do |*params|

data/lib/her/model/orm.rb

@@ -228,8 +228,15 @@ module Her
         #   @user = User.save_existing(1, { :fullname => "Tobias Fünke" })
         #   # Called via PUT "/users/1"
         def save_existing(id, params)
+          save_existing!(id, params)
+        rescue Her::Errors::ResourceInvalid => e
+          e.resource
+        end
+
+        # Similar to .save_existing but raises ResourceInvalid if save fails
+        def save_existing!(id, params)
           resource = new(params.merge(primary_key => id))
-          resource.save
+          resource.save!
           resource
         end
 

data/lib/her/version.rb

@@ -1,3 +1,3 @@
 module Her
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/model/associations_spec.rb

@@ -460,6 +460,9 @@ describe Her::Model::Associations do
         Her::API.setup url: "https://api.example.com" do |builder|
           builder.use Her::Middleware::FirstLevelParseJSON
           builder.use Faraday::Request::UrlEncoded
+          builder.adapter :test do |stub|
+            stub.get("/users/1") { [200, {}, { id: 1, name: "Lindsay Fünke", organization_id: 2 }.to_json] }
+          end
         end
       end
 

data/spec/model/http_spec.rb

@@ -158,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
 
-        describe "#id" do
-          subject { super().id }
-          it { is_expected.to eq(4) }
-        end
+    context "with options" do
+      before do
+        allow(Foo::User).to receive(:warn)
+        Foo::User.custom_get :popular, foo: "bar"
+      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/orm_spec.rb

@@ -402,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
@@ -423,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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: her
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-13 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -73,9 +73,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,9 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +118,7 @@ files:
 - gemfiles/Gemfile.activemodel-5.0
 - gemfiles/Gemfile.activemodel-5.1
 - gemfiles/Gemfile.activemodel-5.2
+- gemfiles/Gemfile.faraday-1.0
 - her.gemspec
 - lib/her.rb
 - lib/her/api.rb
@@ -200,8 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A simple Representational State Transfer-based Hypertext Transfer Protocol-powered