apiphobic-resource 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dae97d487f9abece061556e3ba4cb71f1c058e7ececb8c4090a13d01ea8ba41
-  data.tar.gz: ea0bef41133fa3c364cefb3038ce6b5520a9d88ad12777add602e77181dec244
+  metadata.gz: 903c1eaded9d586c56a64b3d37262e2928e2ec21d68038bf6d0e74ec706bb21b
+  data.tar.gz: 4ffbae8c2c18055f11a915f9b4fad69349ce272f4bd67c84aaf5b50139d0bff4
 SHA512:
-  metadata.gz: ea6fe96e15112cd14cd31b6a531481eac33c0d439a89ca7776464f02770b2c16b838a531fb7fb7379237fda08234f318051fdd7e3fc6a01a56a6567f2e092339
-  data.tar.gz: e29f086828c8ac680e9a09e8b8c57c62b4f51a5e5e60bf53b528549885dd8fef22c235b6691d0e853c78d02a8ea413761efe39faefa3b6c78480288f1b2f7183
+  metadata.gz: 452c15e4c4f3083d5661c0cb553064d72018a56aed0233c7d7a9c367b5ef2455fabaa8b379ab4e0367fbd0f83f7453c4ff3ae4976456bcc68bdf04d27bca688a
+  data.tar.gz: d461fe912e2329d3528d5697497a2fcd1e563ed1da675108a0a6e98c623141a6d68589abddcd0c4f7e412888f04e3886cf2a6d8d0ebedee5f72bd59edfad0911

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

@@ -15,26 +15,35 @@ class   Model
 
   DEFAULT_PROCESSORS = %w{including}.freeze
 
-  attr_accessor :resource,
+  attr_accessor :id,
+                :resource,
                 :parameters
   attr_reader   :processors
 
-  def_delegators :resource,
-                 :assign_attributes,
+  def_delegators :processed,
                  :delete,
-                 :save!,
-                 :save
+                 :subscribe
 
-  def initialize(resource:, parameters:, **options)
+  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
@@ -43,6 +52,24 @@ class   Model
     end
   end
 
+  def assign_attributes(attrs)
+    processed.assign_attributes(attrs)
+
+    processed
+  end
+
+  def save!
+    processed.save!
+
+    processed
+  end
+
+  def save
+    processed.save
+
+    processed
+  end
+
   def processors=(other)
     @processors = other.map do |processor|
       Object.const_get("::Apiphobic::Resource::Processors::#{processor.capitalize}")

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.1.0'
+  VERSION = '1.3.0'
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apiphobic-resource
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.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-19 00:00:00.000000000 Z
+date: 2022-07-17 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.3.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