azahara_schema 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fea304469865cc54d62c3a21a1e9c0dd170ab1b4997a11432e1807ff1b637091
-  data.tar.gz: 22120ff30c2f02383c81f5a76c920de32fd69755e456e3be005919386664b584
+  metadata.gz: cbcc60cb930db0856a0b272a556e1e5c26104f3d7d0034b069898cc638271f81
+  data.tar.gz: cbc108bfbf03eec4893f1ccf54ee81193f5482ff3c89f9dffa8a3c7c46d86a62
 SHA512:
-  metadata.gz: 4c30d57a0b72116c2c0bd88c65eae05f81c66b14f88e7af9eca8dcc0bde933cb9cdcfc32a1d9742b093a853c40e09aad4d368756634cdaa1000402d557c14a5f
-  data.tar.gz: 30c42413edeacf575ca4e5d70cd6f51258c25423839ec4f892972ece456404c44519121c5f9de84d40f57d5ef87d55a4133940c0cf67c90cd7c91f43d8d025be
+  metadata.gz: 4221ea1d965bd950d2cd58580a3031581cd8b6d5dc17ed5afc959b32fad061d1fea05b9d9dd2be99144873565710a32e56b71e095d0eebfde2fecdb08e1f0651
+  data.tar.gz: ae2806c220f03f5164a98d1f86e4399060bd11c09643a29c867c9967a01ea9b199378b8f1d976308a6b0626718fba78b34b60bafaec7aea05430b06947f372a7

data/lib/azahara_schema/association_attribute.rb

@@ -22,6 +22,11 @@ module AzaharaSchema
       super(model, association.name.to_s+'-'+attribute.name, attribute.type)
     end
 
+    # Goes to the last level, for attribute base schema
+    def base_schema
+      attribute.try(:schema) || schema
+    end
+
     def available_values
       attribute.available_values
     end
@@ -30,12 +35,16 @@ module AzaharaSchema
       attribute.arel_field
     end
 
+    def primary_key_name
+      association.name.to_s+'-'+attribute.primary_key_name
+    end
+
     def path
       association.name.to_s+'.'+attribute.path
     end
 
     def column?
-      association.macro == :belongs_to
+      association.macro == :belongs_to && attribute.column?
     end
 
     def searchable?

data/lib/azahara_schema/attribute.rb

@@ -47,6 +47,11 @@ module AzaharaSchema
       name
     end
 
+    # Name of the primary key attribute (same as column obviously)
+    def primary_key_name
+      model.primary_key
+    end
+
     def column?
       true
     end

data/lib/azahara_schema/version.rb

@@ -1,3 +1,3 @@
 module AzaharaSchema
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azahara_schema
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails