playerconnect-wsdsl 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/response.rb

@@ -29,7 +29,7 @@ class WSDSL
     # @return [Array<WSDSL::Response::Element>]
     # @api public
     def element(opts={})
-      el = Element.new(opts[:name], opts[:type], opts[:required])
+      el = Element.new(opts)
       yield(el) if block_given?
       @elements << el
     end
@@ -60,6 +60,9 @@ class WSDSL
       # @api public
       attr_reader :type
 
+      # @api public
+      attr_reader :opts
+
       # @return [Array<WSDSL::Response::Element::Attribute>] An array of attributes
       # @api public
       attr_reader :attributes
@@ -78,15 +81,19 @@ class WSDSL
       # param [String, Symbol] name The name of the element
       # param [String, Symbol] type The optional type of the element
       # @api public
-      def initialize(name, type=nil, required=nil)
+      def initialize(opts={})
+        opts[:type] ||= nil
+        opts[:required] ||= nil
+
         # sets a documentation placeholder since the response doc is defined at the same time
         # the response is defined.
-        @doc        = Documentation::ElementDoc.new(name)
-        @name       = name
-        @type       = type
-        @required   = !(required==false)
+        @name       = opts.delete(:name) if(opts.has_key?(:name))
+        @doc        = Documentation::ElementDoc.new(@name)
+        @type       = opts.delete(:type) if(opts.has_key?(:type))
+        @required   = !(opts.delete(:required)==false)
         @attributes = []
         @vectors    = []
+        @opts       = opts
         # we don't need to initialize the nested elements, by default they should be nil
       end
 
@@ -172,7 +179,7 @@ class WSDSL
       # @return [Array<WSDSL::Response::Element>]
       # @api public
       def element(opts={})
-        el = Element.new(opts[:name], opts[:type], opts[:required])
+        el = Element.new(opts)
         yield(el) if block_given?
         @elements ||= []
         @elements << el
@@ -237,6 +244,9 @@ class WSDSL
         # @api public
         attr_reader :obj_type
 
+        # @api public
+        attr_reader :opts
+
         # @api public
         attr_accessor :required
 
@@ -265,9 +275,11 @@ class WSDSL
         #
         # @api public
         def initialize(opts)
-          @name       = opts[:name]
-          @obj_type   = opts[:type]
-          @required   = !(opts[:required] == false)
+          opts[:required] ||= false
+          @name       = opts.delete(:name) if opts.has_key?(:name)
+          @obj_type   = opts.delete(:type) if opts.has_key?(:type)
+          @required   = !(opts.delete(:required) == false)
+          @opts       = opts
           @attributes = []
         end
 
@@ -296,7 +308,7 @@ class WSDSL
         # @return [Array<WSDSL::Response::Element>]
         # @api public
         def element(opts={})
-          el = Element.new(opts[:name], opts[:type], opts[:required])
+          el = Element.new(opts)
           yield(el) if block_given?
           @elements ||= []
           @elements << el

data/playerconnect-wsdsl.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "playerconnect-wsdsl"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Team SDOD"]

data/spec/params_verification_spec.rb

@@ -139,12 +139,4 @@ describe ParamsVerification do
     lambda{ ParamsVerification.validate!(params, service.defined_params) }.should raise_exception
   end
 
-  it "should not mutate nested params to a serialized ruby object" do
-    service = WSList.all.find{|s| s.url == "services/test_deep_nested_params"}
-    service.should_not be_nil
-    params = {"analytics"=>{"accountId"=>"456", "events"=>[{"eventInfo"=>"asdf", "eventInfo2"=>"asdf"}, {"eventInfo"=>"asdfasdf", "eventInfo2"=>"asdfasdf"}], "sessionId"=>"123"}}
-    validated = ParamsVerification.validate!(params, service.defined_params)
-    validated[:analytics][:events].should be == params['analytics']['events']
-  end
-
 end

data/spec/test_services.rb

@@ -75,19 +75,6 @@ describe_service "services" do |service|
 
 end
 
-describe_service "services/test_deep_nested_params" do |service|
-  service.formats  :json
-  service.http_verb :post
-
-  service.params do |p|
-    p.namespace :analytics do |a|
-      a.string :accountId, :required => true
-      a.string :sessionId, :required => true
-      a.string :events, :required => true
-    end
-  end
-end
-
 describe_service "services/array_param" do |s|
   s.formats :xml
   s.http_verb :post

data/wsdsl.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wsdsl}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Aimonetti"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: playerconnect-wsdsl
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors: