lalala 4.0.0.dev.126 → 4.0.0.dev.128

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6060c6b53af5a9c9c3de6fb7a2b5fc10c7cf1b4e
-  data.tar.gz: 3e55f1d9fc338b48de3d8362f33403c7f89cdb91
+  metadata.gz: 0da73c5555e578485c8df8b6dc103ee52979291c
+  data.tar.gz: 2f59ea454308bd2b49142c135d35f803f5074034
 SHA512:
-  metadata.gz: 333e9cc5316f5eccc5aea857823bf8cfae09b213b559c28ce71d55dba1e6be192c523b32172c727fbca0c5b1ffa5d8c3987243f48c538de1224ae1dac8b08807
-  data.tar.gz: 2508a55160619c01b96a254280596be715a63aae2ae7a94c1734e3af8c6e2b762f2ecee6392b43d62d168a9502439d4d29621a23a2624b8216a264d865f13285
+  metadata.gz: b0e0d67b87ed890810cdbdedce96a9e7f21c86f5f2dc12c25db98ef4dc944641aed55e10c07d4d132b72ba7c65ff5f7229b9b757896bb4baf05d9697b7cd6bac
+  data.tar.gz: aa31db8c0c12f1ed3d82784bba3d8da2098982d86fbe69c4995faa23c7b1f6059931466dd197d637bb4e7ce195e0380eb6c8a6da6ddc8747d1e58edbd91c6c9d

data/lib/formtastic/inputs/grid_input.rb

@@ -5,9 +5,9 @@ class Formtastic::Inputs::GridInput
     object = builder.object
     assets = object.send(method)
 
-    image_model_class = object.class.reflect_on_association(method).class_name.constantize
-    image_attributes = image_model_class.accessible_attributes.to_a
-    image_attributes.select! { |x| x.size > 0 and !%w(asset translations_writer).include?(x) }
+    asset_model_class = object.class.reflect_on_association(method).class_name.constantize
+    asset_attributes = asset_model_class.accessible_attributes.to_a
+    asset_attributes.select! { |x| x.size > 0 and !%w(asset translations_writer).include?(x) }
 
     ul = template.content_tag :ul do
       html = template.raw("")
@@ -15,11 +15,18 @@ class Formtastic::Inputs::GridInput
       assets.each_with_index do |asset, idx|
         html += template.content_tag :li, class: "asset" do
           builder.fields_for(method, asset) do |f|
-            thumbnail_html = template.image_tag f.object.asset.lalala_thumb.url
+            lalala_thumb = f.object.asset.lalala_thumb
+
+            if lalala_thumb
+              link_inner_html = template.image_tag(lalala_thumb.url)
+            else
+              link_inner_html = ""
+            end
+
             asset_html = template.raw("")
-            asset_html << template.link_to(thumbnail_html, f.object.asset.url)
+            asset_html << template.link_to(link_inner_html, f.object.asset.url)
             asset_html << template.content_tag(:ol, { class: "attributes" }) do
-              inputs = image_attributes.map do |ia|
+              inputs = asset_attributes.map do |ia|
                 f.input ia.to_sym, placeholder: ia
               end
 
@@ -34,7 +41,7 @@ class Formtastic::Inputs::GridInput
 
       html += template.content_tag :li do
         builder.fields_for(method, assets.build) do |f|
-          f.file_field :asset, multiple: true, accept: image_model_class.extension_white_list
+          f.file_field :asset, multiple: true, accept: asset_model_class.extension_white_list
         end
       end
 

data/lib/lalala/uploaders/file.rb

@@ -12,7 +12,7 @@ class Lalala::Uploaders::File < CarrierWave::Uploader::Base
     super_url = super
     if Rails.env.production? or Rails.env.staging?
       if super_url
-        File.join("/storage/assets", super_url)
+        AssetURL.new(File.join("/storage/assets", super_url))
       else
         super_url
       end
@@ -21,4 +21,26 @@ class Lalala::Uploaders::File < CarrierWave::Uploader::Base
     end
   end
 
+  # This class circumvents the Sprockets asset path rewriting
+  # by pretending that it is a full URL.
+  #
+  # @see
+  #   https://mrhenry.basecamphq.com/projects/10235776-hetpaleis/todo_items/164031435/comments (internal)
+  #   http://apidock.com/rails/ActionView/Helpers/AssetTagHelper/image_tag
+  #   http://apidock.com/rails/v3.2.13/ActionView/Helpers/AssetTagHelper/path_to_image
+  #   http://apidock.com/rails/ActionView/Helpers/AssetTagHelper/image_path
+  #   http://apidock.com/rails/ActionView/AssetPaths/compute_public_path
+  #   http://apidock.com/rails/v3.2.13/ActionView/AssetPaths/is_uri%3F
+  class AssetURL < String
+
+    def to_s
+      self
+    end
+
+    def  =~(pattern)
+      return true
+    end
+
+  end
+
 end

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "126"
+  BUILD   = "128"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.126
+  version: 4.0.0.dev.128
 platform: ruby
 authors:
 - Simon Menke