scrivito_sdk 0.60.0.rc1 → 0.60.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8911a89b494e43e231fd96f8531db03f4e8cd9a
-  data.tar.gz: 134bacda1d8ac4999e4da8b848db773ea3979c9e
+  metadata.gz: 712c28035633619477bfc444b11996dab6d76fc6
+  data.tar.gz: 32d66f14ac294339b7303c4283fd81b0a4d7d0b7
 SHA512:
-  metadata.gz: 3aa713d056322a84c6dc80dcb3ccadd185e78ac269e54092b5148c5e731b65085288a9b132e754eb0044240b1b3036795a6a6252701fd29cad6309b8d1575fe8
-  data.tar.gz: 04beb72d21730486cebe70591f23cc99982ddd85fcc9c53065c921d22a10c29c426126d63a4f4161c2a0ac160e479e76d6ddcd8b5fc2996a6f32e69ccce1c279
+  metadata.gz: f09d10a74b5949b591ce41cdd6469c2c95da7413156d33dc133e8bac84e931dc9d7d75345c0b9e76987c6f1741e6717629462b752e97b853e29d95a34f7af48f
+  data.tar.gz: 19d63941f41c476ceb5e5e8e914cc8b6b2186e64bf5053e7731bfcc6277e304fceb624692f89337907701dc56d7a0090736f9caf67ad55384d66978d3048d9c7

data/.yardopts

@@ -4,3 +4,4 @@
 --non-transitive-tag api
 --api public
 --embed-mixin AttributeContent
+--embed-mixin Scrivito::AttributeContent::ClassMethods

data/app/controllers/scrivito/objs_controller.rb

@@ -98,27 +98,15 @@ module Scrivito
 
     def page_class_selection
       @page_class_markup = valid_page_classes.map do |page_class_name|
-        begin
-          markup = render_to_string("#{page_class_name.underscore}/thumbnail", formats: :html)
-          {name: page_class_name, markup: markup}
-        rescue ActionView::MissingTemplate
-        end
+        build_selection_option(page_class_name)
       end
-      @page_class_markup.compact!
     end
 
     def widget_class_selection
       load_obj
 
       @widgets_classes = valid_widget_classes.map do |widget_class_name|
-        template_path = "#{widget_class_name.underscore}/thumbnail"
-        markup = begin
-          render_to_string(template_path, layout: false, formats: :html)
-        rescue ActionView::MissingTemplate
-          render_to_string('scrivito/widget_thumbnail', layout: false, formats: :html,
-              locals: {widget_class_name: widget_class_name, template_path: template_path})
-        end
-        {name: widget_class_name, markup: markup}
+        build_selection_option(widget_class_name)
       end
     end
 
@@ -188,21 +176,33 @@ module Scrivito
       name ? Configuration.obj_formats[name] : proc { |obj, _| obj.id }
     end
 
+    def build_selection_option(class_name)
+      template_path = "#{class_name.underscore}/thumbnail"
+      markup = begin
+        render_to_string(template_path, layout: false, formats: :html)
+      rescue ActionView::MissingTemplate
+        render_to_string('scrivito/fallback_thumbnail', layout: false, formats: :html,
+            locals: {class_name: class_name, template_path: template_path})
+      end
+      {name: class_name, markup: markup}
+    end
+
     def valid_page_classes
-      (page_classes_from_obj || page_descendants).map(&:to_s)
+      without_hidden_classes(page_classes_from_obj).map(&:to_s)
     end
 
     def page_classes_from_obj
-      Obj.valid_page_classes_beneath(params[:parent_path])
+      Obj.valid_page_ruby_classes_beneath(params[:parent_path])
     end
 
-    def page_descendants
-      Scrivito.models.pages
+    def valid_widget_classes
+      widget_classes = current_widget_or_obj.valid_widget_ruby_classes_for(params[:field_name])
+
+      without_hidden_classes(widget_classes).map(&:to_s)
     end
 
-    def valid_widget_classes
-      current_widget_or_obj.valid_widget_class_names_for(params[:field_name]) -
-        ['Scrivito::ContentWidget']
+    def without_hidden_classes(obj_types)
+      obj_types.reject(&:hide_from_editor?)
     end
 
     def current_widget_or_obj

data/app/models/scrivito/content_widget.rb

@@ -2,6 +2,8 @@ module Scrivito
   class ContentWidget < ::Widget
     attribute :content, :reference
 
+    hide_from_editor
+
     def description_for_editor
       content.try(:description_for_editor).presence || 'Content Widget'
     end

data/app/views/scrivito/fallback_thumbnail.html.erb

@@ -0,0 +1,3 @@
+<%= scrivito_thumbnail class_name do %>
+  Missing template "<%= template_path %>". Please provide one.
+<% end %>

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Thu Apr 16 11:00:56 2015
+## Certificate data from Mozilla as of: Mon Apr 27 14:17:45 2015
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -14,7 +14,7 @@
 ## Just configure this file as the SSLCACertificateFile.
 ##
 ## Conversion done with mk-ca-bundle.pl version 1.25.
-## SHA1: f9bc9fa76145720d94124527f82a7185d921975e
+## SHA1: ed3c0bbfb7912bcc00cd2033b0cb85c98d10559c
 ##
 
 
@@ -2790,28 +2790,6 @@ yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
 LXpUq3DDfSJlgnCW
 -----END CERTIFICATE-----
 
-E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi
-===================================================
------BEGIN CERTIFICATE-----
-MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
-EwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxpZ2kgQS5TLjE8MDoGA1UEAxMz
-ZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3
-MDEwNDExMzI0OFoXDTE3MDEwNDExMzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0
-cm9uaWsgQmlsZ2kgR3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9u
-aWsgU2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdUMZTe1RK6UxYC6lhj71vY
-8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlTL/jDj/6z/P2douNffb7tC+Bg62nsM+3Y
-jfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAI
-JjjcJRFHLfO6IxClv7wC90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk
-9Ok0oSy1c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/BAQD
-AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoEVtstxNulMA0GCSqG
-SIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLPqk/CaOv/gKlR6D1id4k9CnU58W5d
-F4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwq
-D2fK/A+JYZ1lpTzlvBNbCNvj/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4
-Vwpm+Vganf2XKWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq
-fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX
------END CERTIFICATE-----
-
 GlobalSign Root CA - R3
 =======================
 -----BEGIN CERTIFICATE-----
@@ -4482,3 +4460,220 @@ jP8DOr3Wnfrn3Ja5GmQ+xP3ZCrZlnrqlqFj8OyLwolfuildHnHfHJeGsNAVN84J+QSO6tFfz58YB
 ZddNiZkcaU1eePbrcnE9ssSVAZ9dDLcvJaZceUHvnsRnPKGdf3E60JWX7HhCdJhuvj5oTFc8qJNB
 hwvkua+R+1BMDLrAJCfRFdtlSCEKL9fcfqDMZX55
 -----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G3
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloXDTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4y
+olQPcPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WWIkYFsO2t
+x1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqXxz8ecAgwoNzFs21v0IJy
+EavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFyKJLZWyNtZrVtB0LrpjPOktvA9mxjeM3K
+Tj215VKb8b475lRgsGYeCasH/lSJEULR9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUur
+mkVLoR9BvUhTFXFkC4az5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU5
+1nus6+N86U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7Ngzp
+07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHPbMk7ccHViLVlvMDo
+FxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXtBznaqB16nzaeErAMZRKQFWDZJkBE
+41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTtXUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMB
+AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleu
+yjWcLhL75LpdINyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD
+U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwpLiniyMMB8jPq
+KqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8Ipf3YF3qKS9Ysr1YvY2WTxB1
+v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixpgZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA
+8KCWAg8zxXHzniN9lLf9OtMJgwYh/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b
+8KKaa8MFSu1BYBQw0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0r
+mj1AfsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq4BZ+Extq
+1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR1VmiiXTTn74eS9fGbbeI
+JG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/QFH1T/U67cjF68IeHRaVesd+QnGTbksV
+tzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM94B7IWcnMFk=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden EV Root CA
+================================
+-----BEGIN CERTIFICATE-----
+MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+RVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0yMjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5M
+MR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRl
+cmxhbmRlbiBFViBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkk
+SzrSM4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nCUiY4iKTW
+O0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3dZ//BYY1jTw+bbRcwJu+r
+0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46prfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8
+Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13lpJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gV
+XJrm0w912fxBmJc+qiXbj5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr
+08C+eKxCKFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS/ZbV
+0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0XcgOPvZuM5l5Tnrmd
+74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH1vI4gnPah1vlPNOePqc7nvQDs/nx
+fRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrPpx9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwa
+ivsnuL8wbqg7MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI
+eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u2dfOWBfoqSmu
+c0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHSv4ilf0X8rLiltTMMgsT7B/Zq
+5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTCwPTxGfARKbalGAKb12NMcIxHowNDXLldRqAN
+b/9Zjr7dn3LDWyvfjFvO5QxGbJKyCqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tN
+f1zuacpzEPuKqf2evTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi
+5Dp6Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIaGl6I6lD4
+WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeLeG9QgkRQP2YGiqtDhFZK
+DyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGy
+eUN51q1veieQA6TqJIc/2b3Z6fJfUEkc7uzXLg==
+-----END CERTIFICATE-----
+
+IdenTrust Commercial Root CA 1
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBS
+b290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQwMTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzES
+MBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENB
+IDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ld
+hNlT3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU+ehcCuz/
+mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gpS0l4PJNgiCL8mdo2yMKi
+1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1bVoE/c40yiTcdCMbXTMTEl3EASX2MN0C
+XZ/g1Ue9tOsbobtJSdifWwLziuQkkORiT0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl
+3ZBWzvurpWCdxJ35UrCLvYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzy
+NeVJSQjKVsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZKdHzV
+WYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHTc+XvvqDtMwt0viAg
+xGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hvl7yTmvmcEpB4eoCHFddydJxVdHix
+uuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5NiGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZI
+hvcNAQELBQADggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
+6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwtLRvM7Kqas6pg
+ghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93nAbowacYXVKV7cndJZ5t+qnt
+ozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3+wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmV
+YjzlVYA211QC//G5Xc7UI2/YRYRKW2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUX
+feu+h1sXIFRRk0pTAwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/ro
+kTLql1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG4iZZRHUe
+2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZmUlO+KWA2yUPHGNiiskz
+Z2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7R
+cGzM7vRX+Bi6hG6H
+-----END CERTIFICATE-----
+
+IdenTrust Public Sector Root CA 1
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3Rv
+ciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcNMzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJV
+UzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBS
+b290IENBIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTy
+P4o7ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGyRBb06tD6
+Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlSbdsHyo+1W/CD80/HLaXI
+rcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF/YTLNiCBWS2ab21ISGHKTN9T0a9SvESf
+qy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoS
+mJxZZoY+rfGwyj4GD3vwEUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFn
+ol57plzy9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9VGxyh
+LrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ2fjXctscvG29ZV/v
+iDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsVWaFHVCkugyhfHMKiq3IXAAaOReyL
+4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gDW/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8B
+Af8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMw
+DQYJKoZIhvcNAQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
+t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHVDRDtfULAj+7A
+mgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9TaDKQGXSc3z1i9kKlT/YPyNt
+GtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8GlwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFt
+m6/n6J91eEyrRjuazr8FGF1NFTwWmhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMx
+NRF4eKLg6TCMf4DfWN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4
+Mhn5+bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJtshquDDI
+ajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhAGaQdp/lLQzfcaFpPz+vC
+ZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ
+3Wl9af0AVqW3rLatt8o+Ae+c
+-----END CERTIFICATE-----
+
+S-TRUST Universal Root CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIID2DCCAsCgAwIBAgIQYFbFSyNAW2TU7SXa2dYeHjANBgkqhkiG9w0BAQsFADCBhTELMAkGA1UE
+BhMCREUxKTAnBgNVBAoTIERldXRzY2hlciBTcGFya2Fzc2VuIFZlcmxhZyBHbWJIMScwJQYDVQQL
+Ex5TLVRSVVNUIENlcnRpZmljYXRpb24gU2VydmljZXMxIjAgBgNVBAMTGVMtVFJVU1QgVW5pdmVy
+c2FsIFJvb3QgQ0EwHhcNMTMxMDIyMDAwMDAwWhcNMzgxMDIxMjM1OTU5WjCBhTELMAkGA1UEBhMC
+REUxKTAnBgNVBAoTIERldXRzY2hlciBTcGFya2Fzc2VuIFZlcmxhZyBHbWJIMScwJQYDVQQLEx5T
+LVRSVVNUIENlcnRpZmljYXRpb24gU2VydmljZXMxIjAgBgNVBAMTGVMtVFJVU1QgVW5pdmVyc2Fs
+IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCo4wvfETeFgpq1bGZ8YT/A
+RxodRuOwVWTluII5KAd+F//0m4rwkYHqOD8heGxI7GsvotOKcrKn19nqf7TASWswJYmM67fVQGGY
+4tw8IJLNZUpynxqOjPolFb/zIYMoDYuvWRGCQ1ybTSVRf1gYY2A7s7WKi1hjN0hIkETCQN1d90Np
+KZhcEmVeq5CSS2bf1XUSU1QYpt6K1rtXAzlZmRgFDPn9FcaQZEYXgtfCSkE9/QC+V3IYlHcbU1qJ
+AfYzcg6TOtzoHv0FBda8c+CI3KtP7LUYhk95hA5IKmYq3TLIeGXIC51YAQVx7YH1aBduyw20S9ih
+7K446xxYL6FlAzQvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
+A1UdDgQWBBSafdfr639UmEUptCCrbQuWIxmkwjANBgkqhkiG9w0BAQsFAAOCAQEATpYS2353XpIn
+niEXGIJ22D+8pQkEZoiJrdtVszNqxmXEj03zMjbceQSWqXcy0Zf1GGuMuu3OEdBEx5LxtESO7YhS
+SJ7V/Vn4ox5R+wFS5V/let2qJE8ii912RvaloA812MoPmLkwXSBvwoEevb3A/hXTOCoJk5gnG5N7
+0Cs0XmilFU/RUsOgyqCDRR319bdZc11ZAY+qwkcvFHHVKeMQtUeTJcwjKdq3ctiR1OwbSIoi5MEq
+9zpok59FGW5Dt8z+uJGaYRo2aWNkkijzb2GShROfyQcsi1fc65551cLeCNVUsldOKjKNoeI60RAg
+Ijl9NEVvcTvDHfz/sk+o4vYwHg==
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVy
+bXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ug
+b25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIw
+HhcNMDkwNzA3MTcyNTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoT
+DUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMx
+OTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP
+/vaCeb9zYQYKpSfYs1/TRU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXz
+HHfV1IWNcCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hWwcKU
+s/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1U1+cPvQXLOZprE4y
+TGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0jaWvYkxN4FisZDQSA/i2jZRjJKRx
+AgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ6
+0B7vfec7aVHUbI2fkBJmqzANBgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5Z
+iXMRrEPR9RP/jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
+Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v1fN2D807iDgi
+nWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4RnAuknZoh8/CbCzB428Hch0P+
+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmHVHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xO
+e4pIb4tF9g==
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - EC1
+==========================================
+-----BEGIN CERTIFICATE-----
+MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkGA1UEBhMCVVMx
+FjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVn
+YWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEzMDEGA1UEAxMqRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+IC0gRUMxMB4XDTEyMTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYw
+FAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2Fs
+LXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQg
+dXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
+IEVDMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHy
+AsWfoPZb1YsGGYZPUxBtByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef
+9eNi1KlHBz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVCR98crlOZF7ZvHH3h
+vxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nXhTcGtXsI/esni0qU+eH6p44mCOh8
+kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
+-----END CERTIFICATE-----
+
+CFCA EV ROOT
+============
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJDTjEwMC4GA1UE
+CgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNB
+IEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkxMjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEw
+MC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQD
+DAxDRkNBIEVWIFJPT1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnV
+BU03sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpLTIpTUnrD
+7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5/ZOkVIBMUtRSqy5J35DN
+uF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp7hZZLDRJGqgG16iI0gNyejLi6mhNbiyW
+ZXvKWfry4t3uMCz7zEasxGPrb382KzRzEpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7
+xzbh72fROdOXW3NiGUgthxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9f
+py25IGvPa931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqotaK8K
+gWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNgTnYGmE69g60dWIol
+hdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfVPKPtl8MeNPo4+QgO48BdK4PRVmrJ
+tqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hvcWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAf
+BgNVHSMEGDAWgBTj/i39KNALtbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
+ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObTej/tUxPQ4i9q
+ecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdLjOztUmCypAbqTuv0axn96/Ua
+4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBSESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sG
+E5uPhnEFtC+NiWYzKXZUmhH4J/qyP5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfX
+BDrDMlI1Dlb4pd19xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjn
+aH9dCi77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN5mydLIhy
+PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX
+kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
+ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
+-----END CERTIFICATE-----

data/lib/scrivito/attribute_content.rb

@@ -25,6 +25,7 @@ module AttributeContent
     %w[html string],
     %w[multienum stringlist],
     %w[string html],
+    %w[string text],
     %w[widgetlist widget],
   ]
 
@@ -43,8 +44,6 @@ module AttributeContent
     'widgetlist'    => [],
   }
 
-  extend ActiveSupport::Concern
-
   delegate :attribute_definitions, to: :class
 
   def has_attribute?(attribute_name)
@@ -52,7 +51,8 @@ module AttributeContent
   end
 
   def has_custom_attribute?(attribute_name)
-    if revision.workspace.uses_obj_classes && attribute_definitions.blank?
+    if revision.workspace.uses_obj_classes && attribute_definitions.blank? &&
+        !self.class.special_class?
       Scrivito.raise_obj_class_deprecated_error
     end
     !!attribute_definitions[attribute_name]
@@ -108,15 +108,18 @@ module AttributeContent
   def valid_widget_classes_for(field_name)
   end
 
-  def valid_widget_class_names_for(field)
-    class_names = []
-    (valid_widget_classes_for(field) || Scrivito.models.widgets.to_a).select do |object|
-      widget_class = object.is_a?(Class) ? object : object.to_s.constantize
-      class_names << widget_class.to_s if widget_class.valid_inside_container?(self.class)
+  def valid_widget_ruby_classes_for(field)
+    computed_classes = valid_widget_classes_for(field)
+
+    return Scrivito.models.widgets.to_a unless computed_classes
+
+    type_computer = Widget.type_computer
+    ruby_classes = self.class.convert_to_obj_classes(computed_classes, type_computer) do |name|
+      Rails.logger.warn("Invalid widget class #{name} returned by #valid_widget_classes_for.")
     end
-    class_names
-  end
 
+    ruby_classes.select { |ruby_class| ruby_class.valid_inside_container?(self.class) }
+  end
 
   def modification_for_attribute(attribute_name, revision=Workspace.current.base_revision)
     return Modification::UNMODIFIED unless revision
@@ -174,8 +177,9 @@ module AttributeContent
   def find_attribute_containing_widget(widget_id)
     attribute_definitions.each do |attribute_definition|
       if attribute_definition.widgetlist?
-        attribute_name = attribute_definition.name
-        return attribute_name if data_from_cms.value_of(attribute_name).include?(widget_id)
+        widgetlist_name = attribute_definition.name
+        widgetlist_value = data_from_cms.value_of(widgetlist_name)
+        return widgetlist_name if widgetlist_value && widgetlist_value.include?(widget_id)
       end
     end
     nil
@@ -404,6 +408,47 @@ module AttributeContent
       AttributeDefinitionCollection.new(all_attribute_definitions)
     end
 
+    # @api public
+    #
+    # This method disables the creation of +Objs+ or +Widgets+ of the given type using the UI.
+    # It does not prevent adding these objects programatically.
+    #
+    # By default +hide_from_editor+ is +false+.
+    #
+    # @example Hiding error pages
+    #   class ErrorPage < Obj
+    #     hide_from_editor
+    #   end
+    #
+    # @example Hiding admin widgets
+    #   class AdminWidget < Widget
+    #     hide_from_editor
+    #   end
+    def hide_from_editor
+      @hide_from_editor = true
+    end
+
+    def hide_from_editor?
+      !!@hide_from_editor
+    end
+
+    def special_class?
+      type_computer.special_class?(self)
+    end
+
+    def convert_to_obj_classes(class_names, type_computer)
+      class_names.inject([]) do |classes, class_name|
+        widget_class = type_computer.compute_type_without_fallback(class_name.to_s)
+
+        if widget_class
+          classes << widget_class
+        else
+          yield class_name
+        end
+        classes
+      end
+    end
+
     protected
 
     def assert_valid_attribute_name(name)
@@ -431,10 +476,6 @@ module AttributeContent
 
     private
 
-    def special_class?
-      type_computer.special_class?(self)
-    end
-
     def prepare_obj_class_attribute(attributes)
       if obj_class = attributes['_obj_class']
         assert_valid_obj_class(obj_class)

data/lib/scrivito/attribute_definition_migrator.rb

@@ -17,6 +17,7 @@ class AttributeDefinitionMigrator
     Dir[Rails.root + 'app/models/**/*.rb'].each do |model_path|
       new(model_path).migrate
     end
+    check_abandoned_obj_classes
   end
 
   def migrate
@@ -26,6 +27,8 @@ class AttributeDefinitionMigrator
       if obj_class
         say_status :migrating, relative_path
         inject_attribute_definitions
+        inject_hide_from_editor if hidden_from_editor?
+        check_model_name
       else
         with_padding do
           say %{[warning] Model "#{model_class}" has no corresponding ObjClass in published workspace.
@@ -56,10 +59,22 @@ class AttributeDefinitionMigrator
     model_class.ancestors.include?(BasicWidget) && model_class != ::Widget
   end
 
+  def inject_hide_from_editor
+    inject_into_class(path, model_class, "  hide_from_editor\n\n")
+  end
+
   def inject_attribute_definitions
     inject_into_class(path, model_class, "#{attribute_definitions.join}\n", verbose: false)
   end
 
+  def hidden_from_editor?
+    !obj_class.active? || (page_model? && !template_exists?)
+  end
+
+  def template_exists?
+    lookup_context.template_exists?("#{class_name.underscore}/thumbnail")
+  end
+
   def class_name
     @class_name ||= path.gsub(/^.*\/app\/models/, '').gsub('.rb', '').classify
   end
@@ -99,10 +114,75 @@ class AttributeDefinitionMigrator
     end
   end
 
+  def lookup_context
+    ActionView::LookupContext.new(ActionController::Base.view_paths)
+  end
+
   def obj_class
     @obj_class = ObjClass.find(model_class.name)
   rescue Scrivito::ResourceNotFound
   end
+
+  def check_model_name
+    name = model_class.name
+
+    if page_model? && !name.ends_with?('Page')
+      is_binary = if obj_class.legacy_type?
+        obj_class.binary?
+      else
+        obj_class.attributes.any? { |attr| attr.name == 'blob' && attr.type == 'binary' }
+      end
+
+      unless is_binary
+        with_padding do
+          say %{[warning] The class name of the non-binary obj model "#{name}" does not end with "Page".
+    Class names of page models should end with "Page" in order to be automatically identified by Scrivito as pages.
+    Please ignore this warning if "#{name}" is not a page by design.
+    Otherwise you need to tell Scrivito about this page explicitly. Please add following to an initializer:
+
+      Scrivito.models.define { page "#{name}" }
+          }, :yellow
+        end
+      end
+    end
+
+    if widget_model? && !name.ends_with?('Widget') &&
+        Scrivito.models.widgets.none? { |w| w.name == name }
+      with_padding do
+        say %{[warning] The class name of the widget model "#{name}" does not end with "Widget".
+  Class names of widget models should end with "Widget" in order to be automatically identified by Scrivito as widgets.
+  You need to tell Scrivito about this widget explicitly. Please add following to an initializer:
+
+    Scrivito.models.define { widget "#{name}" }
+        }, :yellow
+      end
+    end
+  end
+
+  class << self
+    include Thor::Actions
+    include Thor::Base
+    include Thor::Shell
+
+    private
+
+    def check_abandoned_obj_classes
+      ObjClass.all.each do |obj_class|
+        next if obj_class.name == 'MigrationStore'
+        begin
+          obj_class.name.constantize
+        rescue NameError
+          with_padding do
+            say %{[warning] Could not find a ruby class for ObjClass "#{obj_class.name}".
+  Plase create a ruby class for that ObjClass and run this script again.
+
+}, :yellow
+          end
+        end
+      end
+
+    end
+  end
 end
 
 end

data/lib/scrivito/attribute_deserializer.rb

@@ -12,6 +12,7 @@ class AttributeDeserializer < Struct.new(:model, :workspace)
     when 'multienum'     then deserialize_multienum_value(attribute_value, attribute_definition)
     when 'reference'     then deserialize_reference_value(attribute_value)
     when 'referencelist' then deserialize_referencelist_value(attribute_value)
+    when 'string'        then deserialize_string_value(attribute_value)
     when 'widget'        then deserialize_legacy_widget_value(attribute_value, attribute_definition)
     when 'widgetlist'    then deserialize_widgetlist_value(attribute_value, attribute_definition)
     else attribute_value
@@ -35,7 +36,7 @@ class AttributeDeserializer < Struct.new(:model, :workspace)
   end
 
   def deserialize_html_value(attribute_value)
-    StringTagging.tag_as_html(attribute_value)
+    StringTagging.tag_as_html(attribute_value || '')
   end
 
   def deserialize_link_value(attribute_value)
@@ -64,7 +65,11 @@ class AttributeDeserializer < Struct.new(:model, :workspace)
   end
 
   def deserialize_multienum_value(attribute_value, attribute_definition)
-    attribute_value & attribute_definition.values
+    if attribute_value
+      attribute_value & attribute_definition.values
+    else
+      []
+    end
   end
 
   def deserialize_reference_value(attribute_value)
@@ -72,7 +77,7 @@ class AttributeDeserializer < Struct.new(:model, :workspace)
   end
 
   def deserialize_referencelist_value(attribute_value)
-    workspace.objs.find(attribute_value).compact
+    attribute_value ? workspace.objs.find(attribute_value).compact : []
   end
 
   def deserialize_internal_link(attribute_value)
@@ -85,6 +90,10 @@ class AttributeDeserializer < Struct.new(:model, :workspace)
     Link.new(attribute_value.slice('url', 'title', 'target').symbolize_keys)
   end
 
+  def deserialize_string_value(attribute_value)
+    attribute_value || ''
+  end
+
   def deserialize_legacy_widget_value(widget_ids, attribute_definition)
     if workspace.uses_obj_classes
       deserialize_widgetlist_value(widget_ids, attribute_definition)

data/lib/scrivito/basic_obj.rb

@@ -12,8 +12,6 @@ module Scrivito
   # @api public
   #
   class BasicObj
-    # @!parse extend Scrivito::AttributeContent::ClassMethods
-
     PublicSystemAttributeDefinition = Class.new(AttributeDefinition)
 
     SYSTEM_ATTRIBUTES = AttributeDefinitionCollection.new(
@@ -43,6 +41,7 @@ module Scrivito
     ].freeze
 
     extend ActiveModel::Naming
+    extend AttributeContent::ClassMethods
 
     include AttributeContent
     include ModelIdentity
@@ -289,6 +288,18 @@ module Scrivito
     def self.valid_page_classes_beneath(parent_path)
     end
 
+    def self.valid_page_ruby_classes_beneath(parent_path)
+      computed_classes = valid_page_classes_beneath(parent_path)
+
+      return Scrivito.models.pages.to_a unless computed_classes
+
+      convert_to_obj_classes(computed_classes, Obj.type_computer) do |class_name|
+        Rails.logger.warn(
+          "Invalid page class #{class_name} returned by #valid_page_classes_beneath."
+        )
+      end
+    end
+
     # Update the {Scrivito::BasicObj Obj} with the attributes provided.
     #
     # For an overview of which values you can set via this method see the

data/lib/scrivito/basic_widget.rb

@@ -3,8 +3,7 @@ module Scrivito
 # The CMS widget class
 # @api public
 class BasicWidget
-  # @!parse extend Scrivito::AttributeContent::ClassMethods
-
+  extend AttributeContent::ClassMethods
   include AttributeContent
 
   def self.type_computer

data/lib/scrivito/cache/file_store.rb

@@ -21,6 +21,11 @@ module Cache
       internal_store.write(key, value, expires_in: expires_in)
     end
 
+    def transform_key(key)
+      # Workaround for rails/rails#15616. Will be fixed in Rails 4.2.
+      Digest::SHA1.hexdigest(key)
+    end
+
     def forward_write?(key, value, expires_in)
       super && !expires_in
     end

data/lib/scrivito/cms_field_tag.rb

@@ -73,7 +73,8 @@ class CmsFieldTag < Struct.new(:view, :tag_name, :obj_or_widget, :field_name)
   private
 
   def build_valid_widget_classes
-    obj_or_widget.valid_widget_class_names_for(field_name).map do |widget_class|
+    obj_or_widget.valid_widget_ruby_classes_for(field_name).map do |widget_class|
+      widget_class = widget_class.to_s
       {
         name: widget_class,
         description: description_for_widget_class(widget_class),

data/lib/scrivito/migrations/migration.rb

@@ -1,57 +1,9 @@
 module Scrivito
   module Migrations
-    # CMS Migrations can alter the structure and content of the CMS and allow
-    # other developers to simultaneously apply changes. Migrations provide a set
-    # of methods to create, update or delete CMS objects, attributes and object
-    # classes.
-    #
-    # @example Simple Migration
-    #
-    #   class CreateTestAttribute < Scrivito::Migrations::Migration
-    #     def up
-    #       ObjClass.find('Homepage').attributes.add(Attribute.new(name: 'test', type: :string))
-    #     end
-    #   end
     class Migration
-      class << self
-        def copy(destination, sources)
-          unless File.exist?(destination)
-            FileUtils.mkdir_p(destination)
-          end
-
-          destination_migrations = Scrivito::Migrations::Migrator.determine_migrations(destination)
-          last = destination_migrations.last
-
-          sources.each do |scope, path|
-            source_migrations = Scrivito::Migrations::Migrator.determine_migrations(path)
-
-            source_migrations.each do |migration|
-              next if duplicate_migration?(destination_migrations, migration.name, scope)
-
-              name = migration.name
-              version = next_migration_number(last ? last.version : 0)
-              filename = File.join(destination, "#{version}_#{name.underscore}.#{scope}.rb")
-
-              new_migration = self.new(name, version, filename, scope)
-
-              FileUtils.cp(migration.filename, new_migration.filename)
-
-              last = new_migration
-              destination_migrations << new_migration
-            end
-          end
-        end
-
-        def duplicate_migration?(migrations, name, scope)
-          migrations.detect do |migration|
-            migration.name == name && migration.scope == scope.to_s
-          end
-        end
-
-        def next_migration_number(current_migration_number)
-          migration_number = current_migration_number + 1
-          [Time.now.utc.strftime('%Y%m%d%H%M%S'), '%.14d' % migration_number].max
-        end
+      def self.next_migration_number(current_migration_number)
+        migration_number = current_migration_number + 1
+        [Time.now.utc.strftime('%Y%m%d%H%M%S'), '%.14d' % migration_number].max
       end
 
       attr_accessor :name

data/lib/scrivito/string_tagging.rb

@@ -5,7 +5,7 @@ module Scrivito
 
     # html flavour
     def self.tag_as_html(string)
-      unless string.blank?
+      if string
         class << string
           include Scrivito::HtmlString
         end

data/lib/tasks/migration.rake

@@ -26,10 +26,5 @@ namespace :scrivito do
         puts exception.message
       end
     end
-
-    desc 'Copy CMS migrations from Engines. Specify Engines to use with FROM=engine1,engine2'
-    task :install => :environment do
-      Scrivito::Migrations::Installer.new(ENV['FROM']).install
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_sdk
 version: !ruby/object:Gem::Version
-  version: 0.60.0.rc1
+  version: 0.60.0.rc2
 platform: ruby
 authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -173,6 +173,7 @@ files:
 - app/views/scrivito/_editing_auth_warning.html.erb
 - app/views/scrivito/blobs/upload_permission.json.jbuilder
 - app/views/scrivito/content_widget/show.html.erb
+- app/views/scrivito/fallback_thumbnail.html.erb
 - app/views/scrivito/objs/copy_widget.html.erb
 - app/views/scrivito/objs/create_widget.html.erb
 - app/views/scrivito/objs/destroy.json.jbuilder
@@ -190,7 +191,6 @@ files:
 - app/views/scrivito/users/suggest.json.jbuilder
 - app/views/scrivito/webservice/empty.json
 - app/views/scrivito/webservice/error.json.jbuilder
-- app/views/scrivito/widget_thumbnail.html.erb
 - app/views/scrivito/workspaces/_workspace.json.jbuilder
 - app/views/scrivito/workspaces/check.json.jbuilder
 - app/views/scrivito/workspaces/create.json.jbuilder
@@ -206,7 +206,6 @@ files:
 - config/locales/en.scrivito.models.yml
 - config/precedence_routes.rb
 - config/routes.rb
-- lib/assets/images/180x120.gif
 - lib/assets/images/scrivito/image_placeholder.png
 - lib/assets/javascripts/scrivito_sdk.js
 - lib/assets/javascripts/scrivito_ui.js
@@ -314,7 +313,6 @@ files:
 - lib/scrivito/migration.rb
 - lib/scrivito/migrations.rb
 - lib/scrivito/migrations/cms_backend.rb
-- lib/scrivito/migrations/installer.rb
 - lib/scrivito/migrations/migration.rb
 - lib/scrivito/migrations/migration_store.rb
 - lib/scrivito/migrations/migrator.rb

data/app/views/scrivito/widget_thumbnail.html.erb

@@ -1,9 +0,0 @@
-<div class="scrivito_editing_widget_visualization">
-  <%= image_tag '180x120.gif' %>
-</div>
-<div class="scrivito_editing_widget_title">
-  <%= widget_class_name %>
-</div>
-<div class="scrivito_editing_widget_description">
-  Missing template "app/views/<%= template_path %>". Please provide one.
-</div>

data/lib/scrivito/migrations/installer.rb

@@ -1,45 +0,0 @@
-module Scrivito
-  module Migrations
-    class Installer
-      def initialize(from)
-        @to_load = from.blank? ? :all : from.split(',').map(&:strip)
-      end
-
-      def install
-        Scrivito::Migrations::Migration.copy(destination, find_engines_with_migrations)
-      end
-
-      private
-
-      def destination
-        Scrivito::Migrations::Migrator.migrations_path
-      end
-
-      def find_engines_with_migrations
-        Rails.application.railties.inject({}) do |railties, railtie|
-          next railties unless @to_load == :all || @to_load.include?(railtie.railtie_name)
-
-          if path = railtie_migration_path_for(railtie)
-            railties[railtie.railtie_name] = path
-          end
-
-          railties
-        end
-      end
-
-      def railtie_migration_path_for(railtie)
-        if railtie.respond_to?(:paths)
-          path = railtie.paths.path + relative_migration_path
-
-          if File.exist?(path)
-            path
-          end
-        end
-      end
-
-      def relative_migration_path
-        Scrivito::Configuration.migration_path
-      end
-    end
-  end
-end