infopark_rails_connector 6.8.0.406.131718077 → 6.8.0.444.171626367

data/app/helpers/rails_connector/default_cms_routing_helper.rb

@@ -5,8 +5,7 @@ module RailsConnector
     # Returns the path for +target+ using the +CmsController+ routes.
     # +target+ can be an +Obj+ or a +Link+ or a +LinkList+.
     # If +target+ is a +Linklist+, it must be non-empty. The first +Link+ from the +LinkList+ will be used.
-    # +options+ are optional and include url settings such as path parameters or protocol
-    # +options+ are only passed on if +target+ is an +Obj+.
+    # +options+ are optional and include url settings such as path parameters or protocol.
     # @return [String]
     # @api public
     def cms_path(target, options = {})
@@ -16,8 +15,7 @@ module RailsConnector
     # Returns the absolute URL for target using the +CmsController+ routes.
     # +target+ can be an +Obj+ or a +Link+ or a +LinkList+.
     # If +target+ is a +Linklist+, it must be non-empty. The first +Link+ from the +LinkList+ will be used.
-    # +options+ are optional and include url settings such as path parameters or protocol
-    # +options+ are only passed on if +target+ is an +Obj+.
+    # +options+ are optional and include url settings such as path parameters or protocol.
     # @return [String]
     # @api public
     def cms_url(target, options = {})
@@ -29,12 +27,12 @@ module RailsConnector
 
     def cms_path_or_url(target, path_or_url, options = {})
       if target.is_a?(Link)
-        cms_path_or_url_for_links(target, path_or_url)
+        cms_path_or_url_for_links(target, path_or_url, options)
       elsif target.is_a?(Obj)
         cms_path_or_url_for_objs(target, path_or_url, options)
       elsif target.respond_to?(:first)
         if target.first.is_a?(Link)
-          cms_path_or_url_for_links(target.first, path_or_url)
+          cms_path_or_url_for_links(target.first, path_or_url, options)
         else
           return LINK_TO_EMPTY_LINKLIST
         end
@@ -44,11 +42,12 @@ module RailsConnector
       end
     end
 
-    def cms_path_or_url_for_links(link, path_or_url)
+    def cms_path_or_url_for_links(link, path_or_url, options = {})
       return LINK_TO_UNREACHABLE if link.internal? && link.destination_object.nil?
-      append_search_and_fragment(
-        basic_url_or_path_for_link(link, path_or_url), link
-      )
+      url = basic_url_or_path_for_link(link, path_or_url, options)
+      url = append_search(url, link) if options.empty?
+
+      append_fragment(url, link)
     end
 
     def cms_path_or_url_for_objs(obj, path_or_url, options = {})
@@ -72,15 +71,18 @@ module RailsConnector
 
     private
 
-    def basic_url_or_path_for_link(link, path_or_url)
+    def basic_url_or_path_for_link(link, path_or_url, options = {})
       if link.internal?
-        __send__("cms_#{path_or_url}", link.destination_object)
+        __send__("cms_#{path_or_url}", link.destination_object, options)
       else
         if link.external_prefix?
-           remove_external_prefix(link.url)
+          url = remove_external_prefix(link.url)
         else
-          link.url
+          url = link.url
         end
+
+        url = merge_options(url, options) if options.any?
+        url
       end
     end
 
@@ -88,11 +90,25 @@ module RailsConnector
       link.gsub(/external:/, "").strip
     end
 
-    def append_search_and_fragment(url,link)
-      result = url
-      result += "?#{link.search}" unless link.search.blank?
-      result += "##{link.fragment}" unless link.fragment.blank?
-      result
+    def append_search(url, link)
+      url += "?#{link.search}" unless link.search.blank?
+      url
     end
+
+    def append_fragment(url, link)
+      url += "##{link.fragment}" unless link.fragment.blank?
+      url
+    end
+
+    def merge_options(url, options)
+      parsed_url = URI.parse(url)
+
+      search = Rack::Utils.parse_query(parsed_url.query)
+      merged_search = search.merge(options.stringify_keys)
+      parsed_url.query = merged_search.to_query
+
+      parsed_url.to_s
+    end
+
   end
 end

data/lib/rails_connector/ses.rb

@@ -61,10 +61,11 @@ module RailsConnector
       # @api public
       attr_reader :doc
 
-      def initialize(id, score, doc={})
+      def initialize(id, score, doc={}, obj=nil)
         @id = id
         @score = score
         @doc = doc
+        @obj = obj
       end
 
       # Returns the hit's corresponding Obj (or nil if none found in the database).

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_rails_connector
 version: !ruby/object:Gem::Version 
-  hash: 263434717
+  hash: 343251185
   prerelease: 
   segments: 
   - 6
   - 8
   - 0
-  - 406
-  - 131718077
-  version: 6.8.0.406.131718077
+  - 444
+  - 171626367
+  version: 6.8.0.444.171626367
 platform: ruby
 authors: 
 - Infopark AG
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-04 00:00:00 +01:00
+date: 2012-12-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency