azahara_schema 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97da3d5692c281b23103b2f29bb7d000e9a9a47d
-  data.tar.gz: 6650308c13f3b416394d6899067768300f6a022a
+  metadata.gz: d672ff9453d94ce1d4926ca08e78bd3df9298fb3
+  data.tar.gz: b3101131a1b1d578edeaac3444af869212afb5e3
 SHA512:
-  metadata.gz: b5a10fdff991b788f56fe2ffe2f3c72f65d3f8feea779dc5766706a31bc69130cbc2154014b78cd0088713400ae09f2d81b72d2130066f468ddc4432716a57e6
-  data.tar.gz: 7a1f06279dfeed7351b9d10bbaeb9b5c3f0196c3d2fa6a26f29a4e1951599b56744b433e8e74266c81bd5f30b0e37bee7a06a1bac402b322fdbcab04e6b85247
+  metadata.gz: 1b3a6f4232a219e888beaf3f36b5b6e243ec286e4af28ce850afa6d2ad93a4468ed4e4cbbff562bce546544a8a6da6bf95513eb8a71491acd894681f504ff9b7
+  data.tar.gz: a99067d5f78de03f6672b2c8c33aff2695aa4ab6828f4ce85479f7fa7bd51505b29c271c5cd4dc0fea2efbb5b2f81895e43ed227bfef05ed2f9e4693a420a242

data/app/assets/javascripts/azahara_schema/azahara_schema.coffee

@@ -5,7 +5,9 @@ class Filter
     that = this
     @hiddenEl = $('<input>', {name: @valueEl.attr('name'), type: 'hidden'}).insertAfter(@valueEl)
     chngFnc = (evt)->
-      that.hiddenEl.val(that.shortValue())
+      short_val = that.shortValue()
+      that.hiddenEl.val(short_val)
+      that.hiddenEl.prop('disabled', short_val == '')
 
     @operatorEl.change(chngFnc)
     @valueEl.change(chngFnc)
@@ -28,3 +30,6 @@ $.widget 'azahara_schema.filters',
       that.filters.push new Filter($(this).data('name'), $(this).find('.operator-field'), $(this).find('.value-field'))
 
     @form = @element.closest('form')
+    @form.on 'submit', ()->
+      that.form.find('.operator-field').prop('disabled', true)
+      that.form.find('.value-field').prop('disabled', true)

data/app/views/azahara_schema/_filters.html.erb

@@ -2,7 +2,7 @@
   <div id="filters_uncollapsable">
     <% schema.uncollapsable_filters.each do |name, filter| %>
       <div class="form-group row filter" data-name="<%= name %>">
-        <div class="col-md-2 control-label"><%= label_tag "f[#{name}]", t('activerecord.attributes.'+schema.model.name.underscore+'.'+name, default: name.humanize) %></div>
+        <div class="col-md-2 control-label"><%= label_tag "f[#{name}]", filter.attribute_name.human %></div>
         <% if schema.operators_for(name).count > 1 %>
           <div class="col-md-2"><%= select_tag "f[#{name}]", options_for_select(operators_for_select(schema, name), schema.operator_for(name)), class: 'form-control operator-field' %></div>
           <div class="col-md-8">

data/lib/azahara_schema/association_attribute.rb

@@ -16,10 +16,10 @@ module AzaharaSchema
 
     delegate :association, to: :schema
 
-    def initialize(association_schema, attribute)
+    def initialize(model, association_schema, attribute)
       @schema = association_schema
       @attribute = attribute
-      super(association.klass, association.name.to_s+'-'+attribute.name, attribute.type)
+      super(model, association.name.to_s+'-'+attribute.name, attribute.type)
     end
 
     def available_values
@@ -39,25 +39,26 @@ module AzaharaSchema
     end
 
     def value(parent)
-      parent.public_send(association.name).to_s
+      if association.macro == :has_many
+        parent.public_send(association.name).collect{|record| attribute.value( record )}.flatten
+      else
+        attribute.value( parent.public_send(association.name) )
+      end
+    end
+
+    def association_hash
+      { association.name => attribute.association_hash }
     end
 
     def add_join(scope)
-      if attribute.is_a?(AzaharaSchema::AssociationAttribute)
-        scope.includes(association.name => attribute.association.name).references(association.name => attribute.association.name)
-      else
-        scope.includes(association.name).references(association.name)
-      end
+      scope.includes(association_hash).references(association_hash)
     end
 
     def add_preload(scope)
-      if attribute.is_a?(AzaharaSchema::AssociationAttribute)
-        scope.preload(association.name => attribute.association.name)
-      else
-        scope.preload(association.name)
-      end
+      scope.preload(association_hash)
     end
 
+    # TODO: heuristic for when add left outer join and when add inner join
     def add_statement(scope, operator, values)
       super(add_join(scope), operator, values)
     end

data/lib/azahara_schema/attribute.rb

@@ -79,5 +79,13 @@ module AzaharaSchema
       options
     end
 
+    def attribute_name
+      AzaharaSchema::AttributeName.new(self)
+    end
+
+    def association_hash
+      {}
+    end
+
   end
 end

data/lib/azahara_schema/attribute_name.rb

@@ -0,0 +1,37 @@
+module AzaharaSchema
+  class AttributeName
+
+    attr_reader :attribute
+
+    def initialize(attribute)
+      @attribute = attribute
+    end
+
+    def human
+      I18n.t(i18n_scoped_key, default: i18n_fallback_keys)
+    end
+
+    def model_i18n_key
+      attribute.model.model_name.i18n_key
+    end
+
+    def i18n_key
+      attribute.name
+    end
+
+    def i18n_scoped_key
+      ('activerecord.attributes.' + model_i18n_key.to_s + '.' + i18n_key.to_s).to_sym
+    end
+
+    def i18n_fallback_keys
+      if attribute.respond_to?(:attribute)
+        parent_attr_name = attribute.attribute.attribute_name
+        keys = [ parent_attr_name.i18n_scoped_key.to_sym ]
+        keys.concat( parent_attr_name.i18n_fallback_keys )
+        keys
+      else
+        [ i18n_scoped_key.to_sym ]
+      end
+    end
+  end
+end

data/lib/azahara_schema/engine.rb

@@ -1,6 +1,7 @@
 require 'azahara_schema/field_format'
 require 'azahara_schema/attribute'
 require 'azahara_schema/association_attribute'
+require 'azahara_schema/attribute_name'
 require 'azahara_schema/outputs'
 require 'azahara_schema/output'
 require 'azahara_schema/schema'

data/lib/azahara_schema/schema.rb

@@ -29,11 +29,12 @@ module AzaharaSchema
       operators_for_filters[filter] = operators
     end
 
-    attr_accessor :model, :association
+    attr_accessor :model, :association, :parent_schema
 
     def initialize(model, **attributes)
       @model = model
       @association = attributes[:association]
+      @parent_schema = attributes[:parent_schema]
       @column_names = attributes[:columns]
     end
 
@@ -55,7 +56,7 @@ module AzaharaSchema
     end
 
     def sort
-      @sort ||= {}
+      @sort ||= default_sort
     end
 
     # DEFAULTS
@@ -64,11 +65,19 @@ module AzaharaSchema
       [main_attribute_name]
     end
 
+    def default_sort
+      {}
+    end
+
     # just a dummy implementation
     def main_attribute_name
       available_attributes.detect{|att| att.name != 'id' }.name
     end
 
+    def follow_nested_relations
+      true
+    end
+
     # ACCESSORS
 
     def add_short_filter(name, str)
@@ -141,10 +150,15 @@ module AzaharaSchema
       @available_filters ||= available_attributes_hash.slice(*enabled_filter_names)
     end
 
+    def association_path
+      @association_path ||= parent_schema ? ( [association.name].concat(parent_schema.association_path) ) : []
+    end
+
     def available_associations
-      return [] if @association #only first level of association - would need to solve circular dependency first to add next level
-      @available_associations ||= model.reflect_on_all_associations.collect do |association|
-        AzaharaSchema::Schema.schema_for(association.klass, association: association)
+      @available_associations ||= model.reflect_on_all_associations.select do |association|
+        association.klass != model && !association_path.include?( association.name.to_s.singularize.to_sym ) && !association_path.include?( association.name.to_s.pluralize.to_sym )
+      end.collect do |association|
+        AzaharaSchema::Schema.schema_for(association.klass, parent_schema: self, association: association)
       end
     end
 
@@ -159,7 +173,7 @@ module AzaharaSchema
       end
       available_associations.each do |asoc_schema|
         asoc_schema.available_attributes.each do |asoc_attribute|
-          @available_attributes << AssociationAttribute.new(asoc_schema, asoc_attribute)
+          @available_attributes << AssociationAttribute.new(model, asoc_schema, asoc_attribute)
         end
       end
     end

data/lib/azahara_schema/version.rb

@@ -1,3 +1,3 @@
 module AzaharaSchema
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azahara_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,6 +67,7 @@ files:
 - lib/azahara_schema.rb
 - lib/azahara_schema/association_attribute.rb
 - lib/azahara_schema/attribute.rb
+- lib/azahara_schema/attribute_name.rb
 - lib/azahara_schema/engine.rb
 - lib/azahara_schema/field_format.rb
 - lib/azahara_schema/model_schema.rb