hanami-model 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb1fca18a6f84f606883ffab656334c1b8e619f6
-  data.tar.gz: 8d2884fbd3bfda01dc6390b4271280cfffe1abc2
+  metadata.gz: b42e3225f01dfdc11db772e01e9380930378b34b
+  data.tar.gz: 61c681f2b8dacd1867ac9b929e84f2fc2d9da120
 SHA512:
-  metadata.gz: 4af0a977d17c5cab779ba6b7fefc91b5e94ffa927324439ed99d45fd468000289f564f151c48e1926e2e603052967077517e055735dbe719152a021ccb2c7282
-  data.tar.gz: f4c30f92ab810dde2c9678d8352bec0787e2c446235e70a078e7a419913bf2fc59d8d0fdcd30727be296085b74f7dc89f300bb57cca463437cf94805ce2b2800
+  metadata.gz: c7c31f943c0af575a6b1197c87d2ce0bcf1b1ccf3e42dab6869c85580e79f5f316c62d7c52093a8b96b4fb5ace02e237723fd3fa115398247e68c409871cb592
+  data.tar.gz: f6b396a6f8e57b35d9a213f9d49c45610a3dc3825fc8233e83721af811bdf411b270e6d1ce8420d745d91d725ba3ca826ffa1b6dca02e4976c44de79dc74a6e8

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Hanami::Model
 A persistence layer for Hanami
 
+## v1.0.2 - 2017-08-04
+### Fixed
+- [Maurizio De Magnis] URI escape for Postgres password
+- [Marion Duprey] Ensure repository to generate timestamps values even when only one between `created_at` and `updated_at` is present
+- [Paweł Świątkowski] Make Postgres JSON(B) to work with Ruby arrays
+- [Luca Guidi] Don't remove migrations when running `Hanami::Model::Migrator#apply` fails to dump the database
+
 ## v1.0.1 - 2017-06-23
 ### Fixed
 - [Kai Kuchenbecker & Marcello Rocha & Luca Guidi] Ensure `Hanami::Entity#initialize` to not serialize (into `Hash`) other entities passed as an argument

data/hanami-model.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'hanami-utils',    '~> 1.0'
   spec.add_runtime_dependency 'rom-sql',         '~> 1.3'
-  spec.add_runtime_dependency 'rom-repository',  '~> 1.3'
-  spec.add_runtime_dependency 'dry-types',       '~> 0.10'
+  spec.add_runtime_dependency 'rom-repository',  '~> 1.4'
+  spec.add_runtime_dependency 'dry-types',       '~> 0.11'
   spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.6'

data/lib/hanami/model/migrator/adapter.rb

@@ -1,5 +1,6 @@
 require 'uri'
 require 'shellwords'
+require 'open3'
 
 module Hanami
   module Model
@@ -176,6 +177,15 @@ module Hanami
         def escape(string)
           Shellwords.escape(string) unless string.nil?
         end
+
+        # @since 1.0.2
+        # @api private
+        def execute(command, env: {}, error: ->(err) { raise MigrationError.new(err) })
+          Open3.popen3(env, command) do |_, stdout, stderr, wait_thr|
+            error.call(stderr.read) unless wait_thr.value.success?
+            yield stdout if block_given?
+          end
+        end
       end
     end
   end

data/lib/hanami/model/migrator/mysql_adapter.rb

@@ -47,7 +47,6 @@ module Hanami
         # @since 0.4.0
         # @api private
         def dump
-          set_environment_variables
           dump_structure
           dump_migrations_data
         end
@@ -55,18 +54,11 @@ module Hanami
         # @since 0.4.0
         # @api private
         def load
-          set_environment_variables
           load_structure
         end
 
         private
 
-        # @since 0.7.0
-        # @api private
-        def set_environment_variables
-          ENV[PASSWORD] = password unless password.nil?
-        end
-
         # @since 0.7.0
         # @api private
         def password
@@ -76,19 +68,19 @@ module Hanami
         # @since 0.4.0
         # @api private
         def dump_structure
-          system "mysqldump --user=#{username} --no-data --skip-comments --ignore-table=#{database}.#{migrations_table} #{database} > #{schema}"
+          execute "mysqldump --host=#{host} --port=#{port} --user=#{username} --no-data --skip-comments --ignore-table=#{database}.#{migrations_table} #{database} > #{schema}", env: { PASSWORD => password }
         end
 
         # @since 0.4.0
         # @api private
         def load_structure
-          system "mysql --user=#{username} #{database} < #{escape(schema)}" if schema.exist?
+          execute("mysql --host=#{host} --port=#{port} --user=#{username} #{database} < #{escape(schema)}", env: { PASSWORD => password }) if schema.exist?
         end
 
         # @since 0.4.0
         # @api private
         def dump_migrations_data
-          system "mysqldump --user=#{username} --skip-comments #{database} #{migrations_table} >> #{schema}"
+          execute "mysqldump --host=#{host} --port=#{port} --user=#{username} --skip-comments #{database} #{migrations_table} >> #{schema}", env: { PASSWORD => password }
         end
       end
     end

data/lib/hanami/model/migrator/postgres_adapter.rb

@@ -89,19 +89,20 @@ module Hanami
         # @since 0.4.0
         # @api private
         def dump_structure
-          system "pg_dump -s -x -O -T #{migrations_table} -f #{escape(schema)} #{database}"
+          execute "pg_dump -s -x -O -T #{migrations_table} -f #{escape(schema)} #{database}"
         end
 
         # @since 0.4.0
         # @api private
         def load_structure
-          system "psql -X -q -f #{escape(schema)} #{database}" if schema.exist?
+          execute "psql -X -q -f #{escape(schema)} #{database}" if schema.exist?
         end
 
         # @since 0.4.0
         # @api private
         def dump_migrations_data
-          system "pg_dump -t #{migrations_table} #{database} >> #{escape(schema)}"
+          error = ->(err) { raise MigrationError.new(err) unless err =~ /no matching tables/i }
+          execute "pg_dump -t #{migrations_table} #{database} >> #{escape(schema)}", error: error
         end
 
         # @since 0.5.1

data/lib/hanami/model/migrator/sqlite_adapter.rb

@@ -1,5 +1,6 @@
 require 'pathname'
 require 'hanami/utils'
+require 'English'
 
 module Hanami
   module Model
@@ -91,20 +92,36 @@ module Hanami
         # @since 0.4.0
         # @api private
         def dump_structure
-          system "sqlite3 #{escape(path)} .schema > #{escape(schema)}"
+          execute "sqlite3 #{escape(path)} .schema > #{escape(schema)}"
         end
 
         # @since 0.4.0
         # @api private
         def load_structure
-          system "sqlite3 #{escape(path)} < #{escape(schema)}" if schema.exist?
+          execute "sqlite3 #{escape(path)} < #{escape(schema)}" if schema.exist?
         end
 
         # @since 0.4.0
         # @api private
+        #
+        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Metrics/MethodLength
         def dump_migrations_data
-          system %(sqlite3 #{escape(path)} .dump | grep '^INSERT INTO "#{migrations_table}"' >> #{escape(schema)})
+          execute "sqlite3 #{escape(path)} .dump" do |stdout|
+            begin
+              contents = stdout.read.split($INPUT_RECORD_SEPARATOR)
+              contents = contents.grep(/^INSERT INTO "#{migrations_table}"/)
+
+              ::File.open(schema, ::File::CREAT | ::File::BINARY | ::File::WRONLY | ::File::APPEND) do |file|
+                file.write(contents.join($INPUT_RECORD_SEPARATOR))
+              end
+            rescue => exception
+              raise MigrationError.new(exception.message)
+            end
+          end
         end
+        # rubocop:enable Metrics/MethodLength
+        # rubocop:enable Metrics/AbcSize
       end
     end
   end

data/lib/hanami/model/plugins/timestamps.rb

@@ -23,8 +23,7 @@ module Hanami
           # @api private
           def initialize(relation, input)
             super
-            columns     = relation.columns.sort
-            @timestamps = (columns & TIMESTAMPS) == TIMESTAMPS
+            @timestamps = relation.columns & TIMESTAMPS
           end
 
           # Processes the input
@@ -49,7 +48,7 @@ module Hanami
           # @since 0.7.0
           # @api private
           def timestamps?
-            @timestamps
+            !@timestamps.empty?
           end
         end
 
@@ -63,7 +62,7 @@ module Hanami
           # @since 0.7.0
           # @api private
           def _touch(value, now)
-            value[:updated_at] ||= now
+            value[:updated_at] ||= now if @timestamps.include?(:updated_at)
             value
           end
         end
@@ -79,7 +78,7 @@ module Hanami
           # @api private
           def _touch(value, now)
             super
-            value[:created_at] ||= now
+            value[:created_at] ||= now if @timestamps.include?(:created_at)
             value
           end
         end

data/lib/hanami/model/sql/consoles/postgresql.rb

@@ -1,4 +1,5 @@
 require_relative 'abstract'
+require 'cgi'
 
 module Hanami
   module Model
@@ -59,7 +60,7 @@ module Hanami
           # @since 0.7.0
           # @api private
           def configure_password
-            ENV[PASSWORD] = @uri.password unless @uri.password.nil?
+            ENV[PASSWORD] = CGI.unescape(@uri.password) unless @uri.password.nil?
           end
         end
       end

data/lib/hanami/model/sql/types.rb

@@ -31,6 +31,8 @@ module Hanami
           Array    = Types::Strict::Nil | Types::Array.constructor(Coercions.method(:array))
           Hash     = Types::Strict::Nil | Types::Hash.constructor(Coercions.method(:hash))
 
+          PG_JSON  = Types::Strict::Nil | Types::Any.constructor(Coercions.method(:pg_json))
+
           # @since 0.7.0
           # @api private
           MAPPING = {
@@ -72,14 +74,23 @@ module Hanami
             #
             #  MAPPING.fetch(unwrapped.pristine, attribute)
             MAPPING.fetch(unwrapped.pristine) do
-              if defined?(ROM::SQL::Types::PG::JSONB) && unwrapped.pristine == ROM::SQL::Types::PG::JSONB
-                Schema::Hash
+              if pg_json?(unwrapped.pristine)
+                Schema::PG_JSON
               else
                 attribute
               end
             end
           end
 
+          # @since 1.0.2
+          # @api private
+          def self.pg_json?(pristine)
+            (defined?(ROM::SQL::Types::PG::JSONB) && pristine == ROM::SQL::Types::PG::JSONB) ||
+              (defined?(ROM::SQL::Types::PG::JSON) && pristine == ROM::SQL::Types::PG::JSON)
+          end
+
+          private_class_method :pg_json?
+
           # Coercer for SQL associations target
           #
           # @since 0.7.0

data/lib/hanami/model/sql/types/schema/coercions.rb

@@ -11,6 +11,7 @@ module Hanami
           # @since 0.7.0
           # @api private
           #
+          # rubocop:disable Metrics/ModuleLength
           # rubocop:disable Metrics/MethodLength
           module Coercions
             # Coerces given argument into Integer
@@ -192,8 +193,30 @@ module Hanami
                 raise ArgumentError.new("invalid value for Hash(): #{arg.inspect}")
               end
             end
+
+            # Coerces given argument to appropriate Postgres JSON(B) type, i.e. Hash or Array
+            #
+            # @param arg [Object] the object to coerce
+            #
+            # @return [Hash, Array] the result of the coercion
+            #
+            # @raise [ArgumentError] if the coercion fails
+            #
+            # @since 1.0.2
+            # @api private
+            def self.pg_json(arg)
+              case arg
+              when ->(a) { a.respond_to?(:to_hash) }
+                hash(arg)
+              when ->(a) { a.respond_to?(:to_a) }
+                array(arg)
+              else
+                raise ArgumentError.new("invalid value for PG_JSON(): #{arg.inspect}")
+              end
+            end
           end
           # rubocop:enable Metrics/MethodLength
+          # rubocop:enable Metrics/ModuleLength
         end
       end
     end

data/lib/hanami/model/version.rb

@@ -3,6 +3,6 @@ module Hanami
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.0.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-model
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A persistence layer for Hanami