nurego 1.1.21 → 1.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fd050b25a4f218e696b283b83fd92b53465043e
-  data.tar.gz: 561bd9c4233c2434914894f4dec6cd02d331542a
+  metadata.gz: c74351863623bde7e41f9ae426e773d7199a7237
+  data.tar.gz: b4b994925e0241cccf45a746b8dab9cd978c3352
 SHA512:
-  metadata.gz: bf5b1c5b5f4be28293466ff82ed203b27ee165c6647d798c3b48f37a446db3b27a77bf525567d49089d3db400a362a768f0107ad453a8464aced6b8bbb0d1c94
-  data.tar.gz: 515e3d7888256c0a9d8454b37923f55e11d16277644208290d9388da69fef4c4018f8fdf8375a7515c0bc9d64ee6017fffca9c8c1f18397ae3c8b5e23efebaaa
+  metadata.gz: 5c0218315ee123e7165251ff49405ec4770e80d2c4d47278dcd67e53c28d4af3f3565ad200dd7a13863853afee657b0a2e200662b78d07f64353c4ed746a7633
+  data.tar.gz: a787e22d34732aea76ea3c139b8f018225ce3f6c1447271159207461f687cb6d6af2e9cfe4139a6096416b39eb5592c45b188ab1f453af7b3bc3dade102b8cd2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nurego (1.1.20)
+    nurego (1.1.21)
       cf-uaa-lib (= 1.3.10)
       mime-types (~> 1.25)
       multi_json (>= 1.0.4, < 2)
@@ -17,14 +17,19 @@ GEM
       builder (>= 2.1.2)
     diff-lcs (1.2.5)
     docile (1.1.3)
+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
     mime-types (1.25.1)
-    multi_json (1.10.1)
-    netrc (0.10.2)
+    multi_json (1.11.2)
+    netrc (0.10.3)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (10.3.1)
-    rest-client (1.7.2)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     rspec (2.14.1)
@@ -44,6 +49,9 @@ GEM
     simplecov-html (0.8.0)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
     uuidtools (2.1.4)
 
 PLATFORMS

data/VERSION

@@ -1 +1 @@
-1.1.21
+1.1.22

data/examples/complete_example.rb

@@ -5,9 +5,6 @@ begin
     setup_login_and_login(true)
     @email = "integration.test+#{UUIDTools::UUID.random_create.to_s}@openskymarkets.com"
 
-
-
-
     # retrieve catalog
     catalog  = Nurego::Catalog.retrieve()
     puts "Retrieve a catalog:\n" ,catalog[:data]
@@ -42,9 +39,6 @@ begin
     org = Nurego::Organization.retrieve(org_id)
     puts "Retrieve an organization by guid:\n" , org , "\n"
 
-    entitlements = Nurego::Entitlement.all(org_id)
-    puts "Retrieve entitlements by organization guid\n" , entitlements, "\n"
-
     #create a new subscription
     params = {}
     params[:plan_id] = current_offering.plans[:data][2][:id]
@@ -59,16 +53,17 @@ begin
     updatedsub = Nurego::Subscription.update(org_id,sub.id,newplan)
     puts "The Customer subscription (notice the plan update):\n", Nurego::Customer.me.subscriptions , "\n"
 
-    #cancel subscription
-    updatedsub.cancel
-    puts "The Customer subscription (notice end date:\n", Nurego::Customer.me.subscriptions , "\n"
+    entitlements = Nurego::Entitlement.all(updatedsub.id)
+    puts "Retrieve entitlements by subscription guid\n" , entitlements, "\n"
 
     # update usage
-    entitlement = org.entitlements.first
-    Nurego::Entitlement.set_usage(org_id,entitlement.id, 13)
-    puts "Notice the usage of #{entitlement.id} is now set to 13:\n", Nurego::Organization.retrieve(org_id).entitlements.first, "\n"
-
+    entitlement = updatedsub.entitlements.first
+    Nurego::Entitlement.set_usage(updatedsub.id,entitlement.id, 13)
+    puts "Notice the usage of #{entitlement.id} is now set to 13:\n", Nurego::Subscription.retrieve(updatedsub.id).entitlements.first, "\n"
 
+    #cancel subscription
+    updatedsub.cancel
+    puts "The Customer subscription (notice end date:\n", Nurego::Customer.me.subscriptions , "\n"
 
   end
 

data/lib/nurego/entitlement.rb

@@ -3,7 +3,15 @@ module Nurego
     include Nurego::APIOperations::List
     include Nurego::APIOperations::Create
 
-    def self.set_usage(organization_id, feature_id, amount)
+    def self.set_usage(subscription_id, feature_id, amount)
+      payload = {
+          feature_id: feature_id,
+          amount: amount,
+      }
+      response, api_key = Nurego.request(:post, "/v1/subscriptions/#{subscription_id}/entitlements/usage", nil, payload)
+    end
+
+    def self.set_usage_by_organization(organization_id, feature_id, amount)
       payload = {
           feature_id: feature_id,
           amount: amount,
@@ -11,7 +19,12 @@ module Nurego
       response, api_key = Nurego.request(:post, "/v1/organizations/#{organization_id}/entitlements/usage", nil, payload)
     end
 
-    def self.all(organization_id, filters={}, api_key=nil)
+    def self.all(subscription_id, filters={}, api_key=nil)
+      response, api_key = Nurego.request(:get, "/v1/subscriptions/#{subscription_id}/entitlements", api_key, filters)
+      Util.convert_to_nurego_object(response, api_key)
+    end
+
+    def self.all_by_organization(organization_id, filters={}, api_key=nil)
       response, api_key = Nurego.request(:get, "/v1/organizations/#{organization_id}/entitlements", api_key, filters)
       Util.convert_to_nurego_object(response, api_key)
     end

data/lib/nurego/organization.rb

@@ -16,7 +16,7 @@ module Nurego
     end
 
     def entitlements(feature_id = nil)
-      Entitlement.all(id, {:feature_id => feature_id, :external_ids => 'false' }, @api_key)
+      Entitlement.all_by_organization(id, {:feature_id => feature_id}, @api_key)
     end
 
     def subscriptions(params = {}, api_key = nil)

data/lib/nurego/subscription.rb

@@ -17,7 +17,7 @@ module Nurego
       if values.length > 0
         values.delete(:id)
 
-        response, api_key = Nurego.request(:post, url(self.organization_id), @api_key, values)
+        response, api_key = Nurego.request(:put, url(self.organization_id), @api_key, values)
         refresh_from(response, api_key)
       end
       self
@@ -56,5 +56,9 @@ module Nurego
       Util.convert_to_nurego_object(response, api_key)
     end
 
+    def entitlements(feature_id = nil)
+      Entitlement.all(id, {:feature_id => feature_id}, @api_key)
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nurego
 version: !ruby/object:Gem::Version
-  version: 1.1.21
+  version: 1.1.22
 platform: ruby
 authors:
 - Ilia Gilderman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the Nurego API