azahara_schema 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10b335d3ec510ba75c370ef57465b556b0677a701ccf48b0ac4897caa69badde
-  data.tar.gz: c19c73e6b9b01aa4a4d391b0f95e0c4a93789864fb8a07f8bb1707b4261d278b
+  metadata.gz: 196087578480940bd53363da2e160d13b2af3eb4cd42f4bedfef44493993f2bf
+  data.tar.gz: 1c63360964ae78ff48f082219b9c8a1a75d07a63a74562380432cd67a62e67b9
 SHA512:
-  metadata.gz: e1fc19074a8cf5e26fcc158788c1575fedc278d5809a8556f9878cc1a08c30a65565ef49f579b0696d1eb19e31db060cdc91d7dd80a937bd58b34fb92dd78d4b
-  data.tar.gz: 4a663f5fb26982a963eb503d0cb1dad1357152a92181ab78b95ae8f6c785fcd6c50fadc047072d8c7257435f4a199ef617a9755140f4a6f226ecd2e3b9bb065c
+  metadata.gz: 68c48995f02cc99264f29bfb43cb231c2edee15eb66dacc5dce937d60e689d02855e69c4e44191b5b25f5f085e3c6ebc4834acdb186b64e20386ed093e370561
+  data.tar.gz: 420e5d0d41851c0a60783a6746c8514f4e44c99ad6e8b4afecbc2c84621d5797940aaab391288d7470d3272c3414114a21c9b0b5d3ef7d8a8c00a5c31a9d8109

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

@@ -2,7 +2,7 @@
   <%= render 'azahara_schema/index_form', schema: schema %>
 <% end %>
 <% schema.outputs.each do |output| %>
-  <%= render output %>
+  <%= render output, schema: schema %>
 <% end %>
 <div class="exports text-right">
   <% if (csv_path = azahara_export_path(schema, :csv)) %>

data/lib/azahara_schema/attribute_formatter.rb

@@ -84,7 +84,7 @@ module AzaharaSchema
     def format_value(attribute, unformated_value, **options)
       case attribute.type
       when 'datetime'
-        l(unformated_value)
+        unformated_value ? l(unformated_value) : unformated_value
       else
         unformated_value
       end

data/lib/azahara_schema/model_schema.rb

@@ -23,7 +23,7 @@ module AzaharaSchema
     end
 
     def visibility_scope!(ability, authorization_action=:index)
-      @entity_scope = model.accessible_by(ability, authorization_action)
+      @entity_scope = entity_scope.accessible_by(ability, authorization_action)
     end
 
     def entity_scope

data/lib/azahara_schema/output.rb

@@ -32,5 +32,9 @@ module AzaharaSchema
       'azahara_schema/outputs/'+key
     end
 
+    def formatter(template)
+      template.attribute_formatter_for(schema)
+    end
+
   end
 end

data/lib/azahara_schema/schema.rb

@@ -62,7 +62,7 @@ module AzaharaSchema
     end
 
     attr_accessor :model, :enabled_outputs, :association, :parent_schema
-    attr_accessor :search_query
+    attr_accessor :search_query, :default_scope
     attr_accessor :offset, :limit
 
     def initialize(model, **attributes)
@@ -242,7 +242,9 @@ module AzaharaSchema
     end
 
     def entity_scope
-      model.respond_to?(:visible) ? model.visible : model.all
+      scope = model.respond_to?(:visible) ? model.visible : model.all
+      scope.send(self.default_scope) if self.default_scope
+      scope
     end
 
     def filtered_scope
@@ -329,6 +331,7 @@ module AzaharaSchema
           add_sort(sort[:path], sort['desc'] == 'true' ? :desc : :asc )
         end
       end
+      self.default_scope = params[:default_scope] if params[:default_scope]
       self.search_query = params[:q] if params[:q]
       self.offset = params[:offset] if params[:offset]
       self.limit = params[:limit] if params[:limit]
@@ -340,6 +343,7 @@ module AzaharaSchema
       filters.each do |fname, attrs|
         params[:f][fname] = "#{attrs[:o]}|#{Array(attrs[:v]).collect{|v| v.to_s}.join('\\')}"
       end
+      params[:default_scope] = default_scope if default_scope
       params[:c] = column_names
       params[:q] = search_query if params[:q]
       params[:offset] = offset

data/lib/azahara_schema/version.rb

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

metadata

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