ribose 0.3.0 → 0.4.1

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
@@ -20,8 +22,17 @@ module Ribose
     # @return [Sawyer::Resource]
     #
     def request(options = {})
+      parsable = extract_config_option(:parse) != false
       options[:query] = extract_config_option(:query) || {}
-      agent.call(http_method, api_endpoint, data, options).data
+
+      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
 
     # Make a HTTP GET Request
@@ -68,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)
@@ -78,13 +89,22 @@ module Ribose
     end
 
     def find_suitable_client
-      client = extract_config_option(:client) || Ribose::Client.new
-      client.is_a?(Ribose::Client) ? client: raise(Ribose::Unauthorized)
+      # 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
 
     def require_auth_headers?
-      auth_header = extract_config_option(:auth_header)
-      auth_header == false ? false : true
+      extract_config_option(:auth_header) != false
+    end
+
+    def custom_content_headers
+      extract_config_option(:headers) || {}
     end
 
     def api_endpoint
@@ -95,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
 
@@ -107,14 +135,25 @@ module Ribose
       end
     end
 
+    def set_content_type(headers)
+      header = custom_content_headers
+
+      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|
-        http.headers[:accept] = "application/json"
-        http.headers[:content_type] = "application/json"
+        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/space.rb

@@ -15,6 +15,10 @@ module Ribose
       Ribose::Request.post("spaces/#{space_uuid}/freeze", options)
     end
 
+    def self.delete(space_uuid, confirmation:, **options)
+      remove(space_uuid, options.merge(password_confirmation: confirmation))
+    end
+
     private
 
     attr_reader :space

data/lib/ribose/space_category.rb

@@ -0,0 +1,15 @@
+module Ribose
+  class SpaceCategory < Ribose::Base
+    include Ribose::Actions::All
+
+    private
+
+    def resources
+      nil
+    end
+
+    def resources_path
+      "space_categories"
+    end
+  end
+end

data/lib/ribose/space_file.rb

@@ -34,6 +34,21 @@ module Ribose
       new(space_id: space_id, resource_id: file_id, **options).fetch
     end
 
+    # Download a space file
+    #
+    # @param space_id [UUID] The Space UUID
+    # @param file_id [Integer] The File Id
+    # @param options [Hash] Options as key and value pair.
+    #
+    #   Two important keys are :version_id, and :output and
+    #   if these are provided then it will use those otherwise
+    #   it will do additional request to retirve those details
+    #
+    def self.download(space_id, file_id, options = {})
+      options[:version_id] ||= fetch(space_id, file_id).current_version_id
+      Ribose::FileVersion.download(space_id, file_id, **options)
+    end
+
     # Create a new file upload
     #
     # @param space_id [String] The Space UUID
@@ -66,6 +81,20 @@ module Ribose
       new(space_id: space_id, resource_id: file_id, **options).delete
     end
 
+    def fetch_icon
+      Ribose::Request.get([resource_path, "icon"].join("/"))
+    end
+
+    # Fetch a space file icon
+    #
+    # @param space_id [String] The Space UUID
+    # @param file_id [String] The space file ID
+    # @return [Sawyer::Resource]
+    #
+    def self.fetch_icon(space_id, file_id, options = {})
+      new(space_id: space_id, resource_id: file_id, **options).fetch_icon
+    end
+
     private
 
     attr_reader :space_id

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.3.0".freeze
+  VERSION = "0.4.1".freeze
 end

data/lib/ribose/version_uploader.rb

@@ -0,0 +1,27 @@
+require "ribose/file_uploader"
+
+module Ribose
+  class VersionUploader < Ribose::FileUploader
+    def initialize(space_id, file_id, file:, **attributes)
+      @file_id = file_id
+      super(space_id, file: file, **attributes)
+    end
+
+    def self.upload(space_id, file_id, file:, **attributes)
+      new(space_id, file_id, attributes.merge(file: file)).create
+    end
+
+    private
+
+    attr_reader :file_id
+
+    def notifiable_attributes(attributes, key)
+      attributes[:file_info_version] = attributes.delete(:file_info)
+      attributes.merge(key: key)
+    end
+
+    def space_file_path
+      ["spaces", space_id, "file", "files", file_id, "versions"].join("/")
+    end
+  end
+end

data/lib/ribose.rb

@@ -28,6 +28,9 @@ require "ribose/session"
 require "ribose/profile"
 require "ribose/wiki"
 require "ribose/member_role"
+require "ribose/event"
+require "ribose/space_category"
+require "ribose/file_version"
 
 module Ribose
   def self.root

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/fixtures/calendar_event.json

@@ -0,0 +1,48 @@
+{
+  "filter": {
+    "enabled": [
+      123456789
+    ],
+    "userSetting": [0]
+  },
+  "cal_info": [
+    {
+      "id": 123456789,
+      "owner_type": "User",
+      "name": "johndoe",
+      "owner_id": "2970d105-5ccc-4a8c",
+      "owner_name": "Personal",
+      "display_name": "johndoe (Personal)",
+      "can_manage": true,
+      "can_create_event": true
+    }
+  ],
+  "spaces_permission": {
+    "268b0407-c3a3-4aad-8693-fdba789f7f0d": false,
+    "457e8438-1c6f-423f-8bf2-77b9d5102fb0": true,
+    "52e47e18-9a9d-4663-94c5-abcb18fa783a": true,
+    "a45387e2-a573-48ba-8df0-f1424d8a8ec9": false,
+    "a7f7b94e-a007-4457-868f-5af319706ad5": false
+  },
+  "event": {
+    "id": 456789,
+    "name": "Sample event",
+    "description": "",
+    "where": "",
+    "all_day": true,
+    "recurring_type": "not_repeat",
+    "my_note": null,
+    "old_head_id": null,
+    "calendar_id": 123456789,
+    "created_by": "2970d105-5ccc-4a8c-b0c4-ec32d539a00a",
+    "utc_start": "2018-03-13T12:00:00.000Z",
+    "utc_finish": "2018-03-13T13:00:00.000Z",
+    "utc_old_start": null,
+    "utc_old_finish": null,
+    "can_save": true,
+    "can_delete": true,
+    "timestamp": 1520690119
+  },
+  "head_event": null,
+  "recurring": []
+}

data/spec/fixtures/conversation.json

@@ -7,7 +7,7 @@
     "name": "Trips to the Mars!",
     "tag_list": [],
     "published": false,
-    "is_favorite": false,
+    "is_favorite": true,
     "is_read": true,
     "allow_publish": false,
     "number_of_messages": 1,

data/spec/fixtures/event_created.json

@@ -0,0 +1,21 @@
+{
+  "events": {
+    "id": 789012345,
+    "name": "Sample Event",
+    "description": "Sample event",
+    "where": "Skype",
+    "all_day": false,
+    "recurring_type": "not_repeat",
+    "my_note": null,
+    "old_head_id": null,
+    "calendar_id": 18987,
+    "created_by": "2970d105-5ccc",
+    "utc_start": "2018-04-04T18:00:00.000Z",
+    "utc_finish": "2018-04-04T18:30:00.000Z",
+    "utc_old_start": null,
+    "utc_old_finish": null,
+    "can_save": true,
+    "can_delete": true,
+    "timestamp": 1521387260
+  }
+}

data/spec/fixtures/event_updated.json

@@ -0,0 +1,23 @@
+{
+  "events": [
+    {
+      "id": 345678901,
+      "name": "Sample event",
+      "description": "",
+      "where": "",
+      "all_day": true,
+      "recurring_type": "not_repeat",
+      "my_note": "",
+      "old_head_id": null,
+      "calendar_id": 123456789,
+      "created_by": "bdc6aced-f7d0-465d-9d8b",
+      "utc_start": "2017-11-07T12:00:00.000Z",
+      "utc_finish": "2017-11-07T13:00:00.000Z",
+      "utc_old_start": null,
+      "utc_old_finish": null,
+      "can_save": true,
+      "can_delete": true,
+      "timestamp": 1508401619
+    }
+  ]
+}

data/spec/fixtures/file_version.json

@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "name": "sample.png",
+  "description": "",
+  "created_at": "2017-11-30T09:12:03.000+00:00",
+  "updated_at": "2017-11-30T09:12:05.000+00:00",
+  "position": 1,
+  "current_version_id": 789012,
+  "icon_path": "/spaces/456789/file/files/11570/versions/13235?type=usual",
+  "content_size": 81421,
+  "author": "John Doe",
+  "content_type": "image/png",
+  "file_info_id": 11570
+}

data/spec/fixtures/space_categories.json

@@ -0,0 +1,150 @@
+[
+  {
+    "id": 1,
+    "name": "animals"
+  },
+  {
+    "id": 2,
+    "name": "architecture"
+  },
+  {
+    "id": 3,
+    "name": "art"
+  },
+  {
+    "id": 4,
+    "name": "business"
+  },
+  {
+    "id": 5,
+    "name": "cars_and_motorcycles"
+  },
+  {
+    "id": 6,
+    "name": "common_interest"
+  },
+  {
+    "id": 7,
+    "name": "diy_and_crafts"
+  },
+  {
+    "id": 8,
+    "name": "design"
+  },
+  {
+    "id": 9,
+    "name": "education"
+  },
+  {
+    "id": 10,
+    "name": "entertainment"
+  },
+  {
+    "id": 11,
+    "name": "fashion"
+  },
+  {
+    "id": 12,
+    "name": "film_music_books"
+  },
+  {
+    "id": 13,
+    "name": "food_and_drink"
+  },
+  {
+    "id": 14,
+    "name": "gardening"
+  },
+  {
+    "id": 15,
+    "name": "geek"
+  },
+  {
+    "id": 16,
+    "name": "geography"
+  },
+  {
+    "id": 17,
+    "name": "groups_and_organizations"
+  },
+  {
+    "id": 18,
+    "name": "hair_and_beauty"
+  },
+  {
+    "id": 19,
+    "name": "health_and_fitness"
+  },
+  {
+    "id": 20,
+    "name": "history"
+  },
+  {
+    "id": 21,
+    "name": "holidays_and_events"
+  },
+  {
+    "id": 22,
+    "name": "home_decor"
+  },
+  {
+    "id": 23,
+    "name": "humor"
+  },
+  {
+    "id": 24,
+    "name": "illustrations_and_posters"
+  },
+  {
+    "id": 25,
+    "name": "kids"
+  },
+  {
+    "id": 26,
+    "name": "mens_fashion"
+  },
+  {
+    "id": 27,
+    "name": "outdoors"
+  },
+  {
+    "id": 28,
+    "name": "philosophy"
+  },
+  {
+    "id": 29,
+    "name": "photography"
+  },
+  {
+    "id": 30,
+    "name": "products"
+  },
+  {
+    "id": 31,
+    "name": "religion_and_spirituality"
+  },
+  {
+    "id": 32,
+    "name": "science_and_nature"
+  },
+  {
+    "id": 33,
+    "name": "sports"
+  },
+  {
+    "id": 34,
+    "name": "technology"
+  },
+  {
+    "id": 35,
+    "name": "travel"
+  },
+  {
+    "id": 36,
+    "name": "weddings"
+  },
+  {
+    "id": 37,
+    "name": "others"
+  }
+]

data/spec/fixtures/space_file_icon.json

@@ -0,0 +1,4 @@
+{
+  "icon_processed": true,
+  "icon_path": "/spaces/files/icon_path?type=usual"
+}

data/spec/ribose/connection_spec.rb

@@ -23,4 +23,15 @@ RSpec.describe Ribose::Connection do
       expect(suggestions.first.name).to eq("Jennie Doe")
     end
   end
+
+  describe ".disconnect" do
+    it "disconnect with provided connection" do
+      connection_id = 123_456
+      stub_ribose_connection_delete_api(connection_id)
+
+      expect do
+        Ribose::Connection.disconnect(connection_id)
+      end.not_to raise_error
+    end
+  end
 end

data/spec/ribose/conversation_spec.rb

@@ -59,6 +59,20 @@ RSpec.describe Ribose::Conversation do
     end
   end
 
+  describe ".mark_as_favorite" do
+    it "marks a conversation as favorite" do
+      space_id = 123_456_789
+      conversation_id = 456_789
+      stub_ribose_space_conversation_mafav_api(space_id, conversation_id)
+
+      conversation = Ribose::Conversation.mark_as_favorite(
+        space_id, conversation_id
+      )
+
+      expect(conversation.is_favorite).to eq(true)
+    end
+  end
+
   describe ".destroy" do
     it "remvoes a conversation from a space" do
       space_id = 123456789