lhs 2.2.2 → 3.0.0

data/lib/lhs/proxy.rb

@@ -17,8 +17,8 @@ class LHS::Proxy
 
   def reload!
     fail 'No href found' unless _data.href
-    service = _data._root._service
-    data = service.request(url: _data.href, method: :get)
+    record = _data._root._record_class
+    data = record.request(url: _data.href, method: :get)
     _data.merge_raw!(data)
     self._loaded = true
     self

data/lib/lhs/record.rb

@@ -0,0 +1,42 @@
+Dir[File.dirname(__FILE__) + '/concerns/record/*.rb'].each {|file| require file }
+
+class LHS::Record
+  include All
+  include Batch
+  include Create
+  include Endpoints
+  include Find
+  include FindBy
+  include First
+  include Mapping
+  include Model
+  include Includes
+  include Request
+  include Where
+
+  def initialize(data = nil)
+    data = LHS::Data.new({}, nil, self.class) unless data
+    data = LHS::Data.new(data, nil, self.class) unless data.is_a?(LHS::Data)
+    define_singleton_method(:_data) { data }
+    if data._proxy.is_a?(LHS::Item) and data._raw.is_a?(Hash)
+      data._raw.each { |k, v| instance_variable_set("@#{k}", v) }
+    elsif data._proxy.is_a? LHS::Collection
+      instance_variable_set('@collection', data._collection.raw)
+    end
+  end
+
+  def self.build(data = nil)
+    self.new(data)
+  end
+
+  protected
+
+  def method_missing(name, *args, &block)
+    _data.send(name, *args, &block)
+  end
+
+  def respond_to_missing?(name, include_all = false)
+    (_data.root_item? && _data._root._record_class.instance_methods.include?(name)) ||
+    _data._proxy.respond_to?(name, include_all)
+  end
+end

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "2.2.2"
+  VERSION = "3.0.0"
 end

data/spec/collection/meta_data_spec.rb

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

data/spec/collection/without_object_items_spec.rb

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

data/spec/data/item_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe LHS::Data do
 
   before(:each) do
-    class SomeService < LHS::Service
+    class Record < LHS::Record
       endpoint ':datastore/v2/:campaign_id/feedbacks'
       endpoint ':datastore/v2/feedbacks'
     end
@@ -14,7 +14,7 @@ describe LHS::Data do
   end
 
   let(:data) do
-    LHS::Data.new(json, nil, SomeService)
+    LHS::Data.new(json, nil, Record)
   end
 
   let(:item) do
@@ -41,16 +41,4 @@ describe LHS::Data do
       expect(item.valid_from).to be_kind_of Date
     end
   end
-
-  context 'different date time formats' do
-    let(:item) do
-      item = data[0]
-      item._raw[:created_date] = '2016-07-09T13:45:00+00:00'
-      item
-    end
-
-    it 'returns TimeWithZone if string can be parsed as date_time' do
-      expect(item.created_date).to be_kind_of ActiveSupport::TimeWithZone
-    end
-  end
 end

data/spec/data/merge_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe LHS::Data do
 
   before(:each) do
-    class SomeService < LHS::Service
+    class Record < LHS::Record
       endpoint ':datastore/v2/:campaign_id/feedbacks'
       endpoint ':datastore/v2/feedbacks'
     end
@@ -12,14 +12,14 @@ describe LHS::Data do
   let(:data) do
     LHS::Data.new({
       href: 'http://www.local.ch/v2/stuff'
-    }, nil, SomeService)
+    }, nil, Record)
   end
 
   let(:loaded_data) do
     LHS::Data.new({
       href: 'http://www.local.ch/v2/stuff',
       id: '123123123'
-    }, nil, SomeService)
+    }, nil, Record)
   end
 
   context 'merging' do

data/spec/data/raw_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe LHS::Data do
 
   before(:each) do
-    class SomeService < LHS::Service
+    class Record < LHS::Record
       endpoint ':datastore/v2/entries/:entry_id/content-ads/:campaign_id/feedbacks'
       endpoint ':datastore/v2/:campaign_id/feedbacks'
       endpoint ':datastore/v2/feedbacks'

data/spec/data/respond_to_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe LHS::Data do
 
   before(:each) do
-    class SomeService < LHS::Service
+    class Record < LHS::Record
       map :test_mapping?, ->(item){ true }
     end
   end
@@ -11,14 +11,14 @@ describe LHS::Data do
   context '#respond_to?' do
 
     it 'it is true for mappings that are defined' do
-      data = described_class.new({'campaign' => {'id' => 123}}, nil, SomeService)
+      data = described_class.new({'campaign' => {'id' => 123}}, nil, Record)
 
       expect(data.respond_to?(:test_mapping?)).to be(true)
     end
 
     # proxy for this example is LHC::Collection which implements total
     it 'it is true for calls forwarded to proxy' do
-      data = described_class.new({'items' => [{'campaign' => {'id' => 123}}]}, nil, SomeService)
+      data = described_class.new({'items' => [{'campaign' => {'id' => 123}}]}, nil, Record)
 
       expect(data.respond_to?(:total)).to be(true)
     end

data/spec/data/root_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe LHS::Data do
 
   before(:each) do
-    class SomeService < LHS::Service
+    class Record < LHS::Record
       endpoint ':datastore/v2/entries/:entry_id/content-ads/:campaign_id/feedbacks'
       endpoint ':datastore/v2/:campaign_id/feedbacks'
       endpoint ':datastore/v2/feedbacks'
@@ -13,7 +13,7 @@ describe LHS::Data do
   context 'root' do
 
     it 'is navigateable from nested data' do
-      root = LHS::Data.new({'items' => [{'campaign' => {'id' => 123}}]}, nil, SomeService)
+      root = LHS::Data.new({'items' => [{'campaign' => {'id' => 123}}]}, nil, Record)
       child = root.first
       leafe = child.campaign
       expect(leafe._root).to eq root

data/spec/data/to_json_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe LHS::Data do
 
   before(:each) do
-    class SomeService < LHS::Service
+    class Record < LHS::Record
       endpoint ':datastore/v2/:campaign_id/feedbacks'
       endpoint ':datastore/v2/feedbacks'
     end
@@ -14,7 +14,7 @@ describe LHS::Data do
   end
 
   let(:collection) do
-    LHS::Data.new(json, nil, SomeService)
+    LHS::Data.new(json, nil, Record)
   end
 
   let(:item) do

data/spec/endpoint/for_url_spec.rb

@@ -5,7 +5,7 @@ describe LHS::Endpoint do
   context 'for url' do
 
     before(:each) do
-      class SomeService < LHS::Service
+      class Record < LHS::Record
         endpoint ':datastore/entries/:entry_id/content-ads/:campaign_id/feedbacks'
         endpoint ':datastore/:campaign_id/feedbacks'
         endpoint ':datastore/feedbacks'

data/spec/item/delegate_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe LHS::Item do
 
   before(:each) do
-    class SomeService < LHS::Service
+    class Record < LHS::Record
       endpoint ':datastore/v2/:campaign_id/feedbacks'
       endpoint ':datastore/v2/feedbacks'
     end
@@ -14,7 +14,7 @@ describe LHS::Item do
   end
 
   let(:data) do
-    LHS::Data.new(json, nil, SomeService)
+    LHS::Data.new(json, nil, Record)
   end
 
   let(:item) do

data/spec/item/destroy_spec.rb

@@ -4,7 +4,7 @@ describe LHS::Item do
 
   before(:each) do
     LHC.config.placeholder('datastore', datastore)
-    class SomeService < LHS::Service
+    class Record < LHS::Record
       endpoint ':datastore/v2/:campaign_id/feedbacks'
       endpoint ':datastore/v2/feedbacks'
     end
@@ -19,7 +19,7 @@ describe LHS::Item do
   end
 
   let(:data) do
-    LHS::Data.new(json, nil, SomeService)
+    LHS::Data.new(json, nil, Record)
   end
 
   let(:item) do
@@ -43,7 +43,7 @@ describe LHS::Item do
 
     context 'includes and empty response' do
       before(:each) do
-        class AnotherService < LHS::Service
+        class AnotherRecord < LHS::Record
           endpoint ':datastore/v2/:campaign_id/restaurants'
         end
       end
@@ -56,7 +56,7 @@ describe LHS::Item do
           .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 = Record.includes(:restaurant).find(1)
         item.destroy
       end
     end

data/spec/item/errors_spec.rb

@@ -42,7 +42,7 @@ describe LHS::Item do
 
   before(:each) do
     LHC.config.placeholder(:datastore, datastore)
-    class SomeService < LHS::Service
+    class Record < LHS::Record
       endpoint ':datastore/:campaign_id/feedbacks'
       endpoint ':datastore/feedbacks'
     end
@@ -53,7 +53,7 @@ describe LHS::Item do
     it 'parses fields correctly when creation failed' do
       stub_request(:post, "#{datastore}/feedbacks")
         .to_return(status: 400, body: error_format_fields.to_json)
-      record = SomeService.build
+      record = Record.build
       record.name = 'Steve'
       result = record.save
       expect(result).to eq false
@@ -68,7 +68,7 @@ describe LHS::Item do
     it 'parses field errors correctly when creation failed' do
       stub_request(:post, "#{datastore}/feedbacks")
         .to_return(status: 400, body: error_format_field_errors.to_json)
-      record = SomeService.build
+      record = Record.build
       record.name = 'Steve'
       result = record.save
       expect(result).to eq false
@@ -85,7 +85,7 @@ describe LHS::Item do
     it 'provides access to raw error data' do
       stub_request(:post, "#{datastore}/feedbacks")
         .to_return(status: 400, body: error_format_field_errors.to_json)
-      record = SomeService.build
+      record = Record.build
       record.save
       expect(record.errors.raw).to be
       json = JSON.parse(record.errors.raw)

data/spec/item/getter_spec.rb

@@ -3,14 +3,14 @@ require 'rails_helper'
 describe LHS::Item do
 
   before(:each) do
-    class SomeService < LHS::Service
+    class Record < LHS::Record
       endpoint ':datastore/v2/:campaign_id/feedbacks'
       endpoint ':datastore/v2/feedbacks'
     end
   end
 
   let(:data) do
-    LHS::Data.new({addresses: [{business: {identities: [{name: 'Löwenzorn'}]}}]}, nil, SomeService)
+    LHS::Data.new({addresses: [{business: {identities: [{name: 'Löwenzorn'}]}}]}, nil, Record)
   end
 
   context 'item getter' do

data/spec/item/internal_data_structure_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe LHS::Item do
 
   before(:each) do
-    class Feedback < LHS::Service
+    class Feedback < LHS::Record
       endpoint ':datastore/v2/feedbacks'
       endpoint ':datastore/v2/feedbacks/:id'
     end

data/spec/item/save_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe LHS::Item do
 
   before(:each) do
-    class SomeService < LHS::Service
+    class Record < LHS::Record
       endpoint ':datastore/v2/:campaign_id/feedbacks'
       endpoint ':datastore/v2/feedbacks'
     end
@@ -14,7 +14,7 @@ describe LHS::Item do
   end
 
   let(:data) do
-    LHS::Data.new(json, nil, SomeService)
+    LHS::Data.new(json, nil, Record)
   end
 
   let(:item) do
@@ -24,8 +24,7 @@ describe LHS::Item do
   context 'save' do
 
     it 'persists changes on the backend' do
-      stub_request(:post, item.href)
-      .with(body: item._raw.merge(name: 'Steve').to_json)
+      stub_request(:post, item.href).with(body: item._raw.merge(name: 'Steve').to_json)
       item.name = 'Steve'
       expect(item.save).to eq true
     end

data/spec/item/setter_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe LHS::Item do
 
   before(:each) do
-    class SomeService < LHS::Service
+    class Record < LHS::Record
       endpoint ':datastore/v2/:campaign_id/feedbacks'
       endpoint ':datastore/v2/feedbacks'
     end
@@ -14,7 +14,7 @@ describe LHS::Item do
   end
 
   let(:data) do
-    LHS::Data.new(json, nil, SomeService)
+    LHS::Data.new(json, nil, Record)
   end
 
   let(:item) do

data/spec/item/update_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe LHS::Item do
 
   before(:each) do
-    class SomeService < LHS::Service
+    class Record < LHS::Record
       endpoint ':datastore/v2/:campaign_id/feedbacks'
       endpoint ':datastore/v2/feedbacks'
     end
@@ -14,7 +14,7 @@ describe LHS::Item do
   end
 
   let(:data) do
-    LHS::Data.new(json, nil, SomeService)
+    LHS::Data.new(json, nil, Record)
   end
 
   let(:item) do

data/spec/item/validation_spec.rb

@@ -4,112 +4,84 @@ describe LHS::Item do
 
   let(:datastore) { 'http://local.ch' }
 
-  let(:validation_parameter) { 'persist' }
+  before(:each) do
+    LHC.config.placeholder('datastore', datastore)
+    class User < LHS::Record
+      endpoint ':datastore/v2/users', validates: true
+    end
+    mock_validation
+  end
 
   let(:mock_validation) do
       successful_validation
     end
 
   let(:successful_validation) do
-    stub_request(:post, "#{datastore}/v2/users?#{validation_parameter}=false").to_return(body: '{}')
+    stub_request(:post, "#{datastore}/v2/users?persist=false").to_return(body: '{}')
   end
 
-  before(:each) do
-    mock_validation
+  let(:failing_validation) do
+    stub_request(:post, "#{datastore}/v2/users?persist=false")
+      .to_return(status: 400,
+        body: {
+          field_errors: [{code: "UNSUPPORTED_PROPERTY_VALUE", "path" => [ "email" ]}] 
+        }.to_json
+      )
   end
 
-  context 'custom validation parameter' do
-
-    let(:validation_parameter) { 'publish' }
-
+  context 'valid data' do
     let(:user) do
       User.build(email: 'steve@local.ch')
     end
 
-    before(:each) do
-      LHC.config.placeholder('datastore', datastore)
-      class User < LHS::Service
-        endpoint ':datastore/v2/users', validates: 'publish'
-      end
-    end
-
     it 'validates' do
       expect(user.valid?).to eq true
     end
 
+    it 'turns to be invalid if validating on changed, invalid data' do
+      expect(user.valid?).to eq true
+      user.email = 'not a valid email'
+      failing_validation
+      expect(user.valid?).to eq false
+      expect(user.errors[:email]).to be
+    end
   end
 
-  context 'default parameter' do
+  context 'invalid data' do
 
-    before(:each) do
-      LHC.config.placeholder('datastore', datastore)
-      class User < LHS::Service
-        endpoint ':datastore/v2/users', validates: true
-      end
+    let(:user) do
+      User.build(email: 'im not an email address')
     end
 
-    let(:failing_validation) do
-      stub_request(:post, "#{datastore}/v2/users?persist=false")
-        .to_return(status: 400,
-                   body: {
-                     field_errors: [{ code: "UNSUPPORTED_PROPERTY_VALUE", "path" => ["email"] }]
-                   }.to_json
-                  )
+    let(:mock_validation) do
+      failing_validation
     end
 
-    context 'valid data' do
-      let(:user) do
-        User.build(email: 'steve@local.ch')
-      end
-
-      it 'validates' do
-        expect(user.valid?).to eq true
-      end
-
-      it 'turns to be invalid if validating on changed, invalid data' do
-        expect(user.valid?).to eq true
-        user.email = 'not a valid email'
-        failing_validation
-        expect(user.valid?).to eq false
-        expect(user.errors[:email]).to be
-      end
+    it 'does not validate and provides error messages' do
+      expect(user.valid?).to eq false
+      expect(user.errors[:email]).to be
     end
 
-    context 'invalid data' do
-      let(:user) do
-        User.build(email: 'im not an email address')
-      end
-
-      let(:mock_validation) do
-        failing_validation
-      end
-
-      it 'does not validate and provides error messages' do
-        expect(user.valid?).to eq false
-        expect(user.errors[:email]).to be
-      end
-
-      it 'resets errors when revalidating' do
-        expect(user.valid?).to eq false
-        user.email = 'steve@local.ch'
-        successful_validation
-        expect(user.valid?).to eq true
-        expect(user.errors).to be_nil
-      end
+    it 'resets errors when revalidating' do
+      expect(user.valid?).to eq false
+      user.email = 'steve@local.ch'
+      successful_validation
+      expect(user.valid?).to eq true
+      expect(user.errors).to be_nil
     end
+  end
 
-    context 'endpoint does not support validations' do
-      before(:each) do
-        class Favorite < LHS::Service
-          endpoint ':datastore/v2/favorites'
-        end
+  context 'endpoint does not support validations' do
+    before(:each) do
+      class Favorite < LHS::Record
+        endpoint ':datastore/v2/favorites'
       end
+    end
 
-      it 'fails when trying to use an endpoint for validations that does not support it' do
-        expect(lambda {
-          Favorite.build.valid?
-        }).to raise_error('Endpoint does not support validations!')
-      end
+    it 'fails when trying to use an endpoint for validations that does not support it' do
+      expect(->{
+        Favorite.build.valid?
+      }).to raise_error('Endpoint does not support validations!')
     end
   end
 end