Added cascadeCreate parameter to merge users request

Author: OndraFiedler

README.md

@@ -57,7 +57,7 @@ begin
   puts 'Recommend for a user'
   recommended = client.send(UserBasedRecommendation.new('user-25', 5, 'rotationRate' => 0))
   puts "Recommended items: #{recommended}"
-rescue ResponseError => e
+rescue APIError => e
   puts e
 end
 ```

lib/recombee_api_client/api/merge_users.rb

@@ -13,7 +13,7 @@ module RecombeeApiClient
   #Merging happens between two users referred to as the *source* and the *target*. After the merge, all the interactions of the source user are attributed to the target user, and the source user is **deleted** unless special parameter `keepSourceUser` is set `true`.
   #
   class MergeUsers < ApiRequest
-    attr_reader :target_user_id, :source_user_id, :keep_source_user
+    attr_reader :target_user_id, :source_user_id, :keep_source_user, :cascade_create
     attr_accessor :timeout
     attr_accessor :ensure_https
 
@@ -23,17 +23,19 @@ class MergeUsers < ApiRequest
   #   - +source_user_id+ -> ID of the target user.
   #
   # * *Optional arguments (given as hash optional)*
-  #   - +keepSourceUser+ -> If true, the source user will not be deleted, but also kept in the database..
+  #   - +keepSourceUser+ -> If true, the source user will not be deleted, but also kept in the database.
+  #   - +cascadeCreate+ -> Sets whether the user *targetUserId* should be created if not present in the database.
   #
     def initialize(target_user_id, source_user_id, optional = {})
       @target_user_id = target_user_id
       @source_user_id = source_user_id
       @keep_source_user = optional['keepSourceUser']
+      @cascade_create = optional['cascadeCreate']
       @optional = optional
       @timeout = 1000
       @ensure_https = false
       @optional.each do |par, _|
-        fail UnknownOptionalParameter.new(par) unless ["keepSourceUser"].include? par
+        fail UnknownOptionalParameter.new(par) unless ["keepSourceUser","cascadeCreate"].include? par
       end
     end
 
@@ -53,6 +55,7 @@ def body_parameters
     def query_parameters
       params = {}
       params['keepSourceUser'] = @optional['keepSourceUser'] if @optional['keepSourceUser']
+      params['cascadeCreate'] = @optional['cascadeCreate'] if @optional['cascadeCreate']
       params
     end
 

lib/recombee_api_client/version.rb

@@ -1,3 +1,3 @@
 module RecombeeApiClient
-  VERSION = '1.2.1'
+  VERSION = '1.2.3'
 end

spec/api/set_values.rb

@@ -12,6 +12,11 @@
     resp = @client.send(req)
   end
 
+  it 'does not fail with non-ASCII string' do
+    req = described_class.new('entity_id',{'str_property' => 'šřžذ的‎'})
+    resp = @client.send(req)
+  end
+
   it 'sets multiple properties' do
     req = described_class.new('entity_id',{'int_property' => 5,'str_property' => 'test'})
     resp = @client.send(req)