outlook_calendar 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a537cd742ff33b29714eb9a39f0fc10d6cba0be9
-  data.tar.gz: a6fdee91ff89c8762ed207ca5236b7ca80833a6e
+  metadata.gz: 0733d96b18a88002243448d8aceaba320f970bc3
+  data.tar.gz: 795d14fb2d317fcd4cab1636c0a94e68ce9995c7
 SHA512:
-  metadata.gz: db2af7eff088eb7bad2b159ed8e27360ae101141edc424ed96bec9f4765d74a7d2bb5cf616a57f24b23c7cc336cc0a1ca99194d99b54ccf7931340aac93c77aa
-  data.tar.gz: 0b5c8c71c9a52dca7505caa036fdef85ce321e7d6afe68b7c9c17eb8ad6b4444445ffa1b64845617c591b32cf7eaa9632164d91e9cee1ea755895a3a68d85374
+  metadata.gz: de5cc33c26b54ce40dd2e3dde2f681bf9a45306fb1ec3f04e45d667455764dbcafc0552a27f686d139945b88aeef1352d1aabd9e8c1397a3e17b8f3ddb6d5716
+  data.tar.gz: a8ccebe047a744cbf23a77d8e49f6807ae367baddbca6597c5e104553b29792fd096f29d6f334d5f0d2ed4875a1714635a03d08343ae5fb2647dbee61747db13

data/Gemfile.lock

@@ -1,34 +1,22 @@
 PATH
   remote: .
   specs:
-    outlook_calendar (0.1.1)
+    outlook_calendar (0.2.0)
+      rest-client
 
 GEM
   remote: https://rubygems.org/
   specs:
     byebug (9.1.0)
     diff-lcs (1.3)
-    domain_name (0.5.20170404)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    faraday (0.12.2)
-      multipart-post (>= 1.2, < 3)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    jwt (1.5.6)
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    multi_json (1.13.1)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
+    mime-types-data (3.2019.0331)
     netrc (0.11.0)
-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    rack (2.0.3)
     rake (10.5.0)
     require_all (1.5.0)
     rest-client (2.0.2)
@@ -50,7 +38,7 @@ GEM
     rspec-support (3.7.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.4)
+    unf_ext (0.0.7.6)
 
 PLATFORMS
   ruby
@@ -58,11 +46,9 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.16)
   byebug
-  oauth2 (~> 1.4)
   outlook_calendar!
   rake (~> 10.0)
   require_all
-  rest-client
   rspec (~> 3.0)
 
 BUNDLED WITH

data/README.md

@@ -1,4 +1,4 @@
-# OutlookCalendar
+# Outlook Calendar
 
 The Outlook calendar gem is a api implementation of the Calendar APIs. It provides basic CRUD functionality for Outlook calendar.
 
@@ -23,39 +23,50 @@ Or install it yourself as:
 
 ## Usage
 
-    For getting a user access token call:
-    OutlookCalendar::AccessToken.new(code, app_id, app_secret_key, scope, redirect_uri).call
-    
-    For getting a user refresh token 
-    OutlookCalendar::RefreshToken.new(token, refresh_token, client_id, client_secret, redirect_uri).call
-    
-    For getting a user calendar
-    OutlookCalendar::Calenders.new(token).call
-    
-    For getting calendar based event
-    OutlookCalendar::UserEvents.new(
-            token, outlook_params, selected_calendar
-          )
-    params = {
-                'startDateTime'=> from_date,
-                'endDateTime'=> to_date,
-                '$select'=> 'Subject,Start,End',
-                '$top'=> 1000
-              }      
-    
-    default value of select = 'Subject' but you can also pass your values.
-    
-    For getting events
-    OutlookCalendar::RefreshToken.new(token, start_time, end_time, select).call
-    
-    For creating a event 
-    OutlookCalendar::CreateEvent.new(token, calendar_id, params, select).call
-     pass the select for response same like above
-     params = {title: '', start_time: '', end_time: '', timezone: '', content_type: '', content: '', Attendees: [{email: '', name: ''}]}
-     
-    For deleting a event
-    OutlookCalendar::DeleteEvent.new(token, event_id).call
+To get a user access token
+```ruby
+OutlookCalendar::AccessToken.new(code, client_id, client_secret, scope, redirect_uri).call
+```
+
+To refresh a user access token
+```ruby
+OutlookCalendar::RefreshToken.new(refresh_token, client_id, client_secret, scope, redirect_uri).call
+```
 
+To get calendars
+```ruby
+OutlookCalendar::Calenders.new(token).call
+```
+
+To get events
+```ruby
+params = {
+  'startDateTime'=> from_date,
+  'endDateTime'=> to_date,
+  '$select'=> 'Subject,Start,End', # 'Subject' by default
+  '$top'=> 1000
+}
+OutlookCalendar::UserEvents.new(token, params, selected_calendar)
+```
+
+To create an event
+```ruby
+params = {
+  title: '',
+  start_time: '',
+  end_time: '',
+  timezone: '',
+  content_type: '',
+  content: '',
+  Attendees: [{ email: '', name: '' }]
+}
+OutlookCalendar::CreateEvent.new(token, calendar_id, params, select).call
+```
+
+To delete an event
+```ruby
+OutlookCalendar::DeleteEvent.new(token, event_id).call
+```
 
 ## Development
 
@@ -71,10 +82,16 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/Hitend
 
 Everyone interacting in the OutlookCalendar project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/Hitendra1632/outlook_calendar/blob/master/CODE_OF_CONDUCT.md).
 
+## Release Notes
+
+version 0.1.6, Remove issue of double creation of event.
+
+version 0.1.7, Fix the response for event deletion.
+
+version 0.1.9, Add more params for getting events.
 
-## Bug fixes
-version 0.1.6 Remove issue of double creation of event. 
+version 0.2.0, Upgrade to new auth APIs.
 
-version 0.1.7, fixing the response for event deletion.
+## To Do
 
-version 0.1.9, Adding more params for getting events.
+Upgrade to Graph APIs.

data/lib/outlook_calendar.rb

@@ -1,4 +1,3 @@
-require 'oauth2'
 require 'json'
 require 'rest-client'
 require 'outlook_calendar/version'

data/lib/outlook_calendar/calender/calenders.rb

@@ -28,7 +28,7 @@ module OutlookCalendar
     end
 
     def url
-      @url = 'https://outlook.office365.com/api/v2.0/me/calendars'
+      @url = 'https://outlook.office.com/api/v2.0/me/calendars'
     end
   end
-end
+end

data/lib/outlook_calendar/user/access_token.rb

@@ -1,35 +1,48 @@
 module OutlookCalendar
   class AccessToken
-    attr_reader :code, :app_id, :app_secret_key, :scope, :redirect_uri
+    attr_reader :code, :client_id, :client_secret, :scope, :redirect_uri
 
-    def initialize(code, app_id, app_secret_key, scope, redirect_uri)
+    def initialize(code, client_id, client_secret, scope, redirect_uri)
       @code = code
-      @app_id = app_id
-      @app_secret_key = app_secret_key
+      @client_id = client_id
+      @client_secret = client_secret
       @scope = scope
       @redirect_uri = redirect_uri
     end
 
     def call
-      access_token
+      response
     end
 
     private
 
-    def access_token
-      user_token_response
+    def response
+      caller
     end
 
-    def oauth_client
-      @oauth_client = OAuth2::Client.new(app_id,
-                                         app_secret_key,
-                                         site: 'https://login.microsoftonline.com',
-                                         authorize_url: '/common/oauth2/v2.0/authorize',
-                                         token_url: '/common/oauth2/v2.0/token')
+    def caller
+      RestCaller.new('post', url, headers, attributes).call
     end
 
-    def user_token_response
-      @user_token_response = oauth_client.auth_code.get_token(code, redirect_uri: redirect_uri, scope: scope)
+    def headers
+      {
+        'Content-Type' => 'application/x-www-form-urlencoded'
+      }
+    end
+
+    def attributes
+      {
+        code: code,
+        client_id: client_id,
+        client_secret: client_secret,
+        scope: scope,
+        redirect_uri: redirect_uri,
+        grant_type: 'authorization_code'
+      }
+    end
+
+    def url
+      'https://login.microsoftonline.com/common/oauth2/v2.0/token'
     end
   end
-end
+end

data/lib/outlook_calendar/user/refresh_token.rb

@@ -1,12 +1,12 @@
 module OutlookCalendar
   class RefreshToken
-    attr_reader :token, :refresh_token, :client_id, :client_secret, :redirect_uri
+    attr_reader :refresh_token, :client_id, :client_secret, :scope, :redirect_uri
 
-    def initialize(token, refresh_token, client_id, client_secret, redirect_uri)
-      @token = token
+    def initialize(refresh_token, client_id, client_secret, scope, redirect_uri)
       @refresh_token = refresh_token
       @client_id = client_id
       @client_secret = client_secret
+      @scope = scope
       @redirect_uri = redirect_uri
     end
 
@@ -33,15 +33,16 @@ module OutlookCalendar
     def attributes
       {
         refresh_token: refresh_token,
-        redirect_uri: redirect_uri,
         client_id: client_id,
         client_secret: client_secret,
+        scope: scope,
+        redirect_uri: redirect_uri,
         grant_type: 'refresh_token'
       }
     end
 
     def url
-      'https://login.live.com/oauth20_token.srf'
+      'https://login.microsoftonline.com/common/oauth2/v2.0/token'
     end
   end
 end

data/lib/outlook_calendar/version.rb

@@ -1,3 +1,3 @@
 module OutlookCalendar
-  VERSION = '0.1.9'
+  VERSION = '0.2.0'
 end

data/outlook_calendar.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["hitendra1632@gmail.com"]
 
   spec.summary       = %q{A gem for outlook calendar}
-  spec.description   = %q{A wapper for outlook calender }
+  spec.description   = %q{A wrapper for outlook calender }
   spec.homepage      = 'https://github.com/Hitendra1632/outlook_calendar'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -19,8 +19,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  
-  spec.add_runtime_dependency "oauth2", "~> 1.4"
+
   spec.add_runtime_dependency "rest-client"
 
   spec.add_development_dependency "bundler", "~> 1.16"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: outlook_calendar
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - hitendra
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-08 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: oauth2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 'A wapper for outlook calender '
+description: 'A wrapper for outlook calender '
 email:
 - hitendra1632@gmail.com
 executables: []
@@ -106,7 +92,6 @@ files:
 - lib/outlook_calendar/event/parse_event_response.rb
 - lib/outlook_calendar/event/user_events.rb
 - lib/outlook_calendar/rest_caller.rb
-- lib/outlook_calendar/user.rb
 - lib/outlook_calendar/user/access_token.rb
 - lib/outlook_calendar/user/refresh_token.rb
 - lib/outlook_calendar/version.rb