userlist 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a76254952c47cc9014e31019550491b96b1a8f46814cb6e44750ddf4c4d966f1
-  data.tar.gz: 17eabd156ef0d1eda09a7480c9eb3f5822098f045123d2a2d9f33351630493d6
+  metadata.gz: 1f8e5ee8f9d8d18f98ebc7744ced642b9641ec6bd156fff4fbf0352be37dbaa2
+  data.tar.gz: a532a136941e347e7c7dc454f3ec7a735990f53abd8ddaff1bdf50eb67a3c219
 SHA512:
-  metadata.gz: 7d3311432655c8b7758d59733845558f526208874f31fee9034dbbb8a75bca653dc39b8b18007928b7fae7d2cf3efae449126c2c355bd6f3b3e5d0e82f2a24a7
-  data.tar.gz: 8531012b1ec1824c2ff60b537c641b17b534e60ea4665e476b66055f1f623ed51787c4a336402fb1adb63b1645e238008bb94ec64a2c7caf87cb21956d35111c
+  metadata.gz: 9065b7f9af8fc5692b334bcfa97410ee3260544f02cd6440cea57150d3daceb1e62c5b8fba8780f4309da764603966842b59064baad786918f1f23381a8ba0b5
+  data.tar.gz: f01918dafbaa9a837b25503f667b1387998036a5a626cce75fe3f45ef80539cb6e57aa9ab512bf8813f039b959eb138039ab0086bd98342dec5ef61f2d129969

data/lib/userlist/push/company.rb

@@ -8,7 +8,7 @@ module Userlist
         '/companies'
       end
 
-      has_many :relationships, type: 'Userlist::Push::Relationship'
+      has_many :relationships, type: 'Userlist::Push::Relationship', inverse: :company
       has_many :users, type: 'Userlist::Push::User'
       has_one  :user, type: 'Userlist::Push::User'
 

data/lib/userlist/push/relationship.rb

@@ -9,7 +9,8 @@ module Userlist
 
       def initialize(payload = {}, config = Userlist.config)
         raise Userlist::ArgumentError, 'Missing required payload' unless payload
-        raise Userlist::ArgumentError, 'Missing required parameter :user or :company' unless payload[:user] || payload[:company]
+        raise Userlist::ArgumentError, 'Missing required parameter :user' unless payload[:user]
+        raise Userlist::ArgumentError, 'Missing required parameter :company' unless payload[:company]
 
         super
       end

data/lib/userlist/push/resource.rb

@@ -20,13 +20,17 @@ module Userlist
         end
 
         def relationship_names
-          @relationship_names ||= Set.new
+          @relationship_names ||= relationships.keys
+        end
+
+        def relationships
+          @relationships ||= {}
         end
 
       protected
 
         def has_one(name, type:) # rubocop:disable Naming/PredicateName
-          relationship_names << name.to_sym
+          relationships[name.to_sym] = { type: type }
 
           generated_methods.class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def #{name}
@@ -35,12 +39,14 @@ module Userlist
           RUBY
         end
 
-        def has_many(name, type:) # rubocop:disable Naming/PredicateName
-          relationship_names << name.to_sym
+        def has_many(name, **options) # rubocop:disable Naming/PredicateName
+          relationships[name.to_sym] = options
 
           generated_methods.class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def #{name}
-              ResourceCollection.new(payload[:#{name}], #{type}, config)
+              relationship = self.class.relationships[:#{name}]
+
+              ResourceCollection.new(payload[:#{name}], relationship, self, config)
             end
           RUBY
         end

data/lib/userlist/push/resource_collection.rb

@@ -3,19 +3,30 @@ module Userlist
     class ResourceCollection
       include Enumerable
 
-      attr_reader :collection, :type, :config
+      attr_reader :collection, :relationship, :owner, :config
 
-      def initialize(collection, type, config = Userlist.config)
+      def initialize(collection, relationship, owner, config = Userlist.config)
         @collection = Array(collection)
-        @type = type
+        @relationship = relationship
+        @owner = owner
         @config = config
       end
 
       def each
         collection.each do |resource|
+          resource[inverse] = owner if inverse && resource.is_a?(Hash)
+
           yield type.from_payload(resource, config)
         end
       end
+
+      def type
+        Object.const_get(relationship[:type])
+      end
+
+      def inverse
+        relationship[:inverse]
+      end
     end
   end
 end

data/lib/userlist/push/serializer.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module Userlist
   class Push
     class Serializer

data/lib/userlist/push/user.rb

@@ -4,7 +4,7 @@ module Userlist
       include Operations::Create
       include Operations::Delete
 
-      has_many :relationships, type: 'Userlist::Push::Relationship'
+      has_many :relationships, type: 'Userlist::Push::Relationship', inverse: :user
       has_many :companies, type: 'Userlist::Push::Company'
       has_one  :company, type: 'Userlist::Push::Company'
 

data/lib/userlist/version.rb

@@ -1,3 +1,3 @@
 module Userlist
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: userlist
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Benedikt Deicke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler