lhs 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79706509847d5e009bdc036cd616b804d88c6dfa
-  data.tar.gz: 2530ee6f7e347584cba1ec46c51ff13291307950
+  metadata.gz: 8d19aca4a6fcb6ae3919253eb5dfc56dd15b9dee
+  data.tar.gz: 923b15da62737dd1dd0b1f1fa9b326eba4401da9
 SHA512:
-  metadata.gz: dbdb3f1be6fb3412a94f08f1bf55661b660ff7d0587a88b2f8704fce74ccdac57aaca9618d9bff8fd3cf8b34aec1b768b4fa25b6caa8ae30cc778b5912147b7b
-  data.tar.gz: 63ef7d714318e13a90507512bd7a8be1e2bc4122931e2acc3bfc262142d9fb0b5ea3d9ebdfa414f2c96788a7635e241754e48deb63049da3e9da4f3a0af3ff1e
+  metadata.gz: 96cc284a37e9107fbb5eb86ca6baae8fa97cf23cef4db5dea91b78331d5ee145d03d2d27c8da555eb231ecb6b12595630bf9c10884b768f0c6a3a778db4818c2
+  data.tar.gz: e99b4c5f0d0f49b99e852e7439515b361c7d566d2bc8a1991d0f96d7fae3aeacd9c5883e180f57e12ad5ac6f6533c8827b56e11f59817502715a00e5debc4d0d

data/lib/lhs/collection.rb

@@ -55,6 +55,7 @@ class LHS::Collection < LHS::Proxy
     include Enumerable
 
     attr_accessor :raw
+    delegate :last, :sample, :[], :present?, :blank?, :empty?, to: :raw
 
     def initialize(raw, parent, service)
       self.raw = raw
@@ -71,9 +72,5 @@ class LHS::Collection < LHS::Proxy
         end
       end
     end
-
-    delegate :last, to: :raw
-    delegate :sample, to: :raw
-    delegate :[], to: :raw
   end
 end

data/lib/lhs/concerns/service/request.rb

@@ -54,6 +54,7 @@ class LHS::Service
     end
 
     def handle_include(data, key)
+      return unless data.present?
       options = if data._proxy.is_a? LHS::Collection
         options_for_multiple(data, key)
       else

data/lib/lhs/item.rb

@@ -8,6 +8,8 @@ class LHS::Item < LHS::Proxy
   include Save
   include Update
 
+  delegate :present?, :blank?, :empty?, to: :_raw
+
   # prevent clashing with attributes of underlying data
   attr_accessor :errors
 

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/spec/collection/delegate_spec.rb

@@ -0,0 +1,21 @@
+require 'rails_helper'
+
+describe LHS::Collection do
+
+  let(:data) {
+    ['ROLE_USER', 'ROLE_LOCALCH_ACCOUNT']
+  }
+
+  let(:collection){
+    described_class.new(LHS::Data.new(data))
+  }
+
+  context 'delegates methods to raw' do
+
+    %w(present? blank? empty?).each do |method|
+      it "delegates #{method} to raw" do
+        expect(collection.send(method.to_sym)).not_to be_nil
+      end
+    end
+  end
+end

data/spec/item/delegate_spec.rb

@@ -0,0 +1,32 @@
+require 'rails_helper'
+
+describe LHS::Item do
+
+  before(:each) do
+    class SomeService < LHS::Service
+      endpoint ':datastore/v2/:campaign_id/feedbacks'
+      endpoint ':datastore/v2/feedbacks'
+    end
+  end
+
+  let(:json) do
+    load_json(:feedbacks)
+  end
+
+  let(:data) do
+    LHS::Data.new(json, nil, SomeService)
+  end
+
+  let(:item) do
+    data[0]
+  end
+
+  context 'delegates methods to raw' do
+
+    %w(present? blank? empty?).each do |method|
+      it "delegates #{method} to raw" do
+        expect(item.send(method.to_sym)).not_to be_nil
+      end
+    end
+  end
+end

data/spec/item/destroy_spec.rb

@@ -3,12 +3,17 @@ require 'rails_helper'
 describe LHS::Item do
 
   before(:each) do
+    LHC.config.placeholder('datastore', datastore)
     class SomeService < LHS::Service
       endpoint ':datastore/v2/:campaign_id/feedbacks'
       endpoint ':datastore/v2/feedbacks'
     end
   end
 
+  let(:datastore) do
+    'http://datastore-stg.lb-service.sunrise.intra.local.ch'
+  end
+
   let(:json) do
     load_json(:feedbacks)
   end
@@ -24,16 +29,36 @@ describe LHS::Item do
   context 'destroy' do
 
     it 'destroys the item on the backend' do
-      stub_request(:delete, 'http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/feedbacks/0sdaetZ-OWVg4oBiBJ-7IQ')
+      stub_request(:delete, "#{datastore}/v2/feedbacks/0sdaetZ-OWVg4oBiBJ-7IQ")
       .to_return(status: 200)
       expect(item.destroy._raw).to eq item._raw
     end
 
     it 'updates the request information on the item' do
       no_content = 204
-      stub_request(:delete, 'http://datastore-stg.lb-service.sunrise.intra.local.ch/v2/feedbacks/0sdaetZ-OWVg4oBiBJ-7IQ')
-      .to_return(status: no_content)
+      stub_request(:delete, "#{datastore}/v2/feedbacks/0sdaetZ-OWVg4oBiBJ-7IQ")
+        .to_return(status: no_content)
       expect(item.destroy._request.response.code).to eq no_content
     end
+
+    context 'includes and empty response' do
+      before(:each) do
+        class AnotherService < LHS::Service
+          endpoint ':datastore/v2/:campaign_id/restaurants'
+        end
+      end
+
+      it 'destroys an item even though it includes additonal services and an empty response body' do
+        stub_request(:delete, "#{datastore}/v2/feedbacks/1")
+          .to_return(status: 204, body: '')
+        data = { href: "#{datastore}/v2/feedbacks/1", restaurant: {href: "#{datastore}/v2/restaurants/1"} }
+        stub_request(:get, "#{datastore}/v2/feedbacks?id=1")
+          .to_return(status: 200, body: data.to_json)
+        stub_request(:get, "#{datastore}/v2/restaurants/1")
+          .to_return(status: 200, body: {name: 'Casa Ferlin'}.to_json)
+        item = SomeService.includes(:restaurant).find(1)
+        item.destroy
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - local.ch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
@@ -156,6 +156,7 @@ files:
 - lib/lhs/version.rb
 - script/ci/build.sh
 - spec/.DS_Store
+- spec/collection/delegate_spec.rb
 - spec/collection/meta_data_spec.rb
 - spec/collection/respond_to_spec.rb
 - spec/collection/without_object_items_spec.rb
@@ -206,6 +207,7 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/endpoint/for_url_spec.rb
+- spec/item/delegate_spec.rb
 - spec/item/destroy_spec.rb
 - spec/item/getter_spec.rb
 - spec/item/respond_to_spec.rb
@@ -265,6 +267,7 @@ signing_key:
 specification_version: 4
 summary: LocalHttpServices
 test_files:
+- spec/collection/delegate_spec.rb
 - spec/collection/meta_data_spec.rb
 - spec/collection/respond_to_spec.rb
 - spec/collection/without_object_items_spec.rb
@@ -315,6 +318,7 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/endpoint/for_url_spec.rb
+- spec/item/delegate_spec.rb
 - spec/item/destroy_spec.rb
 - spec/item/getter_spec.rb
 - spec/item/respond_to_spec.rb