infopark_fiona7 1.5.4.3.0 → 1.5.5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48f2e2270c1b9a56258e9a46ef13492dcd835805
-  data.tar.gz: f8c931d72b8a80bc2da52f3af652736e1e8494c6
+  metadata.gz: f0590fa89cace0547e0dbf261e5acf5946c37cc8
+  data.tar.gz: f88431937133bfb08439d6d2ee1f9bc3441e9524
 SHA512:
-  metadata.gz: 9e5ed06ef8ec90a08b28e7ef26dcede484ad4e6c7a8164ae4bd02d0062447b7af90ab54e5fa03a25f9766a0cb4b6286a068919d20114fe87244737cae2862f36
-  data.tar.gz: abc9e5a582f2c4aa46ebce452d923591fd462a4069c862f776cb3804131e3573c966ba9d36eeef4cc25da8dd5dc86bc4577defab72e3d3c0f9eac6f12fddf81b
+  metadata.gz: 9883ff71077c343ba7f33c4f6bae47e2c19ef83a2489ec1d8cf28848be9b9a66a409adea54ed110161ba1be73e655db3cdfc7bba9ee5e41b4cb325727284440f
+  data.tar.gz: 07179e47fe6f27c1cc31bc279f4121e6e0e79cfd4413ee7697b69bc51432315fc87dfda28835344f861adb78d41d622cb6cd9f61a38268aa0752eee6a34e7eb2

data/lib/fiona7/naive_search_engine.rb

@@ -25,11 +25,19 @@ module Fiona7
       obj_class_filter = @query.find {|q| (q[:field] == :_obj_class || q[:field] == "_obj_class") && q[:operator] == :equal }
       id_filter = @query.find {|q| (q[:field] == :id || q[:field] == "id") && q[:operator] == :equal }
       if obj_class_filter
-        @all = @klass.where(obj_class: obj_class_filter[:value])
+        if obj_class_filter[:negate]
+          @all = @klass.where.not(obj_class: obj_class_filter[:value])
+        else
+          @all = @klass.where(obj_class: obj_class_filter[:value])
+        end
         @query.delete(obj_class_filter)
       elsif id_filter
+        if id_filter[:negate]
+          @all = @klass.where.not(obj_id: id_filter[:value])
+        else
+          @all = @klass.where(obj_id: id_filter[:value])
+        end
         @query.delete(id_filter)
-        @all = @klass.where(obj_id: id_filter[:value])
       else
         # FIXME: this is deprecated
         @all = @klass.all
@@ -68,7 +76,6 @@ module Fiona7
 
       sort_field = @sort
       @all = @all.to_a
-      #@all.sort_by! {|o| o.send(:[], resolve_field_name(o,sort_field)) }
       @all.sort! do |a,b|
         a_value = a.send(:[], resolve_field_name(a,sort_field)) 
         b_value = b.send(:[], resolve_field_name(b,sort_field))
@@ -105,38 +112,79 @@ module Fiona7
           if value != ["new", "edited", "deleted"]
             raise "Unsupported modification values: #{value.inspect}. Only #{["new", "edited", "deleted"].inspect} are supported"
           else
-            # TODO: this can be solved with AR, faster
-            @all = @all.to_a.select {|o| o.edited? }
+            if (@all.is_a?(Array))
+              if filter[:negate]
+                @all = @all.to_a.select {|o| !o.edited? }
+              else
+                @all = @all.to_a.select {|o| o.edited? }
+              end
+            else
+              if filter[:negate]
+                @all = @all.where.not(is_edited: '1')
+              else
+                @all = @all.where(is_edited: '1')
+              end
+            end
           end
         elsif field == :_path
           value = [value] unless value.is_a?(Array)
           value.map{|v| v.gsub!('.', '_') }
           if (@all.is_a?(Array))
-            @all = @all.select do |o|
-              value.include?(o.path)
+            if filter[:negate]
+              @all = @all.select do |o|
+                !value.include?(o.path)
+              end
+            else
+              @all = @all.select do |o|
+                value.include?(o.path)
+              end
             end
           else
-            @all = @all.where(:path => value)
+            if filter[:negate]
+              @all = @all.where.not(:path => value)
+            else
+              @all = @all.where(:path => value)
+            end
           end
         elsif field == :_permalink
           value = [value] unless value.is_a?(Array)
           if (@all.is_a?(Array))
-            @all = @all.select do |o|
-              value.include?(o.permalink)
+            if filter[:negate]
+              @all = @all.select do |o|
+                !value.include?(o.permalink)
+              end
+            else
+              @all = @all.select do |o|
+                value.include?(o.permalink)
+              end
             end
           else
-            @all = @all.where(:permalink => value)
+            if filter[:negate]
+              @all = @all.where.not(:permalink => value)
+            else
+              @all = @all.where(:permalink => value)
+            end
           end
         elsif field == :_parent_path
           parent_obj = @klass.where(path: value).first
           if parent_obj
             parent_obj_id = parent_obj.id
             if (@all.is_a?(Array))
-              @all = @all.select do |o|
-                o.parent_obj_id == parent_obj_id
+              if filter[:negate]
+                @all = @all.select do |o|
+                  o.parent_obj_id != parent_obj_id
+                end
+              else
+                @all = @all.select do |o|
+                  o.parent_obj_id == parent_obj_id
+                end
               end
             else
-              @all = @all.where(:parent_obj_id => parent_obj_id)
+              if filter[:negate]
+                @all = @all.where.not(:parent_obj_id => parent_obj_id)
+              else
+                @all = @all.where(:parent_obj_id => parent_obj_id)
+              end
             end
           else
             @all = []
@@ -149,11 +197,18 @@ module Fiona7
               if resolved_field == :obj_id
                 field_value = field_value.to_s
               end
-              # FIXME: linklist, referencelist unsupported
-              if field_value.is_a?(Array)
-                !(value & field_value).empty?
+              if filter[:negate]
+                if field_value.is_a?(Array)
+                  (value & field_value).empty?
+                else
+                  !value.include?(field_value)
+                end
               else
-                value.include?(field_value)
+                if field_value.is_a?(Array)
+                  !(value & field_value).empty?
+                else
+                  value.include?(field_value)
+                end
               end
             end
           else
@@ -163,7 +218,11 @@ module Fiona7
               if resolved_field == :obj_id
                 field_value = field_value.to_s
               end
-              field_value == value
+              if filter[:negate]
+                field_value != value
+              else
+                field_value == value
+              end
             end
           end
         end
@@ -171,14 +230,30 @@ module Fiona7
         if !@all.is_a?(Array) && field.to_sym == :_path
           # TODO: handle this properly
           value = value.first if value.kind_of?(Array)
-          @all = @all.where("path LIKE ?", "#{value}%")
+          if filter[:negate]
+            @all = @all.where.not("path LIKE ?", "#{value}%")
+          else
+            @all = @all.where("path LIKE ?", "#{value}%")
+          end
         else
-          @all = @all.to_a.select {|o| o.send(:[], resolve_field_name(o,field)).to_s.start_with?(value) }
+          if filter[:negate]
+            @all = @all.to_a.select {|o| !o.send(:[], resolve_field_name(o,field)).to_s.start_with?(value) }
+          else
+            @all = @all.to_a.select {|o| o.send(:[], resolve_field_name(o,field)).to_s.start_with?(value) }
+          end
         end
       when :greater_than
-        @all = @all.to_a.select {|o| o.send(:[], resolve_field_name(o,field)).to_s > (value) }
+        if filter[:negate]
+          @all = @all.to_a.select {|o| o.send(:[], resolve_field_name(o,field)).to_s <= (value) }
+        else
+          @all = @all.to_a.select {|o| o.send(:[], resolve_field_name(o,field)).to_s > (value) }
+        end
       when :less_than
-        @all = @all.to_a.select {|o| o.send(:[], resolve_field_name(o,field)).to_s < (value) }
+        if filter[:negate]
+          @all = @all.to_a.select {|o| o.send(:[], resolve_field_name(o,field)).to_s >= (value) }
+        else
+          @all = @all.to_a.select {|o| o.send(:[], resolve_field_name(o,field)).to_s < (value) }
+        end
       else
         raise "Operator: #{filter[:operator]} not supported"
       end

data/lib/fiona7/scrivito_patches/binary.rb

@@ -146,13 +146,14 @@ module Fiona7
         def valid_transformation?
           true && 
             (self.mime_type =~ /image\//) &&
-            (self.width.present? || self.height.present?) &&
             (!self.width.present? || (1..4096).include?(self.width.to_i)) &&
             (!self.height.present? || (1..4096).include?(self.height.to_i)) &&
-            ((1..75).include?(self.quality.to_i)) &&
-            (self.fit == 'clip' || self.fit == 'crop') &&
-            (self.width.to_i + self.height.to_i < 4096) &&
-            (self.fit == 'clip' || (self.width.present? && self.height.present?))
+            ((0..100).include?(self.quality.to_i)) &&
+            (!self.fit.present? || (
+               (self.fit == 'clip' || self.fit == 'crop') &&
+               (self.width.to_i + self.height.to_i < 4096) &&
+               (self.fit == 'clip' || (self.width.present? && self.height.present?))
+            ))
         end
 
         def transformed_filepath
@@ -170,15 +171,21 @@ module Fiona7
 
           image = MiniMagick::Image.open(original_filepath)
 
-          if self.fit == 'clip'
+          if self.fit.blank?
+            image.combine_options do |b|
+              b.quality self.quality.to_i
+            end 
+          elsif self.fit == 'clip'
             image.combine_options do |b|
               b.resize "#{self.width}x#{self.height}>"
+              b.quality self.quality.to_i
             end 
           elsif self.fit == 'crop'
             image.combine_options do |b|
               b.resize "#{self.width}x#{self.height}^"
-              b.gravity "center"
+              b.gravity self.gravity
               b.extent "#{self.width}x#{self.height}>"
+              b.quality self.quality.to_i
             end 
           else
             raise 'invalid fit'
@@ -190,13 +197,30 @@ module Fiona7
 
         def transformed_filename
           ext = ::File.extname(self.original_filepath)
-          "#{self.fit}_#{self.width}_#{self.height}_#{self.quality}#{ext}"
+          "#{self.fit}_#{self.crop}_#{self.width}_#{self.height}_#{self.quality}#{ext}"
         end
 
         def transformation_with_fallback
           @transformation_with_fallback ||= (self.transformation || {}).with_indifferent_access
         end
 
+        CROP_TO_GRAVITY = {
+          'center'  => 'Center',
+          'top'     => 'North',
+          'left'    => 'West',
+          'right'   => 'East',
+          'bottom'  => 'South',
+        }.freeze
+
+
+        def crop
+          self.transformation_with_fallback[:crop].presence || 'center'
+        end
+
+        def gravity
+          CROP_TO_GRAVITY[self.crop] || 'Center'
+        end
+
         def width
           self.transformation_with_fallback[:width].to_s
         end
@@ -210,7 +234,7 @@ module Fiona7
         end
 
         def fit
-          self.transformation_with_fallback[:fit] || 'clip'
+          self.transformation_with_fallback[:fit]
         end
       end
 

data/lib/fiona7/verity_search_engine.rb

@@ -89,7 +89,7 @@ module Fiona7
           # paths are sadly not in the search index by default.
           next if field == :visiblePath
 
-          case q[:operator]
+          condition = case q[:operator]
           when :equal
             if field == :__dummy__
               '("edited" <#IN> state)'
@@ -125,6 +125,12 @@ module Fiona7
           else
             raise "Operator: #{q[:operator]} not supported"
           end
+
+          if q[:negate] && condition.present?
+            condition = %|<#NOT> (#{condition})|
+          end
+
+          condition
         end.compact
 
         if conditions.empty?

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "1.5.4.3.0"
+  VERSION = "1.5.5.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.5.4.3.0
+  version: 1.5.5.3.1
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails