usman 0.3.13 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01ac583f7b2db6539f7c30c806d1c706c63d0c90
-  data.tar.gz: 3fe75fd1f24555c3e8560f7e9568e22faf57e0d9
+  metadata.gz: eed7d98639d06ca2611f6cb360693e8f7e1354b1
+  data.tar.gz: c31ffb7805ba5a7a4bd2d5c33831d1d72671ae73
 SHA512:
-  metadata.gz: aee20527bc3c9bd207f5f8e6a8c7bc449bfc0847bc82da46f5ab96fbc33922323c5128c57a444d6a51c7e18fafe67ce832cc5f836174848283ff46e588768373
-  data.tar.gz: 5a79998e67e318b8e7dbfe42358342d80a8cfde4800091a78d6eb4b5ef8554093fdfdd7f3611e3235c1c2d516490e11d3b87f9050278b385ee88019002c1c817
+  metadata.gz: cdb61002edb95fb3bf61c3d5ab72c29a3733335ba6db3f6f1c3d880a80df470d372a03d038a937a6fc80f5ba9dc6847b35a4a49f33d13283297fcb15d2071204
+  data.tar.gz: d86daa0d9d479657b6a7345dfa27fd892f5897370707cb7487b9a7f04de49ba21dd3a4cc63f71d05881610a5ac10f2d4d867df6f111e3ec3c8be2f55fb3af9f9

data/app/models/feature.rb

@@ -162,5 +162,25 @@ class Feature < Usman::ApplicationRecord
   def display_name
     "#{name.to_s.demodulize.pluralize.titleize}"
   end
+
+  # Image Configuration
+  # -------------------
+  def image_configuration
+    {
+      "Image::FeaturePicture" => {
+        max_upload_limit: 1048576,
+        min_upload_limit: 1024,
+        resolutions: [400, 400],
+        form_upload_image_label: "Upload a new Image",
+        form_title: "Upload an Image (Feature)",
+        form_sub_title: "Please read the instructions below:",
+        form_instructions: [
+          "the filename should be in .jpg / .jpeg or .png format",
+          "the image resolutions should be <strong>400 x 400 Pixels</strong>",
+          "the file size should be greater than 100 Kb and or lesser than <strong>10 MB</strong>"
+        ]
+      }
+    }
+  end
 	
 end

data/app/models/user.rb

@@ -453,6 +453,26 @@ class User < Usman::ApplicationRecord
     self.dummy = true
   end
 
+  # Image Configuration
+  # -------------------
+  def image_configuration
+    {
+      "Image::ProfilePicture" => {
+        max_upload_limit: 1048576,
+        min_upload_limit: 1024,
+        resolutions: [400, 400],
+        form_upload_image_label: "Upload a new Image",
+        form_title: "Upload an Image (Profile)",
+        form_sub_title: "Please read the instructions below:",
+        form_instructions: [
+          "the filename should be in .jpg / .jpeg or .png format",
+          "the image resolutions should be <strong>400 x 400 Pixels</strong>",
+          "the file size should be greater than 100 Kb and or lesser than <strong>10 MB</strong>"
+        ]
+      }
+    }
+  end
+
   private
 
   def should_validate_password?

data/app/services/usman/mobile_registration_service.rb

@@ -10,14 +10,14 @@ module Usman
                 :registration, :device, :remote_ip
 
     def initialize(params)
+
       @dialing_prefix = params[:dialing_prefix]
       @mobile_number = params[:mobile_number]
       
-      @country = nil
-      @city = nil
       @country = Country.find_by_id(params[:country_id])
       @city = City.find_by_id(params[:city_id])
 
+      # FIXME
       # Edge case to catch city selected that of a different country
       @city = nil unless @city.country == @country if @city
       
@@ -52,13 +52,8 @@ module Usman
     end
 
     def check_if_device_is_already_registered
-      @registration = Registration.where("LOWER(mobile_number) = LOWER('#{@mobile_number}')").first
-      if @registration
-        @registration.country = @country
-        @registration.city = @city
-      end
+      @registration = Registration.where("LOWER(mobile_number) = LOWER('#{@mobile_number}') AND LOWER(dialing_prefix) = LOWER('#{@dialing_prefix}')").first
       @device = Device.where("LOWER(uuid) = LOWER('#{@uuid}')").first if @registration
-
       @device.generate_otp if @device
     end
 
@@ -72,8 +67,11 @@ module Usman
       ActiveRecord::Base.transaction do
         # Create a new registration if it doesn't exist
         @registration = Registration.new unless @registration
+        @user = @registration.user
+          
         @registration.country = @country
         @registration.city = @city
+        
         @registration.dialing_prefix = @dialing_prefix
         @registration.mobile_number = @mobile_number
         

data/lib/usman/version.rb

@@ -1,3 +1,3 @@
 module Usman
-  VERSION = '0.3.13'
+  VERSION = '0.3.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usman
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -107,7 +107,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.1.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.1.21
 - !ruby/object:Gem::Dependency
   name: pattana
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.16
+        version: 0.1.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.16
+        version: 0.1.17
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement