ddy_remote_resource 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3d2576b744b3dafd66aff8fca6d991f709fa10d
-  data.tar.gz: b32d6edb8af70dccdfe2b83cf4da340969b7f8b9
+  metadata.gz: f35784393790ebf350ef35b54603bb614377dff0
+  data.tar.gz: c76505446def63c7885faff3af1b0691405d2014
 SHA512:
-  metadata.gz: 3934a8a1d740a88e3cae6e8dc726c6af2bbb99bc35c4d8a25faf8ac6993fedcf5cdf67cf9093c9f6cf299b14eba9be50feb89a3527418720b0a8dc5f6e5f264f
-  data.tar.gz: 99b67f28cb4284c6100d69340e3f68020f4e13e3a5abedc99d62242858864b4846e9b207b6c1e79fc0834781e5e04a782cc6372bda5558aa06e29ee7a07d601e
+  metadata.gz: bb631e61a3730f260c44dec931ea1da7a97eda48c5dd4f4f56be1456a0d697183083c646cfe8c9210d827fd7bdd5c89594d9285ee28a1beb3f8740169c1b2f0f
+  data.tar.gz: 609cc90d3de1c59bff32be7809df7eb24292d7806a0df1e35f9dbe38c2b7ab77d60608e41abacfd17f96260f17dc8d0e2f712668bbe21ed0ef3163d3e9df4ce1

data/lib/remote_resource/url_naming.rb

@@ -14,8 +14,8 @@ module RemoteResource
         warn '[DEPRECATION] `.app_host` is deprecated. Please use a different method to determine the site.'
       end
 
-      def base_url
-        warn '[DEPRECATION] `.base_url` is deprecated. Please use the connection_options[:base_url] when querying instead.'
+      def base_url(connection_options = {})
+        RemoteResource::UrlNamingDetermination.new(self, self.connection_options.to_hash.merge(connection_options)).base_url(connection_options[:id], check_collection_options: false)
       end
 
       def use_relative_model_naming?

data/lib/remote_resource/version.rb

@@ -1,3 +1,3 @@
 module RemoteResource
-  VERSION = '1.0.0.rc1'.freeze
+  VERSION = '1.0.0.rc2'.freeze
 end

data/spec/lib/remote_resource/url_naming_spec.rb

@@ -42,9 +42,14 @@ RSpec.describe RemoteResource::UrlNaming do
   end
 
   describe '.base_url' do
-    it 'warns that the method is deprecated' do
-      expect(dummy_class).to receive(:warn).with('[DEPRECATION] `.base_url` is deprecated. Please use the connection_options[:base_url] when querying instead.')
-      dummy_class.base_url
+    it 'returns the base URL which will be used to make the request URL' do
+      aggregate_failures do
+        expect(dummy_class.base_url).to eql 'https://foobar.com/url_naming_dummy'
+        expect(dummy_class.base_url(version: '/api/v2')).to eql 'https://foobar.com/api/v2/url_naming_dummy'
+        expect(dummy_class.base_url(id: 10, collection: true)).to eql 'https://foobar.com/url_naming_dummies/10'
+        expect(dummy_class.base_url(id: 10, collection: true, collection_prefix: '/parent/:parent_id' )).to eql 'https://foobar.com/parent/:parent_id/url_naming_dummies/10'
+        expect(dummy_class.base_url(id: 10, collection: true, collection_prefix: '/parent/:parent_id', collection_options: { parent_id: 18 } )).to eql 'https://foobar.com/parent/18/url_naming_dummies/10'
+      end
     end
   end
 

data/spec/lib/remote_resource/version_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe RemoteResource::VERSION do
-  it { is_expected.to eql '1.0.0.rc1' }
+  it { is_expected.to eql '1.0.0.rc2' }
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddy_remote_resource
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Jan van der Pas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler