From 4b3427368738a01ee67283a8880332f4e57108d9 Mon Sep 17 00:00:00 2001 From: Terry S Date: Wed, 4 Jan 2023 12:24:04 +0000 Subject: [PATCH 1/2] Added options hash to supplement ENV variables --- .ruby-version | 1 - lib/instagram_basic_display/client.rb | 5 +++-- lib/instagram_basic_display/configuration.rb | 8 ++++---- lib/instagram_basic_display/version.rb | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index aedc15b..0000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.5.3 diff --git a/lib/instagram_basic_display/client.rb b/lib/instagram_basic_display/client.rb index 290c27c..b3c0e12 100644 --- a/lib/instagram_basic_display/client.rb +++ b/lib/instagram_basic_display/client.rb @@ -35,8 +35,9 @@ class Client # authentication utilities provided. # # @return void - def initialize(auth_token: nil) + def initialize(auth_token: nil, opts = {}) @auth_token = auth_token + @opts = opts @auth = Auth.new(configuration) @profile = Profile.new(configuration) @@ -49,7 +50,7 @@ def initialize(auth_token: nil) # # @return [InstagramBasicDisplay::Configuration] def configuration - @configuration ||= InstagramBasicDisplay::Configuration.new(auth_token: @auth_token) + @configuration ||= InstagramBasicDisplay::Configuration.new(auth_token: @auth_token, @opts) end # Sets the gem's configuration diff --git a/lib/instagram_basic_display/configuration.rb b/lib/instagram_basic_display/configuration.rb index 263b356..c6bc76f 100644 --- a/lib/instagram_basic_display/configuration.rb +++ b/lib/instagram_basic_display/configuration.rb @@ -25,11 +25,11 @@ class Configuration # @param auth_token [String] token that will be used to make requests # # @return void - def initialize(auth_token: nil) - @client_id = set_client_id - @client_secret = set_client_secret - @redirect_uri = set_redirect_uri + def initialize(auth_token: nil, opts = {}) @auth_token = auth_token + @client_id = opts[:client_id] || set_client_id + @client_secret = opts[:client_secret] || set_client_secret + @redirect_uri = opts[:redirect_uri] || set_redirect_uri end def set_client_id diff --git a/lib/instagram_basic_display/version.rb b/lib/instagram_basic_display/version.rb index bbb90ad..4b15050 100644 --- a/lib/instagram_basic_display/version.rb +++ b/lib/instagram_basic_display/version.rb @@ -15,6 +15,6 @@ # limitations under the License. module InstagramBasicDisplay - VERSION = '0.2.0' + VERSION = '0.3.0' end From 509f1b5ebd9044703fd6a54b0192324e73e833c2 Mon Sep 17 00:00:00 2001 From: Terry S Date: Wed, 4 Jan 2023 12:37:29 +0000 Subject: [PATCH 2/2] Updated options --- Gemfile.lock | 4 ++-- instagram_basic_display.gemspec | 2 +- lib/instagram_basic_display/client.rb | 6 +++--- lib/instagram_basic_display/configuration.rb | 4 ++-- lib/instagram_basic_display/version.rb | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ca581cf..2cb3b8d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - instagram_basic_display (0.2.0) + instagram_basic_display (0.3.0) GEM remote: https://rubygems.org/ @@ -59,7 +59,7 @@ PLATFORMS ruby DEPENDENCIES - bundler (~> 1.16) + bundler dotenv instagram_basic_display! pry diff --git a/instagram_basic_display.gemspec b/instagram_basic_display.gemspec index be1c607..ae0875f 100644 --- a/instagram_basic_display.gemspec +++ b/instagram_basic_display.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_development_dependency "bundler", "~> 1.16" + spec.add_development_dependency "bundler" spec.add_development_dependency "rake", "~> 10.0" spec.add_development_dependency "rspec", "~> 3.0" end diff --git a/lib/instagram_basic_display/client.rb b/lib/instagram_basic_display/client.rb index b3c0e12..609cb61 100644 --- a/lib/instagram_basic_display/client.rb +++ b/lib/instagram_basic_display/client.rb @@ -35,8 +35,8 @@ class Client # authentication utilities provided. # # @return void - def initialize(auth_token: nil, opts = {}) - @auth_token = auth_token + def initialize(opts = {}) + @auth_token = opts[:auth_token] @opts = opts @auth = Auth.new(configuration) @@ -50,7 +50,7 @@ def initialize(auth_token: nil, opts = {}) # # @return [InstagramBasicDisplay::Configuration] def configuration - @configuration ||= InstagramBasicDisplay::Configuration.new(auth_token: @auth_token, @opts) + @configuration ||= InstagramBasicDisplay::Configuration.new(@opts) end # Sets the gem's configuration diff --git a/lib/instagram_basic_display/configuration.rb b/lib/instagram_basic_display/configuration.rb index c6bc76f..9ae5fa5 100644 --- a/lib/instagram_basic_display/configuration.rb +++ b/lib/instagram_basic_display/configuration.rb @@ -25,8 +25,8 @@ class Configuration # @param auth_token [String] token that will be used to make requests # # @return void - def initialize(auth_token: nil, opts = {}) - @auth_token = auth_token + def initialize(opts = {}) + @auth_token = opts[:auth_token] @client_id = opts[:client_id] || set_client_id @client_secret = opts[:client_secret] || set_client_secret @redirect_uri = opts[:redirect_uri] || set_redirect_uri diff --git a/lib/instagram_basic_display/version.rb b/lib/instagram_basic_display/version.rb index 4b15050..57a80c3 100644 --- a/lib/instagram_basic_display/version.rb +++ b/lib/instagram_basic_display/version.rb @@ -15,6 +15,6 @@ # limitations under the License. module InstagramBasicDisplay - VERSION = '0.3.0' + VERSION = '0.3.1' end