lhs 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40403e2ae293ace8b6504d10b3f25ed4696b3fc4
-  data.tar.gz: 5cb53fbd0fb4742d5b4a0ddf70313b56f9c67de9
+  metadata.gz: edf3d097348d9c26b700bfe35df2d41b43052109
+  data.tar.gz: 6b2130406f136714241764b4e9c8c6a418896d3b
 SHA512:
-  metadata.gz: 5ad6899b426c29d006b48f3fa7d3cada987a55a7311c8c7d7ab8a2dc38ebeb661b2f359d01a6b9c92dddfb438568cb35cbdce6bbef5aa537b9d7a4d8ce298b08
-  data.tar.gz: 3e540dccae57014ded112e0237a330ede9fcd4e91e9f702eef735edf3f9fde93d7fa1ddb735941b08af84f7cd80041db25e48262eea4fc8a6cc580c746dc1c95
+  metadata.gz: 41c472f8a71fb9f3c7a9f79ed32363754b87cbeb0f7903d3f9e3bd54ed5011056f07b208b233bf8927308e0c5d79422f59eb9c785bb8b3b8af1f91db673d5664
+  data.tar.gz: b875a7965529984e842668f6a92cf6b96b54929db5c8de38f6ceb5a6aa04eba94491046f0add8acb5750d06c97022fe440d5b9e07d8c24bfbfed1c0376fdf960

data/docs/services.md

@@ -221,3 +221,23 @@ class LocalEntry < LHS::Service
 
 end
 ```
+
+### Known services when accessing mapped data from nested data
+
+As LHS detects services from available service definitions as soon as a link is present, mappings will also be applied on nested data:
+
+```
+class Place < LHS::Service
+  endpoint ':datastore/v2/places'
+
+  map :name, ->{ addresses.first.business.identities.first.name }
+
+end
+
+class Favorite < LHS::Service
+  endpoint ':datastore/v2/favorites'
+end
+
+favorite = Favorite.includes(:place).find(1)
+favorite.place.name # local.ch AG
+```

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

@@ -24,6 +24,7 @@ class LHS::Service
       end
 
       def for_url(url)
+        return unless url
         template, service = LHS::Service::Endpoints.all.detect do |template, _service|
           LHC::Endpoint.match?(url, template)
         end

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

@@ -17,7 +17,7 @@ class LHS::Service
 
     # Convert URLs in options to endpoint templates
     def convert_options_to_endpoints(options)
-      if options.respond_to?(:map)
+      if options.is_a?(Array)
         options.map { |option| convert_option_to_endpoints(option) }
       else
         convert_option_to_endpoints(options)

data/lib/lhs/data.rb

@@ -38,7 +38,7 @@ class LHS::Data
   # Use existing mapping to provide data
   # or forward to proxy
   def method_missing(name, *args, &block)
-    if root_item? && mapping = _root._service.instance.mapping[name]
+    if mapping = mapping_for(name)
       self.instance_exec(&mapping)
     else
       _proxy.send(name, *args, &block)
@@ -57,6 +57,13 @@ class LHS::Data
       input.is_a?(Array) || _raw.is_a?(Array)
   end
 
+  def mapping_for(name)
+    service_instance = LHS::Service.for_url(_raw['href']) if _raw.is_a?(Hash)
+    service_instance ||= _root._service.instance if root_item?
+    return unless service_instance
+    service_instance.mapping[name]
+  end
+
   def root_item
     return if self._proxy.class != LHS::Item
     root = root_item = self

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/service/includes_spec.rb

@@ -18,7 +18,29 @@ describe LHS::Service do
       .to_return(body: { 'name' => 'Casa Ferlin' }.to_json)
   end
 
-  context 'includes' do
+  context 'singlelevel includes' do
+    before(:each) do
+     class LocalEntry < LHS::Service
+        endpoint ':datastore/local-entries'
+        endpoint ':datastore/local-entries/:id'
+      end
+      class Favorite < LHS::Service
+        endpoint ':datastore/favorites'
+        endpoint ':datastore/favorites/:id'
+      end
+      stub_request(:get, "#{datastore}/local-entries/1")
+        .to_return(body: {company_name: 'local.ch'}.to_json)
+      stub_request(:get, "#{datastore}/favorites/1")
+        .to_return(body: {local_entry: {href: "#{datastore}/local-entries/1"}}.to_json)
+    end
+
+    it 'does single level includes' do
+      favorite = Favorite.includes(:local_entry).find(1)
+      expect(favorite.local_entry.company_name).to eq 'local.ch'
+    end
+  end
+
+  context 'multilevel includes' do
 
     before(:each) do
       class Feedback < LHS::Service

data/spec/service/mapping_spec.rb

@@ -69,5 +69,22 @@ describe LHS::Service do
       agb = Agb.includes(:preceding_agb).first!
       expect(agb.pdf_url).to be == 'de'
     end
+
+    it 'makes mappings available even for nested data' do
+      class LocalEntry < LHS::Service
+        map :name, ->{ company_name }
+      end
+      class Favorite < LHS::Service
+        endpoint ':datastore/favorites'
+        endpoint ':datastore/favorites/:id'
+      end
+      stub_request(:get, "#{datastore}/local-entries/1")
+        .to_return(body: {company_name: 'local.ch'}.to_json)
+      stub_request(:get, "#{datastore}/favorites/1")
+        .to_return(body: {local_entry: {href: "#{datastore}/local-entries/1"}}.to_json)
+
+      favorite = Favorite.includes(:local_entry).find(1)
+      expect(favorite.local_entry.name).to eq 'local.ch'
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - local.ch