nurego 1.1.18 → 1.1.19

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nurego (1.1.17)
+    nurego (1.1.19)
       cf-uaa-lib (= 1.3.10)
       mime-types (~> 1.25)
       multi_json (>= 1.0.4, < 2)

data/VERSION

@@ -1 +1 @@
-1.1.18
+1.1.19

data/lib/nurego.rb

@@ -38,6 +38,8 @@ require 'nurego/entitlement'
 require 'nurego/discount'
 require 'nurego/legal_doc'
 require 'nurego/extensions'
+require 'nurego/subscription'
+require 'nurego/cf/broker_utility'
 
 
 # Errors

data/lib/nurego/cf/broker_utility.rb

@@ -0,0 +1,97 @@
+module Nurego
+  module Cf
+    class BrokerUtility
+      PROVIDER = 'cloud-foundry'
+      @external_ids = true
+
+      class << self
+        attr_accessor :external_ids
+      end
+
+      def self.provision(params)
+        return nil if nurego_notified(params)
+        raise InvalidRequestError.new('Invalid parameter instance_id', 'instance_id') unless params['instance_id']
+        create_params = { provider: PROVIDER,
+                          external_subscription_id: params['instance_id'],
+                          plan_id: params['plan_id'],
+                          skip_service_webhook: true
+        }
+        Subscription.create(params['organization_guid'], create_params)
+      end
+
+      def self.update(params)
+        return nil if nurego_notified(params)
+        raise InvalidRequestError.new('Invalid parameter instance_id', 'instance_id') unless params['instance_id']
+        sub = Subscription.retrieve(params['instance_id'])
+        sub.plan_id = params['plan_id']
+        sub.provider = PROVIDER
+        sub.skip_service_webhook = true
+        sub.save
+      end
+
+      def self.deprovision(params)
+        return nil if nurego_notified(params)
+        raise InvalidRequestError.new('Invalid parameter instance_id', 'instance_id') unless params['instance_id']
+        sub = Subscription.retrieve(params['instance_id'])
+        sub.delete({ provider: PROVIDER, skip_service_webhook: true })
+      end
+
+      def self.nurego_notified(params)
+        params['nurego_notified'] == true
+      end
+
+      def self.get_service_catalog(service_id)
+        service = Service.retrieve(service_id)
+        service_to_cloud_foundry_catalog(service)
+      end
+
+      private
+
+      def self.service_to_cloud_foundry_catalog(service)
+        cf_catalog = {
+            offer_id: service.offerings.first['id'],
+            offer_name: service.offerings.first['name'],
+            offer_description: service.offerings.first['description'],
+            services: []
+        }
+        cf_service = {
+            # required
+            id: service['id'],
+            name: service['name'],
+            description: service['description'],
+            bindable: true,
+            plans: []
+
+            ## possible
+            # tags: [],
+            # metadata: Object,
+            # requires: [],
+            # plan_updateable: true,
+            # dashboard_client: Object {id,secret,redirect_uri}
+
+        }
+        service.offerings.first['plans']['data'].each do | nurego_plan |
+          cf_plan = {
+              # required
+              id: nurego_plan['id'],
+              name: nurego_plan['name'],
+              description: nurego_plan['description'] || " ",
+
+              ## possible
+              # metadata: Object,
+              # free: true,
+          }
+
+          recurring = nurego_plan['features']['data'].find { | feature | feature['element_type'] == 'recurring' }
+          cf_plan[:free] = !(recurring && recurring['price'] > 0)
+
+          cf_service[:plans] << cf_plan # Add plans to the service
+        end
+        cf_catalog[:services] << cf_service # Add service to offer
+
+        cf_catalog.to_json
+      end
+
+    end
+  end
+end

data/lib/nurego/customer.rb

@@ -15,8 +15,8 @@ module Nurego
       '/v1/customers/me'
     end
 
-    def self.update_plan(plan_id)
-      response, api_key = Nurego.request(:put, "/v1/customers/plan", nil, { :plan_id => plan_id })
+    def self.update_plan(plan_id, sub_id)
+      response, api_key = Nurego.request(:post, "/v1/customers/subscriptions/#{CGI.escape(sub_id)}", nil, { :plan_id => plan_id })
       Util.convert_to_nurego_object(response, api_key)
     end
 

data/lib/nurego/entitlement.rb

@@ -8,7 +8,7 @@ module Nurego
           feature_id: feature_id,
           amount: amount,
       }
-      response, api_key = Nurego.request(:put, "/v1/organizations/#{id}/entitlements/usage", nil, payload)
+      response, api_key = Nurego.request(:post, "/v1/organizations/#{id}/entitlements/usage", nil, payload)
     end
 
     def self.all(organization_id, filters={}, api_key=nil)

data/lib/nurego/organization.rb

@@ -28,6 +28,11 @@ module Nurego
       Util.convert_to_nurego_object(response, api_key)
     end
 
+    def feature_data(params = {}, api_key = nil)
+      response, api_key = Nurego.request(:get, url + "/feature_data", api_key, params)
+      Util.convert_to_nurego_object(response, api_key)
+    end
+
     def cancel(params = {}, api_key = nil)
       response, api_key = Nurego.request(:post, url + '/cancel', api_key, params)
       Util.convert_to_nurego_object(response, api_key)

data/lib/nurego/service.rb

@@ -2,55 +2,5 @@ module Nurego
 
   class Service < APIResource
 
-    def to_cloud_foundry_catalog
-      service_to_cloud_foundry_catalog.to_json
-    end
-
-    private
-
-    def service_to_cloud_foundry_catalog
-      cf_catalog = {
-          offer_id: self.offerings.first['id'],
-          offer_name: self.offerings.first['name'],
-          offer_description: self.offerings.first['description'],
-          services: []
-      }
-      cf_service = {
-          # required
-          id: self['id'],
-          name: self['name'],
-          description: self['description'],
-          bindable: true,
-          plans: []
-
-          ## possible
-          # tags: [],
-          # metadata: Object,
-          # requires: [],
-          # plan_updateable: true,
-          # dashboard_client: Object {id,secret,redirect_uri}
-
-      }
-      self.offerings.first['plans']['data'].each do | nurego_plan |
-        cf_plan = {
-            # required
-            id: nurego_plan['id'],
-            name: nurego_plan['name'],
-            description: nurego_plan['description'],
-
-            ## possible
-            # metadata: Object,
-            # free: true,
-        }
-
-        recurring = nurego_plan['features']['data'].find { | feature | feature['element_type'] == 'recurring' }
-        cf_plan[:free] = !(recurring && recurring['price'] > 0)
-
-        cf_service[:plans] << cf_plan # Add plans to the service
-      end
-      cf_catalog[:services] << cf_service # Add service to offer
-
-      cf_catalog
-    end
   end
 end

data/lib/nurego/subscription.rb

@@ -0,0 +1,50 @@
+module Nurego
+  class Subscription < APIResource
+    # include Nurego::APIOperations::Create
+    include Nurego::APIOperations::Update
+    # include Nurego::APIOperations::Delete
+
+    # Create override
+    def self.create(org_id, params={}, api_key=nil)
+      response, api_key = Nurego.request(:post, self.url(org_id), api_key, params)
+      Util.convert_to_nurego_object(response, api_key)
+    end
+
+    # Update override
+    def save
+      values = serialize_params(self)
+
+      if values.length > 0
+        values.delete(:id)
+
+        response, api_key = Nurego.request(:post, url(self.organization_id), @api_key, values)
+        refresh_from(response, api_key)
+      end
+      self
+    end
+
+    # Delete override
+    def delete(params={})
+      # use params to pass extra parameters to Nurego backend
+      response, api_key = Nurego.request(:delete, url(self.organization_id), @api_key, params)
+      refresh_from(response, api_key)
+      self
+    end
+
+    # override class url
+    def self.url(org_id = nil)
+      return super() unless org_id
+      "/v1/organizations/#{CGI.escape(org_id)}/#{CGI.escape(class_name.downcase)}s"
+    end
+
+    # override instance url
+    def url(org_id = nil)
+      return super() unless org_id
+      unless id = self['id']
+        raise InvalidRequestError.new("Could not determine which URL to request: #{self.class} instance has no ID: #{self.inspect}", 'id')
+      end
+      "#{self.class.url(org_id)}/#{CGI.escape(id)}"
+    end
+
+  end
+end

data/lib/nurego/util.rb

@@ -25,6 +25,7 @@ module Nurego
         'passwordreset' => PasswordReset,
         'offering' => Offering,
         'service' => Service,
+        'subscription' => Subscription,
         'plan' => Plan,
         'feature' => Feature,
         'paymentmethod' => PaymentMethod,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nurego
 version: !ruby/object:Gem::Version
-  version: 1.1.18
+  version: 1.1.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -224,6 +224,7 @@ files:
 - lib/nurego/discount.rb
 - lib/nurego/util.rb
 - lib/nurego/registration.rb
+- lib/nurego/cf/broker_utility.rb
 - lib/nurego/version.rb
 - lib/nurego/bill.rb
 - lib/nurego/json.rb
@@ -231,6 +232,7 @@ files:
 - lib/nurego/list_object.rb
 - lib/nurego/payment_method.rb
 - lib/nurego/offering.rb
+- lib/nurego/subscription.rb
 - lib/nurego/plan.rb
 - lib/nurego/feature.rb
 - lib/nurego/auth.rb
@@ -297,4 +299,3 @@ test_files:
 - spec/unit/nurego/list_object_spec.rb
 - spec/unit/nurego/util_spec.rb
 - spec/unit/test_helper.rb
-has_rdoc: