dina 0.9.6.0 → 1.0.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cce79c602acd586ad4956e059395760f905a7584d5ebb9cd009c18481e7788ee
-  data.tar.gz: 1a848937cff7fe9c1ea149d51776f8273c6ae2d29b5d760b9a26ff823e783f0d
+  metadata.gz: 19e690231bb618d0e35421466a61c550095d2f3bfe6ee83b258e03f8e6873f7d
+  data.tar.gz: 6733125d440e421b987e2c09bfb2d479d33d20f350f355033bb6bc9c22a104b0
 SHA512:
-  metadata.gz: d9504cdc4b88cabcd65b3583c9f5a0227589a6337dafa8444d7d824ec7c6190825f8fa05d50a9aac4684be35d4b100dc6ea749e80b3ccef58ffddabde13b77a1
-  data.tar.gz: f94ab142f10947cd46d37740a7fd3b35bff9d9682e04ec0b30642884fc445d80ccacf57f9b7b018de9f15554322e3f85fe7f2030a2de0974795f6245f2372f3f
+  metadata.gz: 40e453289825aec7185c1c7bf7d316c4f75a13ffcf26f419b9f965aa2434154207da2a7d43dfcdc6d0ef08dac10cf2c6a931a36dcdbe348f73d87098d063217c
+  data.tar.gz: aef21cc4aed3d0670809fa0fec20488b9702d8abcf7b653c3d44e33f4d9f27448c3cc3712a04f4bb320bc5ecb882af71cbc751a8d3d1fc945c8d48c18d30825a

data/lib/dina/authentication/authentication.rb

@@ -25,7 +25,6 @@ module Dina
     #    token_store_file: "file to store the token",
     #    user: "username provided by DINA admin in Keycloak",
     #    password: "password provided by DINA admin in Keycloak",
-    #    server_name: "used locally to reference the token",
     #    client_id: "provided by DINA admin in Keycloak",
     #    endpoint_url: "DINA API URL without terminating slash",
     #    authorization_url: "Keycloak authorization URL without terminating slash".
@@ -37,7 +36,6 @@ module Dina
       raise ConfigItemMissing, "Missing token_store_file from config." unless opts[:token_store_file]
       raise ConfigItemMissing, "Missing user from config." unless opts[:user]
       raise ConfigItemMissing, "Missing password from config." unless opts[:password]
-      raise ConfigItemMissing, "Missing server_name from config." unless opts[:server_name]
       raise ConfigItemMissing, "Missing client_id from config." unless opts[:client_id]
       raise ConfigItemMissing, "Missing endpoint_url from config." unless opts[:endpoint_url]
       raise ConfigItemMissing, "Missing authorization_url from config." unless opts[:authorization_url]
@@ -53,17 +51,17 @@ module Dina
       Keycloak.auth_server_url = config.authorization_url
       Keycloak.realm = config.realm
 
-      if ::File.zero?(config.token_store_file) || !token.key?(config.server_name.to_sym)
-        write_token(data: empty_token)
+      if ::File.zero?(config.token_store_file)
+        save_token(hash: empty_token)
       end
     end
 
-    # Gets, sets, and renews a Bearer access token as required and produces a Header string
+    # Gets, sets, and renews a Bearer access token as required and produces a Bearer string
     #
     # @return [String] the Bearer token
     def header
       if access_token.nil? || refresh_token.nil?
-        set_token
+        get_token
       end
 
       if Time.now >= Time.parse(auth_expiry)
@@ -75,7 +73,7 @@ module Dina
 
     # Save default values in token store file
     def flush
-      write_token(data: empty_token)
+      save_token(hash: empty_token)
     end
 
     def flush_config
@@ -91,7 +89,6 @@ module Dina
         token_store_file: nil,
         user: nil,
         password: nil,
-        server_name: nil,
         client_id: nil,
         endpoint_url: nil,
         realm: nil,
@@ -101,7 +98,7 @@ module Dina
 
     def access_token
       begin
-        token[config.server_name.to_sym][:access_token]
+        token[:access_token]
       rescue
         raise TokenStoreContentInvalid
       end
@@ -109,7 +106,7 @@ module Dina
 
     def refresh_token
       begin
-        token[config.server_name.to_sym][:refresh_token]
+        token[:refresh_token]
       rescue
         raise TokenStoreContentInvalid
       end
@@ -117,7 +114,7 @@ module Dina
 
     def auth_expiry
       begin
-        token[config.server_name.to_sym][:auth_expiry]
+        token[:auth_expiry]
       rescue
         raise TokenStoreContentInvalid
       end
@@ -129,13 +126,8 @@ module Dina
         config.password,
         client_id= config.client_id,
         secret='')
-      JSON.parse(response, symbolize_names: true)
-    end
-
-    def set_token
-      json = get_token
-      auth_expiry = (Time.now + json[:expires_in].seconds).to_s
-      save_token(access_token: json[:access_token], refresh_token: json[:refresh_token], auth_expiry: auth_expiry)
+      json = JSON.parse(response, symbolize_names: true)
+      save_token(hash: json)
     end
 
     def renew_token
@@ -145,10 +137,9 @@ module Dina
           client_id= config.client_id,
           secret='')
         json = JSON.parse(response, symbolize_names: true)
-        auth_expiry = (Time.now + json[:expires_in].seconds).to_s
-        save_token(access_token: json[:access_token], refresh_token: json[:refresh_token], auth_expiry: auth_expiry)
+        save_token(hash: json)
       rescue
-        set_token
+        get_token
       end
     end
 
@@ -157,28 +148,19 @@ module Dina
     end
 
     def empty_token
-      data = {}
-      data[config.server_name.to_sym] = {
+      {
         access_token: nil,
         refresh_token: nil,
+        expires_in: nil,
         auth_expiry: nil
       }
-      data
-    end
-
-    def save_token(access_token:, refresh_token:, auth_expiry:)
-      data = JSON.parse(::File.read(config.token_store_file), symbolize_names: true) rescue {}
-      data[config.server_name.to_sym] = {
-        access_token: access_token,
-        refresh_token: refresh_token,
-        auth_expiry: auth_expiry
-      }
-      write_token(data: data)
     end
 
-    def write_token(data:)
-      ::File.write(config.token_store_file, JSON.dump(data))
-      @token = data
+    def save_token(hash:)
+      auth_expiry = (Time.now + hash[:expires_in].seconds).to_s rescue nil
+      hash.merge!({ auth_expiry: auth_expiry })
+      ::File.write(config.token_store_file, JSON.dump(hash))
+      @token = hash
     end
 
   end

data/lib/dina/casters/{object_caster.rb → hash_caster.rb}

@@ -1,8 +1,10 @@
 module Dina
-  class ObjectCaster
+  class HashCaster
     def self.cast(value, default)
       if value.is_a?(Hash)
         value
+      elsif value.is_a?(Object)
+        value.to_h
       else
         default
       end

data/lib/dina/models/assemblage.rb

@@ -7,7 +7,7 @@ module Dina
     property :name, type: :string
     property :multilingualTitle, type: :multilingual_title
     property :multilingualDescription, type: :multilingual_description
-    property :managedAttributes, type: :object
+    property :managedAttributes, type: :hash
     property :createdBy, type: :string
     property :createdOn, type: :time
 

data/lib/dina/models/material_sample/collecting_event.rb

@@ -35,8 +35,8 @@ module Dina
     property :notPubliclyReleasableReason, type: :string, default: nil
     property :tags, type: :array, default: []
     property :geographicPlaceNameSource, type: :string
-    property :geographicPlaceNameSourceDetail, type: :object, default: {}
-    property :managedAttributes, type: :object
+    property :geographicPlaceNameSourceDetail, type: :hash, default: {}
+    property :managedAttributes, type: :hash
     property :geoReferenceAssertions, type: :array, default: []
     property :eventGeom, type: :string
     property :extensionValues, type: :array, default: []

data/lib/dina/models/material_sample/material_sample.rb

@@ -11,8 +11,8 @@ module Dina
     property :createdOn, type: :time
     property :barcode, type: :string
     property :group, type: :string
-    property :managedAttributes, type: :object
-    property :preparationManagedAttributes, type: :object
+    property :managedAttributes, type: :hash
+    property :preparationManagedAttributes, type: :hash
     property :dwcOtherCatalogNumbers, type: :array
     property :preservationType, type: :string
     property :preparationFixative, type: :string
@@ -25,8 +25,8 @@ module Dina
     property :stateChangedOn, type: :date
     property :stateChangeRemarks, type: :string
     property :materialSampleRemarks, type: :string
-    property :extensionValues, type: :object
-    property :restrictionFieldsExtension, type: :object
+    property :extensionValues, type: :hash
+    property :restrictionFieldsExtension, type: :hash
     property :restrictionRemarks, type: :string
     property :isRestricted, type: :boolean
     property :materialSampleChildren, type: :array
@@ -34,9 +34,9 @@ module Dina
     property :tags, type: :array, default: []
     property :publiclyReleasable, type: :boolean, default: true
     property :notPubliclyReleasableReason, type: :string
-    property :hostOrganism, type: :object, default: { name: nil, remarks: nil }
-    property :scheduledActions, type: :object
-    property :hierarchy, type: :object
+    property :hostOrganism, type: :hash, default: { name: nil, remarks: nil }
+    property :scheduledActions, type: :hash
+    property :hierarchy, type: :hash
     property :allowDuplicateName, type: :boolean
 
     has_one :collection, class_name: "Collection"

data/lib/dina/models/object_store/object_store.rb

@@ -24,7 +24,7 @@ module Dina
     property :xmpRightsOwner, type: :string, default: "Government of Canada"
     property :publiclyReleasable, type: :boolean, default: true
     property :notPubliclyReleasableReason, type: :string
-    property :managedAttributes, type: :object
+    property :managedAttributes, type: :hash
     property :acTags, type: :string
     property :orientation, type: :integer
     property :resourceExternalURL, type: :string

data/lib/dina/models/storage/storage_unit_type.rb

@@ -6,7 +6,7 @@ module Dina
     property :group, type: :string
     property :name, type: :string
     property :isInseperable, type: :boolean
-    property :gridLayoutDefinition, type: :object
+    property :gridLayoutDefinition, type: :hash
     property :createdBy, type: :string
     property :createdOn, type: :time
 

data/lib/dina/models/transaction/transaction.rb

@@ -15,9 +15,9 @@ module Dina
     property :closedDate, type: :date
     property :dueDate, type: :date
     property :remarks, type: :string
-    property :managedAttributes, type: :object
+    property :managedAttributes, type: :hash
     property :agentRoles, type: :array # Each of type Dina::AgentRole
-    property :shipment, type: :object # Of type Dina::Shipment
+    property :shipment, type: :hash # Of type Dina::Shipment
     property :createdBy, type: :string
     property :createdOn, type: :time
 

data/lib/dina/models/user.rb

@@ -8,7 +8,7 @@ module Dina
     property :lastName, type: :string
     property :agentId, type: :string
     property :emailAddress, type: :string
-    property :rolesPerGroup, type: :object
+    property :rolesPerGroup, type: :hash
     property :createdBy, type: :string
     property :createdOn, type: :time
 

data/lib/dina/version.rb

@@ -1,9 +1,9 @@
 module Dina
   class Version
 
-    MAJOR = 0
-    MINOR = 9
-    PATCH = 6
+    MAJOR = 1
+    MINOR = 0
+    PATCH = 0
     BUILD = 0
 
     def self.version

data/lib/dina.rb

@@ -11,7 +11,7 @@ module Dina
   JsonApiClient::Paginating::NestedParamPaginator.page_param = "offset"
   JsonApiClient::Paginating::NestedParamPaginator.per_page_param = "limit"
   JsonApiClient::Schema.register array: ArrayCaster
-  JsonApiClient::Schema.register object: ObjectCaster
+  JsonApiClient::Schema.register hash: HashCaster
   JsonApiClient::Schema.register date: DateCaster
   JsonApiClient::Schema.register multilingual_title: MultilingualTitleCaster
   JsonApiClient::Schema.register multilingual_description: MultilingualDescriptionCaster

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dina
 version: !ruby/object:Gem::Version
-  version: 0.9.6.0
+  version: 1.0.0.0
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client
@@ -146,11 +146,11 @@ files:
 - lib/dina/authentication/authentication.rb
 - lib/dina/casters/array_caster.rb
 - lib/dina/casters/date_caster.rb
+- lib/dina/casters/hash_caster.rb
 - lib/dina/casters/multilingual_description.rb
 - lib/dina/casters/multilingual_description_caster.rb
 - lib/dina/casters/multilingual_title.rb
 - lib/dina/casters/multilingual_title_caster.rb
-- lib/dina/casters/object_caster.rb
 - lib/dina/components/address.rb
 - lib/dina/components/agent_role.rb
 - lib/dina/components/determination.rb