rb1drv 0.1.7 → 0.1.8

data/lib/rb1drv/onedrive_item.rb

@@ -1,68 +1,67 @@
-module Rb1drv
-  class OneDriveItem
-    attr_reader :id, :name, :eTag, :size, :mtime, :ctime, :muser, :cuser, :parent_path, :remote_id, :remote_drive_id
-    protected
-    def initialize(od, api_hash)
-      raise api_hash.inspect unless api_hash['createdDateTime']
-      @od = od
-      %w(id name eTag size).each do |key|
-        instance_variable_set("@#{key}", api_hash[key])
-      end
-      @remote_drive_id = api_hash.dig('remoteItem', 'parentReference', 'driveId')
-      @remote_id = api_hash.dig('remoteItem', 'id')
-      @mtime = Time.iso8601(api_hash['lastModifiedDateTime'])
-      @ctime = Time.iso8601(api_hash['createdDateTime'])
-      @muser = api_hash.dig('lastModifiedBy', 'user', 'displayName') || 'N/A'
-      @cuser = api_hash.dig('createdBy', 'user', 'displayName') || 'N/A'
-      @parent_path = api_hash.dig('parentReference', 'path')
-      @remote = api_hash.has_key?('remoteItem')
-    end
-
-    # Create subclass instance by checking the item type
-    #
-    # @return [OneDriveFile, OneDriveDir] instanciated drive item
-    def self.smart_new(od, item_hash)
-      if item_hash['remoteItem']
-        item_hash['remoteItem'].each do |key, value|
-          item_hash[key] ||= value
-        end
-      end
-      if item_hash['file']
-        OneDriveFile.new(od, item_hash)
-      elsif item_hash['folder']
-        OneDriveDir.new(od, item_hash)
-      elsif item_hash.dig('error', 'code') == 'itemNotFound'
-        OneDrive404.new
-      else
-        item_hash
-      end
-    end
-
-    # @return [String] absolute path of current item
-    def absolute_path
-      if @parent_path
-        File.join(@parent_path, @name)
-      else
-        @name
-      end
-    end
-
-    # TODO: API endpoint does not play well with remote files
-    #
-    # @return [String] api reference path of current object
-    def api_path
-      if remote?
-        "drives/#{@remote_drive_id}/items/#{@remote_id}"
-      else
-        "drive/items/#{@id}"
-      end
-    end
-
-    # TODO: API endpoint does not play well with remote files
-    #
-    # @return [Boolean] whether it's shared by others
-    def remote?
-      @remote
-    end
-  end
-end
+module Rb1drv
+  class OneDriveItem
+    attr_reader :id, :name, :eTag, :size, :mtime, :ctime, :muser, :cuser, :parent_path, :remote_id, :remote_drive_id
+    protected
+    def initialize(od, api_hash)
+      @od = od
+      %w(id name eTag size).each do |key|
+        instance_variable_set("@#{key}", api_hash[key])
+      end
+      @remote_drive_id = api_hash.dig('remoteItem', 'parentReference', 'driveId')
+      @remote_id = api_hash.dig('remoteItem', 'id')
+      @mtime = Time.iso8601(api_hash.dig('lastModifiedDateTime'))
+      @ctime = Time.iso8601(api_hash.dig('createdDateTime'))
+      @muser = api_hash.dig('lastModifiedBy', 'user', 'displayName') || 'N/A'
+      @cuser = api_hash.dig('createdBy', 'user', 'displayName') || 'N/A'
+      @parent_path = api_hash.dig('parentReference', 'path')
+      @remote = api_hash.has_key?('remoteItem')
+    end
+
+    # Create subclass instance by checking the item type
+    #
+    # @return [OneDriveFile, OneDriveDir] instanciated drive item
+    def self.smart_new(od, item_hash)
+      if item_hash['remoteItem']
+        item_hash['remoteItem'].each do |key, value|
+          item_hash[key] ||= value
+        end
+      end
+      if item_hash['file']
+        OneDriveFile.new(od, item_hash)
+      elsif item_hash['folder']
+        OneDriveDir.new(od, item_hash)
+      elsif item_hash.dig('error', 'code') == 'itemNotFound'
+        OneDrive404.new
+      else
+        item_hash
+      end
+    end
+
+    # @return [String] absolute path of current item
+    def absolute_path
+      if @parent_path
+        File.join(@parent_path, @name)
+      else
+        @name
+      end
+    end
+
+    # TODO: API endpoint does not play well with remote files
+    #
+    # @return [String] api reference path of current object
+    def api_path
+      if remote?
+        "drives/#{@remote_drive_id}/items/#{@remote_id}"
+      else
+        "drive/items/#{@id}"
+      end
+    end
+
+    # TODO: API endpoint does not play well with remote files
+    #
+    # @return [Boolean] whether it's shared by others
+    def remote?
+      @remote
+    end
+  end
+end

data/lib/rb1drv/sliced_io.rb

@@ -1,38 +1,38 @@
-# SlicedIO slices a large File into a small portion.
-class SlicedIO
-  def initialize(io, from, to, &block)
-    @io = io
-    @from = from
-    @to = to
-    @block = block
-    rewind
-  end
-
-  def rewind
-    @io.seek(@from)
-    @current = 0
-  end
-
-  def size
-    @size ||= @to - @from + 1
-  end
-
-  def read(len)
-    return nil if @current >= size
-    len = [len, size - @current].min
-    # Notify before we read
-    @block.call(@current, size)
-    failed_count = 0
-    begin
-      @io.read(len)
-    rescue Errno::EIO
-      @io.seek(@from + @current)
-      sleep 1
-      failed_count += 1
-      retry unless failed_count > 5
-      raise
-    end
-  ensure
-    @current += len
-  end
-end
+# SlicedIO slices a large File into a small portion.
+class SlicedIO
+  def initialize(io, from, to, &block)
+    @io = io
+    @from = from
+    @to = to
+    @block = block
+    rewind
+  end
+
+  def rewind
+    @io.seek(@from)
+    @current = 0
+  end
+
+  def size
+    @size ||= @to - @from + 1
+  end
+
+  def read(len)
+    return nil if @current >= size
+    len = [len, size - @current].min
+    # Notify before we read
+    @block.call(@current, size)
+    failed_count = 0
+    begin
+      @io.read(len)
+    rescue Errno::EIO
+      @io.seek(@from + @current)
+      sleep 1
+      failed_count += 1
+      retry unless failed_count > 5
+      raise
+    end
+  ensure
+    @current += len
+  end
+end

data/lib/rb1drv/version.rb

@@ -1,3 +1,3 @@
-module Rb1drv
-  VERSION = "0.1.7"
-end
+module Rb1drv
+  VERSION = "0.1.8"
+end

data/lib/rb1drv.rb

@@ -1,59 +1,59 @@
-require 'excon'
-require 'oauth2'
-require "rb1drv/version"
-
-module Rb1drv
-  # Base class to support oauth2 authentication and sending simple API requests.
-  #
-  # Call +#root+ or +#get+ to get an +OneDriveDir+ or +OneDriveFile+ to wotk with.
-  class OneDrive
-    attr_reader :oauth2_client, :logger, :access_token, :conn
-    # Instanciates with app id and secret.
-    def initialize(client_id, client_secret, callback_url, logger=nil)
-      @client_id = client_id
-      @client_secret = client_secret
-      @callback_url = callback_url
-      @logger =  logger
-      @oauth2_client = OAuth2::Client.new client_id, client_secret,
-        authorize_url: 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize',
-        token_url: 'https://login.microsoftonline.com/common/oauth2/v2.0/token'
-      @conn = Excon.new('https://graph.microsoft.com/', persistent: true, idempotent: true)
-      @conn.logger = @logger if @logger
-    end
-
-    # Issues requests to API endpoint.
-    #
-    # @param uri [String] relative path of the API
-    # @param data [Hash] JSON data to be post
-    # @param verb [Symbol] HTTP request verb if data is given
-    #
-    # @return [Hash] response from API.
-    def request(uri, data=nil, verb=:post)
-      @logger.info(uri) if @logger
-      auth_check
-      query = {
-        path: File.join('v1.0/me/', URI.escape(uri)),
-        headers: {
-          'Authorization': "Bearer #{@access_token.token}"
-        }
-      }
-      if data
-        query[:body] = JSON.generate(data)
-        query[:headers]['Content-Type'] = 'application/json'
-        @logger.info(query[:body]) if @logger
-        verb = :post unless [:post, :put, :patch, :delete].include?(verb)
-        response = @conn.send(verb, query)
-      else
-        response = @conn.get(query)
-      end
-      JSON.parse(response.body)
-    end
-  end
-end
-
-require 'rb1drv/auth'
-require 'rb1drv/onedrive'
-require 'rb1drv/onedrive_item'
-require 'rb1drv/onedrive_dir'
-require 'rb1drv/onedrive_file'
-require 'rb1drv/onedrive_404'
+require 'excon'
+require 'oauth2'
+require "rb1drv/version"
+
+module Rb1drv
+  # Base class to support oauth2 authentication and sending simple API requests.
+  #
+  # Call +#root+ or +#get+ to get an +OneDriveDir+ or +OneDriveFile+ to wotk with.
+  class OneDrive
+    attr_reader :oauth2_client, :logger, :access_token, :conn
+    # Instanciates with app id and secret.
+    def initialize(client_id, client_secret, callback_url, logger=nil)
+      @client_id = client_id
+      @client_secret = client_secret
+      @callback_url = callback_url
+      @logger =  logger
+      @oauth2_client = OAuth2::Client.new client_id, client_secret,
+        authorize_url: 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize',
+        token_url: 'https://login.microsoftonline.com/common/oauth2/v2.0/token'
+      @conn = Excon.new('https://graph.microsoft.com/', persistent: true, idempotent: true)
+      @conn.logger = @logger if @logger
+    end
+
+    # Issues requests to API endpoint.
+    #
+    # @param uri [String] relative path of the API
+    # @param data [Hash] JSON data to be post
+    # @param verb [Symbol] HTTP request verb if data is given
+    #
+    # @return [Hash] response from API.
+    def request(uri, data=nil, verb=:post)
+      @logger.info(uri) if @logger
+      auth_check
+      query = {
+        path: File.join('v1.0/me/', URI.escape(uri)),
+        headers: {
+          'Authorization': "Bearer #{@access_token.token}"
+        }
+      }
+      if data
+        query[:body] = JSON.generate(data)
+        query[:headers]['Content-Type'] = 'application/json'
+        @logger.info(query[:body]) if @logger
+        verb = :post unless [:post, :put, :patch, :delete].include?(verb)
+        response = @conn.send(verb, query)
+      else
+        response = @conn.get(query)
+      end
+      JSON.parse(response.body)
+    end
+  end
+end
+
+require 'rb1drv/auth'
+require 'rb1drv/onedrive'
+require 'rb1drv/onedrive_item'
+require 'rb1drv/onedrive_dir'
+require 'rb1drv/onedrive_file'
+require 'rb1drv/onedrive_404'

data/rb1drv.gemspec

@@ -1,28 +1,28 @@
-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "rb1drv/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "rb1drv"
-  spec.version       = Rb1drv::VERSION
-  spec.authors       = ["Xinyue Lu"]
-  spec.email         = ["i@7086.in"]
-
-  spec.summary       = "Ruby OneDrive Library"
-  spec.homepage      = "https://github.com/msg7086/rb1drv"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-  spec.required_ruby_version = '>= 2.3'
-
-  spec.add_dependency "oauth2", "~> 1.4"
-  spec.add_dependency "excon", "~> 0.62"
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-end
+
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "rb1drv/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "rb1drv"
+  spec.version       = Rb1drv::VERSION
+  spec.authors       = ["Xinyue Lu"]
+  spec.email         = ["i@7086.in"]
+
+  spec.summary       = "Ruby OneDrive Library"
+  spec.homepage      = "https://github.com/msg7086/rb1drv"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+  spec.required_ruby_version = '>= 2.3'
+
+  spec.add_dependency "oauth2", "~> 1.4"
+  spec.add_dependency "excon", "~> 0.62"
+  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "rake", "~> 10.0"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rb1drv
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Xinyue Lu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2