lhs 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ff25a42028f674f80afd08d6a152b42bf61b08b
-  data.tar.gz: c123d197b870914fcb564ba2ce152293105c81c9
+  metadata.gz: 40403e2ae293ace8b6504d10b3f25ed4696b3fc4
+  data.tar.gz: 5cb53fbd0fb4742d5b4a0ddf70313b56f9c67de9
 SHA512:
-  metadata.gz: 333cf3687bde474f71b5fcda3ffae1b375ce565fd9c7341888d5fd810d07ae51a137b1b34eb0b31b6d40f5e5d16b94e2330020327df605f3771f3a35224f2bbc
-  data.tar.gz: b43d5f519fa79472617485bbfe21bdc757d97b38ba49b17d2e1d485562f5821e4968d66dd371a3ea5d81a67ae6d071d9610d3d0f14053ff37c378459596918bf
+  metadata.gz: 5ad6899b426c29d006b48f3fa7d3cada987a55a7311c8c7d7ab8a2dc38ebeb661b2f359d01a6b9c92dddfb438568cb35cbdce6bbef5aa537b9d7a4d8ce298b08
+  data.tar.gz: 3e540dccae57014ded112e0237a330ede9fcd4e91e9f702eef735edf3f9fde93d7fa1ddb735941b08af84f7cd80041db25e48262eea4fc8a6cc580c746dc1c95

data/docs/services.md

@@ -18,7 +18,9 @@ You can also add request options for an endpoint (see following example).
 class Feedback < LHS::Service
 
   endpoint ':datastore/v2/content-ads/:campaign_id/feedbacks'
+  endpoint ':datastore/v2/content-ads/:campaign_id/feedbacks/:id'
   endpoint ':datastore/v2/feedbacks', cache: true, cache_expires_in: 1.day
+  endpoint ':datastore/v2/feedbacks/:id', cache: true, cache_expires_in: 1.day
 
 end
 ```
@@ -215,7 +217,7 @@ To influence how data is accessed/provied, you can use mapping to either map dee
 class LocalEntry < LHS::Service
   endpoint ':datastore/v2/local-entries'
 
-  map :name, ->(entry){ entry.addresses.first.business.identities.first.name }
+  map :name, ->{ addresses.first.business.identities.first.name }
 
 end
 ```

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

@@ -57,7 +57,6 @@ class LHS::Service
     def compute_url!(params)
       endpoint = find_endpoint(params)
       url = endpoint.compile(params)
-      url +=  "/#{params.delete(:id)}" if params && params[:id]
       endpoint.remove_interpolated_params!(params)
       url
     end

data/lib/lhs/data.rb

@@ -39,7 +39,7 @@ class LHS::Data
   # or forward to proxy
   def method_missing(name, *args, &block)
     if root_item? && mapping = _root._service.instance.mapping[name]
-      mapping.call(self)
+      self.instance_exec(&mapping)
     else
       _proxy.send(name, *args, &block)
     end

data/lib/lhs/version.rb

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

data/spec/collection/meta_data_spec.rb

@@ -31,9 +31,11 @@ describe LHS::Collection do
     LHC.config.placeholder('datastore', datastore)
     class Feedback < LHS::Service
       endpoint ':datastore/feedbacks'
+      endpoint ':datastore/feedbacks/:id'
     end
     class User < LHS::Service
       endpoint ':datastore/users'
+      endpoint ':datastore/users/:id'
     end
   end
 

data/spec/collection/without_object_items_spec.rb

@@ -7,7 +7,7 @@ describe LHS::Collection do
   before(:each) do
     LHC.config.placeholder('datastore', datastore)
     class Account < LHS::Service
-      endpoint ':datastore/accounts'
+      endpoint ':datastore/accounts/:id'
     end
   end
 

data/spec/service/endpoint_options_spec.rb

@@ -6,7 +6,7 @@ describe LHS::Service do
 
     before(:each) do
       class SomeService < LHS::Service
-        endpoint 'backend/v2/feedbacks', cache_expires_in: 1.day, retry: 2, cache: true
+        endpoint 'backend/v2/feedbacks/:id', cache_expires_in: 1.day, retry: 2, cache: true
       end
     end
 

data/spec/service/endpoints_spec.rb

@@ -43,6 +43,21 @@ describe LHS::Service do
       ).to eq ':datastore/feedbacks'
     end
 
+    context 'compute url from endpoint' do
+
+      before(:each) do
+        class Feedback < LHS::Service
+          endpoint ':datastore/feedbacks'
+          endpoint ':datastore/feedbacks/:id'
+        end
+      end
+
+      it 'computes urls WITHOUT handling id separate' do
+        stub_request(:get, "#{datastore}/feedbacks/1").to_return(status: 200)
+        Feedback.find(1)
+      end
+    end
+
     context 'unsorted endpoints' do
 
       before(:each) do

data/spec/service/find_by_spec.rb

@@ -7,7 +7,9 @@ describe LHS::Service do
     LHC.config.placeholder(:datastore, datastore)
     class SomeService < LHS::Service
       endpoint ':datastore/content-ads/:campaign_id/feedbacks'
+      endpoint ':datastore/content-ads/:campaign_id/feedbacks/:id'
       endpoint ':datastore/feedbacks'
+      endpoint ':datastore/feedbacks/:id'
     end
   end
 

data/spec/service/find_spec.rb

@@ -8,7 +8,9 @@ describe LHS::Service do
     LHC.config.placeholder(:datastore, datastore)
     class SomeService < LHS::Service
       endpoint ':datastore/content-ads/:campaign_id/feedbacks'
+      endpoint ':datastore/content-ads/:campaign_id/feedbacks/:id'
       endpoint ':datastore/feedbacks'
+      endpoint ':datastore/feedbacks/:id'
     end
   end
 

data/spec/service/includes_spec.rb

@@ -23,6 +23,7 @@ describe LHS::Service do
     before(:each) do
       class Feedback < LHS::Service
         endpoint ':datastore/feedbacks'
+        endpoint ':datastore/feedbacks/:id'
       end
       stub_campaign_request
       stub_entry_request

data/spec/service/mapping_spec.rb

@@ -10,12 +10,13 @@ describe LHS::Service do
       LHC.config.placeholder('datastore', datastore)
       class LocalEntry < LHS::Service
         endpoint ':datastore/local-entries'
+        endpoint ':datastore/local-entries/:id'
       end
     end
 
     it 'maps some attr accessors to another target (proxy)' do
       class LocalEntry < LHS::Service
-        map :name, ->(entry){ entry.addresses.first.business.identities.first.name }
+        map :name, ->{ addresses.first.business.identities.first.name }
       end
       stub_request(:get, "#{datastore}/local-entries/1")
       .to_return(status: 200, body: {addresses: [{business: {identities: [{name: 'Löwenzorn'}]}}]}.to_json)
@@ -25,7 +26,7 @@ describe LHS::Service do
 
     it 'maps for root_item even if that item is nested in a root collection' do
       class LocalEntry < LHS::Service
-        map :name, ->(entry){ entry.addresses.first.business.identities.first.name }
+        map :name, ->{ addresses.first.business.identities.first.name }
       end
       stub_request(:get, "#{datastore}/local-entries/1?limit=1")
       .to_return(status: 200, body: {items: [{addresses: [{business: {identities: [{name: 'Löwenzorn'}]}}]}]}.to_json)
@@ -35,7 +36,7 @@ describe LHS::Service do
 
     it 'return data proxy in case of item or collection' do
       class LocalEntry < LHS::Service
-        map :business, ->(entry){ entry.addresses.first.business }
+        map :business, ->{ addresses.first.business }
       end
       stub_request(:get, "#{datastore}/local-entries/1")
       .to_return(status: 200, body: {addresses: [{business: {identities: [{name: 'Löwenzorn'}]}}]}.to_json)
@@ -46,7 +47,7 @@ describe LHS::Service do
     it 'clones mappings when using include' do
       class Agb < LHS::Service
         endpoint ":datastore/agbs/active?agb_type=CC_TOU"
-        map :pdf_url, ->(agb) { agb['binary_url_pdf_de'] }
+        map :pdf_url, -> { self['binary_url_pdf_de'] }
       end
 
       preceding_agb_url = "#{datastore}/agbs/547f0b461c266c4830ea6cea"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - local.ch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc