pakyow-data 1.0.0.rc3 → 1.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc46a555cdeabd3e92057164c7d73eb709e65b249d712a21efab9ac3d823d6b7
-  data.tar.gz: de17be63f229e13b4c71dee1c2f688023722390b33ff2b629579049ba464d2ff
+  metadata.gz: 89ef7f94e6abbe68bb389a5c560d9eba58ce4452bdad141c7b16a0a0f8e8dcd7
+  data.tar.gz: 316e9f4896f4027323ae60700d8ce1d90e1146618fc1c7653089f72c2607fc23
 SHA512:
-  metadata.gz: 515d09959682792f090f2a1584bdfe55bd3a711a3fc486052354141c46ce0087f001bb3d6b6ec1f640601e99b0fc82895d45d00af88220534aa73d35fb76c7bc
-  data.tar.gz: c23f714272f8e8e514faa0b8163bb932e211d34c385a29f1c170c21671a13896002ca6c1eff1671f6a0b936990a8f8c1557071fbf7cfc4bd11a5fe0d1c4c8e82
+  metadata.gz: 331a2fbc87996b350a1d06ff1087d15f5a6b98d9a20e29fa12c05e95cc8291c410282f2c0a0d646cc81874bfd7de4dcac4bbf6843cc04bb16c9eae924e123276
+  data.tar.gz: 7816ae161a6d96d19dabdf0356792a2b17c69d6ea6cd6de2f6876b99143a67c27044d7a3703904a8135a87506a55e82655d0cf9c8dfd1cf94372e7b29555df6a

data/lib/pakyow/data/adapters/{abstract.rb → base.rb}

@@ -3,7 +3,7 @@
 module Pakyow
   module Data
     module Adapters
-      class Abstract
+      class Base
         def initialize(opts, logger: nil)
           @opts, @logger = opts, logger
         end

data/lib/pakyow/data/adapters/sql/commands.rb

@@ -8,7 +8,7 @@ module Pakyow
           extend Support::Extension
 
           apply_extension do
-            command :create, performs_create: true do |values|
+            command :create, creates: true do |values|
               begin
                 inserted_return_value = insert(values)
                 if self.class.primary_key_field
@@ -27,7 +27,7 @@ module Pakyow
               end
             end
 
-            command :update, performs_update: true do |values|
+            command :update, updates: true do |values|
               __getobj__.select(self.class.primary_key_field).map { |result|
                 result[self.class.primary_key_field]
               }.tap do
@@ -43,7 +43,7 @@ module Pakyow
               end
             end
 
-            command :delete, provides_dataset: false, performs_delete: true do
+            command :delete, provides_dataset: false, deletes: true do
               begin
                 delete
               rescue Sequel::ForeignKeyConstraintViolation => error

data/lib/pakyow/data/adapters/sql.rb

@@ -6,13 +6,13 @@ require "pakyow/support/extension"
 
 require "pakyow/support/core_refinements/string/normalization"
 
-require "pakyow/data/adapters/abstract"
+require "pakyow/data/adapters/base"
 
 module Pakyow
   module Data
     module Adapters
       # @api private
-      class Sql < Abstract
+      class Sql < Base
         require "pakyow/data/adapters/sql/commands"
         require "pakyow/data/adapters/sql/dataset_methods"
         require "pakyow/data/adapters/sql/migrator"

data/lib/pakyow/data/container.rb

@@ -91,7 +91,7 @@ module Pakyow
 
             unless joining_source
               joining_source = source.ancestors.find { |ancestor|
-                ancestor != source && ancestor.ancestors.include?(Sources::Abstract)
+                ancestor != source && ancestor.ancestors.include?(Sources::Base)
               }.make(
                 joining_source_name,
                 adapter: source.adapter,

data/lib/pakyow/data/proxy.rb

@@ -125,7 +125,7 @@ module Pakyow
         subscriptions = []
 
         if subscribable?
-          subscriptions << {
+          subscription = {
             source: @source.source_name,
             ephemeral: @source.is_a?(Sources::Ephemeral),
             handler: handler,
@@ -134,6 +134,10 @@ module Pakyow
             proxy: self
           }
 
+          unless subscriptions.include?(subscription)
+            subscriptions << subscription
+          end
+
           @nested_proxies.each do |related_proxy|
             subscriptions.concat(
               related_proxy.subscribe_related(
@@ -154,7 +158,7 @@ module Pakyow
 
         if association = parent_source.class.find_association_to_source(@source)
           parent_source.each do |parent_result|
-            subscriptions << {
+            subscription = {
               source: @source.source_name,
               handler: handler,
               payload: payload,
@@ -163,6 +167,10 @@ module Pakyow
               ),
               proxy: serialized_proxy
             }
+
+            unless subscriptions.include?(subscription)
+              subscriptions << subscription
+            end
           end
         else
           Pakyow.logger.error "tried to subscribe a related source, but we don't know how it's related"
@@ -226,9 +234,21 @@ module Pakyow
           # Populate argument qualifications with argument values.
           #
           qualifications_for_proxied_call.each do |qualification_key, qualification_value|
-            next unless qualification_value.to_s.start_with?("__arg")
-            arg_number = qualification_value.to_s.gsub(/[^0-9]/, "").to_i
-            qualifications_for_proxied_call[qualification_key] = @source.class.attributes[qualification_key][proxied_call[1][arg_number]]
+            if qualification_value.to_s.start_with?("__arg")
+              arg_number = qualification_value.to_s.gsub(/[^0-9]/, "").to_i
+
+              arg_value = proxied_call[1][arg_number]
+              arg_value = case arg_value
+              when Array
+                arg_value.map { |each_value|
+                  @source.class.attributes[qualification_key][each_value]
+                }
+              else
+                @source.class.attributes[qualification_key][arg_value]
+              end
+
+              qualifications_for_proxied_call[qualification_key] = arg_value
+            end
           end
 
           qualifications.merge(qualifications_for_proxied_call)

data/lib/pakyow/data/result.rb

@@ -5,6 +5,9 @@ require "delegate"
 module Pakyow
   module Data
     class Result < SimpleDelegator
+      # @api private
+      attr_reader :__proxy
+
       def initialize(result, proxy, originating_method: nil, originating_args: [])
         @__proxy = proxy
         @originating_method = originating_method

data/lib/pakyow/data/sources/{abstract.rb → base.rb}

@@ -7,7 +7,7 @@ require "pakyow/support/class_state"
 module Pakyow
   module Data
     module Sources
-      class Abstract < SimpleDelegator
+      class Base < SimpleDelegator
         extend Support::ClassState
         class_state :__finalized, default: false, inheritable: true
 

data/lib/pakyow/data/sources/ephemeral.rb

@@ -5,12 +5,12 @@ require "securerandom"
 
 require "pakyow/support/core_refinements/array/ensurable"
 
-require "pakyow/data/sources/abstract"
+require "pakyow/data/sources/base"
 
 module Pakyow
   module Data
     module Sources
-      class Ephemeral < Abstract
+      class Ephemeral < Base
         using Support::Refinements::Array::Ensurable
         attr_reader :type, :qualifications
 

data/lib/pakyow/data/sources/relational/command.rb

@@ -12,8 +12,8 @@ module Pakyow
           using Support::DeepDup
           using Support::Refinements::Array::Ensurable
 
-          def initialize(name, block:, source:, provides_dataset:, performs_create:, performs_update:, performs_delete:)
-            @name, @block, @source, @provides_dataset, @performs_create, @performs_update, @performs_delete = name, block, source, provides_dataset, performs_create, performs_update, performs_delete
+          def initialize(name, block:, source:, provides_dataset:, creates:, updates:, deletes:)
+            @name, @block, @source, @provides_dataset, @creates, @updates, @deletes = name, block, source, provides_dataset, creates, updates, deletes
           end
 
           def call(values = {})
@@ -24,7 +24,7 @@ module Pakyow
               #
               @source.class.attributes.each do |attribute_name, attribute|
                 if attribute.meta[:required]
-                  if @performs_create && !values.include?(attribute_name)
+                  if @creates && !values.include?(attribute_name)
                     raise NotNullViolation.new_with_message(attribute: attribute_name)
                   end
 
@@ -66,7 +66,7 @@ module Pakyow
               # Update timestamp fields.
               #
               if timestamp_fields = @source.class.timestamp_fields
-                if @performs_create
+                if @creates
                   timestamp_fields.values.each do |timestamp_field|
                     final_values[timestamp_field] = Time.now
                   end
@@ -77,7 +77,7 @@ module Pakyow
                 end
               end
 
-              if @performs_create
+              if @creates
                 # Set default values.
                 #
                 @source.class.attributes.each do |attribute_name, attribute|
@@ -102,7 +102,7 @@ module Pakyow
                 case association_value
                 when Proxy
                   if association_value.source.class == association.associated_source
-                    if association.result_type == :one && (association_value.count > 1 || (@performs_update && @source.count > 1))
+                    if association.result_type == :one && (association_value.count > 1 || (@updates && @source.count > 1))
                       raise ConstraintViolation.new_with_message(
                         :associate_multiple,
                         association: association.name
@@ -244,20 +244,20 @@ module Pakyow
               end
             end
 
-            original_dataset = if @performs_update
+            original_dataset = if @updates
               # Hold on to the original values so we can update them locally.
               @source.dup.to_a
             else
               nil
             end
 
-            unless @provides_dataset || @performs_update
+            unless @provides_dataset || @updates
               # Cache the result prior to running the command.
               @source.to_a
             end
 
             @source.transaction do
-              if @performs_delete
+              if @deletes
                 @source.class.associations.values.flatten.select(&:dependents?).each do |association|
                   dependent_values = @source.class.container.connection.adapter.restrict_to_attribute(
                     @source.class.primary_key_field, @source
@@ -326,12 +326,13 @@ module Pakyow
                 end
               end
 
-              if @performs_create || @performs_update
+              if @creates || @updates
                 # Ensure that has_one associations only have one associated object.
                 #
                 @source.class.associations[:belongs_to].flat_map { |belongs_to_association|
                   belongs_to_association.associated_source.associations[:has_one].select { |has_one_association|
-                    has_one_association.associated_query_field == belongs_to_association.query_field
+                    has_one_association.associated_source == @source.class &&
+                      has_one_association.associated_query_field == belongs_to_association.query_field
                   }
                 }.each do |association|
                   value = final_values.dig(
@@ -354,7 +355,7 @@ module Pakyow
 
               command_result = @source.instance_exec(final_values, &@block)
 
-              final_result = if @performs_update
+              final_result = if @updates
                 # For updates, we fetch the values prior to performing the update and
                 # return a source containing locally updated values. This lets us see
                 # the original values but prevents us from fetching twice.
@@ -382,7 +383,7 @@ module Pakyow
                 @source
               end
 
-              if @performs_create || @performs_update
+              if @creates || @updates
                 # Update records associated with the data we just changed.
                 #
                 future_associated_changes.each do |association, association_value|

data/lib/pakyow/data/sources/relational.rb

@@ -4,7 +4,7 @@ require "pakyow/support/makeable"
 require "pakyow/support/class_state"
 require "pakyow/support/inflector"
 
-require "pakyow/data/sources/abstract"
+require "pakyow/data/sources/base"
 
 module Pakyow
   module Data
@@ -54,7 +54,7 @@ module Pakyow
       #   data.posts.by_id(1).first
       #   => #<Pakyow::Data::Object @values={:id => 1, :title => "foo", :created_at => "2018-11-30 10:55:05 -0800", :updated_at => "2018-11-30 10:55:05 -0800"}>
       #
-      class Relational < Sources::Abstract
+      class Relational < Sources::Base
         require "pakyow/data/sources/relational/associations/belongs_to"
         require "pakyow/data/sources/relational/associations/has_many"
         require "pakyow/data/sources/relational/associations/has_one"
@@ -188,9 +188,9 @@ module Pakyow
               block: command[:block],
               source: self,
               provides_dataset: command[:provides_dataset],
-              performs_create: command[:performs_create],
-              performs_update: command[:performs_update],
-              performs_delete: command[:performs_delete]
+              creates: command[:creates],
+              updates: command[:updates],
+              deletes: command[:deletes]
             )
           else
             raise(
@@ -418,20 +418,20 @@ module Pakyow
         class_state :timestamp_fields
         class_state :primary_key_field
         class_state :attributes, default: {}
-        class_state :qualifications, default: {}, getter: false
+        class_state :qualifications, default: {}, reader: false
         class_state :associations, default: { belongs_to: [], has_many: [], has_one: [] }
         class_state :commands, default: {}
 
         class << self
           attr_reader :name, :adapter, :connection
 
-          def command(command_name, provides_dataset: true, performs_create: false, performs_update: false, performs_delete: false, &block)
+          def command(command_name, provides_dataset: true, creates: false, updates: false, deletes: false, &block)
             @commands[command_name] = {
               block: block,
               provides_dataset: provides_dataset,
-              performs_create: performs_create,
-              performs_update: performs_update,
-              performs_delete: performs_delete
+              creates: creates,
+              updates: updates,
+              deletes: deletes
             }
           end
 

data/lib/pakyow/data/subscribers/adapters/redis.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "digest/sha1"
+require "zlib"
 
 require "redis"
 require "concurrent/timer_task"
@@ -20,7 +21,7 @@ module Pakyow
         class Redis
           class << self
             def stringify_subscription(subscription)
-              Marshal.dump(subscription)
+              Zlib::Deflate.deflate(Marshal.dump(subscription))
             end
 
             def generate_subscription_id(subscription_string)
@@ -154,7 +155,7 @@ module Pakyow
                 key_subscription_id(subscription_id)
               }).zip(subscription_ids).map { |subscription_string, subscription_id|
                 begin
-                  Marshal.restore(subscription_string).tap do |subscription|
+                  Marshal.restore(Zlib::Inflate.inflate(subscription_string)).tap do |subscription|
                     subscription[:id] = subscription_id
                   end
                 rescue TypeError

data/lib/pakyow/data/subscribers.rb

@@ -56,19 +56,45 @@ module Pakyow
       end
 
       def did_mutate(source_name, changed_values = nil, result_source = nil)
-        @executor << Proc.new {
-          begin
-            @adapter.subscriptions_for_source(source_name).select { |subscription|
-              process?(subscription, changed_values, result_source)
-            }.uniq.each do |subscription|
-              if subscription[:version] == @app.config.data.subscriptions.version
+        @executor.post(source_name, changed_values, result_source, Pakyow.logger.target) do |source_name, changed_values, result_source, logger|
+          logger.internal {
+            "[Pakyow::Data::Subscribers] did mutate #{source_name}"
+          }
+
+          subscriptions = @adapter.subscriptions_for_source(source_name)
+
+          logger.internal {
+            "[Pakyow::Data::Subscribers] fetched #{subscriptions.count} subscriptions"
+          }
+
+          subscriptions.uniq { |subscription|
+            subscription.dig(:payload, :id) || subscription
+          }.select { |subscription|
+            process?(subscription, changed_values, result_source)
+          }.each do |subscription|
+            if subscription[:version] == @app.config.data.subscriptions.version
+              begin
+                logger.internal {
+                  "[Pakyow::Data::Subscribers] processing subscription #{subscription[:id]}"
+                }
+
                 process(subscription, result_source)
+
+                logger.internal {
+                  "[Pakyow::Data::Subscribers] finished processing subscription #{subscription[:id]}"
+                }
+              rescue => error
+                logger.error {
+                  "[Pakyow::Data::Subscribers] did_mutate failed: #{error}"
+                }
               end
             end
-          rescue => error
-            Pakyow.logger.error "[Pakyow::Data::Subscribers] did_mutate failed: #{error}"
           end
-        }
+
+          logger.internal {
+            "[Pakyow::Data::Subscribers] finished mutate for #{source_name}"
+          }
+        end
       end
 
       def unsubscribe(subscriber)
@@ -134,13 +160,19 @@ module Pakyow
       QUALIFIABLE_TYPES = [Hash, Support::IndifferentHash].freeze
       def qualified?(qualifications, changed_values, changed_results, original_results)
         qualifications.all? do |key, value|
-          (QUALIFIABLE_TYPES.include?(changed_values.class) && changed_values.to_h[key] == value) || qualified_result?(key, value, changed_results, original_results)
+          (
+            QUALIFIABLE_TYPES.include?(changed_values.class) && (
+              (
+                value.is_a?(Array) && value.include?(changed_values.to_h[key])
+              ) || changed_values.to_h[key] == value
+            )
+          ) || qualified_result?(key, value, changed_results, original_results)
         end
       end
 
       def qualified_result?(key, value, changed_results, original_results)
         original_results.concat(changed_results).any? do |result|
-          result[key] == value
+          (value.is_a?(Array) && value.include?(result[key])) || result[key] == value
         end
       end
     end

data/lib/pakyow/validations/unique.rb

@@ -7,19 +7,27 @@ module Pakyow
     # Validates that the value is unique within its data source.
     #
     module Unique
-      def self.name
-        :unique
-      end
-
       def self.message(**)
         "must be unique"
       end
 
       def self.valid?(value, source:, **options)
-        options[:context].app.data.public_send(source).public_send(:"by_#{options[:key]}", value).count == 0
+        query = options[:context].app.data.public_send(source).public_send(:"by_#{options[:key]}", value)
+
+        if updating = options[:updating]
+          if updating.is_a?(Data::Result)
+            query.count == 0 || query.any? { |result|
+              result[updating.__proxy.source.class.primary_key_field] == updating[updating.__proxy.source.class.primary_key_field]
+            }
+          else
+            raise ArgumentError, "Expected `#{updating.class}' to be a `Pakyow::Data::Result'"
+          end
+        else
+          query.count == 0
+        end
       end
     end
 
-    Validator.register_validation(Unique)
+    Validator.register_validation(Unique, :unique)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-data
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
 platform: ruby
 authors:
 - Bryan Powell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2019-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakyow-core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
 - !ruby/object:Gem::Dependency
   name: pakyow-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +118,7 @@ files:
 - LICENSE
 - README.md
 - lib/pakyow/data.rb
-- lib/pakyow/data/adapters/abstract.rb
+- lib/pakyow/data/adapters/base.rb
 - lib/pakyow/data/adapters/sql.rb
 - lib/pakyow/data/adapters/sql/commands.rb
 - lib/pakyow/data/adapters/sql/dataset_methods.rb
@@ -143,7 +143,7 @@ files:
 - lib/pakyow/data/object.rb
 - lib/pakyow/data/proxy.rb
 - lib/pakyow/data/result.rb
-- lib/pakyow/data/sources/abstract.rb
+- lib/pakyow/data/sources/base.rb
 - lib/pakyow/data/sources/ephemeral.rb
 - lib/pakyow/data/sources/relational.rb
 - lib/pakyow/data/sources/relational/association.rb