apiphobic-resource 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e4530e0108f06f8ad02da81ba4775f20e71ac0aa1e4ccfd81d090c1656aeeb9
-  data.tar.gz: ba4df9a641098d37b72674d5685e52175570d700b23f66b8aa3791eca8393135
+  metadata.gz: 5929b13d77c0b3e85f80ac7fcfc71f66cf34249f99970c73436ea1f8496b68d7
+  data.tar.gz: bd5411d364a65e31f8751c403b170363ddfea2c273b9c5aeb89b457272f836ca
 SHA512:
-  metadata.gz: eb6f201cb95cec6aa4840e8f10c08adaeadc51492a5631a29572d4b24791c9c95932a4dcfcb733d0a745acadcb989f65ee738600b3cde712183fa4795efa5d28
-  data.tar.gz: 5e6cbf1314ed020fef1a8d268fdbcfcdcc2f34071b97337286524f590a94ca197aa7d06a6e6200e2ffc43837aded2c264c9ea488c2b5f970b9079192bf50fec3
+  metadata.gz: 77d8cecf97580ef1e8d204540556bb462f66394d8b8547e6d290c21237a980bc66608ed3147a5dbf526ef1d639489ccbce82db76804fdcb26c1efe8c40371a69
+  data.tar.gz: ee80b6b44b634d63cd18b0ea59c01a18c78968c99d66f7295ab5842d25b64d80de71d04b374a34f1f2a8f0d347592ab0170e70caba119a00a65809ed256d2bf7

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-�czm;ڒ�GpR���[�%���Lj�3׫�"@���`*�^�x�<$�
�c���'-6���L�ANUQ�t�Tm���x��e>3�,��%M^P
-Kd�  ���&a[�NkO�H'�p���Jns�iq���	���ƶ�s��/lU�R|�N�#K�B����E��I��+�Ϋ��a�ө=�{��׏�t䡯l��]E�?'B��
+/r�0��'�w�� c�wL�8BM+�������j32���b��s���B�Ҳ0V�?,�Z3��y&u�링���p��3�<^¦[=�)&IL���[yz�0��n0���+�?��K�y��I�ס��fx0X�L�@p���dG�(��qo�6	�'v.m�C�G�z���g2֒�L���1&��
��_�"Q���e	����6��0j6��
�Ki��*�RN�	�>�X�'�]��aZ7b�!٠n9?�ޏ�\���y��
+����s+	ac(�:��Tn���-96��q)�_4� ���C�ɽB���l$�gqmA!w�T��fW����E�8!A��N��W�b$��O�

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2016 The Kompanee, Ltd
+Copyright (c) 2010-2019 The Kompanee, Ltd
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/apiphobic/parameters/filter.rb

@@ -5,7 +5,7 @@ module  Parameters
 class   Filter
   FLOAT           = /\A[\-+]?[_\d]+\.[_\d]+\z/
   INTEGER         = /\A[\-+]?[_\d]+\z/
-  ISO8601         = /\d{4}\-\d{2}\-\d{2}T\d{2}\:\d{2}\:\d{2}(?:[+\-]\d{2}\:\d{2}|Z)/
+  ISO8601         = /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:[+\-]\d{2}:\d{2}|Z)/
   NUMERICAL       = /[\-+]?[_\d]+(?:\.\d+)?/
 
   DATE_RANGE      = /\A(#{ISO8601})\.\.\.?(#{ISO8601})\z/
@@ -39,12 +39,11 @@ class   Filter
     end
   end
 
-  # rubocop:disable Lint/AssignmentInCondition, Metrics/AbcSize,
-  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-  def format_value(value)
+  # rubocop:disable Lint/AssignmentInCondition
+  def format_value(value) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
     return value unless value.is_a?(::String)
 
-    if range_points  = value.match(DATE_RANGE)
+    if range_points    = value.match(DATE_RANGE)
       exclusive      = value.include?('...')
       starting_point = ::Time.iso8601(range_points[1])
       ending_point   = ::Time.iso8601(range_points[2])
@@ -66,17 +65,17 @@ class   Filter
       value
     end
   end
-  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-  # rubocop:enable Lint/AssignmentInCondition, Metrics/AbcSize,
+  # rubocop:enable Lint/AssignmentInCondition
 
   def string_to_number(other)
     other = other.delete('_')
 
-    if other == 'Infinity'
+    case other
+    when 'Infinity'
       9_999_999
-    elsif other.match?(FLOAT)
+    when FLOAT
       other.to_f
-    elsif other.match?(INTEGER)
+    when INTEGER
       other.to_i
     end
   end

data/lib/apiphobic/parameters/include.rb

@@ -23,9 +23,7 @@ class   Include
 
   private
 
-  # rubocop:disable Metrics/PerceivedComplexity,
-  # rubocop:disable Metrics/BlockNesting
-  def map_inclusions(array)
+  def map_inclusions(array) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
     mapped = array.each_with_object([{}]) do |inclusion, memo|
       if inclusion.is_a?(::Hash)
         memo[0] = inclusion
@@ -37,7 +35,7 @@ class   Include
         else
           memo.delete(first)
 
-          memo[0][first] = if memo[0][first].nil?
+          memo[0][first] = if memo[0][first].nil? # rubocop:disable Metrics/BlockNesting
                              rest
                            else
                              map_inclusions(Array(memo[0][first]) << rest)
@@ -50,8 +48,6 @@ class   Include
 
     mapped
   end
-  # rubocop:enable Metrics/BlockNesting
-  # rubocop:enable Metrics/PerceivedComplexity,
 end
 end
 end

data/lib/apiphobic/parameters/sort.rb

@@ -16,13 +16,13 @@ class   Sort
   end
 
   def to_h
-    @to_h ||= Hash[to_a]
+    @to_h ||= to_a.to_h
   end
 
   def to_a
     @to_a ||= raw_parameters.map do |raw_parameter|
       if raw_parameter.start_with?(DESCENDING_PREFIX)
-        [raw_parameter[1..-1], 'desc']
+        [raw_parameter[1..], 'desc']
       else
         [raw_parameter, 'asc']
       end

data/lib/apiphobic/resource/collection.rb

@@ -6,6 +6,10 @@ module  Apiphobic
 module  Resource
 class   Collection < Resource::Model
   DEFAULT_PROCESSORS = %w{including filtering sorting paging indexing}.freeze
+
+  def initialize(**args)
+    super(**args.merge(id: nil))
+  end
 end
 end
 end

data/lib/apiphobic/resource/model.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'forwardable'
+
 require 'apiphobic/resource/processors/filtering'
 require 'apiphobic/resource/processors/including'
 require 'apiphobic/resource/processors/indexing'
@@ -9,22 +11,42 @@ require 'apiphobic/resource/processors/sorting'
 module  Apiphobic
 module  Resource
 class   Model
+  extend Forwardable
+
   DEFAULT_PROCESSORS = %w{including}.freeze
 
-  attr_accessor :resource,
+  attr_accessor :id,
+                :resource,
                 :parameters
   attr_reader   :processors
 
-  def initialize(resource:, parameters:, **options)
+  def_delegators :processed,
+                 :assign_attributes,
+                 :delete,
+                 :save!,
+                 :save,
+                 :subscribe
+
+  def initialize(resource:, id:, parameters:, **options)
+    self.id         = id
     self.resource   = resource
     self.parameters = parameters.dup
     self.processors = options.fetch(:processors, self.class::DEFAULT_PROCESSORS)
   end
 
   def processed
-    @processed ||= processors.inject(resource) do |processed_resource, processor|
-      processor.processed(processed_resource, parameters)
-    end
+    @processed \
+      ||= begin
+            processed = processors.inject(resource) do |processed_resource, processor|
+              processor.processed(processed_resource, parameters)
+            end
+
+            if instance_of?(::Apiphobic::Resource::Collection)
+              processed
+            else
+              processed.find_by(id: id) || processed.new
+            end
+          end
   end
 
   def meta

data/lib/apiphobic/resource/processors/filtering.rb

@@ -30,7 +30,7 @@ class  Filtering
 
       if !filter_method
         filtered_resource
-      elsif filter_method.arity.zero?
+      elsif filter_method.arity == 0
         filtered_resource.public_send(filter_method.name)
       else
         filtered_resource.public_send(filter_method.name, value)

data/lib/apiphobic/resource/version.rb

@@ -2,6 +2,6 @@
 
 module Apiphobic
 module Resource
-  VERSION = '1.0.1'
+  VERSION = '1.2.0'
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apiphobic-resource
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - thegranddesign
@@ -10,28 +10,34 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDqjCCApKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBNMREwDwYDVQQDDAhydWJ5
-  Z2VtczEjMCEGCgmSJomT8ixkARkWE2xpdmluZ2hpZ2hvbnRoZWJsb2cxEzARBgoJ
-  kiaJk/IsZAEZFgNjb20wHhcNMTcwODAyMjI1OTM1WhcNMTgwODAyMjI1OTM1WjBN
-  MREwDwYDVQQDDAhydWJ5Z2VtczEjMCEGCgmSJomT8ixkARkWE2xpdmluZ2hpZ2hv
-  bnRoZWJsb2cxEzARBgoJkiaJk/IsZAEZFgNjb20wggEiMA0GCSqGSIb3DQEBAQUA
-  A4IBDwAwggEKAoIBAQDtLa7+7p49gW15OgOyRZad/F92iZcMdDjZ2kAxZlviXgVe
-  PCtjfdURobH+YMdt++6eRkE25utIFqHyN51Shxfdc21T3fPQe/ZEoMyiJK4tYzbh
-  7VjNJG4ldvKKpS1p7iVz9imnyTxNwb0JaIOsOFCA04T0u6aCQi2acNvAPLviXk0q
-  xJ/CKjI4QUTZKVrBt8Q1Egrp2yzmEnSNftDuTbBb8m4vDR+w325CwbKCgycHJ1/g
-  YZ3FO76TzJuRVbsYS/bU5XKHVEpkeFmWBqEXsk4DuUIWLa6WZEJcoZf+YP+1pycG
-  7YqSbydpINtEdopD+EEI+g+zNJ4nSI8/eQcQyEjBAgMBAAGjgZQwgZEwCQYDVR0T
-  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFDWuVrg4ve0vLu71kqiGdyBnzJGV
-  MCsGA1UdEQQkMCKBIHJ1YnlnZW1zQGxpdmluZ2hpZ2hvbnRoZWJsb2cuY29tMCsG
-  A1UdEgQkMCKBIHJ1YnlnZW1zQGxpdmluZ2hpZ2hvbnRoZWJsb2cuY29tMA0GCSqG
-  SIb3DQEBBQUAA4IBAQDJIpHjbBPGiaY4wOHcXlltQ+BMmhWQNh+1fZtyajQd+7Ay
-  fv23mO7Mf25Q38gopQlpaODkfxq54Jt8FvQbr5RYRS4j+JEKb75NgrAtehd8USUd
-  CiJJGH+yvGNWug9IGZCGX91HIbTsLQ5IUUWQasC5jGP8nxXufUr9xgAJZZenewny
-  B2qKu8q1A/kj6cw62RCY7yBmUXxlcJBj8g+JKYAFbYYKUdQSzf50k9IiWLWunJM+
-  Y2GAoHKstmfIVhc4XHOPpmTd2o/C29O9oaRgjrkfQEhF/KvJ/PhoV5hvokzsCyI5
-  iUeXPfvrGD/itYIBCgk+fnzyQQ4QtE5hTQaWQ3o2
+  MIIEyjCCAzKgAwIBAgIBATANBgkqhkiG9w0BAQsFADBVMSIwIAYDVQQDDBlsb2Nh
+  bGV1bmtub3duODEwX3J1YnlnZW1zMRowGAYKCZImiZPyLGQBGRYKcHJvdG9ubWFp
+  bDETMBEGCgmSJomT8ixkARkWA2NvbTAeFw0yMjA3MDkwNTMxMjJaFw0yMzA3MDkw
+  NTMxMjJaMFUxIjAgBgNVBAMMGWxvY2FsZXVua25vd244MTBfcnVieWdlbXMxGjAY
+  BgoJkiaJk/IsZAEZFgpwcm90b25tYWlsMRMwEQYKCZImiZPyLGQBGRYDY29tMIIB
+  ojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0otlhSPyU7jLLW1p786Mo/pV
+  5cJ1Ed8D/bJK78PqGFO2h0ZUefupxT5PRMokLYNNGRPopnAAxZ0zVxJ68aOyYCBW
+  Wk3/XFcXCrtk/OcFwLTltgeMjyqCBd/zRRx6CCjY4uOfH0E3n1gQ6Fbmewjg83XJ
+  nOs7Gu/hzj5+feEQ1Exmg6z1oCM/8BTIBtK+p++HvcDK3AhJ7x3fc6P9WS+22w6j
+  7jpi3p9YtoAjrXIzw3lsobiX+bEt+N+T47e8gOATVgapuZ/QmJzNU6LWepehs4V1
+  8J+FUaIMV7nAMKmpkbYL51uHEiGV+HDx1HUdOsCFx8zD4h49KRT2t6AcumJ5P1Cj
+  c7NX2xl85ShHDNNFkozuC2c5cwj6F20EVaVjGwv2OFq0S2tUw9EJXHTN9RpfRUmn
+  IHwS9M4gcJO7IzV39a1YL6+9hrabF4+JTSYDehq8oxTdcOPLYyvH54aJWVqCrnLO
+  KNa/p6hMmwxTWNS5Vz0uxuEGyE9E0tHbtjIs2XX5AgMBAAGjgaQwgaEwCQYDVR0T
+  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFAK3RicwO0f6+puFN6lRVMOKMJuu
+  MDMGA1UdEQQsMCqBKGxvY2FsZXVua25vd244MTArcnVieWdlbXNAcHJvdG9ubWFp
+  bC5jb20wMwYDVR0SBCwwKoEobG9jYWxldW5rbm93bjgxMCtydWJ5Z2Vtc0Bwcm90
+  b25tYWlsLmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAQwV6pOp5gm8141pyXeQFI/5E
+  rZYO3MvdyZM8O3HMD51LDS8mtMURceaKZM6WTambe2RVX4A++0qUiEnn9K4Fexm/
+  SEGaC/Gp+Fg9D1SKfkdq9bgdIhOEUwiGqjczgzNC806AtWZ+awI940oydFYZlpo0
+  jMQihPPJEqF1U6JBDMZYV5tX/dJYSGRl9L3s1k2tjoN98q+beNaZQDn21Amml4eK
+  KEkMeTTJ2E4GVzR9eKEETLq2LygdUWWZ5NdWOYTxJMdg1GZp3b6X8hJrwfOiizqt
+  /ANlIEh11/pOnWa6WPUVpGIMpYdquvmJXnF2LX6zxkKK1hbrebt+vAEAGczgw1Ri
+  rkLM6y+BHQdkOTj3VG4MjIU8D4h1Z73Exzxds/VbVKMEz+8JrFjGJ/tYa0PZ8U5p
+  3yXL4G6eW3rdBW/OiLF7GgG2o26d02OMzf4+ubUVS5LQDOcd4vgNPLWzJSBt1YIh
+  TgBsED7Me5YdMVXxtTWYsF1VMzaL9hReD3UXGcxe
   -----END CERTIFICATE-----
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2022-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -39,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: rspeckled
   requirement: !ruby/object:Gem::Requirement
@@ -84,11 +90,18 @@ files:
 - lib/apiphobic/resource/processors/paging.rb
 - lib/apiphobic/resource/processors/sorting.rb
 - lib/apiphobic/resource/version.rb
-homepage: ''
+homepage: https://github.com/thekompanee/apiphobic-resource
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
+  bug_tracker_uri: https://github.com/thekompanee/apiphobic-resource/issues
+  changelog_uri: https://github.com/thekompanee/apiphobic-resource/blob/master/CHANGELOG.md
+  documentation_uri: https://github.com/thekompanee/apiphobic-resource/tree/releases/v1.2.0
+  homepage_uri: https://github.com/thekompanee/apiphobic-resource
+  source_code_uri: https://github.com/thekompanee/apiphobic-resource
+  wiki_uri: https://github.com/thekompanee/apiphobic-resource/wiki
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -104,8 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: API Resources