lib/ably/modules/conversions.rb in ably-0.6.2 vs lib/ably/modules/conversions.rb in ably-0.7.0

@@ -3,22 +3,26 @@
   # All methods are private
   module Conversions
     extend self
 
     private
-    def as_since_epoch(time, granularity: :ms)
+    def as_since_epoch(time, options = {})
+      granularity = options.fetch(:granularity, :ms)
+
       case time
       when Time
         time.to_f * multiplier_from_granularity(granularity)
       when Numeric
         time
       else
         raise ArgumentError, 'time argument must be a Numeric or Time object'
       end.to_i
     end
 
-    def as_time_from_epoch(time, granularity: :ms)
+    def as_time_from_epoch(time, options = {})
+      granularity = options.fetch(:granularity, :ms)
+
       case time
       when Numeric
         Time.at(time / multiplier_from_granularity(granularity))
       when Time
         time
@@ -37,11 +41,13 @@
         raise ArgumentError, 'invalid granularity'
       end
     end
 
     # Convert key to mixedCase from mixed_case
-    def convert_to_mixed_case(key, force_camel: false)
+    def convert_to_mixed_case(key, options = {})
+      force_camel = options.fetch(:force_camel, false)
+
       key.to_s.
         split('_').
         each_with_index.map do |str, index|
           if index > 0 || force_camel
             str.capitalize
@@ -63,8 +69,22 @@
         to_sym
     end
 
     def convert_to_lower_case(key)
       key.to_s.gsub('_', '')
+    end
+
+    # Ensures that the string value is converted to UTF-8 encoding
+    # Unless option allow_nil: true, an {ArgumentError} is raised if the string_value is not a string
+    #
+    # @return <void>
+    #
+    def ensure_utf_8(field_name, string_value, options = {})
+      unless options[:allow_nil] && string_value.nil?
+        raise ArgumentError, "#{field_name} must be a String" unless string_value.kind_of?(String)
+      end
+      string_value.encode!(Encoding::UTF_8) if string_value
+    rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError => e
+      raise ArgumentError, "#{field_name} could not be converted to UTF-8: #{e.message}"
     end
   end
 end