widgets_api_client 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a72ad88fbc67054ad4caad94b25f485507748318d9427cd61b7d31670186708
-  data.tar.gz: c66bdaea4ea234b2dfe02eb2f954e4bab784dacdbf526bdf9dbc157361ee614d
+  metadata.gz: 185557368c2cfbe87f9e6e4bb2579c5dee0e7c5bb48a6d9edba51dc89cc15694
+  data.tar.gz: 705236b3894433070c9b3070e2694e50473350c19cc0fe400f3278a6f98d30ab
 SHA512:
-  metadata.gz: f0ab25d3be655a52560c339d487c891133ed16ba9c007f29ba4273af10e15ab5694ec488a06b2c4d1afe811d46c4fc5ff912c940f0e0d1a0fdd5b21e6ffe4b23
-  data.tar.gz: b5266c114de9f5862f035b17ad86c243898934ed31e02a847e76fbac7e1d994122e1154d304bca08633c20ed6d95895e9eb3784f7cf24a57218e4114962d0758
+  metadata.gz: acd93e65ba68890963a519adf72431d89f40cbf0ed13ae390696d2af5daee27cf027cf613f22313c9b0bdb5a69d60ff1e7eabb5bdd80585b5913772c6f3c7aac
+  data.tar.gz: 914cb67d36f9b14b83a29270e922c9beea68fed2d86a5c9e34efda1d155fac0e40587344b081b45c5efe1adacdfa0087deb17c4cda08c0702175e6c8c20a3507

data/Gemfile

@@ -3,3 +3,7 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 gem 'rspec', :require => 'spec'
 gem 'rest-client'
 gem 'json'
+
+group :test do
+  gem 'simplecov', require: false
+end

data/lib/domain/application_config.rb

@@ -1,18 +1,17 @@
 class ApplicationConfig
-    @@client_id =""
-    @@client_secret =""
+  @@client_id = ''
+  @@client_secret = ''
 
-    def self.set_config(client_id, client_secret)
-        @@client_id = client_id
-        @@client_secret = client_secret
-    end
+  def self.set_config(client_id, client_secret)
+    @@client_id = client_id
+    @@client_secret = client_secret
+  end
 
-    def self.get_client_id
-        return @@client_id
-    end 
-    
-    def self.get_client_secret
-        return @@client_secret
-    end 
-    
-end
+  def self.client_id
+    @@client_id
+  end
+
+  def self.client_secret
+    @@client_secret
+  end
+end

data/lib/domain/authentication.rb

@@ -1,21 +1,27 @@
 require 'json'
+
 class Authentication
-    attr_accessor  :grant_type
-    attr_accessor  :client_id
-    attr_accessor  :client_secret
-    attr_accessor  :username
-    attr_accessor  :password
-    attr_accessor  :token
-    attr_accessor   :refresh_token
+  attr_accessor :grant_type
+  attr_accessor :client_id
+  attr_accessor :client_secret
+  attr_accessor :username
+  attr_accessor :password
+  attr_accessor :token
+  attr_accessor :refresh_token
 
-  def initialize grant_type: nil, client_id: nil, client_secret: nil, username: nil, password: nil, token:nil, refresh_token:nil
-    self.grant_type, self.client_id, self.client_secret, self.username, self.password, self.token, self.refresh_token =
-    grant_type, client_id, client_secret, username, password, token, refresh_token
-   end
+  def initialize(grant_type: nil, client_id: nil, client_secret: nil,
+                 username: nil, password: nil, token: nil, refresh_token: nil)
+    self.grant_type = grant_type
+    self.client_id = client_id
+    self.client_secret = client_secret
+    self.username = username
+    self.password = password
+    self.token = token
+    self.refresh_token = refresh_token
+  end
 
-  
-  def to_json(*a)
-    hash = { 
+  def to_json(*data)
+    hash = {
       grant_type: @grant_type,
       client_id: @client_id,
       client_secret: @client_secret,
@@ -24,23 +30,11 @@ class Authentication
       token: @token,
       refresh_token: @refresh_token
     }
-    hash.delete_if { |k, v| v.nil? || v.empty?  }
-    hash.to_json(*a)
+    hash.delete_if { |k, v| v.nil? || v.empty? }
+    hash.to_json(*data)
   end
 
-  def self.json_create(o)
-    b_from_json = new
-    b_from_json.grant_type = o['grant_type']
-    b_from_json.client_id = o['client_id']
-    b_from_json.client_secret = o['client_secret']
-    b_from_json.username = o['username']
-    b_from_json.password = o['password']
-    b_from_json.token = o['token']
-    b_from_json.refresh_token = o['refresh_token']
-    b_from_json
-  end 
-
-  def self.get_payload(auth_data)
-    return auth_data.to_json
+ def self.get_payload(auth_data)
+    auth_data.to_json
   end
 end

data/lib/domain/client_info_base.rb

@@ -1,20 +1,15 @@
 require 'json'
-class ClientInfoBase
-    attr_accessor  :client_id
-    attr_accessor  :client_secret
-    attr_accessor  :user
 
-  def to_json(*a)
-  { 
-      client_id: @client_id, client_secret: @client_secret, user: @user
-    }.to_json(*a)
+class ClientInfoBase
+  attr_accessor :client_id
+  attr_accessor :client_secret
+  attr_accessor :user
 
+  def to_json(*data)
+    {
+      client_id: @client_id,
+      client_secret: @client_secret,
+      user: @user
+    }.to_json(*data)
   end
-  def self.json_create(o)
-    a_from_json = new
-    a_from_json.client_id = o['client_id']
-    a_from_json.client_secret = o['client_secret']
-    a_from_json.user = o['user']
-    a_from_json
-  end
-end
+end

data/lib/domain/user.rb

@@ -1,51 +1,45 @@
 require 'json'
 
 class User
-    attr_accessor  :first_name
-    attr_accessor  :last_name
-    attr_accessor  :password
-    attr_accessor  :current_password
-    attr_accessor  :new_password
-    attr_accessor  :date_of_birth
-    attr_accessor  :email
-    attr_accessor  :image_url
+  attr_accessor :first_name
+  attr_accessor :last_name
+  attr_accessor :password
+  attr_accessor :current_password
+  attr_accessor :new_password
+  attr_accessor :date_of_birth
+  attr_accessor :email
+  attr_accessor :image_url
 
-  def initialize first_name: nil, last_name: nil, password: nil, date_of_birth:nil, email: nil, image_url: nil
-    self.first_name, self.last_name, self.password, self.current_password, self.new_password, self.date_of_birth, self.email, self.image_url =
-    first_name, last_name, password,current_password, new_password, date_of_birth, email, image_url
-   end
-
-  
-   
-  def to_json(*a)
-   hash = { 
-     first_name: @first_name,
-     last_name: @last_name,
-     password: @password,
-     current_password: @current_password,
-     new_password: @new_password,
-     date_of_birth: @date_of_birth,
-     email: @email,
-     image_url: @image_url
-  }
-  hash.delete_if { |k, v| v.nil? }
-  hash.to_json(*a)
+  def initialize(first_name: nil, last_name: nil, password: nil,
+                 date_of_birth: nil, email: nil, image_url: nil)
+    self.first_name = first_name
+    self.last_name = last_name
+    self.password = password
+    self.current_password = current_password
+    self.new_password = new_password
+    self.date_of_birth = date_of_birth
+    self.email = email
+    self.image_url = image_url
   end
 
-  def self.json_create(o)
-    b_from_json = new
-    b_from_json.first_name = o['first_name']
-    b_from_json.last_name = o['last_name']
-    b_from_json.password = o['password']
-    b_from_json.current_password = o['current_password']
-    b_from_json.new_password = o['new_password']
-    b_from_json.date_of_birth = o['date_of_birth']
-    b_from_json.email = o['email']
-    b_from_json.image_url = o['image_url']
-    b_from_json
-  end 
+  def to_json(*data)
+    hash = {
+      first_name: @first_name,
+      last_name: @last_name,
+      password: @password,
+      current_password: @current_password,
+      new_password: @new_password,
+      date_of_birth: @date_of_birth,
+      email: @email,
+      image_url: @image_url
+    }
+    hash.delete_if { |k, v| v.nil? }
+    hash.to_json(*data)
+  end
 
-  def self.get_payload(userWithClientInfo)
-    return userWithClientInfo.to_json
+    def self.get_payload(user)
+    user.to_json
   end
 end
+
+

data/lib/domain/user_base.rb

@@ -1,16 +1,11 @@
 require 'json'
+
 class UserBase
-    attr_accessor  :user
+  attr_accessor :user
 
-  def to_json(*a)
-    { 
-        user: @user
-    }.to_json(*a)
-  end
-  
-  def self.json_create(o)
-    a_from_json = new
-    a_from_json.user = o['user']
-    a_from_json
+  def to_json(*data)
+    {
+      user: @user
+    }.to_json(*data)
   end
-end
+ end

data/lib/domain/widget.rb

@@ -1,34 +1,27 @@
 require 'json'
+
 class Widget
-    attr_accessor  :name
-    attr_accessor  :description
-    attr_accessor  :kind
+  attr_accessor :name
+  attr_accessor :description
+  attr_accessor :kind
 
-  def initialize name: nil, description: nil, kind: nil
-    self.name, self.description, self.kind =
-    name, description, kind
-   end
+  def initialize(name: nil, description: nil, kind: nil)
+    self.name = name
+    self.description = description
+    self.kind = kind
+  end
 
-  def to_json(*a)
-    hash = { 
+  def to_json(*data)
+    hash = {
       name: @name,
       description: @description,
       kind: @kind
     }
-    hash.delete_if { |k, v| v.nil? || v.empty?  }
-    hash.to_json(*a)
+    hash.delete_if { |k, v| v.nil? || v.empty? }
+    hash.to_json(*data)
   end
 
-  def self.json_create(o)
-    b_from_json = new
-    b_from_json.name = o['name']
-    b_from_json.description = o['description']
-    b_from_json.kind = o['kind']
-    b_from_json
-  end 
-
   def self.get_payload(widget)
-    return widget.to_json
+    widget.to_json
   end
-
-end
+end

data/lib/domain/widget_base.rb

@@ -1,16 +1,12 @@
 require 'json'
+
 class WidgetBase
-    attr_accessor  :widget
+  attr_accessor :widget
 
-  def to_json(*a)
-    { 
-        widget: @widget
-    }.to_json(*a)
-  end
-  
-  def self.json_create(o)
-    a_from_json = new
-    a_from_json.widget = o['widget']
-    a_from_json
+  def to_json(*data)
+    {
+      widget: @widget
+    }.to_json(*data)
   end
-end
+ 
+end

data/lib/services/authentication_service.rb

@@ -4,55 +4,40 @@ require_relative '../domain/authentication.rb'
 require_relative '../domain/application_config.rb'
 
 class AuthenticationService
-    @@authentication_url = 'https://showoff-rails-react-production.herokuapp.com/oauth/token'
-    @@revoke_url = 'https://showoff-rails-react-production.herokuapp.com/oauth/revoke'
-
-    def self.create_authentication(auth_data)
-        auth_data = get_auth_with_client_info(auth_data)
-        auth_payload = Authentication.get_payload(auth_data)
-        return RestClient::Request.execute(method: :post, url: @@authentication_url,
-            payload: auth_payload, headers: {'Content-Type': 'application/json'})
-    end
-
-    def self.refresh_authentication_token(auth_data, bearer_token)
-        auth_data = get_auth_with_client_info(auth_data)
-        auth_payload = Authentication.get_payload(auth_data)
-        return RestClient::Request.execute(method: :post, url: @@authentication_url,
-            payload: auth_payload, headers: {'Content-Type': 'application/json', 'Authorization': bearer_token})
-    end
-
-    def self.revoke_authentication_token(auth_data, bearer_token)
-        auth_payload = Authentication.get_payload(auth_data)
-        return RestClient::Request.execute(method: :post, url: @@revoke_url,
-            payload: auth_payload, headers: {'Content-Type': 'application/json', 'Authorization': bearer_token})
-    end
-
-    def self.get_auth_with_client_info(auth_data)
-        auth_data.client_id = ApplicationConfig.get_client_id
-        auth_data.client_secret = ApplicationConfig.get_client_secret
-        return auth_data
-    end  
-
-    # to remove once tested
-    def self.create_auth_data
-        auth = Authentication.new
-        auth.grant_type = "password"
-       # auth.client_id = "277ef29692f9a70d511415dc60592daf4cf2c6f6552d3e1b769924b2f2e2e6fe"
-        #auth.client_secret = "d6106f26e8ff5b749a606a1fba557f44eb3dca8f48596847770beb9b643ea352"
-        auth.username = "sachinmurthy56@gmail.com"
-        auth.password = "password"
-        return auth
-    end
-
-    #remove once tested
-    def self.get_access_token
-        auth_data = AuthenticationService.create_auth_data
-        authJson = AuthenticationService.create_authentication(auth_data)
-        res_data = JSON.parse(authJson)
-        access_token =  res_data['data']['token']['access_token']
-        return access_token
-    end
-
+  @@authentication_url = 'https://showoff-rails-react-production.herokuapp.com/oauth/token'
+  @@revoke_url = 'https://showoff-rails-react-production.herokuapp.com/oauth/revoke'
+
+  def self.create_authentication(auth_data)
+    auth_data = get_auth_with_client_info(auth_data)
+    auth_payload = Authentication.get_payload(auth_data)
+    RestClient::Request.execute(method: :post,
+                                url: @@authentication_url,
+                                payload: auth_payload,
+                                headers: { 'Content-Type': 'application/json' })
+  end
+
+  def self.refresh_authentication_token(auth_data, bearer_token)
+    auth_data = get_auth_with_client_info(auth_data)
+    auth_payload = Authentication.get_payload(auth_data)
+    RestClient::Request.execute(method: :post,
+                                url: @@authentication_url,
+                                payload: auth_payload,
+                                headers: { 'Content-Type': 'application/json',
+                                           'Authorization': bearer_token })
+  end
+
+  def self.revoke_authentication_token(auth_data, bearer_token)
+    auth_payload = Authentication.get_payload(auth_data)
+    RestClient::Request.execute(method: :post,
+                                url: @@revoke_url,
+                                payload: auth_payload,
+                                headers: { 'Content-Type': 'application/json',
+                                           'Authorization': bearer_token })
+  end
+
+  def self.get_auth_with_client_info(auth_data)
+    auth_data.client_id = ApplicationConfig.client_id
+    auth_data.client_secret = ApplicationConfig.client_secret
+    auth_data
+  end
 end
-
-

data/lib/services/user_service.rb

@@ -5,76 +5,88 @@ require_relative '../domain/user.rb'
 require_relative '../domain/user_base.rb'
 require_relative '../domain/application_config.rb'
 
-
 class UserService
-    @@create_user_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/users'
-    @@create_update_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/users/me'
-    @@check_email_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/users/email'
-    @@reset_password_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/users/reset_password'
-    @@change_password_url ='https://showoff-rails-react-production.herokuapp.com/api/v1/users/me/password'
-    @@show_logged_in_user_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/users/me'
-    @@show_user_id_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/users/'
+  @@create_user_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/users'
+  @@create_update_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/users/me'
+  @@check_email_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/users/email'
+  @@reset_password_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/users/reset_password'
+  @@change_password_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/users/me/password'
+  @@show_logged_in_user_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/users/me'
+  @@show_user_id_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/users/'
 
-    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)
-        return RestClient::Request.execute(method: :post, url: @@create_user_url,
-            payload: create_user_payload, headers: {'Content-Type': 'application/json'})
-    end
+  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)
+    RestClient::Request.execute(method: :post,
+                                url: @@create_user_url,
+                                payload: create_user_payload,
+                                headers: { 'Content-Type': 'application/json' })
+  end
 
-    def self.update_user(user, bearer_token)
-        user_data = get_user(user)
-        update_user_payload = User.get_payload(user_data)   
-        return RestClient::Request.execute(method: :put, url: @@create_update_url,
-            payload: update_user_payload,
-            headers: {'Content-Type': 'application/json', 'Authorization': bearer_token})
-    end
+  def self.update_user(user, bearer_token)
+    user_data = get_user(user)
+    update_user_payload = User.get_payload(user_data)
+    RestClient::Request.execute(method: :put,
+                                url: @@create_update_url,
+                                payload: update_user_payload,
+                                headers: { 'Content-Type': 'application/json',
+                                           'Authorization': bearer_token })
+  end
 
-    def self.check_email(user)
-        return RestClient::Request.execute(method: :get, url: @@check_email_url, 
-            headers: {'Content-Type': 'application/json', params: {:email => user.email , :client_id => ApplicationConfig.get_client_id, :client_secret => ApplicationConfig.get_client_secret}})
-    end
+  def self.check_email(user)
+    RestClient::Request.execute(method: :get,
+                                url: @@check_email_url,
+                                headers: { 'Content-Type': 'application/json',
+                                           params: { email: user.email,
+                                                     client_id: ApplicationConfig.client_id,
+                                                     client_secret: ApplicationConfig.client_secret } })
+  end
 
-    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)  
-        return RestClient::Request.execute(method: :post, url: @@reset_password_url,
-            payload: reset_password_payload,
-            headers: {'Content-Type': 'application/json'})
-    end
+  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)
+    RestClient::Request.execute(method: :post,
+                                url: @@reset_password_url,
+                                payload: reset_password_payload,
+                                headers: { 'Content-Type': 'application/json' })
+  end
 
-    def self.change_password(user, bearer_token)
-        user_data = get_user(user)
-        change_password_payload = User.get_payload(user_data)
-        return RestClient::Request.execute(method: :post, url: @@change_password_url,
-            payload: change_password_payload,
-            headers: {'Content-Type': 'application/json', 'Authorization': bearer_token})
-    end
+  def self.change_password(user, bearer_token)
+    user_data = get_user(user)
+    change_password_payload = User.get_payload(user_data)
+    RestClient::Request.execute(method: :post,
+                                url: @@change_password_url,
+                                payload: change_password_payload,
+                                headers: { 'Content-Type': 'application/json',
+                                           'Authorization': bearer_token })
+  end
 
-    def self.show_logged_in_user(bearer_token)
-            return RestClient::Request.execute(method: :get, url: @@show_logged_in_user_url, 
-            headers: {'Content-Type': 'application/json', 'Authorization': bearer_token})
-    end
+  def self.show_logged_in_user(bearer_token)
+    RestClient::Request.execute(method: :get,
+                                url: @@show_logged_in_user_url,
+                                headers: { 'Content-Type': 'application/json',
+                                           'Authorization': bearer_token })
+  end
 
-    def self.show_user_id(user_id, bearer_token)
-        url_with_id = @@show_user_id_url + "#{user_id}"
-        return RestClient::Request.execute(method: :get, url: url_with_id, 
-        headers: {'Content-Type': 'application/json', 'Authorization': bearer_token})
-    end
+  def self.show_user_id(user_id, bearer_token)
+    url_with_id = @@show_user_id_url + user_id.to_s
+    RestClient::Request.execute(method: :get,
+                                url: url_with_id,
+                                headers: { 'Content-Type': 'application/json',
+                                           'Authorization': bearer_token })
+  end
 
-    def self.get_user_with_client_info(user)
-        user_with_client_info = ClientInfoBase.new
-        user_with_client_info.client_id = ApplicationConfig.get_client_id
-        user_with_client_info.client_secret = ApplicationConfig.get_client_secret
-        user_with_client_info.user = user 
-        return user_with_client_info
-    end 
-    
-    def self.get_user(user)
-        user_data = UserBase.new
-        user_data.user = user 
-        return user_data
-    end 
+  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
 
+  def self.get_user(user)
+    user_data = UserBase.new
+    user_data.user = user
+    user_data
+  end
 end
-

data/lib/services/user_widget_service.rb

@@ -3,34 +3,46 @@ require 'json'
 require_relative '../domain/application_config.rb'
 
 class UserWidgetService
-    @@own_widgets_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/users/me/widgets'
-    @@widgets_by_user_id_url ='https://showoff-rails-react-production.herokuapp.com/api/v1/users/'
-      
-       def self.get_private_widgets(bearer_token)
-         return RestClient::Request.execute(method: :get, url: @@own_widgets_url, 
-            headers: {'Content-Type': 'application/json', params: {:client_id => ApplicationConfig.get_client_id, :client_secret => ApplicationConfig.get_client_secret}, 
-            'Authorization': bearer_token})
-        end
+  @@own_widgets_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/users/me/widgets'
+  @@widgets_by_user_id_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/users/'
 
-        def self.get_private_widgets_with_search_term(search_term, bearer_token)
-            return RestClient::Request.execute(method: :get, url: @@own_widgets_url, 
-               headers: {'Content-Type': 'application/json', params: {:client_id => ApplicationConfig.get_client_id, :client_secret => ApplicationConfig.get_client_secret, :term => search_term}, 
-               'Authorization': bearer_token})
-        end
+  def self.private_widgets(bearer_token)
+    RestClient::Request.execute(method: :get,
+                                url: @@own_widgets_url,
+                                headers: { 'Content-Type': 'application/json',
+                                           params: { client_id: ApplicationConfig.client_id,
+                                                     client_secret: ApplicationConfig.client_secret },
+                                           'Authorization': bearer_token })
+  end
 
-        def self.get_widgets_by_user_id(user_id, bearer_token)
-            url_with_id = @@widgets_by_user_id_url + "#{user_id}" + "/widgets"
-            return RestClient::Request.execute(method: :get, url: url_with_id, 
-               headers: {'Content-Type': 'application/json', params: {:client_id => ApplicationConfig.get_client_id, :client_secret => ApplicationConfig.get_client_secret}, 
-               'Authorization': bearer_token})
-        end
+  def self.private_widgets_with_search_term(search_term, bearer_token)
+    RestClient::Request.execute(method: :get,
+                                url: @@own_widgets_url,
+                                headers: { 'Content-Type': 'application/json',
+                                           params: { client_id: ApplicationConfig.client_id,
+                                                     client_secret: ApplicationConfig.client_secret,
+                                                     term: search_term },
+                                           'Authorization': bearer_token })
+  end
 
-        def self.get_widgets_by_user_id_with_search_term(user_id, search_term, bearer_token)
-            url_with_id = @@widgets_by_user_id_url + "#{user_id}" + "/widgets"
-            return RestClient::Request.execute(method: :get, url: url_with_id, 
-               headers: {'Content-Type': 'application/json', params: {:client_id => ApplicationConfig.get_client_id, :client_secret => ApplicationConfig.get_client_secret, :term => search_term}, 
-               'Authorization': bearer_token})
-        end
+  def self.widgets_by_user_id(user_id, bearer_token)
+    url_with_id = @@widgets_by_user_id_url + user_id.to_s + '/widgets'
+    RestClient::Request.execute(method: :get,
+                                url: url_with_id,
+                                headers: { 'Content-Type': 'application/json',
+                                           params: { client_id: ApplicationConfig.client_id,
+                                                     client_secret: ApplicationConfig.client_secret },
+                                           'Authorization': bearer_token })
+  end
 
+  def self.widgets_by_user_id_with_search_term(user_id, search_term, bearer_token)
+    url_with_id = @@widgets_by_user_id_url + user_id.to_s + '/widgets'
+    RestClient::Request.execute(method: :get,
+                                url: url_with_id,
+                                headers: { 'Content-Type': 'application/json',
+                                           params: { client_id: ApplicationConfig.client_id,
+                                                     client_secret: ApplicationConfig.client_secret,
+                                                     term: search_term },
+                                           'Authorization': bearer_token })
+  end
 end
-

data/lib/services/widget_service.rb

@@ -5,56 +5,66 @@ require_relative '../domain/widget.rb'
 require_relative '../domain/application_config.rb'
 
 class WidgetService
-    @@create_widget_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/widgets'
-    @@update_destroy_widget_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/widgets/'
-    @@list_widget_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/widgets/visible'
-    
-
-    def self.create_widget(widget, bearer_token)
-        widget_data = get_widget(widget)
-        create_widget_payload = Widget.get_payload(widget_data)
-        return RestClient::Request.execute(method: :post, url: @@create_widget_url,
-            payload: create_widget_payload,
-            headers: {'Content-Type': 'application/json', 'Authorization': bearer_token})
-    end
-
-    def self.update_widget(widget, widget_id, bearer_token)
-        update_url_with_widget_id = @@update_destroy_widget_url + "#{widget_id}"
-        widget_data = get_widget(widget)
-        update_widget_payload = Widget.get_payload(widget_data)
-        return RestClient::Request.execute(method: :put, url: update_url_with_widget_id,
-            payload: update_widget_payload,
-            headers: {'Content-Type': 'application/json', 'Authorization': bearer_token})
-    end
-
-    def self.destroy_widget(widget_id, bearer_token)
-        destroy_url_with_widget_id = @@update_destroy_widget_url + "#{widget_id}"
-        return RestClient::Request.execute(method: :delete, url: destroy_url_with_widget_id,
-            headers: {'Content-Type': 'application/json', 'Authorization': bearer_token})
-    end
-
-    def self.get_private_widgets(bearer_token)
-        return RestClient::Request.execute(method: :get, url: @@create_widget_url,
-            headers: {'Content-Type': 'application/json', 'Authorization': bearer_token})
-    end
-
-    def self.get_public_widgets(bearer_token)
-        return RestClient::Request.execute(method: :get, url: @@list_widget_url, 
-            headers: {'Content-Type': 'application/json', params: {:client_id => ApplicationConfig.get_client_id, :client_secret => ApplicationConfig.get_client_secret}, 
-            'Authorization': bearer_token})
-    end
-
-    def self.get_public_widgets_with_search_term(search_term, bearer_token)
-        return RestClient::Request.execute(method: :get, url: @@list_widget_url, 
-            headers: {'Content-Type': 'application/json', params: {:client_id => ApplicationConfig.get_client_id, :client_secret => ApplicationConfig.get_client_secret, :term => search_term}, 
-            'Authorization': bearer_token})
-    end
-
-    def self.get_widget(widget)
-        widget_data = WidgetBase.new
-        widget_data.widget = widget 
-        return widget_data
-    end 
-   
-end
+  @@create_widget_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/widgets'
+  @@update_destroy_widget_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/widgets/'
+  @@list_widget_url = 'https://showoff-rails-react-production.herokuapp.com/api/v1/widgets/visible'
+
+  def self.create_widget(widget, bearer_token)
+    widget_data = get_widget(widget)
+    create_widget_payload = Widget.get_payload(widget_data)
+    RestClient::Request.execute(method: :post, url: @@create_widget_url,
+                                payload: create_widget_payload,
+                                headers: { 'Content-Type': 'application/json',
+                                           'Authorization': bearer_token })
+  end
+
+  def self.update_widget(widget, widget_id, bearer_token)
+    update_url_with_widget_id = @@update_destroy_widget_url + widget_id.to_s
+    widget_data = get_widget(widget)
+    update_widget_payload = Widget.get_payload(widget_data)
+    RestClient::Request.execute(method: :put, url: update_url_with_widget_id,
+                                payload: update_widget_payload,
+                                headers: { 'Content-Type': 'application/json',
+                                           'Authorization': bearer_token })
+  end
+
+  def self.destroy_widget(widget_id, bearer_token)
+    destroy_url_with_widget_id = @@update_destroy_widget_url + widget_id.to_s
+    RestClient::Request.execute(method: :delete,
+                                url: destroy_url_with_widget_id,
+                                headers: { 'Content-Type': 'application/json',
+                                           'Authorization': bearer_token })
+  end
 
+  def self.get_private_widgets(bearer_token)
+    RestClient::Request.execute(method: :get,
+                                url: @@create_widget_url,
+                                headers: { 'Content-Type': 'application/json',
+                                           'Authorization': bearer_token })
+  end
+
+  def self.get_public_widgets(bearer_token)
+    RestClient::Request.execute(method: :get,
+                                url: @@list_widget_url,
+                                headers: { 'Content-Type': 'application/json',
+                                           params: { client_id: ApplicationConfig.client_id,
+                                                     client_secret: ApplicationConfig.client_secret },
+                                           'Authorization': bearer_token })
+  end
+
+  def self.get_public_widgets_with_search_term(search_term, bearer_token)
+    RestClient::Request.execute(method: :get,
+                                url: @@list_widget_url,
+                                headers: { 'Content-Type': 'application/json',
+                                           params: { client_id: ApplicationConfig.client_id,
+                                                     client_secret: ApplicationConfig.client_secret,
+                                                     term: search_term },
+                                           'Authorization': bearer_token })
+  end
+
+  def self.get_widget(widget)
+    widget_data = WidgetBase.new
+    widget_data.widget = widget
+    widget_data
+  end
+end

data/lib/widgets_api_client.rb

@@ -7,116 +7,107 @@ require File.dirname(__FILE__) + '/services/user_widget_service'
 require File.dirname(__FILE__) + '/domain/application_config'
 
 class WidgetsApiClient
-
-    def self.set_config(client_id, client_secret)
-       ApplicationConfig.set_config(client_id, client_secret)
-    end
-   
-   
-    #Create authentication token
-    def self.create_authentication_token(auth_data)
-       return AuthenticationService.create_authentication(auth_data) 
-    end
-
-    #Refresh authentication token
-    def self.refresh_authentication_token(auth_data, bearer_token)
-        return AuthenticationService.refresh_authentication_token(auth_data, bearer_token)
-    end
-
-    #Revoke authentication token
-    def self.revoke_authentication_token(auth_data, bearer_token)
-        return AuthenticationService.revoke_authentication_token(auth_data, bearer_token)
-    end
-    
-
-    #Create user
-    def self.create_user(user_data)
-        return UserService.create_user(user_data) 
-    end
-
-     #Update user
-     def self.update_user(user_data, bearer_token)
-        return UserService.update_user(user_data, bearer_token) 
-    end
-
-    #Check email
-    def self.check_email(user_data) 
-        return UserService.check_email(user_data) 
-    end
-
-     #Reset password
-     def self.reset_password(user_data) 
-        return UserService.reset_password(user_data) 
-    end
-
-     #Change password
-     def self.change_password(user_data, bearer_token)
-        return UserService.change_password(user_data, bearer_token) 
-    end
-
-     #Show logged in user
-      def self.show_logged_in_user(bearer_token)
-        return UserService.show_logged_in_user(bearer_token) 
-    end
-
-    #Show user id
-    def self.show_user_id(user_id, bearer_token)
-        return UserService.show_user_id(user_id, bearer_token) 
-    end
-
-    #Get private widgets  
-    def self.get_private_widgets(bearer_token)
-        return UserWidgetService.get_private_widgets(bearer_token) 
-    end
-
-    #Get private widgets with search term
-    def self.get_private_widgets_with_search_term(search_term, bearer_token)
-        return UserWidgetService.get_private_widgets_with_search_term(search_term, bearer_token) 
-    end
-
-    #Get widgets by user id
-    def self.get_widgets_by_user_id(user_id, bearer_token)
-        return UserWidgetService.get_widgets_by_user_id(user_id, bearer_token)
-    end
-
-    #Get widgets by user id with search term
-    def self.get_widgets_by_user_id_with_search_term(user_id, search_term, bearer_token)
-        return UserWidgetService.get_widgets_by_user_id_with_search_term(user_id, search_term, bearer_token)
-    end
-    
-    #Create widget
-    def self.create_widget(widget_data, bearer_token)
-        return WidgetService.create_widget(widget_data, bearer_token)
-    end
-
-     #Update widget
-     def self.update_widget(widget_data, widget_id, bearer_token)
-        return WidgetService.update_widget(widget_data, widget_id, bearer_token)
-    end
-
-     #Destroy widget
-     def self.destroy_widget(widget_id, bearer_token)
-        return WidgetService.destroy_widget(widget_id, bearer_token)
-    end
-
-     #Get private widgets
-     def self.get_private_widgets(bearer_token)
-        return WidgetService.get_private_widgets(bearer_token)
-    end
-    
-    #Get public widgets
-    def self.get_public_widgets(bearer_token)
-        return WidgetService.get_public_widgets(bearer_token)
-    end
-    
-    #Get public widgets with serach term
-    def self.get_public_widgets_with_search_term(search_term, bearer_token)
-        return WidgetService.get_public_widgets_with_search_term(search_term, bearer_token)
-    end
-
-    #Remove after tesing
-    def self.get_access_token
-        return ApplicationConfig.get_access_token
-    end
-    
+  def self.set_config(client_id, client_secret)
+    ApplicationConfig.set_config(client_id, client_secret)
+  end
+
+  # Create authentication token
+  def self.create_authentication_token(auth_data)
+    AuthenticationService.create_authentication(auth_data)
+  end
+
+  # Refresh authentication token
+  def self.refresh_authentication_token(auth_data, bearer_token)
+    AuthenticationService.refresh_authentication_token(auth_data, bearer_token)
+  end
+
+  # Revoke authentication token
+  def self.revoke_authentication_token(auth_data, bearer_token)
+    AuthenticationService.revoke_authentication_token(auth_data, bearer_token)
+  end
+
+  # Create user
+  def self.create_user(user_data)
+    UserService.create_user(user_data)
+  end
+
+  # Update user
+  def self.update_user(user_data, bearer_token)
+    UserService.update_user(user_data, bearer_token)
+  end
+
+  # Check email
+  def self.check_email(user_data)
+    UserService.check_email(user_data)
+  end
+
+  # Reset password
+  def self.reset_password(user_data)
+    UserService.reset_password(user_data)
+  end
+
+  # Change password
+  def self.change_password(user_data, bearer_token)
+    UserService.change_password(user_data, bearer_token)
+  end
+
+  # Show logged in user
+  def self.show_logged_in_user(bearer_token)
+    UserService.show_logged_in_user(bearer_token)
+  end
+
+  # Show user id
+  def self.show_user_id(user_id, bearer_token)
+    UserService.show_user_id(user_id, bearer_token)
+  end
+
+  # Get private widgets
+  def self.show_private_widgets(bearer_token)
+    UserWidgetService.private_widgets(bearer_token)
+  end
+
+  # Get private widgets with search term
+  def self.show_private_widgets_with_search_term(search_term, bearer_token)
+    UserWidgetService.private_widgets_with_search_term(search_term, bearer_token)
+  end
+
+  # Get widgets by user id
+  def self.show_widgets_by_user_id(user_id, bearer_token)
+    UserWidgetService.widgets_by_user_id(user_id, bearer_token)
+  end
+
+  # Get widgets by user id with search term
+  def self.show_widgets_by_user_id_with_search_term(user_id, search_term, bearer_token)
+    UserWidgetService.widgets_by_user_id_with_search_term(user_id, search_term, bearer_token)
+  end
+
+  # Create widget
+  def self.create_widget(widget_data, bearer_token)
+    WidgetService.create_widget(widget_data, bearer_token)
+  end
+
+  # Update widget
+  def self.update_widget(widget_data, widget_id, bearer_token)
+    WidgetService.update_widget(widget_data, widget_id, bearer_token)
+  end
+
+  # Destroy widget
+  def self.destroy_widget(widget_id, bearer_token)
+    WidgetService.destroy_widget(widget_id, bearer_token)
+  end
+
+  # Get private widgets
+  def self.get_private_widgets(bearer_token)
+    WidgetService.get_private_widgets(bearer_token)
+  end
+
+  # Get public widgets
+  def self.get_public_widgets(bearer_token)
+    WidgetService.get_public_widgets(bearer_token)
+  end
+
+  # Get public widgets with serach term
+  def self.get_public_widgets_with_search_term(search_term, bearer_token)
+    WidgetService.get_public_widgets_with_search_term(search_term, bearer_token)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: widgets_api_client
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Sachin Murthy