terrazzo 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45571db8ac5c20c765feaf02cfe7be1ab1bba1c84e77be02b8b72ca4a749875e
-  data.tar.gz: f221316bc43fe5d871c3603297afb9fceff9a942a07ede4bdade9186ed455598
+  metadata.gz: c8d1fb21a6af1c708437891c1e3216a2749fb682513c40c4c583a950e92750f5
+  data.tar.gz: 47a449b824bf9f5a2cf00e7619aa5d008526f7b8d764258022a3d3ff43109c58
 SHA512:
-  metadata.gz: ce93ab9c2c0a420128006d9cf67e33f083bcf5298cfbe493884970c255153e6ef71d948691ad10c5838c47cfe98c5fa46fb8de4c878eb154ae8ed29a5ff17b15
-  data.tar.gz: 5d98160ec096c04a93a4aa5a5a8aadb3390126e2cddf9a780f519ad16eff2d2783b2e6843d91adbb15bbb4e23c06a7d2e95ad96e615d4204860e0ed84bd6f151
+  metadata.gz: e3970087e358e8ef4988ff18d3dff5c9a28de0253f5358afb0b54aeada98878ac16ad2b1f85a057e0c101bea47a74d6c79a63c259781571cc1b7d95327712bf8
+  data.tar.gz: c85f00757f7f54a86fa37d7f9509e109f672cf074eb9e88370132e74d5ccbc1e4bf0345c9410e396f85770a9b936658f5f637554e94bf7a7de46fc379c901e23

data/app/controllers/terrazzo/application_controller.rb

@@ -129,7 +129,7 @@ module Terrazzo
     end
 
     def find_resource(id)
-      scoped_resource.find(id)
+      @_find_resource ||= scoped_resource.find(id)
     end
 
     def resource_params(action = nil)

data/app/views/terrazzo/application/_edit_base.json.props

@@ -29,7 +29,7 @@ json.form do
       json.label field.attribute.to_s.humanize
       json.fieldType field.field_type
       json.value field.serialize_value(:form)
-      json.options field.serializable_options
+      json.options field.serializable_options(:form)
       json.required field.required?
       json.input field.form_input_attributes(param_key)
     end
@@ -43,7 +43,7 @@ json.form do
           json.label field.attribute.to_s.humanize
           json.fieldType field.field_type
           json.value field.serialize_value(:form)
-          json.options field.serializable_options
+          json.options field.serializable_options(:form)
           json.required field.required?
           json.input field.form_input_attributes(param_key)
         end

data/app/views/terrazzo/application/_new_base.json.props

@@ -25,7 +25,7 @@ json.form do
       json.label field.attribute.to_s.humanize
       json.fieldType field.field_type
       json.value field.serialize_value(:form)
-      json.options field.serializable_options
+      json.options field.serializable_options(:form)
       json.required field.required?
       json.input field.form_input_attributes(param_key)
     end
@@ -39,7 +39,7 @@ json.form do
           json.label field.attribute.to_s.humanize
           json.fieldType field.field_type
           json.value field.serialize_value(:form)
-          json.options field.serializable_options
+          json.options field.serializable_options(:form)
           json.required field.required?
           json.input field.form_input_attributes(param_key)
         end

data/app/views/terrazzo/application/_show_base.json.props

@@ -21,7 +21,7 @@ show_field_json = ->(json, field) do
   end
 end
 
-json.attributeGroups do
+json.attributes do
   json.array! @page.grouped_attributes do |group|
     json.name group[:name]
     json.attributes do
@@ -32,12 +32,6 @@ json.attributeGroups do
   end
 end
 
-json.attributes do
-  json.array! @page.attributes do |field|
-    show_field_json.call(json, field)
-  end
-end
-
 json.editPath route_exists?(:edit) ? (edit_polymorphic_path([namespace, @resource]) rescue nil) : nil
 json.deletePath route_exists?(:destroy) ? (polymorphic_path([namespace, @resource]) rescue nil) : nil
 json.indexPath begin

data/lib/generators/terrazzo/field/templates/field.rb.erb

@@ -5,7 +5,7 @@ module Terrazzo
         data
       end
 
-      def serializable_options
+      def serializable_options(page = nil)
         {}
       end
 

data/lib/generators/terrazzo/views/templates/pages/show.jsx

@@ -9,7 +9,7 @@ export default function AdminShow() {
   const Layout = getLayout();
   const {
     pageTitle,
-    attributeGroups,
+    attributes,
     editPath,
     deletePath,
     indexPath,
@@ -54,7 +54,7 @@ export default function AdminShow() {
         </div>
       }>
 
-      {attributeGroups.map((group, groupIndex) =>
+      {attributes.map((group, groupIndex) =>
         <Card key={groupIndex}>
           {group.name && (
             <CardHeader>

data/lib/terrazzo/field/base.rb

@@ -20,7 +20,7 @@ module Terrazzo
         data
       end
 
-      def serializable_options
+      def serializable_options(page = nil)
         {}
       end
 

data/lib/terrazzo/field/belongs_to.rb

@@ -11,16 +11,13 @@ module Terrazzo
         end
       end
 
-      def serializable_options
-        opts = {}
-        if resource
-          collection = ordered_resource_options
-          if options[:include_blank]
-            collection = [["", nil]] + collection
-          end
-          opts[:resourceOptions] = collection
+      def serializable_options(page = nil)
+        return {} unless page == :form && resource
+        collection = ordered_resource_options
+        if options[:include_blank]
+          collection = [["", nil]] + collection
         end
-        opts
+        { resourceOptions: collection }
       end
 
       class << self

data/lib/terrazzo/field/has_many.rb

@@ -19,12 +19,9 @@ module Terrazzo
         end
       end
 
-      def serializable_options
-        opts = {}
-        if resource
-          opts[:resourceOptions] = resource_options
-        end
-        opts
+      def serializable_options(page = nil)
+        return {} unless page == :form && resource
+        { resourceOptions: resource_options }
       end
 
       class << self
@@ -115,7 +112,13 @@ module Terrazzo
         return records unless sort_by
 
         direction = options.fetch(:direction, :asc)
-        records.reorder(sort_by => direction)
+
+        if records.respond_to?(:reorder)
+          records.reorder(sort_by => direction)
+        else
+          sorted = records.sort_by { |r| r.public_send(sort_by) }
+          direction.to_sym == :desc ? sorted.reverse : sorted
+        end
       end
 
       def find_associated_dashboard

data/lib/terrazzo/field/has_one.rb

@@ -11,12 +11,9 @@ module Terrazzo
         end
       end
 
-      def serializable_options
-        opts = {}
-        if resource
-          opts[:resourceOptions] = resource_options
-        end
-        opts
+      def serializable_options(page = nil)
+        return {} unless page == :form && resource
+        { resourceOptions: resource_options }
       end
 
       class << self

data/lib/terrazzo/field/money.rb

@@ -11,7 +11,7 @@ module Terrazzo
         end
       end
 
-      def serializable_options
+      def serializable_options(page = nil)
         opts = {}
         opts[:prefix] = options[:prefix] if options.key?(:prefix)
         opts[:suffix] = options[:suffix] if options.key?(:suffix)

data/lib/terrazzo/field/number.rb

@@ -17,7 +17,7 @@ module Terrazzo
         end
       end
 
-      def serializable_options
+      def serializable_options(page = nil)
         opts = {}
         opts[:prefix] = options[:prefix] if options.key?(:prefix)
         opts[:suffix] = options[:suffix] if options.key?(:suffix)

data/lib/terrazzo/field/polymorphic.rb

@@ -12,16 +12,16 @@ module Terrazzo
         end
       end
 
-      def serializable_options
-        opts = {}
+      def serializable_options(page = nil)
+        return {} unless page == :form
         classes = options[:classes] || []
         order = options[:order]
-        opts[:groupedOptions] = classes.each_with_object({}) do |klass, hash|
+        grouped = classes.each_with_object({}) do |klass, hash|
           klass = klass.constantize if klass.is_a?(::String)
           scope = order ? klass.order(order) : klass.all
           hash[klass.name] = scope.map { |r| [display_name(r), r.id.to_s] }
         end
-        opts
+        { groupedOptions: grouped }
       end
 
       class << self

data/lib/terrazzo/field/select.rb

@@ -5,7 +5,8 @@ module Terrazzo
         data
       end
 
-      def serializable_options
+      def serializable_options(page = nil)
+        return {} unless page == :form
         { selectableOptions: resolve_collection }
       end
 

data/lib/terrazzo/version.rb

@@ -1,3 +1,3 @@
 module Terrazzo
-  VERSION = "0.5.0"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terrazzo
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Terrazzo Contributors