azahara_schema 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d672ff9453d94ce1d4926ca08e78bd3df9298fb3
-  data.tar.gz: b3101131a1b1d578edeaac3444af869212afb5e3
+  metadata.gz: 8f7f9fca28c48e48db64c1fff3f830700b6e3c52
+  data.tar.gz: e0fbdebd3f9656fbb739684d4d37da76a8825d84
 SHA512:
-  metadata.gz: 1b3a6f4232a219e888beaf3f36b5b6e243ec286e4af28ce850afa6d2ad93a4468ed4e4cbbff562bce546544a8a6da6bf95513eb8a71491acd894681f504ff9b7
-  data.tar.gz: a99067d5f78de03f6672b2c8c33aff2695aa4ab6828f4ce85479f7fa7bd51505b29c271c5cd4dc0fea2efbb5b2f81895e43ed227bfef05ed2f9e4693a420a242
+  metadata.gz: a6804635de61f3adf1ebefec3476052195dd507231083906f163abe8e0dd80a6e41dc2518216f561de9a132117bb759c25b481616d0ddac4ea43141d9b8666cf
+  data.tar.gz: d9d8df57a99ce9a9cae33299015448153f688dd68a5d023847c1c33e14b55f72143c23ff486d8f2841f1999fb4a187b7caf3424e10a81375921007645416a376

data/app/helpers/azahara_schema/application_helper.rb

@@ -7,7 +7,7 @@ module AzaharaSchema
 
     def filter_field(schema, filter)
       case filter.format.format_name
-      when 'list'
+      when 'list', 'love'
         select :f, filter.filter_name, options_for_select( list_values_for_select(filter), schema.value_for(filter.filter_name) ), {include_blank: true}, class: 'form-control value-field'
       else
         text_field :f, filter.filter_name, value: schema.value_for(filter.filter_name), class: 'form-control value-field'
@@ -17,8 +17,12 @@ module AzaharaSchema
     # translates values to list_values
     # TODO: not needed to do it for every value - for example districts are not translatable
     def list_values_for_select(attribute)
-      attribute.available_values.collect do |l, val|
-        [t(l, scope: [:activerecord, :attributes, attribute.model.model_name.i18n_key, attribute.name.to_s.pluralize], default: l.to_s), val]
+      if attribute.format.format_name == 'list'
+        attribute.available_values.collect do |l, val|
+          [t(l, scope: [:activerecord, :attributes, attribute.model.model_name.i18n_key, attribute.name.to_s.pluralize], default: l.to_s), val]
+        end
+      else
+        attribute.available_values
       end
     end
 

data/lib/azahara_schema/attribute.rb

@@ -36,6 +36,7 @@ module AzaharaSchema
       name
     end
 
+    # Path in json structure
     def path
       name
     end

data/lib/azahara_schema/field_format.rb

@@ -83,6 +83,10 @@ module AzaharaSchema
       end
     end
 
+    class LoveFormat < ListFormat
+      add 'love'
+    end
+
     class DateFormat < Base
       add 'date'
     end

data/lib/azahara_schema/schema.rb

@@ -156,7 +156,10 @@ module AzaharaSchema
 
     def available_associations
       @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 )
+        association.klass != model &&
+          !association.options[:polymorphic] &&
+          !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
@@ -203,7 +206,9 @@ module AzaharaSchema
     end
 
     def as_json(options={})
-      entities.as_json(build_json_options!(options))
+      res_ary = entities.as_json(build_json_options!(options))
+      columns.each{|col| res_ary.each{|attr_hash| attr_hash[col.name] = col.available_values.detect{|l, v| v == attr_hash[col.name] }.try(:[], 0) } if col.type == 'love' }
+      res_ary
     end
 
 

data/lib/azahara_schema/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azahara_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2017-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails