nurego 1.1.17 → 1.1.18

data/Gemfile.lock

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

data/README.md

@@ -55,7 +55,7 @@ Get entitlement for customer
 ```
 begin
   Nurego.api_key = “l230bc7b-9b85-4c5f-ad9f-4eeeef4d4f44”
-  ents = Nurego::Organization.entitlements({customer_id: 'cus_2shm2PizVL8QOp'})
+  ents = Nurego::Organization.entitlements('cus_2shm2PizVL8QOp')
   puts ents.inspect
 rescue Nurego::NuregoError => e
   puts “Got exception #{e}”
@@ -74,7 +74,7 @@ end
 ```
 begin
   Nurego.api_key = “l230bc7b-9b85-4c5f-ad9f-4eeeef4d4f44”
-  ents = Nurego::Organization.entitlements({customer_id: 'cus_2shm2PizVL8QOp', feature_id: 'subscribers'})
+  ents = Nurego::Organization.entitlements('cus_2shm2PizVL8QOp', {feature_id: 'subscribers'})
   puts ents.inspect
 rescue Nurego::NuregoError => e
   puts “Got exception #{e}”
@@ -102,23 +102,6 @@ rescue Nurego::NuregoError => e
 end
 ```
 
-Check allowed usage for customer
-
-```
-begin
-  Nurego.api_key = “l230bc7b-9b85-4c5f-ad9f-4eeeef4d4f44”
-  ent = Nurego::Entitlement.new({id: 'cus_2shm2PizVL8QOp'})
-  
-  allowed = ent.is_allowed(feature_id, 1)
-  puts allowed.inspect
-  
-  allowed = ent.is_allowed(feature_id, 2)
-  puts allowed.inspect
-rescue Nurego::NuregoError => e
-  puts “Got exception #{e}”
-end
-```
-
 #Offering
 
 Retrieve the current offering for the 'All' segment through the 'website' distribution channel.

data/VERSION

@@ -1 +1 @@
-1.1.17
+1.1.18

data/lib/nurego.rb

@@ -29,12 +29,14 @@ require 'nurego/instance'
 require 'nurego/connector'
 require 'nurego/password_reset'
 require 'nurego/offering'
+require 'nurego/service'
 require 'nurego/plan'
 require 'nurego/feature'
 require 'nurego/bill'
 require 'nurego/payment_method'
 require 'nurego/entitlement'
 require 'nurego/discount'
+require 'nurego/legal_doc'
 require 'nurego/extensions'
 
 
@@ -231,6 +233,10 @@ module Nurego
     begin
       error_obj = Nurego::JSON.load(rbody)
       error_obj = Util.symbolize_names(error_obj)
+      # todo: remove creating :error from description when bss return is consistent
+      if error_obj[:description]
+        error_obj[:error] = { code:rcode, message:error_obj[:description]}
+      end
       error = (error_obj && error_obj[:error]) or raise NuregoError.new # escape from parsing
 
     rescue MultiJson::DecodeError, NuregoError

data/lib/nurego/customer.rb

@@ -7,8 +7,8 @@ module Nurego
       Util.convert_to_nurego_object(response, api_key)
     end
 
-    def organizations
-      Organization.all({:customer => id }, @api_key)
+    def organization
+      Nurego::Organization.retrieve(id: self[:organization_id])
     end
 
     def self.me_url

data/lib/nurego/entitlement.rb

@@ -6,21 +6,13 @@ module Nurego
     def set_usage(feature_id, amount)
       payload = {
           feature_id: feature_id,
-          organization: id,
           amount: amount,
       }
-      response, api_key = Nurego.request(:put, "/v1/entitlements/usage", nil, payload)
+      response, api_key = Nurego.request(:put, "/v1/organizations/#{id}/entitlements/usage", nil, payload)
     end
 
-    def is_allowed(features)
-      payload =  {
-          :organization => id,
-      }
-
-      features = features.is_a?(Array) ? features : [features]
-      features_url = structure_sensitive_mimic_to_query(features, 'features')
-      response, api_key = Nurego.request(:get, "/v1/entitlements/allowed?#{features_url}",
-                                         nil, payload)
+    def self.all(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/legal_doc.rb

@@ -0,0 +1,13 @@
+module Nurego
+  class LegalDoc < APIResource
+
+    def self.retrieve(params = {}, api_key = nil)
+      raise NotImplementedError.new("Docs cannot be retrieved with ID. Retrieve a legal document using search parameters") if
+          !params.is_a?(Hash)  || params[:id]
+
+      response, api_key = Nurego.request(:get, self.url, api_key, params)
+      Util.convert_to_nurego_object(response, api_key)
+    end
+
+  end
+end

data/lib/nurego/offering.rb

@@ -1,4 +1,5 @@
 module Nurego
+
   class Offering < APIResource
 
     def self.retrieve(id, api_key = nil)
@@ -13,5 +14,6 @@ module Nurego
     def plans
       Plan.all({:offering => id }, @api_key)
     end
+
   end
 end

data/lib/nurego/organization.rb

@@ -15,12 +15,12 @@ module Nurego
       Bill.all({ :organization => id }, @api_key)[:bills]
     end
 
-    def self.entitlements(params = {}, api_key = nil)
-      Entitlement.all({:organization => params[:customer_id], :feature_id => params[:feature_id] }, api_key)
+    def self.entitlements(organization_id, params = {}, api_key = nil)
+      Entitlement.all(organization_id, {:feature_id => params[:feature_id] }, api_key)
     end
 
     def entitlements(feature_id = nil)
-      Entitlement.all({:organization => id, :feature_id => feature_id, :provider_name => 'internal' }, @api_key)
+      Entitlement.all(id, {:feature_id => feature_id, :external_ids => 'false' }, @api_key)
     end
 
     def plan(params = {}, api_key = nil)

data/lib/nurego/registration.rb

@@ -9,7 +9,15 @@ module Nurego
       customer
     end
 
+    def self.find_by_external_id(external_id, params = { })
+      response, api_key = Nurego.request(:get, find_by_external_id_url(external_id), @api_key, params)
+      Util.convert_to_nurego_object(response, api_key)
+    end
+
     private
+    def self.find_by_external_id_url(external_id)
+      url + "?instance_id=#{ external_id }"
+    end
 
     def complete_url
       url + '/complete'

data/lib/nurego/service.rb

@@ -0,0 +1,56 @@
+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/util.rb

@@ -24,6 +24,7 @@ module Nurego
         'connector' => Connector,
         'passwordreset' => PasswordReset,
         'offering' => Offering,
+        'service' => Service,
         'plan' => Plan,
         'feature' => Feature,
         'paymentmethod' => PaymentMethod,

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: nurego
 version: !ruby/object:Gem::Version
-  version: 1.1.17
+  version: 1.1.18
+  prerelease: 
 platform: ruby
 authors:
 - Ilia Gilderman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -51,6 +57,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -61,6 +68,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -68,6 +76,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -75,6 +84,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -82,6 +92,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -89,6 +100,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -96,6 +108,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -103,6 +116,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,6 +124,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -117,6 +132,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -124,6 +140,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -131,6 +148,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -138,6 +156,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -145,6 +164,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov-csv
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -152,6 +172,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -159,6 +180,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,6 +188,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -173,6 +196,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -180,6 +204,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -192,48 +217,50 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.md
-- Rakefile
-- VERSION
-- examples/enumerate_plans.rb
-- lib/data/ca-certificates.crt
 - lib/nurego.rb
-- lib/nurego/api_operations/create.rb
-- lib/nurego/api_operations/delete.rb
-- lib/nurego/api_operations/list.rb
+- lib/nurego/entitlement.rb
+- lib/nurego/legal_doc.rb
+- lib/nurego/password_reset.rb
+- lib/nurego/discount.rb
+- lib/nurego/util.rb
+- lib/nurego/registration.rb
+- lib/nurego/version.rb
+- lib/nurego/bill.rb
+- lib/nurego/json.rb
+- lib/nurego/instance.rb
+- lib/nurego/list_object.rb
+- lib/nurego/payment_method.rb
+- lib/nurego/offering.rb
+- lib/nurego/plan.rb
+- lib/nurego/feature.rb
+- lib/nurego/auth.rb
 - lib/nurego/api_operations/update.rb
+- lib/nurego/api_operations/list.rb
+- lib/nurego/api_operations/delete.rb
+- lib/nurego/api_operations/create.rb
+- lib/nurego/organization.rb
 - lib/nurego/api_resource.rb
-- lib/nurego/auth.rb
-- lib/nurego/bill.rb
 - lib/nurego/connector.rb
+- lib/nurego/nurego_object.rb
 - lib/nurego/customer.rb
-- lib/nurego/discount.rb
-- lib/nurego/entitlement.rb
+- lib/nurego/extensions.rb
+- lib/nurego/errors/card_error.rb
+- lib/nurego/errors/authentication_error.rb
 - lib/nurego/errors/api_connection_error.rb
 - lib/nurego/errors/api_error.rb
-- lib/nurego/errors/authentication_error.rb
-- lib/nurego/errors/card_error.rb
 - 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
-- lib/nurego/list_object.rb
-- lib/nurego/nurego_object.rb
-- lib/nurego/offering.rb
-- lib/nurego/organization.rb
-- lib/nurego/password_reset.rb
-- lib/nurego/payment_method.rb
-- lib/nurego/plan.rb
-- lib/nurego/registration.rb
-- lib/nurego/util.rb
-- lib/nurego/version.rb
+- lib/nurego/service.rb
+- lib/data/ca-certificates.crt
+- examples/enumerate_plans.rb
+- Gemfile
+- Gemfile.lock
 - nurego.gemspec
+- Rakefile
+- VERSION
+- LICENSE
+- README.md
 - spec/unit/nurego/api_resource_spec.rb
 - spec/unit/nurego/customer_spec.rb
 - spec/unit/nurego/list_object_spec.rb
@@ -242,26 +269,27 @@ files:
 homepage: http://www.nurego.com/api
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby bindings for the Nurego API
 test_files:
 - spec/unit/nurego/api_resource_spec.rb
@@ -269,3 +297,4 @@ test_files:
 - spec/unit/nurego/list_object_spec.rb
 - spec/unit/nurego/util_spec.rb
 - spec/unit/test_helper.rb
+has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2IzNWEyYzgzODc0MGI5ZThjYjRiOGEwZWZhNGJkNjMxMzQwNGIwZA==
-  data.tar.gz: !binary |-
-    NDc5ZmM0MTA5ZTc3NzQ3NDc0ZTY3YmM2YzBkYWU3YzBhOGEyOTNkMA==
-SHA512:
-  metadata.gz: !binary |-
-    MTg0YTQyY2IyMjg3YzM4NjI5NDZiMThiOThmZTFjZmExYWNlM2Y2MDhjMGM2
-    MWYwMDVjNTVjNmU1MzdiM2IxOTQxNzg0OTEzNzU3NzhhMzRmNzNiMzAzZGY2
-    NDUwMzk0MTYwNDdiODdhYjU0YjU5MjdlYmViN2I2ODIxMzIxMzI=
-  data.tar.gz: !binary |-
-    OWQ0YzE4NDcwNDExNmQ4YTc4OWU5MzM4ZDhhMjVjYjEzZmJjM2NmNGFhZTk0
-    MzcxYTIxZmU0ZWJjNGNmODkxNWJmNzMyNjFhMzRhZjkwZTFiMWFlZjE3ZmYy
-    ZDBlMTcxYmY3ZDZkM2Y3NGY3ZmUxOGFiYWJiYjNmZjM3NWE5NGU=