her 0.8.2 → 0.10.4

data/spec/model/relation_spec.rb

@@ -5,22 +5,23 @@ describe Her::Model::Relation do
   describe :where do
     context "for base classes" do
       before do
-        Her::API.setup :url => "https://api.example.com" do |builder|
+        Her::API.setup url: "https://api.example.com" do |builder|
           builder.use Her::Middleware::FirstLevelParseJSON
           builder.adapter :test do |stub|
-            stub.get("/users?foo=1&bar=2") { |env| ok! [{ :id => 2, :fullname => "Tobias Fünke" }] }
-            stub.get("/users?admin=1") { |env| ok! [{ :id => 1, :fullname => "Tobias Fünke" }] }
+            stub.get("/users?foo=1&bar=2") { ok! [{ id: 2, fullname: "Tobias Fünke" }] }
+            stub.get("/users?admin=1") { ok! [{ id: 1, fullname: "Tobias Fünke" }] }
+            stub.get("/users?id=3&foo=2") { ok! [{ id: 3, fullname: "Tobias Fünke" }] }
 
-            stub.get("/users") do |env|
+            stub.get("/users") do
               ok! [
-                { :id => 1, :fullname => "Tobias Fünke" },
-                { :id => 2, :fullname => "Lindsay Fünke" },
-                @created_user,
+                { id: 1, fullname: "Tobias Fünke" },
+                { id: 2, fullname: "Lindsay Fünke" },
+                @created_user
               ].compact
             end
 
-            stub.post('/users') do |env|
-              @created_user = { :id => 3, :fullname => 'George Michael Bluth' }
+            stub.post("/users") do
+              @created_user = { id: 3, fullname: "George Michael Bluth" }
               ok! @created_user
             end
           end
@@ -30,40 +31,47 @@ describe Her::Model::Relation do
       end
 
       it "doesn't fetch the data immediatly" do
-        Foo::User.should_receive(:request).never
-        @users = Foo::User.where(:admin => 1)
+        expect(Foo::User).to receive(:request).never
+        @users = Foo::User.where(admin: 1)
       end
 
       it "fetches the data and passes query parameters" do
-        Foo::User.should_receive(:request).once.and_call_original
-        @users = Foo::User.where(:admin => 1)
-        @users.should respond_to(:length)
-        @users.size.should eql 1
+        expect(Foo::User).to receive(:request).once.and_call_original
+        @users = Foo::User.where(admin: 1)
+        expect(@users).to respond_to(:length)
+        expect(@users.size).to eql 1
+      end
+
+      it "fetches the data by parameters including primary_key" do
+        expect(Foo::User).to receive(:request).once.and_call_original
+        @users = Foo::User.where(id: 3, foo: 2)
+        expect(@users).to respond_to(:length)
+        expect(@users.size).to eql 1
       end
 
       it "chains multiple where statements" do
-        @user = Foo::User.where(:foo => 1).where(:bar => 2).first
-        @user.id.should == 2
+        @user = Foo::User.where(foo: 1).where(bar: 2).first
+        expect(@user.id).to eq(2)
       end
 
       it "does not reuse relations" do
-        Foo::User.all.size.should eql 2
-        Foo::User.create(:fullname => 'George Michael Bluth').id.should == 3
-        Foo::User.all.size.should eql 3
+        expect(Foo::User.all.size).to eql 2
+        expect(Foo::User.create(fullname: "George Michael Bluth").id).to eq(3)
+        expect(Foo::User.all.size).to eql 3
       end
     end
 
     context "for parent class" do
       before do
-        Her::API.setup :url => "https://api.example.com" do |builder|
+        Her::API.setup url: "https://api.example.com" do |builder|
           builder.use Her::Middleware::FirstLevelParseJSON
           builder.adapter :test do |stub|
-            stub.get("/users?page=2") { |env| ok! [{ :id => 1, :fullname => "Tobias Fünke" }, { :id => 2, :fullname => "Lindsay Fünke" }] }
+            stub.get("/users?page=2") { ok! [{ id: 1, fullname: "Tobias Fünke" }, { id: 2, fullname: "Lindsay Fünke" }] }
           end
         end
 
         spawn_model("Foo::Model") do
-          scope :page, lambda { |page| where(:page => page) }
+          scope :page, ->(page) { where(page: page) }
         end
 
         class User < Foo::Model; end
@@ -71,19 +79,19 @@ describe Her::Model::Relation do
       end
 
       it "propagates the scopes through its children" do
-        @users = User.page(2)
-        @users.length.should == 2
+        expect(User.page(2).length).to eq(2)
+        expect(User.scoped.page(2).length).to eq(2)
       end
     end
   end
 
   describe :create do
     before do
-      Her::API.setup :url => "https://api.example.com" do |builder|
+      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.post("/users") { |env| ok! :id => 1, :fullname => params(env)[:fullname], :email => params(env)[:email] }
+          stub.post("/users") { |env| ok! id: 1, fullname: params(env)[:fullname], email: params(env)[:email] }
         end
       end
 
@@ -92,19 +100,19 @@ describe Her::Model::Relation do
 
     context "with a single where call" do
       it "creates a resource and passes the query parameters" do
-        @user = Foo::User.where(:fullname => "Tobias Fünke", :email => "tobias@bluth.com").create
-        @user.id.should == 1
-        @user.fullname.should == "Tobias Fünke"
-        @user.email.should == "tobias@bluth.com"
+        @user = Foo::User.where(fullname: "Tobias Fünke", email: "tobias@bluth.com").create
+        expect(@user.id).to eq(1)
+        expect(@user.fullname).to eq("Tobias Fünke")
+        expect(@user.email).to eq("tobias@bluth.com")
       end
     end
 
     context "with multiple where calls" do
       it "creates a resource and passes the query parameters" do
-        @user = Foo::User.where(:fullname => "Tobias Fünke").create(:email => "tobias@bluth.com")
-        @user.id.should == 1
-        @user.fullname.should == "Tobias Fünke"
-        @user.email.should == "tobias@bluth.com"
+        @user = Foo::User.where(fullname: "Tobias Fünke").create(email: "tobias@bluth.com")
+        expect(@user.id).to eq(1)
+        expect(@user.fullname).to eq("Tobias Fünke")
+        expect(@user.email).to eq("tobias@bluth.com")
       end
     end
   end
@@ -113,114 +121,126 @@ describe Her::Model::Relation do
     before { spawn_model "Foo::User" }
 
     it "handles new resource with build" do
-      @new_user = Foo::User.where(:fullname => "Tobias Fünke").build
-      @new_user.new?.should be_truthy
-      @new_user.fullname.should == "Tobias Fünke"
+      @new_user = Foo::User.where(fullname: "Tobias Fünke").build
+      expect(@new_user.new?).to be_truthy
+      expect(@new_user.fullname).to eq("Tobias Fünke")
     end
   end
 
   describe :scope do
     before do
-      Her::API.setup :url => "https://api.example.com" do |builder|
+      Her::API.setup url: "https://api.example.com" do |builder|
         builder.use Her::Middleware::FirstLevelParseJSON
         builder.adapter :test do |stub|
-          stub.get("/users?what=4&where=3") { |env| ok! [{ :id => 3, :fullname => "Maeby Fünke" }] }
-          stub.get("/users?what=2") { |env| ok! [{ :id => 2, :fullname => "Lindsay Fünke" }] }
-          stub.get("/users?where=6") { |env| ok! [{ :id => 4, :fullname => "Tobias Fünke" }] }
+          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
 
-      spawn_model 'Foo::User' do
-        scope :foo, lambda { |v| where(:what => v) }
-        scope :bar, lambda { |v| where(:where => v) }
-        scope :baz, lambda { bar(6) }
+      spawn_model "Foo::User" do
+        scope :foo, ->(v) { where(what: v) }
+        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
       @user = Foo::User.foo(2).first
-      @user.id.should == 2
+      expect(@user.id).to eq(2)
     end
 
     it "passes multiple query parameters" do
       @user = Foo::User.foo(4).bar(3).first
-      @user.id.should == 3
+      expect(@user.id).to eq(3)
     end
 
     it "handles embedded scopes" do
       @user = Foo::User.baz.first
-      @user.id.should == 4
+      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
     context "for new objects" do
       before do
-        spawn_model 'Foo::User' do
-          default_scope lambda { where(:active => true) }
-          default_scope lambda { where(:admin => true) }
+        spawn_model "Foo::User" do
+          default_scope -> { where(active: true) }
+          default_scope -> { where(admin: true) }
         end
       end
 
       it "should apply the scope to the attributes" do
-        Foo::User.new.should be_active
-        Foo::User.new.should be_admin
+        expect(Foo::User.new).to be_active
+        expect(Foo::User.new).to be_admin
       end
     end
 
     context "for fetched resources" do
       before do
-        Her::API.setup :url => "https://api.example.com" do |builder|
+        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.post("/users") { |env| ok! :id => 3, :active => (params(env)[:active] == "true" ? true : false) }
+            stub.post("/users") { |env| ok! id: 3, active: (params(env)[:active] == "true" ? true : false) }
           end
         end
 
-        spawn_model 'Foo::User' do
-          default_scope lambda { where(:active => true) }
+        spawn_model "Foo::User" do
+          default_scope -> { where(active: true) }
         end
       end
 
-      it("should apply the scope to the request") { Foo::User.create.should be_active }
+      it("should apply the scope to the request") { expect(Foo::User.create).to be_active }
     end
 
     context "for fetched collections" do
       before do
-        Her::API.setup :url => "https://api.example.com" do |builder|
+        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?active=true") { |env| ok! [{ :id => 3, :active => (params(env)[:active] == "true" ? true : false) }] }
+            stub.get("/users?active=true") { |env| ok! [{ id: 3, active: (params(env)[:active] == "true" ? true : false) }] }
           end
         end
 
-        spawn_model 'Foo::User' do
-          default_scope lambda { where(:active => true) }
+        spawn_model "Foo::User" do
+          default_scope -> { where(active: true) }
         end
       end
 
-      it("should apply the scope to the request") { Foo::User.all.first.should be_active }
+      it("should apply the scope to the request") { expect(Foo::User.all.first).to be_active }
     end
   end
 
   describe :map do
     before do
-      Her::API.setup :url => "https://api.example.com" do |builder|
+      Her::API.setup url: "https://api.example.com" do |builder|
         builder.use Her::Middleware::FirstLevelParseJSON
         builder.adapter :test do |stub|
-          stub.get("/users") do |env|
-            ok! [{ :id => 1, :fullname => "Tobias Fünke" }, { :id => 2, :fullname => "Lindsay Fünke" }]
+          stub.get("/users") do
+            ok! [{ id: 1, fullname: "Tobias Fünke" }, { id: 2, fullname: "Lindsay Fünke" }]
           end
         end
       end
 
-      spawn_model 'Foo::User'
+      spawn_model "Foo::User"
     end
 
     it "delegates the method to the fetched collection" do
-      Foo::User.all.map(&:fullname).should == ["Tobias Fünke", "Lindsay Fünke"]
+      expect(Foo::User.all.map(&:fullname)).to eq(["Tobias Fünke", "Lindsay Fünke"])
     end
   end
 end

data/spec/model/validations_spec.rb

@@ -13,12 +13,12 @@ describe "Her::Model and ActiveModel::Validations" do
 
     it "validates attributes when calling #valid?" do
       user = Foo::User.new
-      user.should_not be_valid
-      user.errors.full_messages.should include("Fullname can't be blank")
-      user.errors.full_messages.should include("Email can't be blank")
+      expect(user).not_to be_valid
+      expect(user.errors.full_messages).to include("Fullname can't be blank")
+      expect(user.errors.full_messages).to include("Email can't be blank")
       user.fullname = "Tobias Fünke"
       user.email = "tobias@bluthcompany.com"
-      user.should be_valid
+      expect(user).to be_valid
     end
   end
 
@@ -35,8 +35,8 @@ describe "Her::Model and ActiveModel::Validations" do
     end
 
     it "validates attributes when calling #valid?" do
-      user = User.new(:_errors => ["Email cannot be blank"])
-      user.errors.should include("Email cannot be blank")
+      user = User.new(_errors: ["Email cannot be blank"])
+      expect(user.errors).to include("Email cannot be blank")
     end
   end
 end

data/spec/model_spec.rb

@@ -1,13 +1,13 @@
 # encoding: utf-8
-require 'spec_helper'
+require "spec_helper"
 
 describe Her::Model do
   before do
-    Her::API.setup :url => "https://api.example.com" do |connection|
+    Her::API.setup url: "https://api.example.com" do |connection|
       connection.use Her::Middleware::FirstLevelParseJSON
       connection.adapter :test do |stub|
-        stub.get("/users/1") { |env| [200, {}, { :id => 1, :name => "Tobias Fünke" }.to_json] }
-        stub.get("/users/1/comments") { |env| [200, {}, [{ :id => 4, :body => "They're having a FIRESALE?" }].to_json] }
+        stub.get("/users/1") { [200, {}, { id: 1, name: "Tobias Fünke" }.to_json] }
+        stub.get("/users/1/comments") { [200, {}, [{ id: 4, body: "They're having a FIRESALE?" }].to_json] }
       end
     end
 
@@ -17,28 +17,28 @@ describe Her::Model do
   subject { Foo::User.find(1) }
 
   describe :has_key? do
-    it { should_not have_key(:unknown_method_for_a_user) }
-    it { should_not have_key(:unknown_method_for_a_user) }
-    it { should have_key(:name) }
-    it { should have_key(:comments) }
+    it { is_expected.not_to have_key(:unknown_method_for_a_user) }
+    it { is_expected.not_to have_key(:unknown_method_for_a_user) }
+    it { is_expected.to have_key(:name) }
+    it { is_expected.to have_key(:comments) }
   end
 
   describe :serialization do
-    it 'should be serialized without an error' do
+    it "should be serialized without an error" do
       expect { Marshal.dump(subject.comments) }.not_to raise_error
     end
 
-    it 'should correctly load serialized object' do
-       serialized_comments = Marshal.load(Marshal.dump(subject.comments))
-       subject.comments.size.should eq(serialized_comments.size)
-       subject.comments.first.id.should eq(serialized_comments.first.id)
-       subject.comments.first.body.should eq(serialized_comments.first.body)
+    it "should correctly load serialized object" do
+      serialized_comments = Marshal.load(Marshal.dump(subject.comments))
+      expect(subject.comments.size).to eq(serialized_comments.size)
+      expect(subject.comments.first.id).to eq(serialized_comments.first.id)
+      expect(subject.comments.first.body).to eq(serialized_comments.first.body)
     end
   end
 
   describe :[] do
-    it { should_not have_key(:unknown_method_for_a_user) }
-    specify { subject[:name].should == "Tobias Fünke" }
-    specify { subject[:comments].first.body.should == "They're having a FIRESALE?" }
+    it { is_expected.not_to have_key(:unknown_method_for_a_user) }
+    specify { expect(subject[:name]).to eq("Tobias Fünke") }
+    specify { expect(subject[:comments].first.body).to eq("They're having a FIRESALE?") }
   end
 end

data/spec/spec_helper.rb

@@ -1,11 +1,10 @@
-$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
 require "rspec"
-require "rspec/its"
 require "her"
 
 # Require everything in `spec/support`
-Dir[File.expand_path('../../spec/support/**/*.rb', __FILE__)].map(&method(:require))
+Dir[File.expand_path("../../spec/support/**/*.rb", __FILE__)].map(&method(:require))
 
 # Remove ActiveModel deprecation message
 I18n.enforce_available_locales = false

data/spec/support/macros/model_macros.rb

@@ -3,7 +3,7 @@ module Her
     module Macros
       module ModelMacros
         # Create a class and automatically inject Her::Model into it
-        def spawn_model(klass, options={}, &block)
+        def spawn_model(klass, options = {}, &block)
           super_class = options[:super_class]
           model_type = options[:type] || Her::Model
           new_class = if super_class
@@ -12,7 +12,7 @@ module Her
                         Class.new
                       end
           if klass =~ /::/
-            base, submodel = klass.split(/::/).map{ |s| s.to_sym }
+            base, submodel = klass.split(/::/).map(&:to_sym)
             Object.const_set(base, Module.new) unless Object.const_defined?(base)
             Object.const_get(base).module_eval do
               remove_const submodel if constants.map(&:to_sym).include?(submodel)

metadata

@@ -1,157 +1,129 @@
 --- !ruby/object:Gem::Specification
 name: her
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.10.4
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: fivemat
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !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
     requirements:
-    - - '>='
+    - - ">="
       - !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
     requirements:
-    - - '>='
+    - - ">="
       - !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
     requirements:
-    - - '>='
+    - - ">="
       - !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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !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
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 description: Her is an ORM that maps REST resources and collections to Ruby objects
@@ -161,10 +133,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
+- ".yardopts"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -242,17 +215,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A simple Representational State Transfer-based Hypertext Transfer Protocol-powered