pakyow-data 1.0.0.rc5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0508f7f451c68fe8254c7a468a41a84673f9190405168ede5964e36fc7c6563
-  data.tar.gz: 6a629f8c9d1b29977efb5184f3c9147241fd5b5b0eb05eb86d2161891854fe47
+  metadata.gz: e05427fdd149e88fb48af9182abc15a427dcb8b621c4cb9e362d5df377ab157f
+  data.tar.gz: a219ae7c4044104a259adf7e901d51c4655f0e746cf79e1491c477716f72242b
 SHA512:
-  metadata.gz: 7dc9e1446b99fea5d84ea4c01fbc764e1005a71c579e9fcddc6cf69f592aee6355d52aa57f8093e9bf894bd40256bfe7b961b3ab4d2142c3d835bb29b647a744
-  data.tar.gz: e10524efdf8522441aa20df907e8301a85eafb633c55ef4da25e09cb1c4608e103d15750ac0c8d46379812df9de66462d6e4eb679d44dff8913932d7ec369868
+  metadata.gz: 44e1ab1da9e2f891255856fefa0821e8547be015dce16beab0823603d631dbdc4d34e55ec091c2e1ee756712956751c6d7ebe9ef36615fb52dfd885acdfb276f
+  data.tar.gz: b6e2caffba485db823a392901f88334bd95ef3e7b96e688e81b62e62ada92baa2ac2fedfa2bc51ea40f64e5ef06ac5b02f73e24b7f6e28ec851ef13f39728225

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# UNRELEASED
+
+# 1.0
+
+  * Hello, Web

data/lib/pakyow/application/behavior/data/lookup.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require "pakyow/support/extension"
+
+require "pakyow/data/container"
+require "pakyow/data/lookup"
+require "pakyow/data/subscribers"
+
+module Pakyow
+  class Application
+    module Behavior
+      module Data
+        module Lookup
+          extend Support::Extension
+
+          # Data container object.
+          #
+          attr_reader :data
+
+          apply_extension do
+            after "boot", "initialize.data", priority: :high do
+              # Validate that each source connection exists.
+              #
+              state(:source).each do |source|
+                Pakyow.connection(source.adapter, source.connection)
+              end
+
+              subscribers = if is_a?(Plugin)
+                # Plugins should use the same subscribers object as their parent app.
+                #
+                parent.data.subscribers
+              else
+                Pakyow::Data::Subscribers.new(
+                  self,
+                  Pakyow.config.data.subscriptions.adapter,
+                  Pakyow.config.data.subscriptions.adapter_settings
+                )
+              end
+
+              containers = Pakyow.data_connections.values.each_with_object([]) { |connections, arr|
+                connections.values.each do |connection|
+                  arr << Pakyow::Data::Container.new(
+                    connection: connection,
+                    sources: state(:source).select { |source|
+                      connection.name == source.connection && connection.type == source.adapter
+                    },
+                    objects: state(:object)
+                  )
+                end
+              }
+
+              containers.each do |container|
+                container.finalize_associations!(containers - [container])
+              end
+
+              containers.each do |container|
+                container.finalize_sources!(containers - [container])
+              end
+
+              @data = Pakyow::Data::Lookup.new(
+                app: self,
+                containers: containers,
+                subscribers: subscribers
+              )
+            end
+
+            on "shutdown" do
+              if instance_variable_defined?(:@data)
+                @data.subscribers.shutdown
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pakyow/application/behavior/data/serialization.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require "pakyow/support/extension"
+require "pakyow/support/serializer"
+
+module Pakyow
+  class Application
+    module Behavior
+      module Data
+        # Persists in-memory subscribers across restarts.
+        #
+        module Serialization
+          extend Support::Extension
+
+          apply_extension do
+            on "shutdown", priority: :high do
+              if Pakyow.config.data.subscriptions.adapter == :memory && data
+                subscriber_serializer.serialize
+              end
+            end
+
+            after "boot" do
+              if Pakyow.config.data.subscriptions.adapter == :memory && data
+                subscriber_serializer.deserialize
+              end
+            end
+          end
+
+          private def subscriber_serializer
+            Support::Serializer.new(
+              data.subscribers.adapter,
+              name: "#{config.name}-subscribers",
+              path: File.join(
+                Pakyow.config.root, "tmp", "state"
+              ),
+              logger: Pakyow.logger
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pakyow/{data/behavior/config.rb → application/config/data.rb}

@@ -3,9 +3,9 @@
 require "pakyow/support/extension"
 
 module Pakyow
-  module Data
-    module Behavior
-      module Config
+  class Application
+    module Config
+      module Data
         extend Support::Extension
 
         apply_extension do

data/lib/pakyow/application/helpers/data.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Pakyow
+  class Application
+    module Helpers
+      module Data
+        def data
+          @connection.app.data
+        end
+      end
+    end
+  end
+end

data/lib/pakyow/{environment → behavior}/data/auto_migrate.rb

@@ -3,7 +3,7 @@
 require "pakyow/support/extension"
 
 module Pakyow
-  module Environment
+  module Behavior
     module Data
       module AutoMigrate
         extend Support::Extension

data/lib/pakyow/{environment → behavior}/data/connections.rb

@@ -5,7 +5,7 @@ require "pakyow/support/extension"
 require "pakyow/data/connection"
 
 module Pakyow
-  module Environment
+  module Behavior
     module Data
       module Connections
         extend Support::Extension

data/lib/pakyow/{environment → behavior}/data/memory_db.rb

@@ -3,7 +3,7 @@
 require "pakyow/support/extension"
 
 module Pakyow
-  module Environment
+  module Behavior
     module Data
       # Configures an in-memory sqlite database.
       #

data/lib/pakyow/config/data.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "pakyow/support/extension"
+
+module Pakyow
+  module Config
+    module Data
+      extend Support::Extension
+
+      apply_extension do
+        on "configure" do
+          # We have to define these in a before configure hook since new types could be added.
+          #
+          Pakyow.config.data.connections.instance_eval do
+            Pakyow::Data::Connection.adapter_types.each do |type|
+              setting type, {}
+            end
+          end
+        end
+
+        configurable :data do
+          setting :default_adapter, :sql
+          setting :default_connection, :default
+
+          setting :silent, true
+          setting :auto_migrate, true
+          setting :auto_migrate_always, [:memory]
+          setting :migration_path, "./database/migrations"
+
+          defaults :production do
+            setting :auto_migrate, false
+          end
+
+          configurable :subscriptions do
+            setting :adapter, :memory
+            setting :adapter_settings, {}
+
+            defaults :production do
+              setting :adapter, :redis
+              setting :adapter_settings do
+                Pakyow.config.redis.to_h
+              end
+            end
+          end
+
+          configurable :connections do
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pakyow/data.rb

@@ -10,18 +10,18 @@ Pakyow::Data::Connection.register_adapter :sql
 require "pakyow/data/errors"
 require "pakyow/data/framework"
 
-require "pakyow/environment/data/auto_migrate"
-require "pakyow/environment/data/config"
-require "pakyow/environment/data/connections"
-require "pakyow/environment/data/memory_db"
+require "pakyow/behavior/data/auto_migrate"
+require "pakyow/behavior/data/connections"
+require "pakyow/behavior/data/memory_db"
+require "pakyow/config/data"
 
-require "pakyow/validations/unique"
+require "pakyow/validations/data/unique"
 
 module Pakyow
-  config.tasks.paths << File.expand_path("../data/tasks", __FILE__)
+  config.tasks.paths << File.expand_path("../tasks", __FILE__)
 
-  include Environment::Data::AutoMigrate
-  include Environment::Data::Config
-  include Environment::Data::Connections
-  include Environment::Data::MemoryDB
+  include Behavior::Data::AutoMigrate
+  include Behavior::Data::Connections
+  include Behavior::Data::MemoryDB
+  include Config::Data
 end

data/lib/pakyow/data/framework.rb

@@ -2,12 +2,12 @@
 
 require "pakyow/framework"
 
-require "pakyow/data/object"
-require "pakyow/data/helpers"
+require "pakyow/application/config/data"
+require "pakyow/application/behavior/data/lookup"
+require "pakyow/application/behavior/data/serialization"
+require "pakyow/application/helpers/data"
 
-require "pakyow/data/behavior/config"
-require "pakyow/data/behavior/lookup"
-require "pakyow/data/behavior/serialization"
+require "pakyow/data/object"
 
 require "pakyow/data/sources/relational"
 
@@ -30,11 +30,11 @@ module Pakyow
           #
           aspect :objects
 
-          register_helper :active, Helpers
+          register_helper :active, Pakyow::Application::Helpers::Data
 
-          include Behavior::Config
-          include Behavior::Lookup
-          include Behavior::Serialization
+          include Application::Config::Data
+          include Application::Behavior::Data::Lookup
+          include Application::Behavior::Data::Serialization
         end
       end
     end

data/lib/pakyow/data/subscribers.rb

@@ -44,15 +44,13 @@ module Pakyow
       end
 
       def register_subscriptions(subscriptions, subscriber: nil, &block)
-        @executor << Proc.new {
-          subscriptions.each do |subscription|
-            subscription[:version] = @app.config.data.subscriptions.version
-          end
+        subscriptions.each do |subscription|
+          subscription[:version] = @app.config.data.subscriptions.version
+        end
 
-          @adapter.register_subscriptions(subscriptions, subscriber: subscriber).tap do |ids|
-            yield ids if block_given?
-          end
-        }
+        @adapter.register_subscriptions(subscriptions, subscriber: subscriber).tap do |ids|
+          yield ids if block_given?
+        end
       end
 
       def did_mutate(source_name, changed_values = nil, result_source = nil)

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

@@ -138,9 +138,15 @@ module Pakyow
           def cleanup
             @redis.with do |redis|
               redis.scan_each(match: key_subscription_ids_by_source("*")) do |key|
-                Pakyow.logger.debug "[Pakyow::Data::Subscribers::Adapters::Redis] Cleaning up expired subscriptions for #{key}"
+                Pakyow.logger.internal {
+                  "[Pakyow::Data::Subscribers::Adapters::Redis] Cleaning up expired subscriptions for #{key}"
+                }
+
                 removed_count = redis.zremrangebyscore(key, 0, Time.now.to_i)
-                Pakyow.logger.debug "[Pakyow::Data::Subscribers::Adapters::Redis] Removed #{removed_count} members for #{key}"
+
+                Pakyow.logger.internal {
+                  "[Pakyow::Data::Subscribers::Adapters::Redis] Removed #{removed_count} members for #{key}"
+                }
               end
             end
           end

data/lib/pakyow/tasks/info/sources.rake

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require "pakyow/support/cli/style"
+require "pakyow/support/dependencies"
+
+desc "Show defined sources for an app"
+namespace :info do
+  task :sources, [:app] do |_, args|
+    sources = args[:app].state(:source).sort_by { |source|
+      source.plural_name
+    }
+
+    source_names = sources.map { |source|
+      source.plural_name
+    }
+
+    source_locations = sources.map { |source|
+      source_location = source.__source_location.to_a.join(":")
+
+      source_location = if source_location.empty?
+        "unknown"
+      else
+        Pakyow::Support::Dependencies.library_name(source_location) ||
+          Pakyow::Support::Dependencies.strip_path_prefix(source_location)
+      end
+
+      source_location = if source_location.start_with?("pakyow-")
+        Pakyow::Support::CLI.style.blue(
+          "pakyow/#{source_location.split("pakyow-", 2)[1]}"
+        )
+      elsif source_location == "unknown"
+        Pakyow::Support::CLI.style.italic(source_location)
+      else
+        source_location
+      end
+    }
+
+    sources.each_with_index do |source, i|
+      puts Pakyow::Support::CLI.style.bold(source_names[i].inspect) + " #{source_locations[i]}"
+
+      source.associations.each do |association_type, associations|
+        associations.each do |association|
+          puts "  #{association_type} #{association.name.inspect}"
+        end
+      end
+
+      if source.attributes.any? && source.associations.values.flatten.any?
+        puts
+      end
+
+      if source.attributes.any?
+        attributes = source.attributes.sort_by { |attribute_name, _|
+          attribute_name
+        }
+
+        attributes.each do |attribute_name, attribute_type|
+          puts "  attribute #{attribute_name.inspect}, #{attribute_type.meta[:mapping].inspect}"
+        end
+      end
+
+      puts
+    end
+  end
+end

data/lib/pakyow/validations/data/unique.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "pakyow/validator"
+
+module Pakyow
+  module Validations
+    module Data
+      # Validates that the value is unique within its data source.
+      #
+      module Unique
+        def self.message(**)
+          "must be unique"
+        end
+
+        def self.valid?(value, source:, **options)
+          query = options[:context].app.data.public_send(source).public_send(:"by_#{options[:key]}", value)
+
+          if updating = options[:updating]
+            if updating.is_a?(Pakyow::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, :unique)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-data
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc5
+  version: 1.0.0
 platform: ruby
 authors:
 - Bryan Powell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-15 00:00:00.000000000 Z
+date: 2019-07-16 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.rc5
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc5
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: pakyow-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc5
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc5
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.22'
 description: Data persistence layer for Pakyow
-email: bryan@metabahn.com
+email: bryan@bryanp.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -117,6 +117,14 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
+- lib/pakyow/application/behavior/data/lookup.rb
+- lib/pakyow/application/behavior/data/serialization.rb
+- lib/pakyow/application/config/data.rb
+- lib/pakyow/application/helpers/data.rb
+- lib/pakyow/behavior/data/auto_migrate.rb
+- lib/pakyow/behavior/data/connections.rb
+- lib/pakyow/behavior/data/memory_db.rb
+- lib/pakyow/config/data.rb
 - lib/pakyow/data.rb
 - lib/pakyow/data/adapters/base.rb
 - lib/pakyow/data/adapters/sql.rb
@@ -130,14 +138,10 @@ files:
 - lib/pakyow/data/adapters/sql/runner.rb
 - lib/pakyow/data/adapters/sql/source_extension.rb
 - lib/pakyow/data/adapters/sql/types.rb
-- lib/pakyow/data/behavior/config.rb
-- lib/pakyow/data/behavior/lookup.rb
-- lib/pakyow/data/behavior/serialization.rb
 - lib/pakyow/data/connection.rb
 - lib/pakyow/data/container.rb
 - lib/pakyow/data/errors.rb
 - lib/pakyow/data/framework.rb
-- lib/pakyow/data/helpers.rb
 - lib/pakyow/data/lookup.rb
 - lib/pakyow/data/migrator.rb
 - lib/pakyow/data/object.rb
@@ -161,19 +165,16 @@ files:
 - lib/pakyow/data/subscribers/adapters/redis/scripts/expire.lua
 - lib/pakyow/data/subscribers/adapters/redis/scripts/persist.lua
 - lib/pakyow/data/subscribers/adapters/redis/scripts/register.lua
-- lib/pakyow/data/tasks/bootstrap.rake
-- lib/pakyow/data/tasks/create.rake
-- lib/pakyow/data/tasks/drop.rake
-- lib/pakyow/data/tasks/finalize.rake
-- lib/pakyow/data/tasks/migrate.rake
-- lib/pakyow/data/tasks/reset.rake
 - lib/pakyow/data/types.rb
-- lib/pakyow/environment/data/auto_migrate.rb
-- lib/pakyow/environment/data/config.rb
-- lib/pakyow/environment/data/connections.rb
-- lib/pakyow/environment/data/memory_db.rb
-- lib/pakyow/validations/unique.rb
-homepage: https://pakyow.org
+- lib/pakyow/tasks/db/bootstrap.rake
+- lib/pakyow/tasks/db/create.rake
+- lib/pakyow/tasks/db/drop.rake
+- lib/pakyow/tasks/db/finalize.rake
+- lib/pakyow/tasks/db/migrate.rake
+- lib/pakyow/tasks/db/reset.rake
+- lib/pakyow/tasks/info/sources.rake
+- lib/pakyow/validations/data/unique.rb
+homepage: https://pakyow.com
 licenses:
 - LGPL-3.0
 metadata: {}
@@ -188,9 +189,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: 

data/lib/pakyow/data/behavior/lookup.rb

@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-require "pakyow/support/extension"
-
-require "pakyow/data/container"
-require "pakyow/data/lookup"
-require "pakyow/data/subscribers"
-
-module Pakyow
-  module Data
-    module Behavior
-      module Lookup
-        extend Support::Extension
-
-        # Data container object.
-        #
-        attr_reader :data
-
-        apply_extension do
-          after "boot", "initialize.data", priority: :high do
-            # Validate that each source connection exists.
-            #
-            state(:source).each do |source|
-              Pakyow.connection(source.adapter, source.connection)
-            end
-
-            subscribers = if is_a?(Plugin)
-              # Plugins should use the same subscribers object as their parent app.
-              #
-              parent.data.subscribers
-            else
-              Subscribers.new(
-                self,
-                Pakyow.config.data.subscriptions.adapter,
-                Pakyow.config.data.subscriptions.adapter_settings
-              )
-            end
-
-            containers = Pakyow.data_connections.values.each_with_object([]) { |connections, arr|
-              connections.values.each do |connection|
-                arr << Container.new(
-                  connection: connection,
-                  sources: state(:source).select { |source|
-                    connection.name == source.connection && connection.type == source.adapter
-                  },
-                  objects: state(:object)
-                )
-              end
-            }
-
-            containers.each do |container|
-              container.finalize_associations!(containers - [container])
-            end
-
-            containers.each do |container|
-              container.finalize_sources!(containers - [container])
-            end
-
-            @data = Data::Lookup.new(
-              app: self,
-              containers: containers,
-              subscribers: subscribers
-            )
-          end
-
-          on "shutdown" do
-            if instance_variable_defined?(:@data)
-              @data.subscribers.shutdown
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/pakyow/data/behavior/serialization.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require "pakyow/support/extension"
-require "pakyow/support/serializer"
-
-module Pakyow
-  module Data
-    module Behavior
-      # Persists in-memory subscribers across restarts.
-      #
-      module Serialization
-        extend Support::Extension
-
-        apply_extension do
-          on "shutdown", priority: :high do
-            if Pakyow.config.data.subscriptions.adapter == :memory && data
-              subscriber_serializer.serialize
-            end
-          end
-
-          after "boot" do
-            if Pakyow.config.data.subscriptions.adapter == :memory && data
-              subscriber_serializer.deserialize
-            end
-          end
-        end
-
-        private def subscriber_serializer
-          Support::Serializer.new(
-            data.subscribers.adapter,
-            name: "#{config.name}-subscribers",
-            path: File.join(
-              Pakyow.config.root, "tmp", "state"
-            ),
-            logger: Pakyow.logger
-          )
-        end
-      end
-    end
-  end
-end

data/lib/pakyow/data/helpers.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Pakyow
-  module Data
-    module Helpers
-      def data
-        @connection.app.data
-      end
-    end
-  end
-end

data/lib/pakyow/environment/data/config.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-require "pakyow/support/extension"
-
-module Pakyow
-  module Environment
-    module Data
-      module Config
-        extend Support::Extension
-
-        apply_extension do
-          on "configure" do
-            # We have to define these in a before configure hook since new types could be added.
-            #
-            Pakyow.config.data.connections.instance_eval do
-              Pakyow::Data::Connection.adapter_types.each do |type|
-                setting type, {}
-              end
-            end
-          end
-
-          configurable :data do
-            setting :default_adapter, :sql
-            setting :default_connection, :default
-
-            setting :silent, true
-            setting :auto_migrate, true
-            setting :auto_migrate_always, [:memory]
-            setting :migration_path, "./database/migrations"
-
-            defaults :production do
-              setting :auto_migrate, false
-            end
-
-            configurable :subscriptions do
-              setting :adapter, :memory
-              setting :adapter_settings, {}
-
-              defaults :production do
-                setting :adapter, :redis
-                setting :adapter_settings do
-                  Pakyow.config.redis.to_h
-                end
-              end
-            end
-
-            configurable :connections do
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/pakyow/validations/unique.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require "pakyow/validator"
-
-module Pakyow
-  module Validations
-    # Validates that the value is unique within its data source.
-    #
-    module Unique
-      def self.message(**)
-        "must be unique"
-      end
-
-      def self.valid?(value, source:, **options)
-        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, :unique)
-  end
-end