infopark_fiona7 0.71.1.3 → 0.71.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afe43c80b818f5ca19c21571d3a98c2568eac684
-  data.tar.gz: aeb258c26d909330c3383d135a5ff989168c6a88
+  metadata.gz: 0d8b201b6a4452091465d86a8dccc8a743b9e287
+  data.tar.gz: d0b4b9eba303b752fed9d11e931add5722116051
 SHA512:
-  metadata.gz: 3f0f1ade46b5928b457534bd07da938c240d809b9de10146eae70d87233e85d3283e5ffc1200e4b6ce0fd957d24dc6b3ff731fdb14ee1fdef6b97096e73f49a2
-  data.tar.gz: 5815edb6514e05026cdb5b88444ece0e223181cb786b1a4740dbf0040e8d2e7607a763aa445f0278941e33e8d92e5f49a86845241448791e82a20d440a4ef6f1
+  metadata.gz: a7569e6bebe621be9d0d1e5aa2b5caa987377d325e7d63a2be9a52af3af9e6748c7e0456731e604f10087bd38648bbc03e3276e31723d61fb89f827c6539318a
+  data.tar.gz: 2249c27ce493f725190214fa86f23f756ea70063f2b7555d618f727e80008712c5946ef94fa157c76c5aee211a780b95a5c2535040eb83e4a0e102fe37b55fa4

data/lib/fiona7/builder/obj_builder.rb

@@ -239,7 +239,7 @@ module Fiona7
               end
             elsif value.kind_of?(ActionDispatch::Http::UploadedFile)
               if !Fiona7.mode == :legacy || attribute_name.to_s != "blob"
-                @obj.set(attribute_name.to_s, upload_file(value))
+                @obj.set(attribute_name.to_s, upload_uploaded_file(value))
               else
                 special_upload_uploaded_handling(attribute_name, value)
               end

data/lib/fiona7/scrivito_patches/binary.rb

@@ -468,7 +468,11 @@ module Fiona7
           self.validate_transformation!
           options[:query] = self.encode_query_string
         end
-        URI::HTTP.build(options).to_s
+        if port == 443
+          URI::HTTPS.build(options).to_s
+        else
+          URI::HTTP.build(options).to_s
+        end
       end
 
       def encode_query_string

data/lib/fiona7/scrivito_patches/cms_routing.rb

@@ -29,6 +29,7 @@ module Scrivito
       end
     end
 
+    # do not reference global Obj
     def path_or_url_without_editing_context(target, path_or_url, options)
       if target.is_a?(Link)
         path_or_url_for_links(target, path_or_url, options)
@@ -47,6 +48,27 @@ module Scrivito
           "It must only be called with an Obj or a Link or a non-empty LinkList."
       end
     end
+
+    # use rails connector permalinks in legacy mode
+    def path_or_url_for_objs(obj, path_or_url, options)
+      permalink = obj.permalink
+      if permalink
+        if Fiona7.mode == :legacy
+          main_app
+          .public_send("cms_permalink_#{path_or_url}", options.merge(:permalink => permalink))
+        else
+          main_app
+          .public_send("scrivito_permalink_#{path_or_url}", options.merge(:permalink => permalink))
+        end
+      elsif homepage?(obj)
+        main_app.public_send("scrivito_root_#{path_or_url}", options)
+      elsif obj.binary?
+        binary_obj_url(obj) || LINK_TO_EMPTY_BLOB
+      else
+        slug = obj.slug.present? ? obj.slug.sub(/^\//, '') : nil
+        id_path_or_url_for_objs(obj, path_or_url, options.merge(slug: slug))
+      end
+    end
   end
 end
 

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "0.71.1.3"
+  VERSION = "0.71.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 0.71.1.3
+  version: 0.71.1.4
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails