widgets_api_client 0.2.0.1 → 0.2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '018faf4958b920d634bd273a30ad791a94c77dd3'
-  data.tar.gz: 433c9831d21ef07f944f34f34e92479ed53e0ba9
+  metadata.gz: b8a33b70b243fa7d2421fb28b4cf5b2c774ce7d3
+  data.tar.gz: 218218f461ba3096a5e1445e53b24408033c41e8
 SHA512:
-  metadata.gz: e160c6b1f5d31f24573439aec554fbf8a708374d813bbd9f240c874fcfdb59b69f8224d60c87bc5f0cbb70f9b8a23c5f9a2d7db57ddb84011145fa50cf924349
-  data.tar.gz: 889de8c50d7304113778f01d7bcac87d3cca9d4e22f0eadd39b943a35bc8a2166d6d225222b833e59afd5dfec80313d002981cc1f5fe43391b67724f9e62c979
+  metadata.gz: 58153cf80012217ffefcac576d76a2ebabb4136199d91820e08797bdcafd8e31eed3aa4842b9ae3bb1acdb8995f0b46c49f4dc5301c5aaaeecddbac8e26e6e9c
+  data.tar.gz: 5bcab61761acf1bb84671b8a43fa6672e8da88771eb645e94be4e8991a16410382649b0d6697494ac8d597a81033e658a196d5951017cae9d3fe59c8f4d405c3

data/lib/domain/user.rb

@@ -3,7 +3,7 @@ require 'json'
 #
 # User model conatining user create and update attributes
 #
-class User
+class User 
   attr_accessor :first_name
   attr_accessor :last_name
   attr_accessor :password
@@ -28,6 +28,7 @@ class User
   def initialize(first_name: nil, last_name: nil, password: nil,
                  current_password: nil, new_password: nil,
                  date_of_birth: nil, email: nil, image_url: nil)
+                 
     self.first_name = first_name
     self.last_name = last_name
     self.password = password
@@ -38,15 +39,9 @@ class User
     self.image_url = image_url
   end
 
-  #
-  # Converts User object to Json object
-  #
-  # @param [Refrence] *data user object refrence
-  #
-  # @return [Json] Json represenatation of user object
-  #
-  def to_json(*data)
-    hash = {
+  def as_json(options={})
+    hash_data = {
+      self.class.name.downcase => {
       first_name: @first_name,
       last_name: @last_name,
       password: @password,
@@ -55,10 +50,12 @@ class User
       date_of_birth: @date_of_birth,
       email: @email,
       image_url: @image_url
-    }
-    hash.delete_if { |k, v| v.nil? }
-    hash.to_json(*data)
-  end
+      }
+     }
+     
+     hash_data.each {|k,v| v.delete_if { |k, v| v.nil? || v.empty? }}
+     hash_data
+   end
 
   #
   # Gets Json represenatation of user object
@@ -68,6 +65,10 @@ class User
   # @return [Json] Json represenatation of user object
   #
   def self.get_payload(user)
-    user.to_json
+    user.as_json.to_json
+  end
+
+  def self.get_payload_with_client_info(user)
+      user.as_json.merge({'client_id' => ApplicationConfig.client_id, 'client_secret' => ApplicationConfig.client_secret}).to_json
   end
 end

data/lib/services/user_service.rb

@@ -1,9 +1,7 @@
 require 'rest-client'
 require 'json'
 require_relative '../domain/application_config.rb'
-require_relative '../domain/client_info_base.rb'
 require_relative '../domain/user.rb'
-require_relative '../domain/user_base.rb'
 
 #
 # User Service for CRUD operation related to user
@@ -17,8 +15,8 @@ class UserService
   # @return [Json] Response of create user
   #
   def self.create_user(user)
-    user_with_client_info = get_user_with_client_info(user)
-    create_user_payload = User.get_payload(user_with_client_info)
+    create_user_payload = User.get_payload_with_client_info(user)
+    puts create_user_payload
     RestClient::Request.execute(method: :post,
                                 url: ApplicationConfig.get_url('create_user_path'),
                                 payload: create_user_payload,
@@ -34,8 +32,7 @@ class UserService
   # @return [Json] Response of update user
   #
   def self.update_user(user, bearer_token)
-    user_data = get_user(user)
-    update_user_payload = User.get_payload(user_data)
+    update_user_payload = User.get_payload(user)
     RestClient::Request.execute(method: :put,
                                 url: ApplicationConfig.get_url('update_user_path'),
                                 payload: update_user_payload,
@@ -67,8 +64,7 @@ class UserService
   # @return [Json] Response of reset password
   #
   def self.reset_password(user)
-    user_with_client_info = get_user_with_client_info(user)
-    reset_password_payload = User.get_payload(user_with_client_info)
+    reset_password_payload = User.get_payload_with_client_info(user)
     RestClient::Request.execute(method: :post,
                                 url: ApplicationConfig.get_url('reset_password_path'),
                                 payload: reset_password_payload,
@@ -84,8 +80,7 @@ class UserService
   # @return [Json] Response of change password
   #
   def self.change_password(user, bearer_token)
-    user_data = get_user(user)
-    change_password_payload = User.get_payload(user_data)
+    change_password_payload = User.get_payload(user)
     RestClient::Request.execute(method: :post,
                                 url: ApplicationConfig.get_url('change_password_path'),
                                 payload: change_password_payload,
@@ -122,32 +117,4 @@ class UserService
                                 headers: { 'Content-Type': 'application/json',
                                            'Authorization': bearer_token })
   end
-
-  #
-  # Sets Client information to user object
-  #
-  # @param [Object] user User Object
-  #
-  # @return [Object] User with client details
-  #
-  def self.get_user_with_client_info(user)
-    user_with_client_info = ClientInfoBase.new
-    user_with_client_info.client_id = ApplicationConfig.client_id
-    user_with_client_info.client_secret = ApplicationConfig.client_secret
-    user_with_client_info.user = user
-    user_with_client_info
-  end
-
-  #
-  # Sets Parent to User object
-  #
-  # @param [Object] user User Object
-  #
-  # @return [Object] User as child object
-  #
-  def self.get_user(user)
-    user_data = UserBase.new
-    user_data.user = user
-    user_data
-  end
 end

data/lib/widgets_api_client.rb

@@ -265,10 +265,3 @@ class WidgetsApiClient
     WidgetService.get_public_widgets_with_search_term(search_term, bearer_token)
   end
 end
-
-#WidgetsApiClient.set_config("a","b", "c")
-#widget = Widget.new
-#widget.name ='name'
-#widget.description ='desc'
-#widget.kind ='hidden'
-#WidgetsApiClient.create_widget(widget, "Bearer xxxxxxxxxxxxxxxxxxx")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: widgets_api_client
 version: !ruby/object:Gem::Version
-  version: 0.2.0.1
+  version: 0.2.0.2
 platform: ruby
 authors:
 - Sachin Murthy
@@ -35,9 +35,7 @@ files:
 - lib/config.yml
 - lib/domain/application_config.rb
 - lib/domain/authentication.rb
-- lib/domain/client_info_base.rb
 - lib/domain/user.rb
-- lib/domain/user_base.rb
 - lib/domain/widget.rb
 - lib/services/authentication_service.rb
 - lib/services/user_service.rb

data/lib/domain/client_info_base.rb

@@ -1,25 +0,0 @@
-require 'json'
-
-#
-# Client Base model conatining client information
-#
-class ClientInfoBase
-  attr_accessor :client_id
-  attr_accessor :client_secret
-  attr_accessor :user
-
-  #
-  # Converts User with client details object to Json object
-  #
-  # @param [refrence] *data User object with client details refrence
-  #
-  # @return [<Type>] Json represenatation of User with client details
-  #
-  def to_json(*data)
-    {
-      client_id: @client_id,
-      client_secret: @client_secret,
-      user: @user
-    }.to_json(*data)
-  end
-end

data/lib/domain/user_base.rb

@@ -1,21 +0,0 @@
-require 'json'
-
-#
-# User Base class containing user object
-#
-class UserBase
-  attr_accessor :user
-
-  #
-  # Converts User object to Json object
-  #
-  # @param [Refrence] *data user object refrence
-  #
-  # @return [<Type>] Json represenatation of user object
-  #
-  def to_json(*data)
-    {
-      user: @user
-    }.to_json(*data)
-  end
-end