azahara_schema 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 196087578480940bd53363da2e160d13b2af3eb4cd42f4bedfef44493993f2bf
-  data.tar.gz: 1c63360964ae78ff48f082219b9c8a1a75d07a63a74562380432cd67a62e67b9
+  metadata.gz: f94ff9042c2246d38dbfabfc0b4935c0e3e187cdee2a98f23bf6f37c25b4defa
+  data.tar.gz: 301ab4cbe1764857c16f9c26e69e607a2bac6c5be3ee335e9cd7ec63ca8c426b
 SHA512:
-  metadata.gz: 68c48995f02cc99264f29bfb43cb231c2edee15eb66dacc5dce937d60e689d02855e69c4e44191b5b25f5f085e3c6ebc4834acdb186b64e20386ed093e370561
-  data.tar.gz: 420e5d0d41851c0a60783a6746c8514f4e44c99ad6e8b4afecbc2c84621d5797940aaab391288d7470d3272c3414114a21c9b0b5d3ef7d8a8c00a5c31a9d8109
+  metadata.gz: 9a72b9632ec5e74ff694b679fcd37dbee464dbf37300941a52b4c55312055b8bbaee54c3e2dd9f1fe2527c414f53c09dbacee7ff834528a0f99ea46b70101139
+  data.tar.gz: 5ada7cf0f14f608d304bd7f1b6a93baa6ea7d19d76ad287486b42445251507b037ac92a26e90bb2a88ebb3878c9e509ca76f665dc20cb32233fc847a82b5bdef

data/lib/azahara_schema/attribute_formatter.rb

@@ -60,11 +60,11 @@ module AzaharaSchema
     end
 
     def formatted_value(attribute, entity, **options)
-      real_formatter(attribute).format_value(attribute, attribute_human_value(attribute, entity), options)
+      real_formatter(attribute).format_value(attribute, attribute_human_value(attribute, entity), formatting_options(attribute,entity).merge(options))
     end
 
     def html_formatted_value(attribute, entity, **options)
-      format_value_html(attribute, attribute.value(entity), options)
+      format_value_html(attribute, attribute.value(entity), formatting_options(attribute,entity).merge(options))
     end
 
     def attribute_html_label(attribute, **options)
@@ -94,6 +94,10 @@ module AzaharaSchema
       formated_value = real_formatter(attribute).format_value(attribute, unformated_value, options)
     end
 
+    def formatting_options(attribute, entity)
+      {}
+    end
+
     def real_formatter(attribute)
       if attribute.respond_to?(:attribute)
         self.class.formatter_for(attribute.attribute.model).new(attribute.attribute.model, template, @options).real_formatter(attribute.attribute)

data/lib/azahara_schema/field_format.rb

@@ -81,6 +81,10 @@ module AzaharaSchema
 
     class FloatFormat < NumberFormat
       add 'float'
+
+      def sanitize_value(value)
+        value.to_s.present? ? value.to_s.to_f : nil
+      end
     end
 
     class DecimalFormat < FloatFormat

data/lib/azahara_schema/schema.rb

@@ -243,7 +243,7 @@ module AzaharaSchema
 
     def entity_scope
       scope = model.respond_to?(:visible) ? model.visible : model.all
-      scope.send(self.default_scope) if self.default_scope
+      scope = scope.send(self.default_scope) if self.default_scope
       scope
     end
 

data/lib/azahara_schema/version.rb

@@ -1,3 +1,3 @@
 module AzaharaSchema
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

metadata

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