ms_rest 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 557c3c233a2d26e6bd39063c570ab562ed7fc98b
-  data.tar.gz: ee941f9448f40926491505a0bc5e5d3ff018b5fb
+  metadata.gz: 6002241e297f352e09b8b7e66ccccf2c6dd11817
+  data.tar.gz: f4326806d9a7ef67e857d06ef40f1dc54c6fa418
 SHA512:
-  metadata.gz: 5ea7bb73cf7dccc48a7d43187c7e7b0034d0b22bacfd93c824b7016fdbbc5ea90be2754e594140311819a935587bac3983c34c9addc365fd6e4f445a7f6b94fc
-  data.tar.gz: 930bfd23cbfbd0ebbb24f84557744efa637b127d86139584777e7f803eee2da55d685144642d119b85abb763896f062a238920ae869df91b1028a39a971b7da9
+  metadata.gz: 3b9dda5a36648483b1ba2c4c12de38e3942ce32abe051b7f997c1742808b28115431ead4b5e20000a9b61fad3cba7b454957a0494bc8248ff2d3d2bb528ffaac
+  data.tar.gz: 97abece3a32d63a121cd3a47656af95045efe319e12efca496939a0a8d6444aaa42c297a89cfda64db8117b06bcf2cebaa26225b5db57db2bc475f545c22fc1f

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+##2017.06.30 ms_rest version 0.7.0
+* [Breaking Change] Refactored serialization & deserialization logic to remove client from the process.[Issue #610](https://github.com/Azure/azure-sdk-for-ruby/issues/610) [PR #799](https://github.com/Azure/azure-sdk-for-ruby/pull/799)
+
 ##2017.04.04 ms_rest version 0.6.4
 * Bug fix to handle new faraday version. [Issue #182](https://github.com/Azure/vagrant-azure/issues/182)
 

data/README.md

@@ -48,7 +48,7 @@ To start working on the gem the only additional dev dependency is required - rsp
 Reference it in the gemfile and also add this line to your client's gemspec file:
 
 ```ruby
-spec.add_runtime_dependency 'ms_rest', '~> 0.6.4'
+spec.add_runtime_dependency 'ms_rest', '~> 0.7.0'
 ```
 Don't forget to correct the version.
 

data/lib/ms_rest/jsonable.rb

@@ -9,10 +9,12 @@ module MsRest
 
     #
     # Serialize the object to JSON
+    # @param options [Hash] hash map contains options to convert to json.
     # @return [String] JSON serialized version of the object
     #
-    def to_json
-      serialize(self.class.mapper, self)
+    def to_json(options = nil)
+      mapper = self.class.mapper if options.nil? || !options.key?(:mapper)
+      serialize(mapper, self)
     end
 
     #
@@ -20,8 +22,9 @@ module MsRest
     # @param json [String] JSON string representation of the object
     # @return [JSONable] object built from json input
     #
-    def from_json(json)
-      deserialize(self.class.mapper, json)
+    def from_json(json, mapper = nil)
+      mapper = self.class.mapper if mapper.nil?
+      deserialize(mapper, json)
     end
 
     #

data/lib/ms_rest/serialization.rb

@@ -15,8 +15,8 @@ module MsRest
     # @param response_body [Hash] Ruby Hash object to deserialize.
     # @param object_name [String] Name of the deserialized object.
     #
-    def deserialize(mapper, response_body, object_name = nil)
-      build_serializer.deserialize(mapper, response_body, object_name)
+    def deserialize(mapper, response_body)
+      build_serializer.deserialize(mapper, response_body)
     end
 
     #
@@ -26,8 +26,8 @@ module MsRest
     # @param object [Object] Ruby object to serialize.
     # @param object_name [String] Name of the serialized object.
     #
-    def serialize(mapper, object, object_name = nil)
-      build_serializer.serialize(mapper, object, object_name)
+    def serialize(mapper, object)
+      build_serializer.serialize(mapper, object)
     end
 
     private
@@ -54,10 +54,10 @@ module MsRest
       # @param response_body [Hash] Ruby Hash object to deserialize.
       # @param object_name [String] Name of the deserialized object.
       #
-      def deserialize(mapper, response_body, object_name)
+      def deserialize(mapper, response_body)
         return response_body if response_body.nil?
 
-        object_name = mapper[:serialized_name] unless object_name.nil?
+        object_name = mapper[:serialized_name]
         mapper_type = mapper[:type][:name]
 
         if !mapper_type.match(/^(Number|Double|ByteArray|Boolean|Date|DateTime|DateTimeRfc1123|UnixTime|Enum|String|Object|Stream)$/i).nil?
@@ -131,7 +131,7 @@ module MsRest
 
         result = Hash.new
         response_body.each do |key, val|
-          result[key] = deserialize(mapper[:type][:value], val, object_name)
+          result[key] = deserialize(mapper[:type][:value], val)
         end
         result
       end
@@ -177,7 +177,7 @@ module MsRest
               levels.each { |level| sub_response_body = sub_response_body.nil? ? nil : sub_response_body[level.to_s] }
             end
 
-            result.instance_variable_set("@#{key}", deserialize(val, sub_response_body, object_name)) unless sub_response_body.nil?
+            result.instance_variable_set("@#{key}", deserialize(val, sub_response_body)) unless sub_response_body.nil?
           end
         end
         result
@@ -199,7 +199,7 @@ module MsRest
 
         result = []
         response_body.each do |element|
-          result.push(deserialize(mapper[:type][:element], element, object_name))
+          result.push(deserialize(mapper[:type][:element], element))
         end
 
         result
@@ -212,8 +212,8 @@ module MsRest
       # @param object [Object] Ruby object to serialize.
       # @param object_name [String] Name of the serialized object.
       #
-      def serialize(mapper, object, object_name)
-        object_name = mapper[:serialized_name] unless object_name.nil?
+      def serialize(mapper, object)
+        object_name = mapper[:serialized_name]
 
         # Set defaults
         unless mapper[:default_value].nil?
@@ -297,7 +297,7 @@ module MsRest
             value.validate
           end
 
-          payload[key] = serialize(mapper[:type][:value], value, object_name)
+          payload[key] = serialize(mapper[:type][:value], value)
         end
         payload
       end
@@ -339,7 +339,7 @@ module MsRest
               next
             end
 
-            sub_payload = serialize(value, instance_variable, object_name)
+            sub_payload = serialize(value, instance_variable)
 
             unless value[:serialized_name].to_s.include? '.'
               payload[value[:serialized_name].to_s] = sub_payload unless sub_payload.nil?
@@ -380,7 +380,7 @@ module MsRest
           if !element.nil? && element.respond_to?(:validate)
             element.validate
           end
-          payload.push(serialize(mapper[:type][:element], element, object_name))
+          payload.push(serialize(mapper[:type][:element], element))
         end
         payload
       end
@@ -391,13 +391,19 @@ module MsRest
       # @param model_name [String] Name of the model to retrieve.
       #
       def get_model(model_name)
-        consts = @context.class.to_s.split('::')
-        if consts.any?{ |const| const == 'Models' }
-          # context is a model class
-          @context.class
-        else
-          # context is a service, so find the model class
-          Object.const_get(consts[0...-1].join('::') + "::Models::#{model_name}")
+        begin
+          consts = @context.class.to_s.split('::')
+          end_index = 0
+          if consts.any?{ |const| const == 'Models' }
+            # context is a model class
+            end_index = -2
+          else
+            # context is a service, so find the model class
+            end_index = -1
+          end
+          Object.const_get(consts[0...end_index].join('::') + "::Models::#{model_name}")
+        rescue
+          Object.const_get("MsRestAzure::#{model_name}")
         end
       end
 

data/lib/ms_rest/version.rb

@@ -3,5 +3,5 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 
 module MsRest
-  VERSION = '0.6.4'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ms_rest
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler