unimatrix 2.9.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65a1bfb24d46b588eac2edb5671df43c98de1656
-  data.tar.gz: a9ee431261fed4cd050913a52aa35c9cdf7bd166
+  metadata.gz: 4344e3e42d575fbf08f8267a7e0e3a546c7d48d4
+  data.tar.gz: 2aa2efd5c15c702fbba8b5a944210343bc838af6
 SHA512:
-  metadata.gz: 6ba8df20d0fb3a46d8f57396a051f173996fc4001d21b6b4ebbfee7fb29072a94ffe58850f89cee09d81e714668f276d25b859e9161b43f25e76dd6ab2ad825d
-  data.tar.gz: fc16202719fd231eae1768958705fcf414959213b44b2658416f7ecb217a45168e7826adf572234a68a3a35399c3f91ccd846c1c96996f1efb881d791c6bb3c0
+  metadata.gz: f1d7b43535c668da3a3df7f018f57dc9860dbbec02746abcf0c11c9ddcc3ddbebd8b1bb334e05f6ab027d2e8d6073608a4445dffea362de0808639710e3fab13
+  data.tar.gz: 71ec51345c28f823c5d7d40d1e6cef186c45deece4c2986c1e0af929905c130ccab30dfb156b516d541b65add88eb7c26a261fa44bf57f3443639410d5da906a

data/VERSION

@@ -1 +1 @@
-2.9.0
+3.0.0

data/lib/unimatrix/archivist/artifact.rb

@@ -5,31 +5,33 @@ module Unimatrix::Archivist
     include Unimatrix::Blueprintable
 
     field    :id
+    field    :uuid
+    field    :realm_uuid
+    field    :type_name
+    field    :language
     field    :creator_uuid
     field    :picture_uuid
     field    :provider
     field    :provider_uid
     field    :provider_url
+    field    :name
+    field    :short_name
     field    :description
     field    :short_description
-    field    :short_name
-    field    :originated_at
-    field    :destroyed_at
     field    :slug
     field    :note
-    field    :type_name
-    field    :language
-    field    :uuid
-    field    :realm_uuid
-    field    :component_uuids
+    field    :legacy_id
+    field    :legacy_uid
     field    relationships: [ :category, :person, :season, :asset, :athlete ]
-    field    :name
     field    :created_at
     field    :updated_at
+    field    :originated_at
+    field    :destroyed_at
 
     has_many :artifact_locators
     has_many :artifact_relationships
-    has_many  :errors
+    has_many :components
+    has_many :errors
 
   end
 

data/lib/unimatrix/archivist/blueprint.rb

@@ -1,7 +1,7 @@
 module Unimatrix::Archivist
 
   class Blueprint < Unimatrix::Resource
-    
+
     field    :id
     field    :uuid
     field    :realm_uuid
@@ -11,7 +11,8 @@ module Unimatrix::Archivist
     field    :resource_type_name
     field    :created_at
     field    :updated_at
-    
+    field    :destroyed_at
+
     has_many :blueprint_attributes
     has_many :errors
 

data/lib/unimatrix/archivist/blueprint_attribute.rb

@@ -2,14 +2,16 @@ module Unimatrix::Archivist
 
   class BlueprintAttribute < Unimatrix::Resource
 
-    field    :id
+    field     :id
     field     :uuid
     field     :realm_uuid
+    field     :type_name
     field     :blueprint_uuid
     field     :name
     field     :readable
     field     :writable
     field     :type
+    field     :allow_nil
     field     :validates_uniqueness
     field     :validates_uniqueness_scope
     field     :validates_presence
@@ -20,13 +22,11 @@ module Unimatrix::Archivist
     field     :validates_length_maximum
     field     :validates_in
     field     :validates_not_in
-    field     :validates_numeric
-    field     :validates_numeric_integer
     field     :validates_numeric_minimum
     field     :validates_numeric_maximum
-    field     :validates_type
     field     :created_at
     field     :updated_at
+    field     :destroyed_at
 
     has_many :errors
 

data/lib/unimatrix/archivist/component.rb

@@ -1,14 +1,15 @@
 module Unimatrix::Archivist
 
-  class Component < Unimatrix::DynamicResource
-    
+  class Component < Unimatrix::Resource
+
     field    :id
     field    :uuid
     field    :realm_uuid
     field    :type_name
     field    :created_at
     field    :updated_at
-    
+    field    :destroyed_at
+
     has_one  :artifact
     has_many :errors
 

data/lib/unimatrix/archivist/embed_component.rb

@@ -0,0 +1,9 @@
+module Unimatrix::Archivist
+
+  class EmbedComponent < Component
+
+    field    :embed_code
+
+  end
+
+end

data/lib/unimatrix/archivist/gallery_component.rb

@@ -0,0 +1,7 @@
+module Unimatrix::Archivist
+
+  class GalleryComponent < Component
+
+  end
+
+end

data/lib/unimatrix/archivist/headline_component.rb

@@ -0,0 +1,9 @@
+module Unimatrix::Archivist
+
+  class HeadlineComponent < Component
+
+    field    :text
+
+  end
+
+end

data/lib/unimatrix/archivist/picture_component.rb

@@ -0,0 +1,11 @@
+module Unimatrix::Archivist
+
+  class PictureComponent < Component
+
+    field    :credit_text
+    field    :credit_url
+    field    :caption
+
+  end
+
+end

data/lib/unimatrix/archivist/section_component.rb

@@ -0,0 +1,9 @@
+module Unimatrix::Archivist
+
+  class SectionComponent < Component
+
+    field    :text
+
+  end
+
+end

data/lib/unimatrix/archivist/text_component.rb

@@ -0,0 +1,9 @@
+module Unimatrix::Archivist
+
+  class TextComponent < Component
+
+    field    :text
+
+  end
+
+end

data/lib/unimatrix/archivist/unknown_component.rb

@@ -0,0 +1,7 @@
+module Unimatrix::Archivist
+
+  class UnknownComponent < Component
+
+  end
+
+end

data/lib/unimatrix/archivist/video_component.rb

@@ -0,0 +1,7 @@
+module Unimatrix::Archivist
+
+  class VideoComponent < Component
+
+  end
+
+end

data/lib/unimatrix/authorization/client_credentials_grant.rb

@@ -9,7 +9,7 @@ module Unimatrix::Authorization
       @client_secret = args[ :client_secret ]
     end
 
-    def request_token
+    def request_token( options={} )
       uri      = URI.parse( "#{ Unimatrix.configuration.authorization_url }/token" )
       params   = { "grant_type" => "client_credentials" }
       http     = Net::HTTP.new( uri.host, uri.port )
@@ -27,7 +27,14 @@ module Unimatrix::Authorization
           body = JSON.parse( response.body )
           body = body[ 'token' ] if body[ 'token' ].present?
 
-          body[ 'access_token' ] rescue nil
+          if options[ :with_expiry ]
+            {
+              access_token: ( body[ 'access_token' ] rescue nil ),
+              expires_in: ( body[ 'expires_in' ] rescue nil )
+            }
+          else
+            body[ 'access_token' ] rescue nil
+          end
         else
           puts "ERROR: #{ response.body }"
         end

data/lib/unimatrix/authorization/filters/requires_policies.rb

@@ -7,7 +7,10 @@ module Unimatrix::Authorization
     end
 
     def before( controller )
-      access_token = controller.params[ 'access_token' ]
+      client_id     = Unimatrix.configuration.client_id
+      client_secret = Unimatrix.configuration.client_secret
+      access_token  = controller.params[ 'access_token' ] || \
+                      controller.retrieve_client_token( client_id, client_secret )
 
       realm_uuid = begin
         if controller.respond_to?( :realm_uuid )
@@ -96,6 +99,8 @@ module Unimatrix::Authorization
         realm_uuid,
         resource_server
       )
+    else
+      nil
     end
   end
 
@@ -106,6 +111,19 @@ module Unimatrix::Authorization
         access_token: access_token,
         resource: "realm/#{ realm_uuid }::#{ resource_server }::#{ resource_name }/*"
       ).read
+    else
+      nil
+    end
+  end
+  
+  def request_client_token( client_id, client_secret )
+    if client_id && client_secret
+      ClientCredentialsGrant.new(
+        client_id: client_id,
+        client_secret: client_secret
+      ).request_token( with_expiry: true )
+    else
+      nil
     end
   end
 

data/lib/unimatrix/authorization/filters/requires_resource_owner.rb

@@ -3,7 +3,10 @@ module Unimatrix::Authorization
   class RequiresResourceOwner
 
     def before( controller )
-      access_token = controller.params[ 'access_token' ]
+      client_id     = Unimatrix.configuration.client_id
+      client_secret = Unimatrix.configuration.client_secret
+      access_token  = controller.params[ 'access_token' ] || \
+                      controller.retrieve_client_token( client_id, client_secret )
 
       if access_token.present?
         resource_owner = controller.retrieve_resource_owner( access_token )

data/lib/unimatrix/authorization/railtie.rb

@@ -18,6 +18,8 @@ module Unimatrix::Authorization
       ) do
         request_policies( resource_name, access_token, realm_uuid, resource_server )
       end
+    else
+      nil
     end
   end
 
@@ -29,6 +31,40 @@ module Unimatrix::Authorization
       ) do
         request_resource_owner( access_token )
       end
+    else
+      nil
+    end
+  end
+  
+  def retrieve_client_token( client_id, client_secret )
+    if client_id && client_secret
+      key        = [ client_id, client_secret ].join
+      expires_in = nil
+      
+      token = Rails.cache.fetch(
+        "keymaker-client_token-#{ Digest::SHA1.hexdigest( key ) }",
+        expires_in: 1.minute
+      ) do
+        token_hash = request_client_token( client_id, client_secret )
+        
+        if token_hash && token_hash[ :expires_in ] && token_hash[ :expires_in ] < 60
+          expires_in = token_hash[ :expires_in ]
+        end
+        
+        token_hash[ :access_token ] rescue nil
+      end
+      
+      if expires_in
+        Rails.cache.write(
+          "keymaker-client_token-#{ Digest::SHA1.hexdigest( key ) }",
+          token,
+          expires_in: expires_in
+        )
+      end
+      
+      token
+    else
+      nil
     end
   end
 

data/lib/unimatrix/configuration.rb

@@ -31,6 +31,9 @@ module Unimatrix
     
     field :authorization_url,  default: ENV[ 'UNIMATRIX_AUTHORIZATION_API_URL' ] || 
                                         'http://us-west-2.keymaker.boxxspring.net'
+                                        
+    field :client_id,          default: ENV[ 'KEYMAKER_CLIENT' ]
+    field :client_secret,      default: ENV[ 'KEYMAKER_SECRET' ]
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unimatrix
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Jackson Souza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-25 00:00:00.000000000 Z
+date: 2018-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -116,6 +116,14 @@ files:
 - lib/unimatrix/archivist/blueprint.rb
 - lib/unimatrix/archivist/blueprint_attribute.rb
 - lib/unimatrix/archivist/component.rb
+- lib/unimatrix/archivist/embed_component.rb
+- lib/unimatrix/archivist/gallery_component.rb
+- lib/unimatrix/archivist/headline_component.rb
+- lib/unimatrix/archivist/picture_component.rb
+- lib/unimatrix/archivist/section_component.rb
+- lib/unimatrix/archivist/text_component.rb
+- lib/unimatrix/archivist/unknown_component.rb
+- lib/unimatrix/archivist/video_component.rb
 - lib/unimatrix/attribute_error.rb
 - lib/unimatrix/authorization/client_credentials_grant.rb
 - lib/unimatrix/authorization/error.rb