futurism 1.2.0.pre2 → 1.2.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00f16be3e103b54e5c6bbd9efaea16b7196d0e4a561bde8b61051989b1e74e59
-  data.tar.gz: 67c9a17bb4a80fcc12f830bf8ce39174086e336b93d041f822308a20359381dc
+  metadata.gz: 80e0ce6e5c458215afe4266493a6644a029b75f005bfbadcdc181b82325e0d43
+  data.tar.gz: 902744214a43cee7e28c57f1999e52191aaf2d2022860c53c4784ba9fda200fd
 SHA512:
-  metadata.gz: ff6e67f624ad9ccd114800b457c4f7e48fa6232f87aa970f7f1513b59bd4ea3daedf05806e2582af057588d1cd19075e87ab81f8f4ffde23544f64b6e8ae2a5c
-  data.tar.gz: 1bafaacb876d3d50d020692a555946112a74bdb10b0cabac0e67b3b57f561b7935ba25024c0792102ec9f89addfa54fde03daf10101364cb27b51f687817956f
+  metadata.gz: a8638ce1768afd2da09199dc9e033b32168b54c401fd5ab2b26e20e127b38e4c172b93d8846cca8cc0adb28078073fb0bcd2554d70a5d070e60f631d1d596e5b
+  data.tar.gz: cf8c0a7ecd8451b15f7d71f496bd0e49adb358e1bf9770449424e4d4780709b410ba197f8c459a71468f46c3d7961b4ae331bd9e61e4d0e1d959720b46a7dd88

data/lib/futurism/helpers.rb~

@@ -28,12 +28,13 @@ module Futurism
 
         WrappingFuturismElement.new(extends: extends, placeholder: placeholder, options: options).render
       else
-        placeholder = capture(record, index, &block) if block_given?
-
         collection_class_name = collection.try(:klass).try(:name) || collection.first.class.to_s
         as = options.delete(:as) || collection_class_name.underscore
         broadcast_each = options.delete(:broadcast_each) || false
+
         collection.each_with_index.map { |record, index|
+          placeholder = capture(record, index, &block) if block_given?
+
           WrappingFuturismElement.new(extends: extends, placeholder: placeholder, options: options.deep_merge(
             broadcast_each: broadcast_each,
             locals: {as.to_sym => record, "#{as}_counter".to_sym => index}
@@ -55,7 +56,7 @@ module Futurism
       include ActionView::Helpers
       include Futurism::MessageVerifier
 
-      attr_reader :extends, :placeholder, :html_options, :data_attributes, :model, :options, :eager, :broadcast_each, :controller
+      attr_reader :placeholder, :html_options, :data_attributes, :model, :options, :eager, :broadcast_each, :controller
 
       def initialize(extends:, placeholder:, options:)
         @extends = extends
@@ -80,14 +81,7 @@ module Futurism
       end
 
       def render
-        case extends
-        when :li
-          content_tag :li, placeholder, html_options.deep_merge({data: dataset, is: "futurism-li"})
-        when :tr
-          content_tag :tr, placeholder, html_options.deep_merge({data: dataset, is: "futurism-table-row"})
-        else
-          content_tag :"futurism-element", placeholder, html_options.deep_merge({data: dataset})
-        end
+        content_tag :"futurism-element", placeholder, html_options.deep_merge({data: dataset, extends: extends})
       end
 
       def transformed_options
@@ -112,6 +106,15 @@ module Futurism
 
         message_verifier.generate(controller.to_s)
       end
+
+      def extends
+        # TODO remove this in the next major version
+        case @extends
+        when :li then "list-item"
+        when :tr then "table-row"
+        else @extends
+        end
+      end
     end
   end
 end

data/lib/futurism/version.rb

@@ -1,3 +1,3 @@
 module Futurism
-  VERSION = "1.2.0.pre2"
+  VERSION = "1.2.0.pre3"
 end

data/lib/futurism/version.rb~

@@ -1,3 +1,3 @@
 module Futurism
-  VERSION = "1.2.0.pre1"
+  VERSION = "1.2.0.pre2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: futurism
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre2
+  version: 1.2.0.pre3
 platform: ruby
 authors:
 - Julian Rubisch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-01 00:00:00.000000000 Z
+date: 2021-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler