azahara_schema 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61ff56bbd9eaed8a0b8d15ec62d66ab8db5b9787
-  data.tar.gz: 7e6e1b03f11c923226b13a35aa03627a0babe333
+  metadata.gz: 8fdc281f1678559822f32f72ae8dc63a8ae3cb0c
+  data.tar.gz: 94a238cae3c82df5573c651a81d9b5d0ea3e78f1
 SHA512:
-  metadata.gz: cde121ff79ff55d690a52577d50bd602ab8e75008106c831dd3f850883dfa90fd650ff247532a34b8bb2f6a3cad46c333a96bb0a3eb564f645cd419c041e7e6c
-  data.tar.gz: c3497a02dfe5b6aa4236341dc0021e84d926d59fc75dd3342298e61736be3ef3b4d23938dddbd9238ecbdc08bc9a7d9977415d84b25abf1bee3428d704108d07
+  metadata.gz: 0b5c33963f165442367dcb014f17b5d287094cda153da630815eae239bcf6fc166f40591339be34932d3dc4fba02154a876ed672ab9d78ba369f08f4727fda33
+  data.tar.gz: c3bb384bcde4c9a27881c86b39ca42ccc120b2f3d8b80b3470754e4f8bbaea8f82f01d8ddcd22b9790a1a54c79bea3cd651ba09b6b1b57e4667bbdf421afa838

data/lib/azahara_schema/association_attribute.rb

@@ -50,6 +50,14 @@ module AzaharaSchema
       end
     end
 
+    def add_preload(scope)
+      if attribute.is_a?(AzaharaSchema::AssociationAttribute)
+        scope.preload(association.name => attribute.association.name)
+      else
+        scope.preload(association.name)
+      end
+    end
+
     def add_statement(scope, operator, values)
       super(add_join(scope), operator, values)
     end
@@ -58,5 +66,12 @@ module AzaharaSchema
       super(add_join(scope), order)
     end
 
+    def build_json_options!(options)
+      options[:include] ||= {}
+      options[:include][association.name.to_sym] ||= {}
+      attribute.build_json_options!(options[:include][association.name.to_sym])
+      options
+    end
+
   end
 end

data/lib/azahara_schema/attribute.rb

@@ -52,6 +52,10 @@ module AzaharaSchema
       record.public_send(name)
     end
 
+    def add_preload(scope)
+      scope
+    end
+
     def add_statement(scope, operator, values)
       case operator
       when '='
@@ -69,5 +73,9 @@ module AzaharaSchema
       scope.order( arel_sort_field.public_send(order) )
     end
 
+    def build_json_options!(options)
+      options
+    end
+
   end
 end

data/lib/azahara_schema/schema.rb

@@ -2,12 +2,16 @@ module AzaharaSchema
   class Schema
 
     def self.schema_for(klass, *attributes)
-      schema_klass = "#{klass.name}Schema".safe_constantize
-      if schema_klass
-        schema_klass.new(*attributes)
-      else
-        AzaharaSchema::Schema.new(klass, *attributes)
+      klasses = [klass]
+      while klass != klass.base_class
+        klass = klass.superclass
+        klasses << klass
+      end
+      klasses.each do |kls|
+        schema_klass = "#{kls.name}Schema".safe_constantize
+        return schema_klass.new(*attributes) if schema_klass
       end
+      AzaharaSchema::Schema.new(klass, *attributes)
     end
 
     def self.enabled_filters(*filter_names)
@@ -36,7 +40,7 @@ module AzaharaSchema
     end
 
     def columns
-      @columns ||= available_attributes.select{|attribute| attribute.column? && column_names.include?(attribute.name) }
+      @columns ||= available_attributes_hash.slice(*column_names).values
     end
 
     def filters
@@ -103,6 +107,10 @@ module AzaharaSchema
       @available_attributes
     end
 
+    def available_attributes_hash
+      available_attributes.inject({}){|obj, aa| obj[aa.name] = aa; obj }
+    end
+
     def available_columns
       @available_columns ||= available_attributes.select{|att| att.column? }
     end
@@ -148,6 +156,9 @@ module AzaharaSchema
 
     def entities
       scope = model.respond_to?(:visible) ? model.visible : model.all
+      columns.each do |col|
+        scope = col.add_preload(scope)
+      end
       filters.each do |name, attrs|
         scope = available_filters[name].add_statement(scope, attrs[:o], attrs[:v])
       end
@@ -158,6 +169,15 @@ module AzaharaSchema
       scope
     end
 
+    def build_json_options!(options={})
+      columns.each{|col| col.build_json_options!(options) }
+      options
+    end
+
+    def as_json(options={})
+      entities.as_json(build_json_options!(options))
+    end
+
 
     #serialization
     def from_params(params)

data/lib/azahara_schema/version.rb

@@ -1,3 +1,3 @@
 module AzaharaSchema
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azahara_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Gem to support developement of rails application with schema over an entity