ddy_remote_resource 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 105352f9caf2a46040cd7428628bd73371f09b76
-  data.tar.gz: e64caf4294b2d126b306b8906327e5adea78c249
+  metadata.gz: ae92e08ce0a95cfc8253c09f3106087caf9ba636
+  data.tar.gz: 0e675db4069759cb3bf185c616821c78f55b1cad
 SHA512:
-  metadata.gz: 697f9c48d2761ed0c689866ea9ffb0a86133b9232a822807a8bdbe8f19c4eca5f7b0dab48b0767fd83054389cb46f29a13990b9437225b99dc505194cff9b748
-  data.tar.gz: 8dcf2452275ea8ecf7a03f83a81f6537fd2853d5694a48e7eadaaeb64c97eba1d5e928118a3b57f077554a70c8bc205e78c9b2bae581805ffff22fbd2eab0776
+  metadata.gz: 2b829236979e4f246503864b810da68b9939e84e2fdab2c288131a20bbde39fed70660b1a708d9390818e4d408579cf94db7508300c5cc1a3d1dc777cc84aeff
+  data.tar.gz: d8ed2d8f09246377321acb6a2a0cd1a889e2090a2504509346d209f52cb6f541b3f7e30e890cbc72e06d778c36bd10c1071c74abf2adf909e48fb737b1f14796

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
+sandbox/

data/.ruby-version

@@ -1 +1 @@
-2.1.1
+2.3.1

data/Guardfile

@@ -0,0 +1,45 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features) \
+#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
+
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'
+
+guard :rspec, cmd: 'bundle exec rspec', notification: true do
+  require 'guard/rspec/dsl'
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+
+  # Notification (See: https://github.com/Codaisseur/terminal-notifier-guard)
+  notification :terminal_notifier, app_name: 'RemoteResource', activate: 'com.googlecode.iTerm2' if `uname` =~ /Darwin/
+end

data/lib/remote_resource/querying/finder_methods.rb

@@ -6,26 +6,23 @@ module RemoteResource
       module ClassMethods
 
         def find(id, connection_options = {})
-          connection_options.merge! no_attributes: true
-          response = RemoteResource::Request.new(self, :get, { id: id }, connection_options).perform
-          build_resource_from_response response
+          response = RemoteResource::Request.new(self, :get, { id: id }, connection_options.merge(no_attributes: true)).perform
+          build_resource_from_response(response)
         end
 
         def find_by(params, connection_options = {})
           response = RemoteResource::Request.new(self, :get, params, connection_options).perform
-          build_resource_from_response response
+          build_resource_from_response(response)
         end
 
         def all(connection_options = {})
-          connection_options.merge! collection: true
-          response = RemoteResource::Request.new(self, :get, {}, connection_options).perform
-          build_collection_from_response response
+          response = RemoteResource::Request.new(self, :get, {}, connection_options.merge(collection: true)).perform
+          build_collection_from_response(response)
         end
 
         def where(params, connection_options = {})
-          connection_options.merge! collection: true
-          response = RemoteResource::Request.new(self, :get, params, connection_options).perform
-          build_collection_from_response response
+          response = RemoteResource::Request.new(self, :get, params, connection_options.merge(collection: true)).perform
+          build_collection_from_response(response)
         end
       end
 

data/lib/remote_resource/querying/persistence_methods.rb

@@ -6,9 +6,9 @@ module RemoteResource
       module ClassMethods
 
         def create(attributes = {}, connection_options = {})
-          resource = new attributes
+          resource = new(attributes)
           response = RemoteResource::Request.new(self, :post, attributes, connection_options).perform
-          resource.handle_response response
+          resource.handle_response(response)
         end
 
         def destroy(id, connection_options = {})
@@ -19,24 +19,23 @@ module RemoteResource
       end
 
       def update_attributes(attributes = {}, connection_options = {})
-        rebuild_resource attributes
-        attributes.reverse_merge! id: id
-        create_or_update attributes, connection_options
+        rebuild_resource(attributes)
+        create_or_update(attributes.reverse_merge(id: id), connection_options)
         success? ? self : false
       end
 
       def save(connection_options = {})
-        create_or_update self.attributes, connection_options
+        create_or_update(self.attributes, connection_options)
         success? ? self : false
       end
 
       def create_or_update(attributes = {}, connection_options = {})
-        if attributes.has_key? :id
+        if attributes.has_key?(:id)
           response = RemoteResource::Request.new(self, :patch, attributes, connection_options).perform
         else
           response = RemoteResource::Request.new(self, :post, attributes, connection_options).perform
         end
-        handle_response response
+        handle_response(response)
       end
 
       def destroy(connection_options = {})

data/lib/remote_resource/request.rb

@@ -17,12 +17,11 @@ module RemoteResource
     end
 
     def connection_options
-      @connection_options.reverse_merge! threaded_connection_options
-      @connection_options.reverse_merge! resource.connection_options.to_hash
+      @connection_options.reverse_merge(threaded_connection_options).reverse_merge(resource.connection_options.to_hash)
     end
 
     def original_connection_options
-      @original_connection_options.reverse_merge! threaded_connection_options
+      @original_connection_options.reverse_merge(threaded_connection_options)
     end
 
     def perform

data/lib/remote_resource/version.rb

@@ -1,3 +1,3 @@
 module RemoteResource
-  VERSION = '0.4.10'
+  VERSION = '0.4.11'
 end

data/remote_resource.gemspec

@@ -23,6 +23,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.1'
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'webmock', '~> 1.24'
+  spec.add_development_dependency 'guard', '~> 2.14'
+  spec.add_development_dependency 'guard-rspec', '~> 4.7'
+  spec.add_development_dependency 'terminal-notifier-guard', '~> 1.6.1'
 
   spec.add_runtime_dependency 'activesupport', '~> 4.1'
   spec.add_runtime_dependency 'activemodel', '~> 4.1'

data/spec/lib/remote_resource/querying/finder_methods_spec.rb

@@ -36,6 +36,12 @@ describe RemoteResource::Querying::FinderMethods do
       dummy_class.find('12')
     end
 
+    it 'does NOT change the given connection_options' do
+      connection_options = { headers: { 'Foo' => 'Bar' } }
+
+      expect { dummy_class.find('12', connection_options) }.not_to change { connection_options }.from({ headers: { 'Foo' => 'Bar' } })
+    end
+
     context 'with extra params' do
       it 'performs a RemoteResource::Request with params' do
         stub_request(:get, 'https://foobar.com/finder_methods_dummy/12.json?skip_associations=true').to_return(status: 200, body: {}.to_json)
@@ -67,6 +73,12 @@ describe RemoteResource::Querying::FinderMethods do
       expect(dummy_class).to receive(:build_resource_from_response).with response
       dummy_class.find_by params
     end
+
+    it 'does NOT change the given connection_options' do
+      connection_options = { headers: { 'Foo' => 'Bar' } }
+
+      expect { dummy_class.find_by(params, connection_options) }.not_to change { connection_options }.from({ headers: { 'Foo' => 'Bar' } })
+    end
   end
 
   describe '.all' do
@@ -87,6 +99,12 @@ describe RemoteResource::Querying::FinderMethods do
       expect(dummy_class).to receive(:build_collection_from_response).with response
       dummy_class.all
     end
+
+    it 'does NOT change the given connection_options' do
+      connection_options = { headers: { 'Foo' => 'Bar' } }
+
+      expect { dummy_class.all(connection_options) }.not_to change { connection_options }.from({ headers: { 'Foo' => 'Bar' } })
+    end
   end
 
   describe '.where' do
@@ -110,6 +128,12 @@ describe RemoteResource::Querying::FinderMethods do
       expect(dummy_class).to receive(:build_collection_from_response).with response
       dummy_class.where params
     end
+
+    it 'does NOT change the given connection_options' do
+      connection_options = { headers: { 'Foo' => 'Bar' } }
+
+      expect { dummy_class.where(params, connection_options) }.not_to change { connection_options }.from({ headers: { 'Foo' => 'Bar' } })
+    end
   end
 
 end

data/spec/lib/remote_resource/querying/persistence_methods_spec.rb

@@ -44,6 +44,16 @@ describe RemoteResource::Querying::PersistenceMethods do
       expect_any_instance_of(dummy_class).to receive(:handle_response).with response
       dummy_class.create attributes
     end
+
+    it 'does NOT change the given attributes' do
+      expect { dummy_class.create(attributes) }.not_to change { attributes }.from({ name: 'Mies' })
+    end
+
+    it 'does NOT change the given connection_options' do
+      connection_options = { headers: { 'Foo' => 'Bar' } }
+
+      expect { dummy_class.create(attributes, connection_options) }.not_to change { connection_options }.from({ headers: { 'Foo' => 'Bar' } })
+    end
   end
 
   describe '.destroy' do
@@ -70,6 +80,12 @@ describe RemoteResource::Querying::PersistenceMethods do
       dummy_class.destroy('15')
     end
 
+    it 'does NOT change the given connection_options' do
+      connection_options = { headers: { 'Foo' => 'Bar' } }
+
+      expect { dummy_class.destroy('15', connection_options) }.not_to change { connection_options }.from({ headers: { 'Foo' => 'Bar' } })
+    end
+
     context 'request' do
       let(:response) { { status: 200, body: '' } }
       before { allow_any_instance_of(RemoteResource::Request).to receive(:perform).and_call_original }
@@ -112,6 +128,16 @@ describe RemoteResource::Querying::PersistenceMethods do
         expect(dummy).to receive(:create_or_update).with(attributes, {})
         dummy.update_attributes attributes
       end
+
+      it 'does NOT change the given attributes' do
+        expect { dummy.update_attributes(attributes) }.not_to change { attributes }.from({ id: 14, name: 'Noot' })
+      end
+
+      it 'does NOT change the given connection_options' do
+        connection_options = { headers: { 'Foo' => 'Bar' } }
+
+        expect { dummy.update_attributes(attributes, connection_options) }.not_to change { connection_options }.from({ headers: { 'Foo' => 'Bar' } })
+      end
     end
 
     context 'when the id is NOT given in the attributes' do
@@ -119,6 +145,16 @@ describe RemoteResource::Querying::PersistenceMethods do
         expect(dummy).to receive(:create_or_update).with(attributes.merge(id: dummy.id), {})
         dummy.update_attributes attributes
       end
+
+      it 'does NOT change the given attributes' do
+        expect { dummy.update_attributes(attributes) }.not_to change { attributes }.from({ name: 'Noot' })
+      end
+
+      it 'does NOT change the given connection_options' do
+        connection_options = { headers: { 'Foo' => 'Bar' } }
+
+        expect { dummy.update_attributes(attributes, connection_options) }.not_to change { connection_options }.from({ headers: { 'Foo' => 'Bar' } })
+      end
     end
 
     context 'when the save was successful' do
@@ -151,6 +187,12 @@ describe RemoteResource::Querying::PersistenceMethods do
       dummy.save
     end
 
+    it 'does NOT change the given connection_options' do
+      connection_options = { headers: { 'Foo' => 'Bar' } }
+
+      expect { dummy.save(connection_options) }.not_to change { connection_options }.from({ headers: { 'Foo' => 'Bar' } })
+    end
+
     context 'when the save was successful' do
       it 'returns the resource' do
         allow(dummy).to receive(:success?) { true }
@@ -191,6 +233,16 @@ describe RemoteResource::Querying::PersistenceMethods do
         expect(dummy).to receive(:handle_response).with response
         dummy.create_or_update attributes
       end
+
+      it 'does NOT change the given attributes' do
+        expect { dummy.create_or_update(attributes) }.not_to change { attributes }.from({ id: 10, name: 'Kees' })
+      end
+
+      it 'does NOT change the given connection_options' do
+        connection_options = { headers: { 'Foo' => 'Bar' } }
+
+        expect { dummy.create_or_update(attributes, connection_options) }.not_to change { connection_options }.from({ headers: { 'Foo' => 'Bar' } })
+      end
     end
 
     context 'when the attributes do NOT contain an id' do
@@ -208,6 +260,16 @@ describe RemoteResource::Querying::PersistenceMethods do
         expect(dummy).to receive(:handle_response).with response
         dummy.create_or_update attributes
       end
+
+      it 'does NOT change the given attributes' do
+        expect { dummy.create_or_update(attributes) }.not_to change { attributes }.from({ name: 'Mies' })
+      end
+
+      it 'does NOT change the given connection_options' do
+        connection_options = { headers: { 'Foo' => 'Bar' } }
+
+        expect { dummy.create_or_update(attributes, connection_options) }.not_to change { connection_options }.from({ headers: { 'Foo' => 'Bar' } })
+      end
     end
   end
 
@@ -233,6 +295,12 @@ describe RemoteResource::Querying::PersistenceMethods do
       dummy.destroy
     end
 
+    it 'does NOT change the given connection_options' do
+      connection_options = { headers: { 'Foo' => 'Bar' } }
+
+      expect { dummy.destroy(connection_options) }.not_to change { connection_options }.from({ headers: { 'Foo' => 'Bar' } })
+    end
+
     context 'request' do
       let(:response) { { status: 200, body: '' } }
       before { allow_any_instance_of(RemoteResource::Request).to receive(:perform).and_call_original }

data/spec/lib/remote_resource/version_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe RemoteResource::VERSION do
 
-  it { should eql '0.4.10' }
+  it { should eql '0.4.11' }
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddy_remote_resource
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Jan van der Pas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.24'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier-guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -196,6 +238,7 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -252,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: RemoteResource, a gem to use resources with REST services.