zuora_connect_ui 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1886f2f1471c4e35f9ae706758dc8e90439f510d4eafd9a1339e961c885102f7
-  data.tar.gz: f6ae8fcd775612cb2d692f26a08343c2331a2137f3b1c15ff781a06324d453ac
+  metadata.gz: b8a9c79d0859807d72b8c481bcd4e60dd45bc51385919cfa26ffb0c15663fe1f
+  data.tar.gz: 26ca79e92d1f25230c09266a626d1e19b8f6093924b99932ed88fca7e3ad75a4
 SHA512:
-  metadata.gz: 3a553ca47ce36211b62bb0c8bebd7cdfdf4be6a048eedb29f5abdab984ead5efb1d374b5f1b48a2a413a3798047d48c0aecf3fcf70ca2982d00ac7df28a63e84
-  data.tar.gz: 610d62cf603f05af53fb9e33db78b09fa184e9b0b78ad96119e0371ca61e541dcf013bfa10a5e0f4519ad16108098c06acbac3c158438d56f44a7a4458cb23bf
+  metadata.gz: 749dc08d67f909d8a573f6120f2eeb09b783909730053896bda3c4288e61b849b0151fbbc4ba0f606726331d5662a008f8fc9c45f4109b01209ed40faab08474
+  data.tar.gz: e5ef2639f583a652a2b253c002c0bba7d433db02fbdbb6e81fbfeb88513d370a9fa0b9256632212d04938938a6bf867d4f34944f98a29dacd07c1a13e880eaa2

data/app/helpers/zuora_connect_ui/application_helper.rb

@@ -14,6 +14,8 @@ module ZuoraConnectUi
     def zuo_include_tag
       script_tag(type: 'module', src: anjuna(ANJUNA_VERSION, true)) +
         script_tag(nomodule: '', src: anjuna(ANJUNA_VERSION, false)) +
+        script_tag(type: 'module', src: charts(ANJUNA_VERSION, true)) +
+        script_tag(nomodule: '', src: charts(ANJUNA_VERSION, false)) +
         link_tag(href: theme(THEME_VERSION, 'application'), rel: 'stylesheet') +
         link_tag(href: theme(THEME_VERSION, 'theme'), rel: 'stylesheet') +
         link_tag(href: theme(THEME_VERSION, 'icons'), rel: 'stylesheet')
@@ -30,6 +32,11 @@ module ZuoraConnectUi
         "/anjuna-core/anjuna-core#{'.esm' if esm}.js"
     end
 
+    def charts(version, esm)
+      "https://cdn.zuora.com/@anjuna/charts@#{version}" \
+        "/anjuna-charts/anjuna-charts#{'.esm' if esm}.js"
+    end
+
     def link_tag(attrs)
       attr_map = attrs.map { |key, value| " #{key}=\"#{value}\"" }
 
@@ -40,7 +47,7 @@ module ZuoraConnectUi
       "https://cdn.zuora.com/@anjuna/theme@#{version}/css/#{file}.css"
     end
 
-    ANJUNA_VERSION = '1.0.0-rc.36'
-    THEME_VERSION = '1.0.0-rc.11'
+    ANJUNA_VERSION = '1.2.3'
+    THEME_VERSION = '1.2.3'
   end
 end

data/lib/zuora_connect_ui/serializer.rb

@@ -1,14 +1,24 @@
 # frozen_string_literal: true
 
+require 'active_support/core_ext/string'
+require 'zuora_connect_ui/serializer/relationship'
+
 module ZuoraConnectUi
   # Take a resource and dump it to Google Style JSON, really fast
   class Serializer
     def initialize(resource, options = {})
       @resource = resource
       @kind = options[:kind]
-      @fields = options[:fields]
       @is_collection = options[:is_collection]
 
+      @record_type = parse_record_type(@kind, @resource)
+
+      @associations = parse_associations(
+        options[:has_many], options[:belongs_to], options[:has_one]
+      )
+
+      @fields = parse_fields(options[:fields])
+
       # TODO: if an attribute given is reserved, throw an error
     end
 
@@ -16,10 +26,10 @@ module ZuoraConnectUi
       require 'oj'
       # Enable to show Oj working in console
       # Oj.default_options = { trace: true }
-      Oj.dump(serialized_hash, mode: :compat, time_format: :ruby)
+      Oj.dump(serializable_hash, mode: :compat, time_format: :ruby)
     end
 
-    def serialized_hash
+    def serializable_hash
       return hash_for_collection if collection?(@resource)
 
       hash_for_one
@@ -30,27 +40,37 @@ module ZuoraConnectUi
 
       return hash unless @resource
 
-      hash[:data] = record_hash(@resource)
+      hash[:data] = record_hash(@resource, @record_type)
+
+      return hash if @associations.empty?
+
+      hash[:data][:relationships] = @associations.each_with_object({}) do |a, h|
+        h[a.plural_type] = a.serialize([@resource], @fields[a.record_type])
+      end
+
       hash
     end
 
     def hash_for_collection
       hash = { data: {} }
 
-      items = []
+      hash[:data][:items] = @resource.each_with_object([]) do |resource, items|
+        items << record_hash(resource, @record_type)
+      end
+
+      return hash if @associations.empty?
 
-      @resource.each do |resource|
-        items << record_hash(resource)
+      hash[:data][:relationships] = @associations.each_with_object({}) do |a, h|
+        h[a.plural_type] = a.serialize(@resource, @fields[a.record_type])
       end
 
-      hash[:data][:items] = items
       hash
     end
 
     private
 
     def key_transform(input)
-      input.to_s.camelize(:lower)
+      input.to_s.camelize(:lower).to_sym
     end
 
     def collection?(resource)
@@ -59,14 +79,55 @@ module ZuoraConnectUi
       resource.respond_to?(:size) && !resource.respond_to?(:each_pair)
     end
 
-    def record_hash(resource)
-      hash = { kind: key_transform(@kind), id: resource.id }
-      @fields.each do |field|
+    def record_hash(resource, record_type)
+      hash = @kind.nil? ? {} : { kind: record_type }
+      hash[:id] = resource.id
+      @fields[record_type].each do |field|
+        hash[key_transform(field)] = resource.public_send(field)
+      end
+      @associations.each do |association|
+        field = association.id_method_name
         hash[key_transform(field)] = resource.public_send(field)
       end
       hash
     end
 
+    def parse_fields(fields)
+      if fields.is_a? Array
+        Hash[@record_type, filter_associations(fields)]
+      elsif fields.is_a? Hash
+        fields[@record_type] = filter_associations(fields[@record_type])
+        fields
+      end
+    end
+
+    def filter_associations(fields)
+      fields.select { |field| @associations.none? { |a| a.key == field } }
+    end
+
+    def parse_associations(has_many, belongs_to, has_one)
+      [
+        *(has_many || []).map { |k| create_association(k, :has_many) },
+        *(belongs_to || []).map { |k| create_association(k, :belongs_to) },
+        *(has_one || []).map { |k| create_association(k, :has_one) }
+      ]
+    end
+
+    def create_association(key, relationship_type)
+      Relationship.new(
+        key: key_transform(key),
+        relationship_type: relationship_type
+      )
+    end
+
+    def parse_record_type(kind, resource)
+      return key_transform(kind) if kind
+
+      return key_transform(resource.class.name) unless collection?(resource)
+
+      key_transform(resource.first.class.name)
+    end
+
     # TODO: hold reserved words
 
     # see https://google.github.io/styleguide/jsoncstyleguide.xml

data/lib/zuora_connect_ui/serializer/relationship.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module ZuoraConnectUi
+  class Serializer
+    # The configuration for a relationship between models
+    class Relationship
+      # key may be plural, record_type will always be singular
+      attr_reader :key, :relationship_type, :id_method_name,
+                  :record_type, :plural_type
+
+      def initialize(key:, relationship_type:)
+        @key = key
+        @relationship_type = relationship_type
+
+        set_id_method_name
+      end
+
+      def serialize(resources, fields)
+        resources.each_with_object({}) do |resource, hash|
+          relations = resource.public_send(key)
+          relations = [relations] unless @relationship_type == :has_many
+
+          relations.each do |relation|
+            next if hash.key? relation.id.to_s.to_sym
+
+            hash[relation.id.to_s.to_sym] = record_hash(relation, fields)
+          end
+        end
+      end
+
+      private
+
+      def record_hash(resource, fields)
+        hash = { id: resource.id }
+
+        fields.each do |field|
+          hash[key_transform(field)] = resource.public_send(field)
+        end
+
+        hash
+      end
+
+      def set_id_method_name
+        if @relationship_type == :has_many
+          singular_key = @key.to_s.singularize
+          id_postfix = '_ids'
+        else
+          singular_key = @key
+          id_postfix = '_id'
+        end
+
+        @record_type = singular_key.to_sym
+        @plural_type = singular_key.pluralize.to_sym
+        @id_method_name = "#{singular_key}#{id_postfix}".to_sym
+      end
+
+      def key_transform(input)
+        input.to_s.camelize(:lower).to_sym
+      end
+    end
+  end
+end

data/lib/zuora_connect_ui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZuoraConnectUi
-  VERSION = '0.10.2'
+  VERSION = '0.10.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect_ui
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-23 00:00:00.000000000 Z
+date: 2020-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
@@ -81,33 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
+        version: '4.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -194,6 +194,7 @@ files:
 - lib/peek/views/connect.rb
 - lib/zuora_connect_ui.rb
 - lib/zuora_connect_ui/serializer.rb
+- lib/zuora_connect_ui/serializer/relationship.rb
 - lib/zuora_connect_ui/version.rb
 - vendor/assets/anjuna/css/anjuna-icons.css
 - vendor/assets/awesome-bootstrap-checkbox/css/awesome-bootstrap-checkbox.scss