tramway-user 2.1.2 → 2.1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c4c3e4491f8bf09b03dd8e7d8e8f42c818aa4a89f515e0f8b640bf797986632
-  data.tar.gz: 53d0883e613a9031541734c47006a3ae108598742137d7004ab84a99dd6c7844
+  metadata.gz: 48763df0538d0bf92c0538e45efd0df70ff017b050d9ed26d25525ccd64d77c0
+  data.tar.gz: 4c3d2c389e2dbeeb35e58bb5bcdaf4d4cb6f333f18f460124d9c03a3f7887230
 SHA512:
-  metadata.gz: 46c1aca9f8b97823e7439e5aaffe5fdc146577d39cec30b659270887189bbae6c0484028d8b0887be1598330b3ea555b706208c3620eed0b8a110a034adc81c0
-  data.tar.gz: ea30de2a287014f22da83aaba388f8de43acefc6b7cfe176f4ac6ecbb040a13863e2972b1fa17f182988f6eb3990a90325e95d496b3ab068f2a6bb32f713ed6a
+  metadata.gz: e6f5408f00e456b0d3c06faa5b897d294c68eef5d76a15fec690512153732dd839c30e03e5d152d0144ca49d883e7aa911b1baed23bd07bed25791567e62f80b
+  data.tar.gz: 571f6c1500d1a6857edde7048af7c5da7da1f4863dfd7b351f12ab2ef5401dd4914ef29e8228c9639bba5b7caed34b36847631f922b7540178b93332598b2bb6

data/app/decorators/tramway/user/user_decorator.rb

@@ -11,19 +11,21 @@ class Tramway::User::UserDecorator < ::Tramway::Core::ApplicationDecorator
     end
 
     def show_attributes
-      [:email, :first_name, :last_name, :phone, :role, :created_at, :updated_at]
+      %i[email first_name last_name phone role created_at updated_at]
+    end
+
+    if defined? Tramway::Conference
+      def show_associations
+        [:social_networks]
+      end
     end
   end
 
-  delegate :first_name, to: :object
-  delegate :last_name, to: :object
-  delegate :email, to: :object
-  delegate :phone, to: :object
-  delegate :role, to: :object
-  delegate :created_at, to: :object
-  delegate :updated_at, to: :object
+  decorate_association :social_networks, as: :record if defined? Tramway::Conference
+
+  delegate_attributes :first_name, :last_name, :email, :phone, :role, :created_at, :updated_at, :admin?
 
   def name
-    "#{object.first_name} #{object.last_name}"
+    "#{object&.first_name} #{object&.last_name}"
   end
 end

data/app/forms/admin/tramway/user/user_form.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 class Admin::Tramway::User::UserForm < ::Tramway::Core::ApplicationForm
-  self.model_class = Tramway::User::User
+  self.model_class = Tramway::User::User.is_active
 
   properties :email, :password, :first_name, :last_name, :role, :phone
 
-  validates :email, email: true
+  #fix me
+  unless self.model_class.columns_hash['project_id'].present?
+    validates :email, email: true, uniqueness: true, on: :destroy
+  end
 
   def initialize(object)
     super(object).tap do

data/app/models/tramway/user/user.rb

@@ -3,6 +3,8 @@
 class Tramway::User::User < ::Tramway::Core::ApplicationRecord
   has_secure_password
 
+  has_many :social_networks, as: :record, class_name: 'Tramway::Profiles::SocialNetwork' if defined? Tramway::Conference
+
   # FIXME: replace to tramway-admin
   enumerize :role, in: %i[user admin], default: :admin
 
@@ -12,4 +14,5 @@ class Tramway::User::User < ::Tramway::Core::ApplicationRecord
 
   scope :admins, -> { where role: :admin }
   scope :simple_users, -> { where role: :user }
+  scope :is_active, -> { where state: :active }
 end

data/lib/tramway/user/generators/templates/add_phone_to_tramway_user_users.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddPhoneToTramwayUserUsers < ActiveRecord::Migration[5.1]
   def change
     add_column :tramway_user_users, :phone, :text

data/lib/tramway/user/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module User
-    VERSION = '2.1.2'
+    VERSION = '2.1.3.3'
   end
 end

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: tramway-user
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.11
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.11
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.11
 - !ruby/object:Gem::Dependency
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Engine for users in your Rails app