azahara_schema 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd521cb7f65eb4e2da7a431528c37f93118e64fe747a18b25f2b21d68cd71715
-  data.tar.gz: 22be1abf8722e4b5dce3540161ef6f0f3a39a8af458c84c16ab49b72e1a5cef5
+  metadata.gz: d4ebb4cfbf9b88aedd63379c567022ffd313d71ab6496b1b4c15abd85c7bc795
+  data.tar.gz: c90d23fd01a59ba6668d7439e269398c8481d4f906dcb13a680bc65d5f6f0869
 SHA512:
-  metadata.gz: e55554f1443c80a2bc5a2468a6a80789e6687e9bf72664c63ac1bed6c0d333986d32d50524deadb45dc25b33ea32903f0ddd3e04080c8d54ad39112d2870202b
-  data.tar.gz: e9c300edc0cafb02a0829f854075feddefd34385b05e1a1bc509b6191ec5681aa24045c50bab4364d79e73eec4774f42f345e9a22418bd8574aa5e69104293d8
+  metadata.gz: 33378116e789f9ab91ac6b952480d630212db2b3e847a2efbd15a9c3c1b59932ade15d2b60f18dc7d261fffef1460cca1f19bf784507ab31d34d78016ac5482f
+  data.tar.gz: a8a150f7d0c0d4c5295fde70aaaebd52cb973d362dc07d3813f50968acbf6212aeaa6711747cef612831337be839f6bc6385aac9373df58dbfb7c33ebca32129

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

@@ -4,13 +4,13 @@
       <%= azahara_filter_row(schema, filter, name) %>
     <% end %>
   </div>
-  <% if schema.collapsable_filters.any? || lookup_context.template_exists?("#{schema.model.model_name.plural}/_additional_filters") %>
+  <% if schema.collapsable_filters.any? || lookup_context.template_exists?("#{ActiveSupport::Inflector.tableize(schema.model.name)}/_additional_filters") %>
     <div id="filters_collapsable" class="collapse">
       <% schema.collapsable_filters.each do |name, filter| %>
         <%= azahara_filter_row(schema, filter, name) %>
       <% end %>
-      <% if lookup_context.template_exists?("#{schema.model.model_name.plural}/_additional_filters") %>
-        <%= render "#{schema.model.model_name.plural}/additional_filters", schema: schema %>
+      <% if lookup_context.template_exists?("#{ActiveSupport::Inflector.tableize(schema.model.name)}/_additional_filters") %>
+        <%= render "#{ActiveSupport::Inflector.tableize(schema.model.name)}/additional_filters", schema: schema %>
       <% end %>
     </div>
     <div class="collapse-actions" style="text-align: center;">

data/lib/azahara_schema/aggregation_attribute.rb

@@ -21,7 +21,9 @@ module AzaharaSchema
     end
 
     def value(parent)
-      attribute.attribute.add_join( parent.send(attribute.association.name) ).sum(attribute.arel_field).to_f
+      val = attribute.attribute.add_join( parent.send(attribute.association.name) ).sum(attribute.arel_field)
+      val = BigDecimal.new(val.to_s) unless val.is_a?(BigDecimal)
+      val
     end
 
   end

data/lib/azahara_schema/field_format.rb

@@ -132,6 +132,10 @@ module AzaharaSchema
       def available_operators
         ['=']
       end
+
+      def searchable?
+        false
+      end
     end
 
     class LoveFormat < ListFormat

data/lib/azahara_schema/model_schema.rb

@@ -23,11 +23,11 @@ module AzaharaSchema
     end
 
     def visibility_scope!(ability, authorization_action=:index)
-      @entity_scope = entity_scope.accessible_by(ability, authorization_action)
+      @base_scope = base_scope.accessible_by(ability, authorization_action)
     end
 
-    def entity_scope
-      @entity_scope || super
+    def base_scope
+      @base_scope || super
     end
 
     # dummy implementations for rewrite

data/lib/azahara_schema/schema.rb

@@ -243,8 +243,12 @@ module AzaharaSchema
       query.split if query
     end
 
-    def entity_scope
-      scope = model.respond_to?(:visible) ? model.visible : model.all
+    def base_scope
+      model.all
+    end
+
+    def entity_scope(scope=base_scope)
+      scope = scope.visible if scope.respond_to?(:visible)
       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.10'
+  VERSION = '0.3.11'
 end

metadata

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