lhs 2.2.2 → 3.0.0

data/spec/{service → record}/first_spec.rb

@@ -1,12 +1,12 @@
 require 'rails_helper'
 
-describe LHS::Service do
+describe LHS::Record do
 
   let(:datastore) { 'http://local.ch/v2' }
 
   before(:each) do
     LHC.config.placeholder(:datastore, datastore)
-    class SomeService < LHS::Service
+    class Record < LHS::Record
       endpoint ':datastore/content-ads/:campaign_id/feedbacks'
       endpoint ':datastore/feedbacks'
     end
@@ -17,14 +17,15 @@ describe LHS::Service do
     it 'finds a single record' do
       stub_request(:get, "#{datastore}/feedbacks?limit=1")
         .to_return(status: 200, body: load_json(:feedback))
-
-      SomeService.first.source_id
+      record = Record.first
+      expect(record).to be_kind_of Record
+      expect(record.source_id).to be
     end
 
     it 'returns nil if no record was found' do
       stub_request(:get, "#{datastore}/feedbacks?limit=1")
         .to_return(status: 404)
-      expect(SomeService.first).to be_nil
+      expect(Record.first).to be_nil
     end
   end
 
@@ -33,7 +34,7 @@ describe LHS::Service do
     it 'raises if nothing was found with parameters' do
       stub_request(:get, "#{datastore}/feedbacks?limit=1")
         .to_return(status: 404)
-      expect { SomeService.first! }.to raise_error LHC::NotFound
+      expect { Record.first! }.to raise_error LHC::NotFound
     end
   end
 end

data/spec/{service → record}/includes_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe LHS::Service do
+describe LHS::Record do
 
   let(:datastore) { 'http://local.ch/v2' }
   before(:each) { LHC.config.placeholder('datastore', datastore) }
@@ -26,15 +26,15 @@ describe LHS::Service do
 
   context 'singlelevel includes' do
     before(:each) do
-      class LocalEntry < LHS::Service
+      class LocalEntry < LHS::Record
         endpoint ':datastore/local-entries'
         endpoint ':datastore/local-entries/:id'
       end
-      class User < LHS::Service
+      class User < LHS::Record
         endpoint ':datastore/users'
         endpoint ':datastore/users/:id'
       end
-      class Favorite < LHS::Service
+      class Favorite < LHS::Record
         endpoint ':datastore/favorites'
         endpoint ':datastore/favorites/:id'
       end
@@ -70,7 +70,7 @@ describe LHS::Service do
   context 'multilevel includes' do
 
     before(:each) do
-      class Feedback < LHS::Service
+      class Feedback < LHS::Record
         endpoint ':datastore/feedbacks'
         endpoint ':datastore/feedbacks/:id'
       end
@@ -152,7 +152,7 @@ describe LHS::Service do
       end
 
       before(:each) do
-        class Entry < LHS::Service
+        class Entry < LHS::Record
           endpoint ':datastore/local-entries/:id'
         end
         class SomeInterceptor < LHC::Interceptor; end
@@ -175,7 +175,7 @@ describe LHS::Service do
   context 'links pointing to nowhere' do
 
     it 'sets nil for links that cannot be included' do
-      class Feedback < LHS::Service
+      class Feedback < LHS::Record
         endpoint ':datastore/feedbacks'
         endpoint ':datastore/feedbacks/:id'
       end

data/spec/{service → record}/mapping_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe LHS::Service do
+describe LHS::Record do
 
   context 'mapping' do
 
@@ -8,46 +8,54 @@ describe LHS::Service do
 
     before(:each) do
       LHC.config.placeholder('datastore', datastore)
-      class LocalEntry < LHS::Service
+      class LocalEntry < LHS::Record
         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, ->{ addresses.first.business.identities.first.name }
+      class LocalEntry < LHS::Record
+        def name
+          addresses.first.business.identities.first.name
+        end
       end
       stub_request(:get, "#{datastore}/local-entries/1")
-      .to_return(status: 200, body: {addresses: [{business: {identities: [{name: 'Löwenzorn'}]}}]}.to_json)
+        .to_return(status: 200, body: {addresses: [{business: {identities: [{name: 'Löwenzorn'}]}}]}.to_json)
       entry = LocalEntry.find(1)
       expect(entry.name).to eq 'Löwenzorn'
     end
 
     it 'maps for root_item even if that item is nested in a root collection' do
-      class LocalEntry < LHS::Service
-        map :name, ->{ addresses.first.business.identities.first.name }
+      class LocalEntry < LHS::Record
+        def name
+          addresses.first.business.identities.first.name
+        end
       end
       stub_request(:get, "#{datastore}/local-entries/1?limit=1")
-      .to_return(status: 200, body: {items: [{addresses: [{business: {identities: [{name: 'Löwenzorn'}]}}]}]}.to_json)
+        .to_return(status: 200, body: {items: [{addresses: [{business: {identities: [{name: 'Löwenzorn'}]}}]}]}.to_json)
       entry = LocalEntry.find_by(id: 1)
       expect(entry.name).to eq 'Löwenzorn'
     end
 
     it 'return data proxy in case of item or collection' do
-      class LocalEntry < LHS::Service
-        map :business, ->{ addresses.first.business }
+      class LocalEntry < LHS::Record
+        def business
+          addresses.first.business
+        end
       end
       stub_request(:get, "#{datastore}/local-entries/1")
-      .to_return(status: 200, body: {addresses: [{business: {identities: [{name: 'Löwenzorn'}]}}]}.to_json)
+        .to_return(status: 200, body: {addresses: [{business: {identities: [{name: 'Löwenzorn'}]}}]}.to_json)
       entry = LocalEntry.find(1)
       expect(entry.business).to be_kind_of LHS::Data
     end
 
     it 'clones mappings when using include' do
-      class Agb < LHS::Service
+      class Agb < LHS::Record
         endpoint ":datastore/agbs/active?agb_type=CC_TOU"
-        map :pdf_url, -> { self['binary_url_pdf_de'] }
+        def pdf_url
+          self['binary_url_pdf_de']
+        end
       end
 
       preceding_agb_url = "#{datastore}/agbs/547f0b461c266c4830ea6cea"
@@ -71,10 +79,12 @@ describe LHS::Service do
     end
 
     it 'makes mappings available even for nested data' do
-      class LocalEntry < LHS::Service
-        map :name, ->{ company_name }
+      class LocalEntry < LHS::Record
+        def name
+          company_name
+        end
       end
-      class Favorite < LHS::Service
+      class Favorite < LHS::Record
         endpoint ':datastore/favorites'
         endpoint ':datastore/favorites/:id'
       end
@@ -84,6 +94,7 @@ describe LHS::Service do
         .to_return(body: {local_entry: {href: "#{datastore}/local-entries/1"}}.to_json)
 
       favorite = Favorite.includes(:local_entry).find(1)
+      expect(favorite.local_entry).to be_kind_of LocalEntry
       expect(favorite.local_entry.name).to eq 'local.ch'
     end
   end

data/spec/{service → record}/model_name_spec.rb

@@ -1,11 +1,11 @@
 require 'rails_helper'
 
-describe LHS::Service do
+describe LHS::Record do
 
   context 'model_name' do
 
     before(:each) do
-      class LocalEntry < LHS::Service
+      class LocalEntry < LHS::Record
         endpoint ':datastore/local-entries'
       end
     end

data/spec/{service → record}/new_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe LHS::Service do
+describe LHS::Record do
 
   context 'new' do
 
@@ -8,7 +8,7 @@ describe LHS::Service do
 
     before(:each) do
       LHC.config.placeholder('datastore', datastore)
-      class Feedback < LHS::Service
+      class Feedback < LHS::Record
         endpoint ':datastore/content-ads/:campaign_id/feedbacks'
         endpoint ':datastore/feedbacks'
       end
@@ -16,9 +16,10 @@ describe LHS::Service do
 
     it 'builds a new item from scratch (like build)' do
       feedback = Feedback.new recommended: true
+      expect(feedback).to be_kind_of Feedback
       expect(feedback.recommended).to eq true
       stub_request(:post, "http://local.ch/v2/feedbacks")
-      .with(body: "{\"recommended\":true}")
+        .with(body: "{\"recommended\":true}")
       feedback.save
     end
   end

data/spec/{service → record}/request_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe LHS::Service do
+describe LHS::Record do
 
   context 'url pattern' do
 
@@ -8,7 +8,7 @@ describe LHS::Service do
 
     before(:each) do
       LHC.config.placeholder(:datastore, datastore)
-      class SomeService < LHS::Service
+      class Record < LHS::Record
         endpoint ':datastore/content-ads/:campaign_id/feedbacks'
         endpoint ':datastore/feedbacks'
       end
@@ -16,7 +16,7 @@ describe LHS::Service do
 
     it 'is using params as query params explicitly when provided in params namespace' do
       stub_request(:get, "#{datastore}/content-ads/123/feedbacks?campaign_id=456").to_return(status: 200)
-      SomeService.where(campaign_id: 123, params: { campaign_id: '456' })
+      records = Record.where(campaign_id: 123, params: { campaign_id: '456' })
     end
   end
 end

data/spec/record/where_spec.rb

@@ -0,0 +1,34 @@
+require 'rails_helper'
+
+describe LHS::Record do
+
+  let(:datastore) do
+    'http://datastore/v2'
+  end
+
+  before(:each) do
+    LHC.config.placeholder('datastore', datastore)
+    class Record < LHS::Record
+      endpoint ':datastore/content-ads/:campaign_id/feedbacks'
+      endpoint ':datastore/feedbacks'
+    end
+  end
+
+  context 'where' do
+
+    it 'is querying relevant endpoint when using where' do
+      stub_request(:get, "#{datastore}/feedbacks?has_review=true").to_return(status: 200, body: {items: []}.to_json)
+      Record.where(has_review: true)
+      stub_request(:get, "#{datastore}/content-ads/123/feedbacks?has_review=true").to_return(status: 200, body: [].to_json)
+      Record.where(campaign_id: '123', has_review: true)
+      stub_request(:get, "#{datastore}/feedbacks").to_return(status: 200, body: [].to_json)
+      records = Record.where
+      expect(records).to be_kind_of Record
+    end
+
+    it 'is using params as query params explicitly when provided in params namespace' do
+      stub_request(:get, "#{datastore}/content-ads/123/feedbacks?campaign_id=456").to_return(status: 200, body: [].to_json)
+      Record.where(campaign_id: '123', params: { campaign_id: '456' })
+    end
+  end
+end

data/spec/support/cleanup_endpoints.rb

@@ -1,6 +1,6 @@
 RSpec.configure do |config|
 
   config.before(:each) do
-    LHS::Service::Endpoints.all = {}
+    LHS::Record::Endpoints.all = {}
   end
 end

data/spec/support/{cleanup_services.rb → cleanup_records.rb}

@@ -1,4 +1,4 @@
-class LHS::Service
+class LHS::Record
 
   CHILDREN = []
 
@@ -13,7 +13,7 @@ end
 RSpec.configure do |config|
 
   config.before(:each) do
-    LHS::Service::CHILDREN.each do |child|
+    LHS::Record::CHILDREN.each do |child|
       child.endpoints = [] if !child.name['LHS']
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 3.0.0
 platform: ruby
 authors:
-- local.ch
+- https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
@@ -108,7 +108,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Rails gem providing an easy interface to use http services here at local
+description: Rails gem providing an easy, active-record-like interface to use http
+  backend services
 email:
 - ws-operations@local.ch
 executables: []
@@ -122,14 +123,8 @@ files:
 - cider-ci.yml
 - cider-ci/contexts/rspec.yml
 - cider-ci/jobs/tests.yml
-- docs/collections.md
-- docs/data.md
 - docs/examples/claim_no_include.json
 - docs/examples/claim_with_include.json
-- docs/items.md
-- docs/service.jpg
-- docs/service.pdf
-- docs/services.md
 - lhs.gemspec
 - lib/lhs.rb
 - lib/lhs/collection.rb
@@ -138,25 +133,24 @@ files:
 - lib/lhs/concerns/item/save.rb
 - lib/lhs/concerns/item/update.rb
 - lib/lhs/concerns/item/validation.rb
-- lib/lhs/concerns/service/all.rb
-- lib/lhs/concerns/service/batch.rb
-- lib/lhs/concerns/service/build.rb
-- lib/lhs/concerns/service/create.rb
-- lib/lhs/concerns/service/endpoints.rb
-- lib/lhs/concerns/service/find.rb
-- lib/lhs/concerns/service/find_by.rb
-- lib/lhs/concerns/service/first.rb
-- lib/lhs/concerns/service/includes.rb
-- lib/lhs/concerns/service/mapping.rb
-- lib/lhs/concerns/service/model.rb
-- lib/lhs/concerns/service/request.rb
-- lib/lhs/concerns/service/where.rb
+- lib/lhs/concerns/record/all.rb
+- lib/lhs/concerns/record/batch.rb
+- lib/lhs/concerns/record/create.rb
+- lib/lhs/concerns/record/endpoints.rb
+- lib/lhs/concerns/record/find.rb
+- lib/lhs/concerns/record/find_by.rb
+- lib/lhs/concerns/record/first.rb
+- lib/lhs/concerns/record/includes.rb
+- lib/lhs/concerns/record/mapping.rb
+- lib/lhs/concerns/record/model.rb
+- lib/lhs/concerns/record/request.rb
+- lib/lhs/concerns/record/where.rb
 - lib/lhs/data.rb
 - lib/lhs/endpoint.rb
 - lib/lhs/errors.rb
 - lib/lhs/item.rb
 - lib/lhs/proxy.rb
-- lib/lhs/service.rb
+- lib/lhs/record.rb
 - lib/lhs/version.rb
 - script/ci/build.sh
 - spec/.DS_Store
@@ -168,13 +162,11 @@ files:
 - spec/data/collection_spec.rb
 - spec/data/item_spec.rb
 - spec/data/merge_spec.rb
-- spec/data/pagination_spec.rb
 - spec/data/raw_spec.rb
 - spec/data/respond_to_spec.rb
 - spec/data/root_spec.rb
 - spec/data/select_spec.rb
 - spec/data/to_json_spec.rb
-- spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/.keep
 - spec/dummy/app/assets/javascripts/application.js
@@ -226,28 +218,29 @@ files:
 - spec/item/validation_spec.rb
 - spec/proxy/load_spec.rb
 - spec/rails_helper.rb
-- spec/service/all_spec.rb
-- spec/service/build_spec.rb
-- spec/service/create_spec.rb
-- spec/service/creation_failed_spec.rb
-- spec/service/endpoint_misconfiguration_spec.rb
-- spec/service/endpoint_options_spec.rb
-- spec/service/endpoints_spec.rb
-- spec/service/find_by_spec.rb
-- spec/service/find_each_spec.rb
-- spec/service/find_in_batches_spec.rb
-- spec/service/find_spec.rb
-- spec/service/first_spec.rb
-- spec/service/includes_spec.rb
-- spec/service/mapping_spec.rb
-- spec/service/model_name_spec.rb
-- spec/service/new_spec.rb
-- spec/service/request_spec.rb
-- spec/service/where_spec.rb
+- spec/record/all_spec.rb
+- spec/record/build_spec.rb
+- spec/record/create_spec.rb
+- spec/record/creation_failed_spec.rb
+- spec/record/definitions_spec.rb
+- spec/record/endpoint_misconfiguration_spec.rb
+- spec/record/endpoint_options_spec.rb
+- spec/record/endpoints_spec.rb
+- spec/record/find_by_spec.rb
+- spec/record/find_each_spec.rb
+- spec/record/find_in_batches_spec.rb
+- spec/record/find_spec.rb
+- spec/record/first_spec.rb
+- spec/record/includes_spec.rb
+- spec/record/mapping_spec.rb
+- spec/record/model_name_spec.rb
+- spec/record/new_spec.rb
+- spec/record/request_spec.rb
+- spec/record/where_spec.rb
 - spec/spec_helper.rb
 - spec/support/cleanup_configuration.rb
 - spec/support/cleanup_endpoints.rb
-- spec/support/cleanup_services.rb
+- spec/support/cleanup_records.rb
 - spec/support/fixtures/json/feedback.json
 - spec/support/fixtures/json/feedbacks.json
 - spec/support/fixtures/json/localina_content_ad.json
@@ -275,7 +268,8 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: LocalHttpServices
+summary: Rails gem providing an easy, active-record-like interface to use http backend
+  services
 test_files:
 - spec/collection/delegate_spec.rb
 - spec/collection/enumerable_spec.rb
@@ -285,13 +279,11 @@ test_files:
 - spec/data/collection_spec.rb
 - spec/data/item_spec.rb
 - spec/data/merge_spec.rb
-- spec/data/pagination_spec.rb
 - spec/data/raw_spec.rb
 - spec/data/respond_to_spec.rb
 - spec/data/root_spec.rb
 - spec/data/select_spec.rb
 - spec/data/to_json_spec.rb
-- spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/.keep
 - spec/dummy/app/assets/javascripts/application.js
@@ -343,28 +335,29 @@ test_files:
 - spec/item/validation_spec.rb
 - spec/proxy/load_spec.rb
 - spec/rails_helper.rb
-- spec/service/all_spec.rb
-- spec/service/build_spec.rb
-- spec/service/create_spec.rb
-- spec/service/creation_failed_spec.rb
-- spec/service/endpoint_misconfiguration_spec.rb
-- spec/service/endpoint_options_spec.rb
-- spec/service/endpoints_spec.rb
-- spec/service/find_by_spec.rb
-- spec/service/find_each_spec.rb
-- spec/service/find_in_batches_spec.rb
-- spec/service/find_spec.rb
-- spec/service/first_spec.rb
-- spec/service/includes_spec.rb
-- spec/service/mapping_spec.rb
-- spec/service/model_name_spec.rb
-- spec/service/new_spec.rb
-- spec/service/request_spec.rb
-- spec/service/where_spec.rb
+- spec/record/all_spec.rb
+- spec/record/build_spec.rb
+- spec/record/create_spec.rb
+- spec/record/creation_failed_spec.rb
+- spec/record/definitions_spec.rb
+- spec/record/endpoint_misconfiguration_spec.rb
+- spec/record/endpoint_options_spec.rb
+- spec/record/endpoints_spec.rb
+- spec/record/find_by_spec.rb
+- spec/record/find_each_spec.rb
+- spec/record/find_in_batches_spec.rb
+- spec/record/find_spec.rb
+- spec/record/first_spec.rb
+- spec/record/includes_spec.rb
+- spec/record/mapping_spec.rb
+- spec/record/model_name_spec.rb
+- spec/record/new_spec.rb
+- spec/record/request_spec.rb
+- spec/record/where_spec.rb
 - spec/spec_helper.rb
 - spec/support/cleanup_configuration.rb
 - spec/support/cleanup_endpoints.rb
-- spec/support/cleanup_services.rb
+- spec/support/cleanup_records.rb
 - spec/support/fixtures/json/feedback.json
 - spec/support/fixtures/json/feedbacks.json
 - spec/support/fixtures/json/localina_content_ad.json