lhs 2.2.2 → 3.0.0

data/lib/lhs/concerns/item/update.rb

@@ -14,9 +14,9 @@ class LHS::Item < LHS::Proxy
     end
 
     def update!(params)
-      service = _data._root._service
+      record = _data._root._record_class
       _data.merge_raw!(LHS::Data.new(params))
-      response_data = service.request(
+      response_data = record.request(
         method: :post,
         url: href,
         body: _data.to_json,

data/lib/lhs/concerns/item/validation.rb

@@ -8,11 +8,10 @@ class LHS::Item < LHS::Proxy
     def valid?
       self.errors = nil
       fail 'No validation endpoint found!' unless validation_endpoint
-      service = LHS::Service.for_url(validation_endpoint.url)
-      validation_params = validation_endpoint.options[:validates] == true ? { persist: false } : { validation_endpoint.options[:validates] => false }
-      params = validation_endpoint.options.fetch(:params, {}).merge(validation_params)
+      record = LHS::Record.for_url(validation_endpoint.url)
+      params = validation_endpoint.options.fetch(:params, {}).merge(persist: false)
       begin
-        service.request(
+        record.request(
           url: validation_endpoint.url,
           method: :post,
           params: params,
@@ -30,7 +29,7 @@ class LHS::Item < LHS::Proxy
     private
 
     def validation_endpoint
-      endpoint = _data._service.find_endpoint(_data._raw)
+      endpoint = _data._record_class.find_endpoint(_data._raw)
       endpoint ||= LHS::Endpoint.for_url(_data.href) if _data.href
       validates = endpoint.options && endpoint.options.fetch(:validates, false)
       fail 'Endpoint does not support validations!' unless validates

data/lib/lhs/concerns/{service → record}/all.rb

@@ -1,6 +1,6 @@
 require 'active_support'
 
-class LHS::Service
+class LHS::Record
 
   module All
     extend ActiveSupport::Concern
@@ -26,7 +26,7 @@ class LHS::Service
             all.concat request(params: params.merge(limit: limit, offset: offset))._raw[:items]
           end
         end
-        LHS::Data.new(all, nil, self)
+        data._record_class.new(LHS::Data.new(all, nil, self))
       end
     end
   end

data/lib/lhs/concerns/{service → record}/batch.rb

@@ -1,6 +1,6 @@
 require 'active_support'
 
-class LHS::Service
+class LHS::Record
 
   module Batch
     extend ActiveSupport::Concern
@@ -12,7 +12,7 @@ class LHS::Service
         find_in_batches(options) do |data|
           data.each do |record|
             item = LHS::Item.new(LHS::Data.new(record, data, self))
-            yield LHS::Data.new(item, data, self)
+            yield self.new(LHS::Data.new(item, data, self))
           end
         end
       end
@@ -27,7 +27,7 @@ class LHS::Service
           data = request(params: params.merge(limit: batch_size, offset: start))
           batch_size = data._raw[:limit]
           left = data._raw[:total].to_i - data._raw[:offset].to_i - data._raw[:limit].to_i
-          yield data
+          yield self.new(data)
           break if left <= 0
           start += batch_size
         end

data/lib/lhs/concerns/{service → record}/create.rb

@@ -1,6 +1,6 @@
 require 'active_support'
 
-class LHS::Service
+class LHS::Record
 
   module Create
     extend ActiveSupport::Concern
@@ -14,12 +14,13 @@ class LHS::Service
           data = LHS::Data.new(json, nil, self, e.response.request)
           item = LHS::Item.new(data)
           item.errors = LHS::Errors.new(e.response)
-          LHS::Data.new(item, data)
+          data._record_class.new(LHS::Data.new(item, data))
       end
 
       def create!(data = {})
         url = compute_url!(data)
-        request(url: url, method: :post, body: data.to_json, headers: {'Content-Type' => 'application/json'})
+        data = request(url: url, method: :post, body: data.to_json, headers: {'Content-Type' => 'application/json'})
+        data._record_class.new(data)
       end
     end
   end

data/lib/lhs/concerns/{service → record}/endpoints.rb

@@ -1,9 +1,9 @@
 require 'active_support'
 
-class LHS::Service
+class LHS::Record
 
   # An endpoint is an url that leads to a backend resource.
-  # A service can contain multiple endpoints.
+  # A record can contain multiple endpoints.
   # The endpoint that is used to request data is choosen
   # based on the provided parameters.
   module Endpoints
@@ -26,16 +26,16 @@ class LHS::Service
         endpoint = LHC::Endpoint.new(url, options)
         sanity_check(endpoint)
         endpoints.push(endpoint)
-        LHS::Service::Endpoints.all ||= {}
-        LHS::Service::Endpoints.all[url] = self
+        LHS::Record::Endpoints.all ||= {}
+        LHS::Record::Endpoints.all[url] = self
       end
 
       def for_url(url)
         return unless url
-        template, service = LHS::Service::Endpoints.all.detect do |template, _service|
+        template, record = LHS::Record::Endpoints.all.detect do |template, _record_class|
           LHC::Endpoint.match?(url, template)
         end
-        service
+        record
       end
 
       # Find an endpoint based on the provided parameters.

data/lib/lhs/concerns/{service → record}/find.rb

@@ -1,6 +1,6 @@
 require 'active_support'
 
-class LHS::Service
+class LHS::Record
 
   module Find
     extend ActiveSupport::Concern
@@ -9,11 +9,12 @@ class LHS::Service
 
       # Find a single uniqe record
       def find(args)
-        if args.is_a? Hash
+        data = if args.is_a? Hash
           find_with_parameters(args)
         else
           find_by_id(args)
         end
+        data._record_class.new(data)
       end
 
       private

data/lib/lhs/concerns/{service → record}/find_by.rb

@@ -1,6 +1,6 @@
 require 'active_support'
 
-class LHS::Service
+class LHS::Record
 
   module FindBy
     extend ActiveSupport::Concern
@@ -24,11 +24,12 @@ class LHS::Service
       def _find_by(params)
         params = params.dup.merge(limit: 1)
         data = request(params: params)
-        if data._proxy.is_a?(LHS::Collection)
+        data = if data._proxy.is_a?(LHS::Collection)
           data.first || fail(LHC::NotFound.new('No item was found.', data._request.response))
         else
           data
         end
+        data._record_class.new(data)
       end
     end
   end

data/lib/lhs/concerns/{service → record}/first.rb

@@ -1,6 +1,6 @@
 require 'active_support'
 
-class LHS::Service
+class LHS::Record
 
   module First
     extend ActiveSupport::Concern

data/lib/lhs/concerns/{service → record}/includes.rb

@@ -1,6 +1,6 @@
 require 'active_support'
 
-class LHS::Service
+class LHS::Record
 
   module Includes
     extend ActiveSupport::Concern
@@ -16,7 +16,9 @@ class LHS::Service
       end
 
       def includes(*args)
-        class_clone = clone
+        name = "#{self}#{args.object_id}"
+        constant = Object.const_set(name, self)
+        class_clone = constant
         class_clone.endpoints = endpoints
         class_clone.mapping = mapping
         class_clone.including = args.size == 1 ? args[0] : args

data/lib/lhs/concerns/{service → record}/mapping.rb

@@ -1,6 +1,6 @@
 require 'active_support'
 
-class LHS::Service
+class LHS::Record
 
   # Mapping allows to configure some accessors that access data using a provided proc
   module Mapping

data/lib/lhs/concerns/{service → record}/model.rb

@@ -1,7 +1,7 @@
 require 'active_support'
 require 'active_model'
 
-class LHS::Service
+class LHS::Record
 
   module Model
     extend ActiveSupport::Concern

data/lib/lhs/concerns/{service → record}/request.rb

@@ -1,6 +1,6 @@
 require 'active_support'
 
-class LHS::Service
+class LHS::Record
 
   module Request
     extend ActiveSupport::Concern
@@ -71,12 +71,12 @@ class LHS::Service
 
       # Load additional resources that are requested with include
       def load_include(options, data, sub_includes)
-        service = service_for_options(options) || self
-        options = convert_options_to_endpoints(options) if service_for_options(options)
+        record = record_for_options(options) || self
+        options = convert_options_to_endpoints(options) if record_for_options(options)
         begin
-          service.includes(sub_includes).request(options)
+          record.includes(sub_includes).request(options)
         rescue LHC::NotFound
-          LHS::Data.new({}, data, service)
+          LHS::Data.new({}, data, record)
         end
       end
 
@@ -116,17 +116,17 @@ class LHS::Service
         options
       end
 
-      def service_for_options(options)
-        services = []
+      def record_for_options(options)
+        records = []
         if options.is_a?(Array)
           options.each do |option|
-            next unless service = LHS::Service.for_url(option[:url])
-            services.push(service)
+            next unless record = LHS::Record.for_url(option[:url])
+            records.push(record)
           end
-          fail 'Found more than one service that could be used to do the request' if services.uniq.count > 1
-          services.uniq.first
+          fail 'Found more than one record that could be used to do the request' if records.uniq.count > 1
+          records.uniq.first
         else # Hash
-          LHS::Service.for_url(options[:url])
+          LHS::Record.for_url(options[:url])
         end
       end
 

data/lib/lhs/concerns/{service → record}/where.rb

@@ -1,6 +1,6 @@
 require 'active_support'
 
-class LHS::Service
+class LHS::Record
 
   module Where
     extend ActiveSupport::Concern
@@ -9,7 +9,8 @@ class LHS::Service
 
       # Used to query data from the service.
       def where(params = {})
-        request(params: params)
+        data = request(params: params)
+        data._record_class.new(data)
       end
     end
   end

data/lib/lhs/data.rb

@@ -6,12 +6,12 @@ class LHS::Data
   include Json
 
   # prevent clashing with attributes of underlying data
-  attr_accessor :_proxy, :_raw, :_parent, :_service, :_request
+  attr_accessor :_proxy, :_raw, :_parent, :_record_class, :_request
 
-  def initialize(input, parent = nil, service = nil, request = nil)
+  def initialize(input, parent = nil, record = nil, request = nil)
     self._raw = raw_from_input(input)
     self._proxy = proxy_from_input(input)
-    self._service = service
+    self._record_class = record
     self._parent = parent
     self._request = request
   end
@@ -30,7 +30,7 @@ class LHS::Data
   end
 
   def class
-    _root._service
+    _root._record_class
   end
 
   # enforce internal data structure to have deep symbolized keys
@@ -39,48 +39,18 @@ class LHS::Data
     @_raw = raw
   end
 
-  def current_page
-    offset + 1
-  end
-
-  def first_page
-    1
-  end
-
-  def last_page
-    total_pages
-  end
-
-  def prev_page
-    current_page - 1
-  end
-
-  def next_page
-    current_page + 1
-  end
-
-  def limit_value
-    limit
-  end
-
-  def total_pages
-    total / limit
+  def root_item?
+    root_item == self
   end
 
   protected
 
-  # Use existing mapping to provide data
-  # or forward to proxy
   def method_missing(name, *args, &block)
-    if mapping = mapping_for(name)
-      self.instance_exec(&mapping)
-    else
-      _proxy.send(name, *args, &block)
-    end
+    _proxy.send(name, *args, &block)
   end
 
   def respond_to_missing?(name, include_all = false)
-    (root_item? && _root._service.mapping.keys.map(&:to_s).include?(name.to_s)) ||
+    (root_item? && _root._record_class.instance_methods.include?(name)) ||
     _proxy.respond_to?(name, include_all)
   end
 
@@ -90,13 +60,6 @@ class LHS::Data
     !! (input.is_a?(Hash) && input[:items]) || input.is_a?(Array) || _raw.is_a?(Array)
   end
 
-  def mapping_for(name)
-    service = LHS::Service.for_url(_raw[:href]) if _raw.is_a?(Hash)
-    service ||= _root._service if root_item? && _root._service
-    return unless service
-    service.mapping[name]
-  end
-
   def root_item
     return if self._proxy.class != LHS::Item
     root = root_item = self
@@ -111,10 +74,6 @@ class LHS::Data
     root_item
   end
 
-  def root_item?
-    root_item == self
-  end
-
   def root?
     _root == self
   end
@@ -131,15 +90,28 @@ class LHS::Data
 
   def raw_from_input(input)
     if input.is_a?(String) && input.length > 0
-      JSON.parse(input).deep_symbolize_keys
+      raw_from_json_string(input)
     elsif defined?(input._raw)
       input._raw
     elsif defined?(input._data)
       input._data._raw
     else
-      input = input.to_hash if input.class != Hash && input.respond_to?(:to_hash)
-      input.deep_symbolize_keys! if input.is_a?(Hash)
-      input
+      raw_from_anything_else(input)
     end
   end
+
+  def raw_from_json_string(input)
+    json = JSON.parse(input)
+    if json.is_a?(Hash)
+      json.deep_symbolize_keys
+    else
+      json
+    end
+  end
+
+  def raw_from_anything_else(input)
+    input = input.to_hash if input.class != Hash && input.respond_to?(:to_hash)
+    input.deep_symbolize_keys! if input.is_a?(Hash)
+    input
+  end
 end

data/lib/lhs/endpoint.rb

@@ -2,10 +2,10 @@
 class LHS::Endpoint
   
   def self.for_url(url)
-    template, service = LHS::Service::Endpoints.all.detect do |template, _service|
+    template, record = LHS::Record::Endpoints.all.detect do |template, _record_class|
       LHC::Endpoint.match?(url, template)
     end
-    service.endpoints.detect { |endpoint| endpoint.url == template } if service
+    record.endpoints.detect { |endpoint| endpoint.url == template } if record
   end
 end
 

data/lib/lhs/item.rb

@@ -58,7 +58,13 @@ class LHS::Item < LHS::Proxy
   end
 
   def handle_hash(value)
-    LHS::Data.new(value, _data)
+    record = LHS::Record.for_url(value[:href]) if value[:href]
+    data = LHS::Data.new(value, _data)
+    if record
+      record.new(data)
+    else
+      data
+    end
   end
 
   def set(name, value)
@@ -81,6 +87,6 @@ class LHS::Item < LHS::Proxy
   end
 
   def date_time_regex
-    /(?<date>\d{4}-\d{2}-\d{2})?(?<time>T\d{2}:\d{2}:\d{2}(\.\d*.\d{2}:\d{2})*)?/
+    /(?<date>\d{4}-\d{2}-\d{2})?(?<time>T\d{2}:\d{2}:\d{2}\.\d*.\d{2}:\d{2})?/
   end
 end