lhs 3.0.0 → 3.0.1

data/lib/lhs/concerns/record/all.rb

@@ -6,7 +6,6 @@ class LHS::Record
     extend ActiveSupport::Concern
 
     module ClassMethods
-
       # Should be an edge case but sometimes all objects from a certain resource
       # are required. In this case we load the first page with the default max limit,
       # compute the amount of left over requests, do all the the left over requests
@@ -22,7 +21,7 @@ class LHS::Record
         if limit > 0
           requests = total_left / limit
           requests.times do |i|
-            offset = limit * (i+1) + 1
+            offset = limit * (i + 1) + 1
             all.concat request(params: params.merge(limit: limit, offset: offset))._raw[:items]
           end
         end

data/lib/lhs/concerns/record/batch.rb

@@ -6,13 +6,12 @@ class LHS::Record
     extend ActiveSupport::Concern
 
     module ClassMethods
-
       # Process single entries fetched in batches
       def find_each(options = {})
         find_in_batches(options) do |data|
           data.each do |record|
             item = LHS::Item.new(LHS::Data.new(record, data, self))
-            yield self.new(LHS::Data.new(item, data, self))
+            yield new(LHS::Data.new(item, data, self))
           end
         end
       end
@@ -27,7 +26,7 @@ class LHS::Record
           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 self.new(data)
+          yield new(data)
           break if left <= 0
           start += batch_size
         end

data/lib/lhs/concerns/record/create.rb

@@ -6,20 +6,19 @@ class LHS::Record
     extend ActiveSupport::Concern
 
     module ClassMethods
-
       def create(data = {})
         create!(data)
-        rescue LHC::Error => e
-          json = JSON.parse(data.to_json)
-          data = LHS::Data.new(json, nil, self, e.response.request)
-          item = LHS::Item.new(data)
-          item.errors = LHS::Errors.new(e.response)
-          data._record_class.new(LHS::Data.new(item, data))
+      rescue LHC::Error => e
+        json = JSON.parse(data.to_json)
+        data = LHS::Data.new(json, nil, self, e.response.request)
+        item = LHS::Item.new(data)
+        item.errors = LHS::Errors.new(e.response)
+        data._record_class.new(LHS::Data.new(item, data))
       end
 
       def create!(data = {})
         url = compute_url!(data)
-        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

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

@@ -12,7 +12,6 @@ class LHS::Record
     mattr_accessor :all
 
     module ClassMethods
-
       def endpoints
         @endpoints ||= []
       end
@@ -32,7 +31,7 @@ class LHS::Record
 
       def for_url(url)
         return unless url
-        template, record = LHS::Record::Endpoints.all.detect do |template, _record_class|
+        _template, record = LHS::Record::Endpoints.all.detect do |template, _record_class|
           LHC::Endpoint.match?(url, template)
         end
         record
@@ -75,7 +74,7 @@ class LHS::Record
 
       # Sort endpoints by number of placeholders, heighest first
       def sorted_endpoints
-        endpoints.sort{|a, b| b.placeholders.count <=> a.placeholders.count }
+        endpoints.sort { |a, b| b.placeholders.count <=> a.placeholders.count }
       end
 
       # Finds the base endpoint.

data/lib/lhs/concerns/record/find.rb

@@ -6,14 +6,14 @@ class LHS::Record
     extend ActiveSupport::Concern
 
     module ClassMethods
-
       # Find a single uniqe record
       def find(args)
-        data = if args.is_a? Hash
-          find_with_parameters(args)
-        else
-          find_by_id(args)
-        end
+        data =
+          if args.is_a? Hash
+            find_with_parameters(args)
+          else
+            find_by_id(args)
+          end
         data._record_class.new(data)
       end
 

data/lib/lhs/concerns/record/find_by.rb

@@ -6,12 +6,11 @@ class LHS::Record
     extend ActiveSupport::Concern
 
     module ClassMethods
-
       # Fetch some record by parameters
       def find_by(params = {})
         _find_by(params)
-        rescue LHC::NotFound
-          nil
+      rescue LHC::NotFound
+        nil
       end
 
       # Raise if no record was found
@@ -24,11 +23,12 @@ class LHS::Record
       def _find_by(params)
         params = params.dup.merge(limit: 1)
         data = request(params: params)
-        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 =
+          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

data/lib/lhs/concerns/record/first.rb

@@ -6,7 +6,6 @@ class LHS::Record
     extend ActiveSupport::Concern
 
     module ClassMethods
-
       def first
         find_by
       end

data/lib/lhs/concerns/record/includes.rb

@@ -6,7 +6,6 @@ class LHS::Record
     extend ActiveSupport::Concern
 
     module ClassMethods
-
       def including
         @including
       end

data/lib/lhs/concerns/record/mapping.rb

@@ -7,7 +7,6 @@ class LHS::Record
     extend ActiveSupport::Concern
 
     module ClassMethods
-      
       def mapping
         @mapping ||= {}
       end

data/lib/lhs/concerns/record/model.rb

@@ -7,7 +7,6 @@ class LHS::Record
     extend ActiveSupport::Concern
 
     module ClassMethods
-
       def model_name
         ActiveModel::Name.new(self)
       end

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

@@ -6,7 +6,6 @@ class LHS::Record
     extend ActiveSupport::Concern
 
     module ClassMethods
-
       def request(options)
         if options.is_a? Array
           multiple_requests(options)
@@ -29,7 +28,8 @@ class LHS::Record
       def convert_option_to_endpoints(option)
         new_options = option.dup
         url = option[:url]
-        return unless endpoint = LHS::Endpoint.for_url(url)
+        endpoint = LHS::Endpoint.for_url(url)
+        return unless endpoint
         template = endpoint.url
         new_options = new_options.merge(params: LHC::Endpoint.values_as_params(template, url))
         new_options[:url] = template
@@ -50,23 +50,26 @@ class LHS::Record
 
       def handle_includes(includes, data)
         if includes.is_a? Hash
-          includes.each { |_include, sub_includes| handle_include(_include, data, sub_includes) }
+          includes.each { |included, sub_includes| handle_include(included, data, sub_includes) }
         elsif includes.is_a? Array
-          includes.each { |_include| handle_includes(_include, data) }
+          includes.each { |included| handle_includes(included, data) }
         else
           handle_include(includes, data)
         end
       end
 
-      def handle_include(_include, data, sub_includes = nil)
+      def handle_include(included, data, sub_includes = nil)
         return unless data.present?
-        options = if data._proxy.is_a? LHS::Collection
-          options_for_multiple(data, _include)
-        else
-          url_option_for(data, _include)
-        end
+        options =
+          if data._proxy.is_a? LHS::Collection
+            options_for_multiple(data, included)
+            options_for_multiple(data, included)
+          else
+            url_option_for(data, included)
+            url_option_for(data, included)
+          end
         addition = load_include(options, data, sub_includes)
-        extend_raw_data(data, addition, _include)
+        extend_raw_data(data, addition, included)
       end
 
       # Load additional resources that are requested with include
@@ -89,9 +92,9 @@ class LHS::Record
       end
 
       def multiple_requests(options)
-        options = options.map { |options| process_options(options) }
+        options = options.map { |option| process_options(option) }
         responses = LHC.request(options)
-        data = responses.map{ |response| LHS::Data.new(response.body, nil, self, response.request) }
+        data = responses.map { |response| LHS::Data.new(response.body, nil, self, response.request) }
         data = LHS::Data.new(data, nil, self)
         handle_includes(including, data) if including
         data
@@ -120,7 +123,8 @@ class LHS::Record
         records = []
         if options.is_a?(Array)
           options.each do |option|
-            next unless record = LHS::Record.for_url(option[:url])
+            record = LHS::Record.for_url(option[:url])
+            next unless record
             records.push(record)
           end
           fail 'Found more than one record that could be used to do the request' if records.uniq.count > 1

data/lib/lhs/concerns/record/where.rb

@@ -6,7 +6,6 @@ class LHS::Record
     extend ActiveSupport::Concern
 
     module ClassMethods
-
       # Used to query data from the service.
       def where(params = {})
         data = request(params: params)

data/lib/lhs/data.rb

@@ -1,5 +1,5 @@
 require File.join(__dir__, 'proxy.rb')
-Dir[File.dirname(__FILE__) + '/concerns/data/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/concerns/data/*.rb'].each { |file| require file }
 
 # Data provides functionalities to accesses information
 class LHS::Data
@@ -51,7 +51,7 @@ class LHS::Data
 
   def respond_to_missing?(name, include_all = false)
     (root_item? && _root._record_class.instance_methods.include?(name)) ||
-    _proxy.respond_to?(name, include_all)
+      _proxy.respond_to?(name, include_all)
   end
 
   private
@@ -61,14 +61,13 @@ class LHS::Data
   end
 
   def root_item
-    return if self._proxy.class != LHS::Item
+    return if _proxy.class != LHS::Item
     root = root_item = self
     loop do
       root = root._parent
       root_item = root if root && root._proxy.is_a?(LHS::Item)
       if !(root && root._parent)
         break
-      else
       end
     end
     root_item

data/lib/lhs/endpoint.rb

@@ -1,6 +1,6 @@
 # An endpoint is used as source to fetch objects
 class LHS::Endpoint
-  
+
   def self.for_url(url)
     template, record = LHS::Record::Endpoints.all.detect do |template, _record_class|
       LHC::Endpoint.match?(url, template)
@@ -8,4 +8,3 @@ class LHS::Endpoint
     record.endpoints.detect { |endpoint| endpoint.url == template } if record
   end
 end
-

data/lib/lhs/errors.rb

@@ -8,14 +8,14 @@ class LHS::Errors
     @messages = messages_from_response(response)
     @message = message_from_response(response)
     @raw = response.body
-    rescue JSON::ParserError
+  rescue JSON::ParserError # rubocop:disable Lint/HandleExceptions
   end
 
   def include?(attribute)
     messages[attribute].present?
   end
-  alias :has_key? :include?
-  alias :key? :include?
+  alias has_key? include?
+  alias key? include?
 
   def get(key)
     messages[key]
@@ -25,9 +25,7 @@ class LHS::Errors
     messages[key] = value
   end
 
-  def delete(key)
-    messages.delete(key)
-  end
+  delegate :delete, to: :messages
 
   def [](attribute)
     get(attribute.to_sym) || set(attribute.to_sym, [])
@@ -47,20 +45,16 @@ class LHS::Errors
     values.flatten.size
   end
 
-  def values
-    messages.values
-  end
+  delegate :values, to: :messages
 
-  def keys
-    messages.keys
-  end
+  delegate :keys, to: :messages
 
   def count
     to_a.size
   end
 
   def empty?
-    all? { |k, v| v && v.empty? && !v.is_a?(String) }
+    all? { |_k, v| v && v.empty? && !v.is_a?(String) }
   end
 
   private

data/lib/lhs/item.rb

@@ -1,5 +1,5 @@
 require File.join(__dir__, 'proxy.rb')
-Dir[File.dirname(__FILE__) + '/concerns/item/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/concerns/item/*.rb'].each { |file| require file }
 
 # An item is a concrete record.
 # It can be part of another proxy like collection.
@@ -14,13 +14,11 @@ class LHS::Item < LHS::Proxy
   # prevent clashing with attributes of underlying data
   attr_accessor :errors
 
-  def _raw
-    _data._raw
-  end
+  delegate :_raw, to: :_data
 
   protected
 
-  def method_missing(name, *args, &block)
+  def method_missing(name, *args, &_block)
     return set(name, args.try(&:first)) if name.to_s[/=$/]
     name = args.first if name == :[]
     value = _data._raw[name.to_s]
@@ -36,7 +34,7 @@ class LHS::Item < LHS::Proxy
     end
   end
 
-  def respond_to_missing?(name, include_all = false)
+  def respond_to_missing?(name, _include_all = false)
     # We accept every message that does not belong to set of keywords
     BLACKLISTED_KEYWORDS.exclude?(name.to_s)
   end
@@ -49,7 +47,7 @@ class LHS::Item < LHS::Proxy
   def convert(value)
     return value unless value.is_a?(String)
     if date_time?(value)
-      DateTime.parse(value)
+      Time.zone.parse(value)
     elsif date?(value)
       Date.parse(value)
     else
@@ -72,8 +70,6 @@ class LHS::Item < LHS::Proxy
     _data._raw[key.to_sym] = value
   end
 
-  private
-
   def date?(value)
     value[date_time_regex, :date].presence
   end

data/lib/lhs/record.rb

@@ -1,4 +1,4 @@
-Dir[File.dirname(__FILE__) + '/concerns/record/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/concerns/record/*.rb'].each { |file| require file }
 
 class LHS::Record
   include All
@@ -18,15 +18,19 @@ class LHS::Record
     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
+    instance_data =
+      if data._proxy.is_a?(LHS::Item) && data._raw.is_a?(Hash)
+        data._raw
+      elsif data._proxy.is_a?(LHS::Collection) && data._raw.is_a?(Hash)
+        data._raw.fetch(:items, [])
+      else
+        data._raw
+      end
+    instance_variable_set('@data', instance_data)
   end
 
   def self.build(data = nil)
-    self.new(data)
+    new(data)
   end
 
   protected
@@ -37,6 +41,6 @@ class LHS::Record
 
   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)
+      _data._proxy.respond_to?(name, include_all)
   end
 end