nurego 1.1.12 → 1.1.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTMyNjE4YTM0ZjY3Y2M4ZjNmZjMyNTZlNmNkY2Q1MGY1MDNjYTg2NA==
+    MDA3Y2VkZWM4MjdmY2FkZWFkYjJmZjJkMDhmYjE2YWE3ZDFhMTQwNw==
   data.tar.gz: !binary |-
-    OWZjNTFkOWYwODA0NDFlMWZmZGNkNzYxZDVmYTUwNGFmYWE1MjUxOQ==
+    MmNkYzg3ZWM0ZGE3Y2IyMWFmYzcxYjcyMTM5YmViOGZiM2Y4Zjc5Yw==
 SHA512:
   metadata.gz: !binary |-
-    NzBkMGExYjEzNTFhMjkxZTNmYmE2NjBkNDMyOTU3NWZmZmViOWQzYzM0OTdm
-    MjQyMmFmMWI2YjRiMjQ2NmJjZmYyOTgyZDcxZTg4MDFkZjhmMzJmY2ExYTE0
-    NjIwODUzNTVlZmIwMjYxNmIxNDVjNjcwMjhiYzdmOWI4YzFjOTk=
+    ZmEzNWUzZTQ1YWY4NGYwYWIwOTkwMzZkODI2MmQ4MjkxNzc2MTBjNmIyNjk5
+    NjBjNjFkMTA4ODAyN2ZlNGM2ZDNmN2MxMzkwM2IxNDNkNzM2NzMzZTZiZmYz
+    Nzg1YmNjM2IyODIxZDgxZjVmNTQwYTdkN2E4ZTRiNGU5NGQxMTc=
   data.tar.gz: !binary |-
-    ZWM0MTkwMzljNWVmZDc4NWM2YjJjYTllOTAxZGRmYTVlMTU0MWFkNzJhZGM4
-    NzgwYTk1NDU2MjhlOTRiN2JiMGUzNTEyNTY1N2FhN2QzNDY3YTM2OTA5OWFk
-    NjY4NDVjYzE5Mjg2NzZjZGVkN2IwODNkODhjYzY3ODUxZDk5NGY=
+    ZTRkNGRjODkwN2RmNjRkOGRjZjFkMDM2ZmNiODU2ZjE0NmZkNTY4MTQxOWEy
+    NDMzYjhjNmJiYTVlMjM1ZDM4MDA1ZjJiMjNlYmVhOWVmMmQ3MTIzNGIyYTMz
+    ODJmNDQ3ZmI2MjMxOTNjMzllMWI0NzNmNDhkZGQ0MTFjZTFiODc=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nurego (1.0.10)
+    nurego (1.1.12)
       cf-uaa-lib (= 1.3.10)
       mime-types (~> 1.25)
       multi_json (>= 1.0.4, < 2)
@@ -19,14 +19,12 @@ GEM
     docile (1.1.3)
     mime-types (1.25.1)
     multi_json (1.10.0)
-    netrc (0.7.7)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (10.3.1)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)

data/VERSION

@@ -1 +1 @@
-1.1.12
+1.1.13

data/lib/nurego.rb

@@ -34,6 +34,8 @@ require 'nurego/feature'
 require 'nurego/bill'
 require 'nurego/payment_method'
 require 'nurego/entitlement'
+require 'nurego/discount'
+require 'nurego/extensions'
 
 
 # Errors
@@ -165,8 +167,7 @@ module Nurego
   end
 
   def self.uri_encode(params)
-    Util.flatten_params(params).
-      map { |k,v| "#{k}=#{Util.url_encode(v)}" }.join('&')
+    params.to_query
   end
 
   def self.request_headers(api_key)

data/lib/nurego/api_operations/update.rb

@@ -14,17 +14,17 @@ module Nurego
       end
 
 
-      def serialize_params(obj)
+      def serialize_params(obj, force = false)
         case obj
         when nil
           ''
         when NuregoObject
-          unsaved_keys = obj.instance_variable_get(:@unsaved_values)
+          unsaved_keys = force ? obj.instance_variable_get(:@values).keys : obj.instance_variable_get(:@unsaved_values)
           obj_values = obj.instance_variable_get(:@values)
           update_hash = {}
 
           unsaved_keys.each do |k|
-            update_hash[k] = serialize_params(obj_values[k])
+            update_hash[k] = serialize_params(obj_values[k], true)
           end
 
           update_hash

data/lib/nurego/customer.rb

@@ -15,8 +15,8 @@ module Nurego
       '/v1/customers/me'
     end
 
-    def self.update_plan(plan_guid, org_guid = nil)
-      response, api_key = Nurego.request(:put, "/v1/customers/plan", nil, { :plan_id => plan_guid, :org_id => org_guid })
+    def self.update_plan(plan_id, external_ids = true)
+      response, api_key = Nurego.request(:put, "/v1/customers/plan", nil, { :plan_id => plan_id, :external_ids => external_ids })
       Util.convert_to_nurego_object(response, api_key)
     end
 

data/lib/nurego/discount.rb

@@ -0,0 +1,6 @@
+module Nurego
+  class Discount < APIResource
+    include Nurego::APIOperations::List
+
+  end
+end

data/lib/nurego/extensions.rb

@@ -0,0 +1,21 @@
+class Object
+  def to_query(key)
+    require 'cgi' unless defined?(CGI) && defined?(CGI::escape)
+    "#{CGI.escape(key.to_s)}=#{CGI.escape(to_s)}"
+  end
+end
+
+class Array
+  def to_query(key)
+    prefix = "#{key}[]"
+    collect { |value| value.to_query(prefix) }.join '&'
+  end
+end
+
+class Hash
+  def to_query(namespace = nil)
+    collect do |key, value|
+      value.to_query(namespace ? "#{namespace}[#{key}]" : key)
+    end.sort * '&'
+  end
+end

data/lib/nurego/util.rb

@@ -28,6 +28,7 @@ module Nurego
         'feature' => Feature,
         'paymentmethod' => PaymentMethod,
         'bill' => Bill,
+        'discount' => Discount,
         'list' => ListObject
       }
     end
@@ -77,6 +78,7 @@ module Nurego
       URI.escape(key.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
     end
 
+=begin
     def self.flatten_params(params, parent_key=nil)
       result = []
       params.each do |key, value|
@@ -105,5 +107,6 @@ module Nurego
       end
       result
     end
+=end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nurego
 version: !ruby/object:Gem::Version
-  version: 1.1.12
+  version: 1.1.13
 platform: ruby
 authors:
 - Ilia Gilderman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -210,6 +210,7 @@ files:
 - lib/nurego/bill.rb
 - lib/nurego/connector.rb
 - lib/nurego/customer.rb
+- lib/nurego/discount.rb
 - lib/nurego/entitlement.rb
 - lib/nurego/errors/api_connection_error.rb
 - lib/nurego/errors/api_error.rb
@@ -218,6 +219,7 @@ files:
 - lib/nurego/errors/invalid_request_error.rb
 - lib/nurego/errors/nurego_error.rb
 - lib/nurego/errors/user_not_found_error.rb
+- lib/nurego/extensions.rb
 - lib/nurego/feature.rb
 - lib/nurego/instance.rb
 - lib/nurego/json.rb