symphonia 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81d7e486f9226d136f252f53841733cf7fd1f76a84a27b80ff0472cfc574ae30
-  data.tar.gz: 39fa3ee78ed46669f2dcd583179818e7288fd392c54556b943d7ca2a9b1b312b
+  metadata.gz: a94d9e18f62261a832ffb94a8392973d1bc7ecad3c147c9a67bf524fde81d061
+  data.tar.gz: 52ab54d867d94ba7029011f416fa854eb34984b33feed8447c920adfb647ca3e
 SHA512:
-  metadata.gz: 16fa7bf6a6fbfbb875f0d6bf84c554ecd48ba9d2aacf2c259b361c3e5cb90ac57d448bd1da3c95ab3a1918f18b1a22a05ed3db1517bb36dcc34a4d10e30b7577
-  data.tar.gz: 4fd6defbf9b4128295eb1c5d90c9ec9476c08e4d80adb58fdcd275cc5998190adad1db771d496cbb97f6ed128d6fafa46109b9b96b320ec892544ebb6c5a3743
+  metadata.gz: 98facf3061caf96e02c909469c6812eb07b77f5a8695eee924713e00ab052332949e4d26c9e5cbfea557f2f5c86c441f1568807df52cb5373ebda6d6b3094fe5
+  data.tar.gz: fd12db3ba010a729958fa5c11921528db0b36b2c5e614baf359eab19e5472f46c455fed36aeba2c643b43028a7866ca7a4e351666e39536d162706ac26bdf9b4

data/CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [3.3.3] - 2020-10
+### Changed
+- prefill login from email
+- allow login edit for legacy accounts
 ## [3.3.2] - 2020-10-17
 ### Added
 - `render_super` for templates

data/app/models/symphonia/user.rb

@@ -50,9 +50,6 @@ module Symphonia
     before_save do |model|
       Rails.cache.delete_matched('user_allowed_to*') if model.role_id_changed?
     end
-    before_validation do |model|
-      model.login ||= model.email
-    end
 
     def allowed_to?(action)
       return true if admin?

data/app/views/symphonia/accounts/_form.html.erb

@@ -1,4 +1,9 @@
 <div class="row justify-content-center">
+  <% if f.object.login != f.object.email %>
+    <div class="col-lg-8">
+      <%= f.text_field :login, required: true %>
+    </div>
+  <% end %>
   <div class="col-lg-8">
     <%= f.email_field :email, required: true %>
   </div>

data/lib/symphonia/user_management.rb

@@ -9,14 +9,12 @@ module Symphonia
 
       scope :sorted, -> { order(:first_name, :last_name) }
 
-      # validates :mail, uniqueness: true, format: { with: Authlogic::Regex::EMAIL_NONASCII }
-      # validates :password, presence: true, if: ->(u){ u.new_record? }
-
       validates :email, presence: true, uniqueness: { case_sensitive: false }
       validates :login, presence: true, uniqueness: { case_sensitive: false }
       validates :first_name, presence: true
 
       before_validation :set_uuid, only: -> { uuid.blank? }
+      before_validation :set_login, only: -> { login.blank? }
 
       def self.current=(entity)
         Rails.logger.info("* #{entity.class.name}: #{entity.login} id: #{entity.id}") if entity
@@ -62,6 +60,10 @@ module Symphonia
       def set_uuid
         self.uuid ||= SecureRandom.uuid
       end
+
+      def set_login
+        self.login ||= email
+      end
     end
   end
 end

data/lib/symphonia/version.rb

@@ -1,3 +1,3 @@
 module Symphonia
-  VERSION = '3.3.2'
+  VERSION = '3.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symphonia
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Lukas Pokorny
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-18 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -296,14 +296,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -367,7 +367,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.2
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: