pakyow-data 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7764982abc5ed7cee52182df5682fda04521c7258bce5e4685afb63307c9aceb
-  data.tar.gz: bbdfe1dca59903d72c2b2408e2176fe0b3841e1c21c967f72b0a10b199437d89
+  metadata.gz: 1378c2647f72c4d91be73f596565a36c29a4d86bf021d435eed57aecbd9ad9a1
+  data.tar.gz: 452bf6c9b17486ff57fc44dc852fd8a138fec7c0449fbb6d7b31ec4725821c93
 SHA512:
-  metadata.gz: 81300e9647f7c33e3b6ff1cb26ca49d4f8a501655dc2b6fce6dd1209173e32e0a1a4c8516fa9e23c7f3d922cc4a93fc393fb489dbabce585ae3dc1d1acb3bc6e
-  data.tar.gz: d9b098db40285afc7df7cd27be5ed0a8e378a85fee906bc1c88ecb81aec4d85c5caa7f7ef954acf2666166048f5634d4fcb29872a31daa298be077ac24c02c4b
+  metadata.gz: 36bbc1ec91f8cc806dbb4228be0952110fbd77935b5b37188c7c6d368d58b502e162fecd330245250fe517eed49aa80f0317006d1aaad2d636d88e78011f240c
+  data.tar.gz: a8c6dbc07349a57826c3d8900e6a6286ca526a5f64d93ee44bf0af3a948003e91eb02791da98abd04c3972e7092519a639aa61a4da597052bf1c38d731024ef0

data/CHANGELOG.md

@@ -1,5 +1,30 @@
-# UNRELEASED
+# v1.0.2 (unreleased)
 
-# 1.0
+  * `fix` **Data types are now compatible with `dry-types` v1.2.0.**
+
+    *Related links:*
+    - [Pull Request #305][pr-305]
+
+  * `fix` **Associating sources across connections now works correctly.**
+
+    *Related links:*
+    - [Commit 4c8c544][4c8c544]
+
+  * `fix` **Setting up associations of different types for the same source now works correctly.**
+
+    *Related links:*
+    - [Commit 12fafe0][12fafe0]
+
+  * `fix` **Fetching one then all now correctly includes associated data.**
+
+    *Related links:*
+    - [Commit 546e92a][546e92a]
+
+[pr-305]: https://github.com/pakyow/pakyow/pull/305
+[4c8c544]: https://github.com/pakyow/pakyow/commit/4c8c544cd7ec91ffe9ec6d4bb72e14699b59357d
+[12fafe0]: https://github.com/pakyow/pakyow/commit/12fafe0ae1e65e15bd9c78b674bb36ef3bee95f3
+[546e92a]: https://github.com/pakyow/pakyow/commit/546e92a02d840f7586439f0abe6a9a56c533d062
+
+# v1.0.0
 
   * Hello, Web

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

@@ -31,9 +31,9 @@ module Pakyow
           time: Data::Types::MAPPING[:time].meta(database_type: Time, column_type: :datetime),
 
           # sql-specific types
-          file: Types.Constructor(Sequel::SQL::Blob).meta(mapping: :file, database_type: File, column_type: :blob),
-          text: Types::Coercible::String.meta(mapping: :text, database_type: :text, column_type: :text, native_type: "text"),
-          bignum: Types::Coercible::Integer.meta(mapping: :bignum, database_type: :Bignum)
+          file: Data::Types.Constructor(Sequel::SQL::Blob).meta(mapping: :file, database_type: File, column_type: :blob),
+          text: Data::Types::Coercible::String.meta(mapping: :text, database_type: :text, column_type: :text, native_type: "text"),
+          bignum: Data::Types::Coercible::Integer.meta(mapping: :bignum, database_type: :Bignum)
         }.freeze
 
         require "pakyow/data/adapters/sql/types"

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

@@ -13,9 +13,9 @@ module Pakyow
               string: Sql::TYPES[:string].meta(native_type: "text"),
               text: Sql::TYPES[:text].meta(column_type: :string),
 
-              json: Pakyow::Data::Types.Constructor(:json) { |value|
+              json: Pakyow::Data::Types.Constructor(::Object) { |value|
                 Sequel.pg_json(value)
-              }.meta(mapping: :json, database_type: :json)
+              }.meta(mapping: :json, database_type: :json, column_type: :json)
             }.freeze
           end
 

data/lib/pakyow/data/container.rb

@@ -172,11 +172,11 @@ module Pakyow
                 end
 
                 unless association.internal?
-                  unless associated_source.associations[association.specific_type].any? { |current_association| current_association.joining_source_name == association.joining_source_name }
+                  unless associated_source.associations[association.specific_type].any? { |current_association| current_association.type == :through && current_association.joining_source_name == association.joining_source_name }
                     associated_source.send(association.specific_type, association.associated_name, source: source.plural_name, as: association.left_name, through: association.joining_source_name, dependent: association.dependent)
                   end
 
-                  unless source.associations[association.specific_type].any? { |current_association| current_association.associated_source_name == association.joining_source_name }
+                  unless source.associations[association.specific_type].any? { |current_association| current_association.type == :through && current_association.associated_source_name == association.joining_source_name }
                     source.send(association.specific_type, association.joining_source_name, source: joining_source.plural_name, as: Support.inflector.singularize(association.associated_name), dependent: association.dependent)
                   end
                 end

data/lib/pakyow/data/migrator.rb

@@ -132,7 +132,7 @@ module Pakyow
           )
 
           merge_connection_overrides!(connection_opts, connection_overrides)
-          new(Connection.new(opts: connection_opts, type: adapter, name: connection))
+          connect_raw(opts: connection_opts, type: adapter, name: connection)
         end
 
         def connect_global(adapter:, connection:, connection_overrides: {})
@@ -154,12 +154,12 @@ module Pakyow
 
           merge_connection_overrides!(connection_opts, connection_overrides)
           globalize_connection_opts!(adapter, connection_opts)
+          connect_raw(opts: connection_opts, type: adapter, name: connection)
+        end
 
-          connect(
-            adapter: adapter,
-            connection: connection,
-            connection_overrides: connection_opts
-          )
+        # @api private
+        def connect_raw(opts:, type:, name:)
+          new(Connection.new(opts: opts, type: type, name: name))
         end
 
         private

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

@@ -289,6 +289,10 @@ module Pakyow
 
         def include_results!(results)
           @included.each do |association, combined_source|
+            combined_source = combined_source.source_from_self(
+              combined_source.__getobj__.dup
+            )
+
             group_by_key, assign_by_key, remove_keys = if association.type == :through
               joining_source = association.joining_source.instance
 

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

@@ -101,7 +101,7 @@ module Pakyow
 
                 case association_value
                 when Proxy
-                  if association_value.source.class == association.associated_source
+                  if association_value.source.class.__object_name.name == association.associated_source.__object_name.name
                     if association.result_type == :one && (association_value.count > 1 || (@updates && @source.count > 1))
                       raise ConstraintViolation.new_with_message(
                         :associate_multiple,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-data
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Bryan Powell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2019-11-06 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.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: pakyow-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.22'
+        version: '5.26'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.22'
+        version: '5.26'
 description: Data persistence layer for Pakyow
 email: bryan@bryanp.org
 executables: []