global_registry_models 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c518ac0e203b6a04fc6b0bda68eaf25868dfaca0
-  data.tar.gz: b55a75d8c3a979b1aea24e68d4dc1dcf9d4101f9
+  metadata.gz: 32aa339085d76059fde7b418d54786e0b4f8f4f4
+  data.tar.gz: 19c3710e713263f513cff738410b09c81123f8a2
 SHA512:
-  metadata.gz: b49abcf9efaf39871fa279b5e3f2729192f46e2758f622bc0c152e2e059d2b875ac671ac1a6686bcf038a24ccf811b72ea4d92bce52f9f61c94c1480b1a4cf4d
-  data.tar.gz: 7f040286f685e9b54a0862d896e1a54baa5a40b227c8d5338796b36b02864ac6e533da119c7618a6fc59fe33e3e041d0d12bc7a9a5e7ffdbe2ea9ab824be0243
+  metadata.gz: e7b91626fc49b935df140f14435bbec0dda5f431bb73d5a03109f7dc1d38261c7bb1724d529d453412775296a249e2da5db84b52f5368d5f26355847bebb79e6
+  data.tar.gz: adcab3518d5715d63cc9afd95290433a1a1880f20ef6e00d78fda96225f75fb49490fa1e006b8e1f67826d52a71d64ddb22b454cc6d7cb84bd55b2606c47f041

data/global_registry_models.gemspec

@@ -6,7 +6,7 @@ require 'global_registry_models/version'
 Gem::Specification.new do |spec|
   spec.name          = 'global_registry_models'
   spec.version       = GlobalRegistryModels::VERSION
-  spec.authors       = ['Sheldon Dueck']
+  spec.authors       = ['Sheldon Dueck','Daniel Fugere']
   spec.email         = ['sheldon.dueck@gmail.com']
 
   spec.summary       = %q{Data models for the Global Registry.}

data/lib/global_registry/subscription.rb

@@ -0,0 +1,5 @@
+module GlobalRegistry
+  class Subscription < Base
+    
+  end
+end

data/lib/global_registry/system_methods.rb

@@ -0,0 +1,13 @@
+module GlobalRegistry
+  class System < Base
+
+    def self.reset_access_token(system_id)
+      request(:post, nil, "systems/reset_access_token#{parametrized(system_id)}")
+    end
+
+    def self.parametrized(system_id)
+      "?id=#{system_id}" if system_id
+    end
+
+  end
+end

data/lib/global_registry_models/api_operations/finders.rb

@@ -24,7 +24,8 @@ module GlobalRegistryModels
         end
 
         def find(id)
-          new global_registry_resource.find(id)['entity'][name]
+          response_hash = global_registry_resource.find(id)[ressource_type]
+          response_hash.has_key?(name) ? (new response_hash[name]) : (new response_hash)
         end
 
         def page(page_number = 1)

data/lib/global_registry_models/api_operations/persistence.rb

@@ -4,12 +4,26 @@ module GlobalRegistryModels
       extend ActiveSupport::Concern
 
       module ClassMethods
+
+        def prepare_parameters(object, attributes)
+          attribute_keys = attributes.keys.collect(&:to_sym) & writeable_attributes
+          prepared_attributes = object.attributes.with_indifferent_access.slice(*attribute_keys)
+          prepared_attributes
+        end
+
+        def ressource_type
+           global_registry_resource.to_s.demodulize.underscore
+        end
+
         def create!(attributes)
-          entity = new(attributes.with_indifferent_access.except(:id))
-          if entity.valid?
-            attribute_keys_to_create = attributes.keys.collect(&:to_sym) & writeable_attributes
-            create_attributes = entity.attributes.with_indifferent_access.slice(*attribute_keys_to_create)
-            new global_registry_resource.post({ entity: { name => create_attributes }})['entity'][name]
+          object = new(attributes.with_indifferent_access.except(:id))
+          if object.valid?
+            create_attributes = prepare_parameters(object, attributes)
+            response = global_registry_resource.post(attributes_hash(create_attributes))
+            if response.present?
+              response_hash = response[ressource_type] 
+              response_hash.has_key?(name) ? (new response_hash[name]) : (new response_hash)
+            end
           else
             raise GlobalRegistryModels::RecordInvalid.new
           end
@@ -22,11 +36,11 @@ module GlobalRegistryModels
         end
 
         def update!(id, attributes)
-          entity = new(attributes)
-          if entity.valid?
-            attribute_keys_to_update = (attributes.keys.collect(&:to_sym) << :client_integration_id) & writeable_attributes
-            update_attributes = entity.attributes.with_indifferent_access.slice(*attribute_keys_to_update)
-            new global_registry_resource.put(id, { entity: { name => update_attributes }})['entity'][name]
+          object = new(attributes)
+          if object.valid?
+            update_attributes = prepare_parameters(object, attributes)
+            response_hash = global_registry_resource.put(id, attributes_hash(update_attributes))[ressource_type]
+            response_hash.has_key?(name) ? (new response_hash[name]) : (new response_hash)
           else
             raise GlobalRegistryModels::RecordInvalid.new
           end
@@ -37,6 +51,7 @@ module GlobalRegistryModels
         rescue GlobalRegistryModels::RecordInvalid
           false
         end
+
       end
 
       def save
@@ -52,6 +67,7 @@ module GlobalRegistryModels
         self.class.update! id, { client_integration_id: client_integration_id }.with_indifferent_access.merge(update_attributes)
       end
 
+      
     end
   end
 end

data/lib/global_registry_models/api_operations/reset_access_token.rb

@@ -0,0 +1,11 @@
+module GlobalRegistryModels
+  module APIOperations
+    module ResetAccessToken
+      
+      def reset_access_token
+        System::System.new GlobalRegistry::System.reset_access_token(self.id)['system']
+      end
+
+    end
+  end
+end

data/lib/global_registry_models/api_operations/search.rb

@@ -17,10 +17,9 @@ module GlobalRegistryModels
           }).delete_if { |_, v| v.blank? }
 
           params = clean_params(filters, params)
-
           response = GlobalRegistryModels::ResponseParser.new(global_registry_resource.get(params))
-
-          Collection.new meta: response.meta, list: response.objects
+          Collection.new meta: response.meta, list: response.objects 
+          
         end
 
         def clean_params( filters, params )

data/lib/global_registry_models/collection.rb

@@ -16,6 +16,11 @@ module GlobalRegistryModels
       @list.each { |object| yield object }
     end
 
+    def order(attribute)
+      @list = @list.sort_by {|obj| obj.send attribute}
+      return self
+    end
+
     def first
       @list.first
     end

data/lib/global_registry_models/common_base.rb

@@ -6,8 +6,10 @@ require 'virtus'
 
 module GlobalRegistryModels
   class CommonBase
+
     include ActiveModel::Model
     include ActiveModel::Validations
+    include ActiveModel::Validations::Callbacks
     include Virtus.model
 
     include GlobalRegistryModels::APIOperations::Persistence
@@ -15,12 +17,8 @@ module GlobalRegistryModels
     include GlobalRegistryModels::APIOperations::Search
     include GlobalRegistryModels::APIOperations::Delete
 
-
     attribute :id, String
-    attribute :client_integration_id, String
-
-    validates_presence_of :client_integration_id
-
+    
     def self.title
       name.titleize
     end
@@ -41,10 +39,12 @@ module GlobalRegistryModels
       attribute_names - [:id]
     end
 
-    # The name of the entity class. The entity name is required in the api responses and requests, hence the need for this class method.
-    def self.name
-      to_s.gsub(/.*::/, '').underscore
-    end
+    private
+
+    def underscore_name
+      self.name = self.name.downcase.tr(' ','_') if self.name
+    end   
 
   end
+
 end

data/lib/global_registry_models/entity/base.rb

@@ -6,6 +6,8 @@
 module GlobalRegistryModels
   module Entity
     class Base < CommonBase
+      attribute :client_integration_id, String
+      validates_presence_of :client_integration_id
 
       def self.search_params
         {
@@ -16,6 +18,15 @@ module GlobalRegistryModels
       def self.global_registry_resource
         GlobalRegistry::Entity
       end
+
+      def self.attributes_hash(attributes)
+        {'entity'.to_sym => { name => attributes }} 
+      end
+
+      # The name of the entity class. The entity name is required in the api responses and requests, hence the need for this class method.
+      def self.name
+        to_s.gsub(/.*::/, '').underscore
+      end
       
     end
   end

data/lib/global_registry_models/entity_type/base.rb

@@ -1,7 +1,3 @@
-# A base class providing CRUD for GlobalRegistry Entities.
-# API doc at https://github.com/CruGlobal/global_registry_docs/wiki/Entities
-
-
 module GlobalRegistryModels
   module EntityType
     class Base < CommonBase
@@ -16,6 +12,12 @@ module GlobalRegistryModels
         GlobalRegistry::EntityType
       end
 
+      def self.attributes_hash(attributes)
+        { 
+          'entity_type' => attributes 
+        }
+      end
+
     end
   end
 end

data/lib/global_registry_models/entity_type/entity_type.rb

@@ -9,6 +9,10 @@ module GlobalRegistryModels
       attribute :data_visibility, String
       attribute :enum_values, Array
       attribute :unique_value, Boolean
+      attribute :parent_id, String
+
+      validates_presence_of :name
+      after_validation :underscore_name
 
       def initialize(params = {})
         super(params)
@@ -25,7 +29,7 @@ module GlobalRegistryModels
       end
 
       def self.identifying_attributes
-        [:name, :description, :is_editable, :field_type, :data_visibility]
+        [:name, :description, :is_editable, :field_type, :data_visibility, :parent_id]
       end
 
       private

data/lib/global_registry_models/entity_type/field.rb

@@ -6,6 +6,8 @@ module GlobalRegistryModels
       attribute :description, String
       attribute :is_editable, Boolean
       attribute :field_type, String
+      attribute :data_visibility, String
+      attribute :parent_id, String
 
       def initialize(params = {})
         super(params)
@@ -17,7 +19,7 @@ module GlobalRegistryModels
       end
 
       def self.identifying_attributes
-        [:name, :description, :is_editable, :field_type]
+        [:name, :description, :is_editable, :field_type, :data_visibility, :parent_id]
       end
 
     private

data/lib/global_registry_models/measurement_type/base.rb

@@ -14,6 +14,10 @@ module GlobalRegistryModels
         GlobalRegistry::MeasurementType
       end
 
+      def self.attributes_hash(attributes)
+        { 'measurement_type' => attributes }
+      end
+
     end
   end
 end

data/lib/global_registry_models/measurement_type/measurement_type.rb

@@ -9,11 +9,13 @@ module GlobalRegistryModels
       attribute :perm_link, String
       attribute :unit, String
 
+      validates_presence_of :frequency, :unit, :perm_link, :related_entity_type_id, :name
+      after_validation :underscore_name
+
       def self.identifying_attributes
-        [:name, :description, :frequency, :perm_link, :unit]
+        [:related_entity_type_id, :name, :description, :frequency, :perm_link, :unit]
       end
 
-
     end
   end
 end

data/lib/global_registry_models/relationship_type/base.rb

@@ -5,6 +5,7 @@
 module GlobalRegistryModels
   module RelationshipType
     class Base < CommonBase
+      validates_presence_of :entity_type1_id, :relationship1, :entity_type2_id, :relationship2
 
       def self.search_params
         {}
@@ -14,6 +15,10 @@ module GlobalRegistryModels
         GlobalRegistry::RelationshipType
       end
 
+      def self.attributes_hash(attributes)
+        { 'relationship_type' => attributes }
+      end
+
     end
   end
 end

data/lib/global_registry_models/relationship_type/relationship_type.rb

@@ -2,10 +2,16 @@ module GlobalRegistryModels
   module RelationshipType
     class RelationshipType < Base
       attribute :id, String
+      attribute :entity_type1_id
+      attribute :entity_type2_id
+      attribute :relationship1
+      attribute :relationship2
+
+      validates_presence_of :entity_type1_id, :relationship1, :entity_type2_id, :relationship2
 
       def initialize(params = {})
         super(params)
-        create_involved_types([params["relationship1"],params["relationship2"]]) if params["relationship1"] && params["relationship2"]
+        create_involved_types([params["relationship1"],params["relationship2"]]) if params["relationship1"] && params["relationship2"] && !params["entity_type1_id"]
       end
 
       def involved_types

data/lib/global_registry_models/response_parser.rb

@@ -6,7 +6,7 @@ module GlobalRegistryModels
     end
 
     def meta
-      @response_hash['meta']
+      @response_hash['meta'] if @response_hash['meta']
     end
 
     def objects

data/lib/global_registry_models/subscription/base.rb

@@ -0,0 +1,21 @@
+module GlobalRegistryModels
+  module Subscription
+    class Base < CommonBase
+
+      def self.search_params
+        {}
+      end
+
+      def self.global_registry_resource
+        GlobalRegistry::Subscription
+      end
+
+      def self.attributes_hash(attributes)
+        { 
+          'subscription' => attributes 
+        }
+      end
+
+    end
+  end
+end

data/lib/global_registry_models/subscription/subscription.rb

@@ -0,0 +1,17 @@
+module GlobalRegistryModels
+  module Subscription
+    class Subscription < Base
+      attribute :id, String
+      attribute :entity_type_id, String
+      attribute :endpoint, String
+      attribute :format, String
+
+      validates_presence_of :entity_type_id, :endpoint
+
+      def self.identifying_attributes
+        [:id, :entity_type_id]
+      end
+
+    end
+  end
+end

data/lib/global_registry_models/system/base.rb

@@ -0,0 +1,22 @@
+module GlobalRegistryModels
+  module System
+    class Base < CommonBase
+      include GlobalRegistryModels::APIOperations::ResetAccessToken
+
+      def self.search_params
+        {}
+      end
+
+      def self.global_registry_resource
+        GlobalRegistry::System
+      end
+
+      def self.attributes_hash(attributes)
+        { 
+          'system' => attributes 
+        }
+      end
+
+    end
+  end
+end

data/lib/global_registry_models/system/system.rb

@@ -0,0 +1,26 @@
+module GlobalRegistryModels
+  module System
+    class System < Base
+      attribute :name, String
+      attribute :created_at, DateTime
+      attribute :updated_at, DateTime
+      attribute :contact_name, String
+      attribute :contact_email, String
+      attribute :permalink, String
+      attribute :root, Boolean
+      attribute :access_token, String
+      attribute :trusted_ips, Array
+
+      validates_presence_of :name
+
+      def self.identifying_attributes
+        [:id, :name, :contact_name, :contact_email, :permalink, :trusted_ips]
+      end
+
+      def self.identifying_root_attributes
+        [:id, :name, :contact_name, :contact_email, :permalink, :trusted_ips, :root, :access_token]
+      end
+
+    end
+  end
+end

data/lib/global_registry_models/version.rb

@@ -1,3 +1,3 @@
 module GlobalRegistryModels
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/lib/global_registry_models.rb

@@ -1,5 +1,8 @@
 require 'active_support/all'
 
+require 'global_registry/subscription'
+require 'global_registry/system_methods'
+
 require 'global_registry_models/version'
 
 require 'global_registry_models/response_parser'
@@ -12,6 +15,8 @@ require 'global_registry_models/api_operations/persistence'
 require 'global_registry_models/api_operations/finders'
 require 'global_registry_models/api_operations/search'
 require 'global_registry_models/api_operations/delete'
+require 'global_registry_models/api_operations/reset_access_token'
+
 
 require 'global_registry_models/common_base'
 
@@ -33,5 +38,11 @@ require 'global_registry_models/relationship_type/involved_type'
 require 'global_registry_models/measurement_type/base'
 require 'global_registry_models/measurement_type/measurement_type'
 
+require 'global_registry_models/subscription/base'
+require 'global_registry_models/subscription/subscription'
+
+require 'global_registry_models/system/base'
+require 'global_registry_models/system/system'
+
 module GlobalRegistryModels
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: global_registry_models
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Sheldon Dueck
+- Daniel Fugere
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -141,18 +142,21 @@ files:
 - bin/console
 - bin/setup
 - global_registry_models.gemspec
+- lib/.DS_Store
+- lib/global_registry/subscription.rb
+- lib/global_registry/system_methods.rb
 - lib/global_registry_models.rb
 - lib/global_registry_models/.DS_Store
 - lib/global_registry_models/api_operations/delete.rb
 - lib/global_registry_models/api_operations/finders.rb
 - lib/global_registry_models/api_operations/persistence.rb
+- lib/global_registry_models/api_operations/reset_access_token.rb
 - lib/global_registry_models/api_operations/search.rb
 - lib/global_registry_models/collection.rb
 - lib/global_registry_models/common_base.rb
 - lib/global_registry_models/entity/.DS_Store
 - lib/global_registry_models/entity/area.rb
 - lib/global_registry_models/entity/base.rb
-- lib/global_registry_models/entity/entity_collection.rb
 - lib/global_registry_models/entity/global_mcc.rb
 - lib/global_registry_models/entity/iso_country.rb
 - lib/global_registry_models/entity/ministry.rb
@@ -171,6 +175,10 @@ files:
 - lib/global_registry_models/relationship_type/relationship_type.rb
 - lib/global_registry_models/response_parser.rb
 - lib/global_registry_models/retryer.rb
+- lib/global_registry_models/subscription/base.rb
+- lib/global_registry_models/subscription/subscription.rb
+- lib/global_registry_models/system/base.rb
+- lib/global_registry_models/system/system.rb
 - lib/global_registry_models/version.rb
 homepage: https://github.com/sheldond/global_registry_models
 licenses:

data/lib/global_registry_models/entity/entity_collection.rb

@@ -1,66 +0,0 @@
-require 'csv'
-
-module GlobalRegistryModels
-  class EntityCollection < Collection
-    include Enumerable
-    extend Forwardable
-
-    def_delegators :list, :[], :size, :concat, :blank?, :present?
-
-    def initialize(meta:, list:)
-      @meta = meta
-      @list = list
-    end
-
-    def each
-      @entities.each { |entity| yield entity }
-    end
-
-    def all
-      @entities
-    end
-
-    def page
-      @meta['page']
-    end
-
-    def last_page?
-      !@meta['next_page']
-    end
-
-    def first_page?
-      page == 1
-    end
-
-    def next_page
-      last_page? ? nil : page + 1
-    end
-
-    def prev_page
-      first_page? ? nil : page - 1
-    end
-
-    def from
-      @meta['from']
-    end
-
-    def to
-      @meta['to']
-    end
-
-    def per
-      (to - from) + 1
-    end
-
-    def to_csv
-      CSV.generate do |csv|
-        attributes = @entities.first.attributes.collect(&:first).sort
-        csv << attributes
-        @entities.each do |entity|
-          csv << attributes.collect { |attribute| entity.attributes[attribute] }
-        end
-      end
-    end
-
-  end
-end