ribose 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e18f5e392f562d3757a8dffaf903af1f63c2f8d0
-  data.tar.gz: bcef222cf96830b6d150ead2571d31607f06b4d0
+SHA256:
+  metadata.gz: 6f07dcb32d639879659c0ff04134fb21531fb31184d9f446045b7c6bf159d7b8
+  data.tar.gz: 6b4b18cff60096ad9437c593a1d50c781d00226da781f3354192b01f4f83b300
 SHA512:
-  metadata.gz: 49235eefd2aa174afc2eb97febd0d5fb34b5832aa016665c37e17f6d52ff3a02ee29e352e287e623f9f2074b5176bb41488508e90ab47bb5cab0e3b531d22303
-  data.tar.gz: c85dc140fa9b23184aa77d6ef9334e59afe0286ad23f5b85417746ad70b78958fe0591ce3b0d6a9712ccab40e3f79babf8e3891d7f3fd87100a17fc681cf18ea
+  metadata.gz: 4a07d25023569d184f6250c9cf0f7106ee9e9a6e3ae465516f58a5be597ee96f064c047fe5c434a573385b519c55a78fc7776b75d56f8c37666d89e98819fb19
+  data.tar.gz: d09ccceb23eed385f3270b9adb4653f6f4787495dc435366c6989ab51dec49509833c7e4c5d40650d238eb3826334425e1f8aa598c5effae84cea849059aa386

data/.github/workflows/test.yml

@@ -0,0 +1,27 @@
+name: test
+
+on:
+  push:
+    branches: [ main ]
+    tags: [ v* ]
+  pull_request:
+
+jobs:
+  test:
+    name: RSpec
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.4', '2.5', '2.6', '2.7' ] #3.0
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - run: bundle exec rake

data/lib/ribose/client.rb

@@ -1,25 +1,43 @@
 module Ribose
   class Client
-    attr_reader :api_token, :user_email
+    attr_accessor :api_token, :api_email, :user_email,
+                  :client_id, :uid, :access_token
 
     def initialize(options = {})
-      @api_token = options.fetch(:token, configuration.api_token).to_s
-      @user_email = options.fetch(:email, configuration.user_email).to_s
+      @api_token    = options.fetch(:api_token, configuration.api_token).to_s
+      @api_email    = options.fetch(:api_email, configuration.api_email).to_s
+      @client_id    = options[:client_id]
+      @uid          = options[:uid]
+      @access_token = options[:access_token]
     end
 
     # Initiate a ribose client
     #
-    # This interface takes email and password and then it will
-    # do all the underlying work to find out the authentication
-    # token and retrun a ribose client.
+    # This interface takes email, password, api_email and api_token
+    # Then it will do all the underlying work to find out client id and uid
+    # Finally it will return a ribose client.
     #
     # @param :email [String] The email for your Ribose account
     # @param :password [String] The password for your account
+    # @param :api_email [String] The email for your API account
+    # @param :api_token [String] The authentication token for your API account
     # @return [Ribose::Client] A new client with your details
     #
-    def self.from_login(email:, password:)
-      session = Session.create(username: email, password: password)
-      new(email: email, token: session["authentication_token"])
+    def self.from_login(email:, password:, api_email:, api_token:)
+      session = Session.create(
+        username: email,
+        password: password,
+        api_email: api_email,
+        api_token: api_token
+      )
+
+      new(
+        api_email:    api_email,
+        api_token:    api_token,
+        client_id:    session.nil? ? nil : session['client'],
+        uid:          session.nil? ? nil : session['uid'],
+        access_token: session.nil? ? nil : session['access-token'],
+      )
     end
 
     private

data/lib/ribose/configuration.rb

@@ -2,19 +2,27 @@ require "ribose/response/raise_error"
 
 module Ribose
   class Configuration
-    attr_accessor :api_host, :api_token, :user_email, :debug_mode
+    attr_accessor :api_host, :api_email, :api_token,
+                  :user_email, :user_password,
+                  :verify_ssl,
+                  :debug_mode
 
     def initialize
       @debug_mode = false
-      @api_host ||= "www.ribose.com"
+      @verify_ssl = true
+      @api_host ||= "https://www.ribose.com"
     end
 
     def debug_mode?
       debug_mode == true
     end
 
-    def web_url
-      ["https", api_host].join("://")
+    def verify_ssl?
+      !!verify_ssl
+    end
+
+    def ssl_verification_mode
+      verify_ssl? ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
     end
 
     def add_default_middleware(builder)

data/lib/ribose/request.rb

@@ -1,5 +1,7 @@
 module Ribose
   class Request
+
+    DEFAULT_CONTENT_TYPE = "application/json"
     # Initialize a Request
     #
     # @param http_method [Symbol] HTTP verb as sysmbol
@@ -24,6 +26,12 @@ module Ribose
       options[:query] = extract_config_option(:query) || {}
 
       response = agent.call(http_method, api_endpoint, data, options)
+
+      # update client headers from response
+      client.client_id    = response.headers['client']
+      client.uid          = response.headers['uid']
+      client.access_token = response.headers['access-token']
+
       parsable == true ? response.data : response
     end
 
@@ -71,7 +79,7 @@ module Ribose
     attr_reader :client, :data, :http_method
 
     def ribose_host
-      Ribose.configuration.api_host
+      Ribose.configuration.api_host.host
     end
 
     def extract_config_option(key)
@@ -81,7 +89,13 @@ module Ribose
     end
 
     def find_suitable_client
-      client = extract_config_option(:client) || Ribose::Client.new
+      # client = extract_config_option(:client) || Ribose::Client.new
+      client = extract_config_option(:client) ||
+               Ribose::Client.from_login(
+                 email:     Ribose.configuration.user_email,
+                 password:  Ribose.configuration.user_password,
+                 api_token: Ribose.configuration.api_token
+               )
       client.is_a?(Ribose::Client) ? client : raise(Ribose::Unauthorized)
     end
 
@@ -101,9 +115,17 @@ module Ribose
     end
 
     def sawyer_options
+      faraday_options = { builder: custom_rack_builder }
+      unless Ribose.configuration.verify_ssl?
+        faraday_options.merge!(ssl: Faraday::SSLOptions.new(
+          false, nil, nil, OpenSSL::SSL::VERIFY_NONE
+          )
+        )
+      end
+
       {
         links_parser: Sawyer::LinkParsers::Simple.new,
-        faraday: Faraday.new(builder: custom_rack_builder),
+        faraday: Faraday.new(faraday_options),
       }
     end
 
@@ -115,19 +137,23 @@ module Ribose
 
     def set_content_type(headers)
       header = custom_content_headers
-      default_type = "application/json"
 
-      headers[:content_type] = default_type
-      headers[:accept] = header.fetch(:accept, default_type)
+      headers[:content_type] = DEFAULT_CONTENT_TYPE
+      headers[:accept] = header.fetch(:accept, DEFAULT_CONTENT_TYPE)
     end
 
     def agent
       @agent ||= Sawyer::Agent.new(ribose_host, sawyer_options) do |http|
         set_content_type(http.headers)
 
+        # set headers for devise-token-auth
+        http.headers["access-token"] = client.access_token
+        http.headers["client"]       = client.client_id
+        http.headers["uid"]          = client.uid
+
         if require_auth_headers?
           http.headers["X-Indigo-Token"] = client.api_token
-          http.headers["X-Indigo-Email"] = client.user_email
+          http.headers["X-Indigo-Email"] = client.api_email
         end
       end
     end

data/lib/ribose/session.rb

@@ -1,40 +1,54 @@
 require "json"
-require "mechanize"
+require 'net/http'
+require 'uri'
 require "ribose/config"
 
 module Ribose
   class Session
-    def initialize(username, password)
-      @username = username
-      @password = password
+    def initialize(username, password, api_email, api_token)
+      @username  = username
+      @password  = password
+      @api_email = api_email
+      @api_token = api_token
     end
 
     def create
-      JSON.parse(authenticate_user)
-    rescue NoMethodError, JSON::ParserError
-      raise Ribose::Unauthorized
+      authenticate_user
     end
 
-    def self.create(username:, password:)
-      new(username, password).create
+    def self.create(username:, password:, api_email:, api_token:)
+      new(username, password, api_email, api_token).create
     end
 
     private
 
-    attr_reader :username, :password
+    attr_reader :username, :password, :api_email, :api_token
 
     def authenticate_user
-      page = agent.get(ribose_url_for("login"))
-      find_and_submit_the_user_login_form(page)
-      agent.get(ribose_url_for(["settings", "general", "info"])).body
-    end
-
-    def find_and_submit_the_user_login_form(page)
-      login_form = page.form_with(id: "new_user")
-      login_form.field_with(id: "loginEmail").value = username
-      login_form.field_with(id: "loginPassword").value = password
-
-      login_form.submit
+      uri = URI.parse(ribose_url_for("api/v2/auth/sign_in"))
+      response = Net::HTTP.start(
+        uri.host,
+        uri.port,
+        use_ssl: true,
+        verify_mode: Ribose.configuration.ssl_verification_mode
+      ) do |http|
+        request = Net::HTTP::Post.new(uri)
+        # set request headers
+        request['X-Indigo-Username'] = api_email
+        request['X-Indigo-Token']    = api_token
+        request['Content-Type']      = 'application/json'
+
+        # set form data
+        request.set_form_data(
+          'username' => username,
+          'password' => password
+        )
+        http.request(request)
+      end
+
+      # return response headers in hash if success
+      return response.each_header.to_h if response.is_a? Net::HTTPSuccess
+      nil
     end
 
     def agent
@@ -42,7 +56,7 @@ module Ribose
     end
 
     def ribose_url_for(*endpoint)
-      [Ribose.configuration.web_url, *endpoint].join("/")
+      [Ribose.configuration.api_host, *endpoint].join("/")
     end
   end
 end

data/lib/ribose/user.rb

@@ -8,8 +8,12 @@ module Ribose
 
     def activate
       Ribose::Request.post(
-        "signup.user",
-        custom_option.merge(user: attributes, auth_header: false),
+        "api/v2/auth",
+        custom_option.merge(
+          user: attributes,
+          auth_header: false,
+          client: Ribose::Client.new
+        ),
       )
     end
 
@@ -17,12 +21,12 @@ module Ribose
     #
     # @param email [String] The registering user email
     # @param password [String] A strong password for login
-    # @param otp [String] The OTP received via the email
+    # @param edata [String] The OTP received via the email
     # @param attributes [Hash] The other attributes as Hash.
     # @return [Sawyer::Resoruce] The newly activated user
     #
-    def self.activate(email:, password:, otp:, **attributes)
-      new(attributes.merge(email: email, password: password, otp: otp)).activate
+    def self.activate(email:, password:, edata:, **attributes)
+      new(attributes.merge(email: email, password: password, edata: edata)).activate
     end
 
     private

data/lib/ribose/version.rb

@@ -1,3 +1,3 @@
 module Ribose
-  VERSION = "0.4.0".freeze
+  VERSION = "0.4.1".freeze
 end

data/ribose.gemspec

@@ -21,13 +21,12 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.1.9")
 
   spec.add_dependency "id_pack", "~> 1.0.1"
-  spec.add_dependency "mechanize", "~> 2.7.5"
   spec.add_dependency "mime-types", "~> 3.1"
   spec.add_dependency "sawyer", "~> 0.8.1"
 
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry", "~> 0.10.4"
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "webmock", "~> 2.0"
 end

data/spec/ribose/session_spec.rb

@@ -15,11 +15,11 @@ RSpec.describe Ribose::Session do
   end
 
   def login_url
-    ribose_url_for("login")
+    ribose_url_for("api/v2/auth/sign_in")
   end
 
   def ribose_url_for(*endpoints)
-    [Ribose.configuration.web_url, *endpoints].join("/")
+    [Ribose.configuration.api_host, *endpoints].join("/")
   end
 
   def stub_session_creation_request_via_web

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ribose
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-15 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: id_pack
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: mechanize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.7.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.7.5
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -70,30 +56,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +98,16 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -143,12 +129,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".sample.pryrc"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -300,7 +286,7 @@ homepage: https://github.com/riboseinc/ribose-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -315,9 +301,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.0.1
+signing_key:
 specification_version: 4
 summary: The Ruby interface for Ribose API
 test_files: []

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.4.0
-before_install: gem install bundler -v 1.14.6