usman 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d22e2e3562f38ea5576027b67f5d2c82a9c36f39
-  data.tar.gz: c858c47f7b5e81396f5f0dfc887283f9e54cee8d
+  metadata.gz: 66561139d596eb84bc2c00138dea1965ff65cec4
+  data.tar.gz: 2c3cf0d379d6daa1f7f5006ef5aa805778a4f23a
 SHA512:
-  metadata.gz: 4f832c806ddedb96aed37fcb2e80e29d48277ff36bb5c77f297493f9bf2d2dc3205cd0a28ea0f201cc28650c9192d1c487e0ca614b7713755a0c37638e976b33
-  data.tar.gz: abc03809d152fe4275f6741b2680fec4ea63087980d87473e6aca4c58a4547d9a110ed8e810c8644697f81db02beca0a89d9523766d310b1ca910e9d4357d8d5
+  metadata.gz: 47860d3bdb74aa8a34e333d6eff9a00932e2aa19ea5e441cd093cb2ca6938e5de654fe71b81873f092f4350116c02ea0d4c196d8c0270666acad0a148049fc1e
+  data.tar.gz: '09a34bbc72197d03d4c9a246698b7e82f8a7ffc06d0287899afe9155cd1490e2b3821af4abefe7193845b2ba90035fcb21652c9db3ecf24610ca1102b6f7d874'

data/app/models/user.rb

@@ -52,6 +52,10 @@ class User < Usman::ApplicationRecord
   # Callbacks
   before_validation :generate_auth_token
 
+  # Delegates
+  delegate :mobile_number, :to => :registration, :prefix => true, :allow_nil => true
+  delegate :dialing_prefix, :to => :registration, :prefix => true, :allow_nil => true
+
   # Associations
   has_one :profile_picture, :as => :imageable, :dependent => :destroy, :class_name => "Image::ProfilePicture"
   has_many :permissions

data/app/serializers/owner_serializer.rb

@@ -0,0 +1,20 @@
+class OwnerSerializer < ActiveModel::Serializer
+  include NullAttributeReplacer
+  attributes :id, :name, :email
+
+ 	has_one :registration, class_name: "Registration", serializer: RegistrationSerializer do
+ 		if object.registration
+      object.registration
+    else
+      object.build_registration
+    end
+ 	end
+
+  has_one :profile_picture, class_name: "Image::ProfilePicture", serializer: ProfilePictureSerializer do
+    if object.profile_picture
+      object.profile_picture
+    else
+      object.build_profile_picture
+    end
+  end
+end

data/app/serializers/registration_serializer.rb

@@ -0,0 +1,29 @@
+class RegistrationSerializer < ActiveModel::Serializer
+	include NullAttributeReplacer
+
+	attributes :id, :dialing_prefix, :mobile_number, :status
+
+ 	has_one :user, class_name: "User", serializer: ProfileSerializer do
+ 		if object.user
+      object.user
+    else
+      object.build_user
+    end
+ 	end
+
+ 	has_one :country, class_name: "Country", serializer: CountryPreviewSerializer do
+ 		if object.country
+      object.country
+    else
+      object.build_country
+    end
+ 	end
+ 		
+ 	has_one :city, class_name: "City", serializer: CityPreviewSerializer do
+ 		if object.city
+      object.city
+    else
+      object.build_city
+    end
+ 	end
+end

data/lib/usman/version.rb

@@ -1,3 +1,3 @@
 module Usman
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usman
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-26 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -404,8 +404,10 @@ files:
 - app/models/role.rb
 - app/models/user.rb
 - app/models/usman/application_record.rb
+- app/serializers/owner_serializer.rb
 - app/serializers/profile_picture_serializer.rb
 - app/serializers/profile_serializer.rb
+- app/serializers/registration_serializer.rb
 - app/services/usman/authentication_service.rb
 - app/services/usman/mobile_registration_service.rb
 - app/uploaders/feature_image_uploader.rb