infopark_fiona_connector 6.8.0.539.93842523 → 6.8.1

data/README

@@ -2,4 +2,4 @@
 
 Infopark Fiona Connector integrates {https://rubygems.org/gems/infopark_rails_connector Infopark Rails Connector} with Infopark CMS Fiona.
 
-For more information about Infopark Rails and Fiona Connector, please visit {http://kb.infopark.de/ Infopark’s Knowledge Base}.
+For more information about Infopark Rails and Fiona Connector, please visit {http://kb.infopark.de/ Infopark’s Knowledge Base}. Details about recent changes to the Fiona Connector can be found in the {https://kb.infopark.de/fiona-connector-news Latest News on Rails Connector for CMS Fiona}.

data/lib/infopark_fiona_connector.rb

@@ -16,8 +16,6 @@ module RailsConnector
   end
 
   autoload_all_sources
-
-  autoload :AttrValueProvider, "rails_connector/attr_value_provider_loader"
 end
 
 autoload :Comment, "comment"

data/lib/rails_connector/blob.rb

@@ -36,10 +36,13 @@ module RailsConnector
     def self.initialize_blob_streaming_for(adapter_name)
       # Redefines store_data:
       case adapter_name
-      when /mysql/i:
+      when /mysql$/i
+        raise "Adapter 'mysql' no longer supported. " +
+            "Please change adapter in your database.yml to 'mysql2'."
+      when /mysql2/i
         require "rails_connector/blob_mysql"
         include BlobMysql
-      when /oracle/i:
+      when /oracle/i
         require "rails_connector/blob_oracle"
         include BlobOracle
       end
@@ -59,7 +62,7 @@ module RailsConnector
 
     def store_data_atomically(&block)
       tmp_file = "#{path}.#{Process.pid}"
-      File.open(tmp_file, "w", &block)
+      File.open(tmp_file, "wb", &block)
       File.rename(tmp_file, path)
     end
   end

data/lib/rails_connector/blob_mysql.rb

@@ -1,4 +1,4 @@
-require 'mysql'
+require 'mysql2'
 require 'mysql_blob_streaming'
 
 module RailsConnector
@@ -13,30 +13,20 @@ module RailsConnector
     end
 
     def fetch_into_file(file)
-      mysql = connection.instance_variable_get '@connection'
-      stmt = mysql.prepare("SELECT blob_data FROM #{self.class.table_name} WHERE #{self.class.primary_key}=?")
-
-      class << stmt
-        include MysqlBlobStreaming
-
-        attr_accessor :file
-        attr_accessor :logger
-
-        def handle_data(data)
-          @file << data
-          data = nil
-          GC.start
-        end
+      mysql2_client = connection.instance_variable_get '@connection'
+      ActiveRecord::Base.logger.debug "Streaming blob from MySQL2 into #{file.path}"
+
+      table_name = mysql2_client.escape(self.class.table_name)
+      primary_key = mysql2_client.escape(self.class.primary_key)
+      escaped_id = mysql2_client.escape(id)
+      query = "SELECT `blob_data` FROM `#{table_name}` WHERE `#{primary_key}`='#{escaped_id}'"
+
+      MysqlBlobStreaming.stream(mysql2_client, query, 1.megabyte) do |chunk|
+        file << chunk
+        chunk = nil
+        GC.start
       end
-
-      stmt.logger = ActiveRecord::Base.logger
-      stmt.logger.debug "Streaming blob from MySQL into #{file.path}"
-      stmt.file = file
-      stmt.execute(id)
-      stmt.stream(1.megabyte)
-    ensure
-      stmt.close if stmt
     end
   end
 
-end
+end

data/lib/rails_connector/lucene_search_request.rb

@@ -68,7 +68,7 @@ module RailsConnector
       conditions[:object_type] = 'NOT object_type:image'
       conditions[:suppress_export] = 'NOT suppress_export:1'
       now = Time.now
-      conditions[:valid_from] = "NOT valid_from:[#{now.succ.to_iso} TO *]"
+      conditions[:valid_from] = "NOT valid_from:[#{(now + 1.second).to_iso} TO *]"
       conditions[:valid_until] = "NOT valid_until:[* TO #{now.to_iso}]"
       conditions.merge(@options[:filter_query] || {})
     end

data/lib/rails_connector/obj.rb

@@ -1,4 +1,5 @@
 require "json"
+require 'openssl'
 
 module RailsConnector
 
@@ -8,7 +9,10 @@ module RailsConnector
   # [parent] the Obj of which this one is a child - nil for the root object
   # @api public
   class Obj < CmsBaseModel
-    include AttrValueProvider
+    CRYPT_KEY = "\xd7\x28\x9c\x63\xd6\x29\xdf\x20\xcd\x32\xcf\x30\xcf\x30\xcf\x30\xdf\x20\xb6\x49"\
+        "\x91\x6e\x99\x66\x90\x6f\x8f\x70\x9e\x61\x8d\x72\x94\x6b\xdf\x20\xbe\x41\xb8\x47\xc4\x3b"\
+        "\xdf\x20\xbd\x42\x9a\x65\x8d\x72\x93\x6c\x96\x69\x91\x6e".freeze
+
     include DateAttribute
     include SEO
 
@@ -419,7 +423,26 @@ module RailsConnector
 
     # Returns a nested hash of attribute values.
     def attr_values
-      @attr_values ||= fetch_attr_values
+      @attr_values ||= begin
+        encoded_and_encrypted_attr_values = read_attribute(:attr_values)
+        return {} unless encoded_and_encrypted_attr_values
+        encrypted_attr_values = Base64.decode64(encoded_and_encrypted_attr_values)
+        if !encrypted_attr_values.starts_with?('Salted__') || encrypted_attr_values.length < 16
+          raise 'attr_values has wrong format'
+        end
+        cipher = OpenSSL::Cipher.new('rc4')
+        cipher.decrypt
+        salt = encrypted_attr_values[8..15]
+        cipher.pkcs5_keyivgen(CRYPT_KEY, salt, 1)
+        encrypted_attr_values = encrypted_attr_values[16..-1]
+        if encrypted_attr_values.present?
+          decrypted_attr_values = cipher.update(encrypted_attr_values)
+          decrypted_attr_values << cipher.final
+          JSON.parse(decrypted_attr_values)
+        else
+          {}
+        end
+      end
     end
 
     # Returns a nested hash of attribute definitions.

data/lib/rails_connector/ses/verity_accessor.rb

@@ -26,7 +26,7 @@ module RailsConnector
           :collections => ['cm-contents'],
           :base_query => nil
         }.merge(options)
-        @options[:collections] = options[:collection].to_a.flatten if options.has_key?(:collection)
+        @options[:collections] = Array(options[:collection]).flatten if options.has_key?(:collection)
       end
 
       # Queries the SES and returns a SearchResult.

data/lib/rails_connector/verity_search_request.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module RailsConnector
 
   # This class provides an implementation for accessing the Verity based search server.

metadata

@@ -1,81 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: infopark_fiona_connector
-version: !ruby/object:Gem::Version 
-  hash: 187682853
+version: !ruby/object:Gem::Version
+  version: 6.8.1
   prerelease: 
-  segments: 
-  - 6
-  - 8
-  - 0
-  - 539
-  - 93842523
-  version: 6.8.0.539.93842523
 platform: ruby
-authors: 
+authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-11 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-01-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 1
-        - 16
-        version: "1.16"
-  version_requirements: *id001
-  name: mime-types
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '1.16'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 1
-        - 3
-        version: 1.1.3
-  version_requirements: *id002
+      - !ruby/object:Gem::Version
+        version: '1.16'
+- !ruby/object:Gem::Dependency
   name: mysql_blob_streaming
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  version_requirements: *id003
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
   name: rsolr
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
-description: The Fiona Connector for Infopark CMS Fiona enables you to develop modern, dynamic Web 2.0 applications using Ruby on Rails and at the same time display CMS managed content.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+description: The Fiona Connector for Infopark CMS Fiona enables you to develop modern,
+  dynamic Web 2.0 applications using Ruby on Rails and at the same time display CMS
+  managed content.
 email: info@infopark.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .yardopts
 - README
 - app/helpers/rails_connector/marker_helper.rb
@@ -85,7 +76,6 @@ files:
 - lib/rails_connector/attr_value_provider.bundle
 - lib/rails_connector/attr_value_provider.so
 - lib/rails_connector/attr_value_provider64.so
-- lib/rails_connector/attr_value_provider_loader.rb
 - lib/rails_connector/blob.rb
 - lib/rails_connector/blob_mysql.rb
 - lib/rails_connector/blob_oracle.rb
@@ -106,41 +96,32 @@ files:
 - lib/rails_connector/ses/verity_accessor.rb
 - lib/rails_connector/verity_search_request.rb
 - lib/rating.rb
-has_rdoc: yard
 homepage: http://www.infopark.de
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -935364721
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 17
-      segments: 
-      - 1
-      - 3
-      - 5
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Infopark Fiona Connector
 test_files: []
-
+has_rdoc: yard

data/lib/rails_connector/attr_value_provider_loader.rb

@@ -1,11 +0,0 @@
-begin
-  require "rails_connector/attr_value_provider64"
-rescue LoadError => e1
-  begin
-    require "rails_connector/attr_value_provider"
-  rescue LoadError => e2
-    raise "Could neither load attr_value_provider (#{e2.message}) " +
-        "nor attr_value_provider64 (#{e1.message})."
-  end
-end
-