Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexskr
alexskr committed Jul 26, 2023
2 parents 943a4ef + 29dc761 commit 20394e6
Show file tree
Hide file tree
Showing 7 changed files with 262 additions and 119 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
config/config.rb
config/config_*.rb
config/*.p12
config/*.json
data/
projectFilesBackup/
.ruby-version
repo*
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gemspec

gem 'faraday', '~> 1.9'
gem 'ffi'
gem "google-apis-analytics_v3"
gem 'google-analytics-data'
gem 'mail', '2.6.6'
gem 'multi_json'
gem 'oj', '~> 2.0'
Expand Down
72 changes: 44 additions & 28 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ GIT

GIT
remote: https://github.com/ncbo/ncbo_annotator.git
revision: 964f0680799421ab24eddc974d9f2995c6c88734
revision: f4aa1c394359500b50dbc6b0b636e9fd6da93275
branch: master
specs:
ncbo_annotator (0.0.1)
Expand Down Expand Up @@ -60,7 +60,7 @@ PATH
ncbo_cron (0.0.1)
dante
goo
google-apis-analytics_v3
google-analytics-data
mlanett-redis-lock
multi_json
ncbo_annotator
Expand All @@ -83,7 +83,6 @@ GEM
connection_pool (2.4.1)
cube-ruby (0.0.3)
dante (0.2.0)
declarative (0.0.20)
docile (1.4.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
Expand Down Expand Up @@ -115,29 +114,55 @@ GEM
faraday-rack (1.0.0)
faraday-retry (1.0.3)
ffi (1.15.5)
google-apis-analytics_v3 (0.13.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.a)
rexml
webrick
googleauth (1.6.0)
gapic-common (0.19.1)
faraday (>= 1.9, < 3.a)
faraday-retry (>= 1.0, < 3.a)
google-protobuf (~> 3.14)
googleapis-common-protos (>= 1.3.12, < 2.a)
googleapis-common-protos-types (>= 1.3.1, < 2.a)
googleauth (~> 1.0)
grpc (~> 1.36)
google-analytics-data (0.4.0)
google-analytics-data-v1beta (>= 0.7, < 2.a)
google-cloud-core (~> 1.6)
google-analytics-data-v1beta (0.8.0)
gapic-common (>= 0.19.1, < 2.a)
google-cloud-errors (~> 1.0)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.3.1)
google-protobuf (3.23.4)
google-protobuf (3.23.4-x86_64-darwin)
google-protobuf (3.23.4-x86_64-linux)
googleapis-common-protos (1.4.0)
google-protobuf (~> 3.14)
googleapis-common-protos-types (~> 1.2)
grpc (~> 1.27)
googleapis-common-protos-types (1.7.0)
google-protobuf (~> 3.14)
googleauth (1.7.0)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
grpc (1.56.2)
google-protobuf (~> 3.23)
googleapis-common-protos-types (~> 1.0)
grpc (1.56.2-x86_64-darwin)
google-protobuf (~> 3.23)
googleapis-common-protos-types (~> 1.0)
grpc (1.56.2-x86_64-linux)
google-protobuf (~> 3.23)
googleapis-common-protos-types (~> 1.0)
htmlentities (4.3.4)
http-accept (1.7.0)
http-cookie (1.0.5)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.6.3)
Expand All @@ -156,7 +181,6 @@ GEM
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.0218.1)
mini_mime (1.1.2)
minitest (4.7.5)
mlanett-redis-lock (0.2.7)
redis
Expand All @@ -174,7 +198,7 @@ GEM
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.1)
public_suffix (5.0.3)
rack (3.0.8)
rack-test (2.1.0)
rack (>= 1.3)
Expand All @@ -185,16 +209,11 @@ GEM
redis-client (>= 0.9.0)
redis-client (0.14.1)
connection_pool
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
retriable (3.1.2)
rexml (3.2.5)
rsolr (2.5.0)
builder (>= 2.1.2)
Expand Down Expand Up @@ -223,16 +242,13 @@ GEM
systemu (2.6.5)
test-unit-minitest (0.9.1)
minitest (~> 4.7)
trailblazer-option (0.1.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
uuid (2.3.9)
macaddr (~> 1.0)
webrick (1.8.1)

PLATFORMS
ruby
Expand All @@ -246,7 +262,7 @@ DEPENDENCIES
faraday (~> 1.9)
ffi
goo!
google-apis-analytics_v3
google-analytics-data
mail (= 2.6.6)
minitest (< 5.0)
multi_json
Expand All @@ -267,4 +283,4 @@ DEPENDENCIES
test-unit-minitest

BUNDLED WITH
2.4.9
2.4.17
16 changes: 8 additions & 8 deletions config/config.rb.sample
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ NcboCron.config do |config|
config.search_index_all_url = "http://localhost:8983/solr/term_search_core2"
config.property_search_index_all_url = "http://localhost:8983/solr/prop_search_core2"

# Google Analytics config
config.analytics_service_account_email_address = "123456789999-sikipho0wk8q0atflrmw62dj4kpwoj3c@developer.gserviceaccount.com"
config.analytics_path_to_key_file = "config/bioportal-analytics.p12"
config.analytics_profile_id = "ga:1234567"
config.analytics_app_name = "BioPortal"
config.analytics_app_version = "1.0.0"
config.analytics_start_date = "2013-10-01"
config.analytics_filter_str = "ga:networkLocation!@stanford;ga:networkLocation!@amazon"
# Google Analytics GA4 config
config.analytics_path_to_key_file = "config/your_analytics_key.json"
config.analytics_property_id = "123456789"
# path to the Universal Analytics data, which stopped collecting on June 1st, 2023
config.analytics_path_to_ua_data_file = "data/your_ua_data.json"
# path to the file that will hold your Google Analytics data
# this is in addition to storing it in Redis
config.analytics_path_to_ga_data_file = "data/your_ga_data.json"

# this is a Base64.encode64 encoded personal access token
# you need to run Base64.decode64 on it before using it in your code
Expand Down
Loading

0 comments on commit 20394e6

Please sign in to comment.