infopark_fiona7 1.5.2.1.0.pre.beta1 → 1.5.3.2.0.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d09cc0745bc37e2f791a58f3d0e1a8bc99ad16d6
-  data.tar.gz: fc71738b1f4cccedd1bc60583a6821639299514e
+  metadata.gz: 3f8ceabc9a40f129ac8e7d02bf075eed4b08499a
+  data.tar.gz: cd6864e0a21e6eb51a39e9c083cd3d929c6dfc96
 SHA512:
-  metadata.gz: 6dd5dd123b3a866da27aa07a9daa68a6847fe85b94f2257b543390986114359ec8b565ac72db292279382ce65f2ca3eabb1f8cd9c7fe8c03f9de844cc00ac304
-  data.tar.gz: e407f9c445403f1fee0707fa10c28afbc2704e1ce80ff9dfb7ef317db95c3811e957c0bfd6f7e02f8cfb4aa52aedf90f165039bed0f90f7918d6eef148f66364
+  metadata.gz: 0e5d5782ceb31de8e1034673283426fd50f553cd778a7deefb580bd8726389ecb763a35a373cd14951cbfc5f5eb0669e2dd12ca387b296642e805cdb8f63d446
+  data.tar.gz: c5c6e74804cacf6f4d8172e4924f07e8490eb2897f2d7a08baf73c25864b62fefffc608b8cacc28f5c96ade72b6948d2e340166966557d8398f6fa9781e3426f

data/app/assets/javascripts/fiona7_ui.js

@@ -111,12 +111,12 @@
     'commands.release_obj.dialog.confirm': 'Freigeben',
     'commands.release_obj.failed': 'Freigabe fehlgeschlagen',
 
-    'commands.edit_obj.title': 'Seite bearbeiten',
-    'commands.edit_obj.dialog.title': 'Seite bearbeiten?',
+    'commands.edit_obj.title': 'Workflow starten',
+    'commands.edit_obj.dialog.title': 'Workflow starten?',
     'commands.edit_obj.dialog.description': 'Es wird eine neue Arbeitsversion erstellt.',
     'commands.edit_obj.dialog.placeholder': 'Bitte Kommentar eintragen',
-    'commands.edit_obj.dialog.confirm': 'Bearbeiten',
-    'commands.edit_obj.failed': 'Bearbeitung fehlgeschlagen',
+    'commands.edit_obj.dialog.confirm': 'Starten',
+    'commands.edit_obj.failed': 'Workflow fehlgeschlagen',
 
     'commands.forward_obj.title': 'Seite weiterleiten',
     'commands.forward_obj.dialog.title': 'Seite weiterleiten?',
@@ -166,12 +166,12 @@
     'commands.release_obj.dialog.confirm': 'Release',
     'commands.release_obj.failed': 'Release failed',
 
-    'commands.edit_obj.title': 'Edit page',
-    'commands.edit_obj.dialog.title': 'Edit this page?',
+    'commands.edit_obj.title': 'Start a workflow',
+    'commands.edit_obj.dialog.title': 'Start a workflow for this page?',
     'commands.edit_obj.dialog.description': 'A new version of this page will be created.',
     'commands.edit_obj.dialog.placeholder': 'Comment',
-    'commands.edit_obj.dialog.confirm': 'Edit',
-    'commands.edit_obj.failed': 'Edit failed',
+    'commands.edit_obj.dialog.confirm': 'Start a workflow',
+    'commands.edit_obj.failed': 'Workflow failed',
 
     'commands.forward_obj.title': 'Forward page',
     'commands.forward_obj.dialog.title': 'Forward this page?',

data/infopark_fiona7.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   end.sort
 
   s.add_dependency "rails", "~> 4.2.2"
-  s.add_dependency "scrivito", "= 1.5.2"
+  s.add_dependency "scrivito", "= 1.5.3"
   s.add_dependency "scrivito_sdk"
   s.add_dependency "scrivito_editors"
   s.add_dependency "infopark_fiona_connector", "= 7.0.1.beta2"

data/lib/fiona7/attribute_names_from_cms.rb

@@ -10,7 +10,10 @@ module Fiona7
     end
 
     def attributes
+      # Select all known (i.e. registered) classes
       obj_classes = Fiona7::ObjClassesFromCms.new(@type_register).obj_classes
+      # Select classes with the given attribute
+      obj_classes = obj_classes.select {|obj_class| @type_register.read(obj_class).find_attribute(@attribute) }
       obj_classes.map {|obj_class| Fiona7::AttributeNameMangler.new(@attribute, obj_class).mangle }.uniq
     end
   end

data/lib/fiona7/builder/obj_updater.rb

@@ -34,7 +34,13 @@ module Fiona7
 
         ensure_obj_class_exists
 
-        @obj.name = @name unless @name.blank?
+        # NOTE: name is an object attribute and not content attribute
+        # changing content attributes requires permissionWrite
+        # but changing the name attribute requires permissionRoot
+        #
+        # setting the name without changing the value counts
+        # as changing the name attribute for the CM
+        @obj.name = @name if !@name.blank? && @name != @obj.name
         # TODO: move (parent change)
       end
 

data/lib/fiona7/controllers/rest_api/obj_controller.rb

@@ -178,7 +178,13 @@ module Fiona7
             }.to_json)
           end
 
-          response[:facets] = facets.map {|facet| FacetBuilder.new(facet.symbolize_keys, query, klass).build } unless facets.empty?
+          if !facets.empty?
+            if Fiona7.facetting_enabled?
+              response[:facets] = facets.map {|facet| FacetBuilder.new(facet.symbolize_keys, query, klass).build }
+            else
+              response[:facets] = []
+            end
+          end
 
           return ::JSON.parse(::ActiveSupport::JSON.encode(response))
         end

data/lib/fiona7/engine.rb

@@ -126,14 +126,32 @@ module Fiona7
   end
 
   def self.workflows_enabled?
-    true
+    !!self.read_config.features.workflows_enabled
   end
 
-  class Config < Struct.new("Config", :mode, :instance, :host, :port, :username, :secret, :root_mode, :dont_yell_at_me_for_abusing_attributes)
+  def self.facetting_enabled?
+    !!self.read_config.features.facetting_enabled
+  end
+
+  class Config < Struct.new("Config", :mode, :instance, :host, :port, :username, :secret, :root_mode, :dont_yell_at_me_for_abusing_attributes, :features)
+    def initialize(*args)
+      super
+      self.features = Features.new unless self.features
+    end
+  end
+
+  class Features < Struct.new("Features", :workflows_enabled, :facetting_enabled)
+    def initialize(workflows_enabled=true, facetting_enabled=true)
+      super
+    end
   end
 
   mattr_accessor :config
 
+  def self.read_config
+    self.config || raise("Fiona7 gem not configured! Please create `config/initializers/fiona7.rb` and use Fiona7.configure")
+  end
+
   def self.configure(&block)
     self.config = Config.new.tap do |config|
       yield config

data/lib/fiona7/verity_search_engine.rb

@@ -140,14 +140,17 @@ module Fiona7
           fields = [field.to_s]
         else
           fields = Fiona7::AttributeNamesFromQueries.new(field.to_s, @query).attributes || Fiona7::AttributeNamesFromCms.new(field.to_s).attributes || [field.to_s]
+          # NOTE: verity does not like more than 94 fields in its queries
+          # so to be safe we limit the number of fields to 80
+          fields = fields[0, 80]
         end
 
         sanitized_values = values.map {|v| "`#{self.class.sanitize(v)}`" }
-        %|(<#OR> ((#{sanitized_values.join(', ')}) <#IN> (#{fields.join(', ')})))|
+        %|<#OR> ((#{sanitized_values.join(', ')}) <#IN> (#{fields.join(', ')}))|
       end
 
       def search_not_in(field, values)
-        %|(<#NOT> (#{search_in(field, values)}))|
+        %|<#NOT> (#{search_in(field, values)})|
       end
 
       def search_term(field, operator, values, options={})

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "1.5.2.1.0-beta1"
+  VERSION = "1.5.3.2.0-beta1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.5.2.1.0.pre.beta1
+  version: 1.5.3.2.0.pre.beta1
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: scrivito_sdk
   requirement: !ruby/object:Gem::Requirement