bunny_app 1.30.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df5ec4cdad5386f4d1a11336d8ba9e0224057d69145bc4da92582edd7926e39f
-  data.tar.gz: 6d8797cacac0668b099c7e0f9a3f5e05ed7871dc6732940b0e6d02456e152003
+  metadata.gz: ddee2a75dd5e0d155b6262ef9a0af252be0da7a23bf65c5b7082afe8f87944b4
+  data.tar.gz: 3ff475f3847b63fb0b0a2b779bf3df21f0ba5ed6d8cc682764e60b0b71eab2e9
 SHA512:
-  metadata.gz: fabb07788312eb29c7a0aadff1ce7a72dfa500d490101a6367b33e6aa4e4d6fabe89bc701c19c773083789ead16d6677215633807e486596a357d830f101c3fd
-  data.tar.gz: d072331b7c3450ee18a904dd7985704bc347c3ffb75b6844024ec909a10e802cde3601b8f0c6d361ffee7e120d71fb0a79d140d0606267186bd1659b3a21ca2b
+  metadata.gz: 634afceda6fe87a0de908fdfd8926dde84c48d0d8a56ebc54d4a08defb94ab3ace346646ec037eb5c6ded014788beeb5602cb1c0560a69c0ac2e47a8a22355ce
+  data.tar.gz: e0c605da0b2f6e53f2aef46e62067e1f575d73641d16eaf9b246ae6291c4e3b8903dd8f4f38a46ef5e83eae3008fb78b0e241ea7e00397582863f34ac097cca7

data/README.md

@@ -89,11 +89,11 @@ If you have usage based billing or just want to track feature usage then use thi
 
 ```ruby
 # Usage is tracked as if it just happened
-response = BunnyApp::Usage.track(
+response = BunnyApp::FeatureUsage.create(
   quantity: 5, feature_code: 'products', tenant_code: '2')
 
 # Usage is tracked using the date supplied
-response = BunnyApp::Usage.track(
+response = BunnyApp::FeatureUsage.create(
   quantity: 5, feature_code: 'products', tenant_code: '2', usage_at: '2022-03-10')
 ```
 

data/lib/bunny_app/client.rb

@@ -19,6 +19,8 @@ module BunnyApp
         'Content-Type' => 'application/json',
         'Authorization' => "Bearer #{BunnyApp.access_token}"
       }
+
+      @headers['host'] = host_header unless host_header.nil?
     end
 
     def fetch_access_token
@@ -59,7 +61,7 @@ module BunnyApp
       case res.code.to_s
       when /2[0-9][0-9]/ # HTTP 2xx
         response_body = JSON.parse(res.body)
-        raise ResponseError, response_body['errors'] if response_body['errors']
+        raise ResponseError, (response_body['errors'].map { |error| error['message'] }) if response_body['errors']
 
         response_body
 
@@ -74,7 +76,10 @@ module BunnyApp
       when /403/ # HTTP 403
         raise AuthorizationError, res.parsed_response['error_decscription']
       else
-        raise ResponseError, res.body # HTTP 400, 500 etc
+        # HTTP 400, 500 etc
+        puts "Bunny SDK Response Error Headers: #{res.headers}"
+        puts "Bunny SDK Response Error Body: #{res.body}"
+        raise ResponseError, res.body
       end
     end
 
@@ -89,5 +94,9 @@ module BunnyApp
     def verify_ssl
       return true unless ENV['IGNORE_SSL']
     end
+
+    def host_header
+      ENV.fetch('BUNNY_HOST_HEADER', nil)
+    end
   end
 end

data/lib/bunny_app/{usage.rb → feature_usage.rb}

@@ -1,5 +1,5 @@
 module BunnyApp
-  class Usage
+  class FeatureUsage
     @feature_usage_create_mutation = <<-'GRAPHQL'
     mutation featureUsageCreate ($attributes: FeatureUsageAttributes!) {
         featureUsageCreate (attributes: $attributes) {
@@ -23,7 +23,7 @@ module BunnyApp
     }
     GRAPHQL
 
-    def self.track(quantity:, feature_code:, tenant_code:, usage_at: nil)
+    def self.create(quantity:, feature_code:, tenant_code:, usage_at: nil)
       variables = {
         attributes: {
           quantity:,
@@ -34,7 +34,8 @@ module BunnyApp
 
       variables[:attributes][:usageAt] = usage_at unless usage_at.nil?
 
-      Client.new.query(@feature_usage_create_mutation, variables)
+      res = Client.new.query(@feature_usage_create_mutation, variables)
+      res['data']['featureUsageCreate']['featureUsage']
     end
   end
 end

data/lib/bunny_app/platform.rb

@@ -16,12 +16,13 @@ module BunnyApp
     def self.create(name:, code:)
       variables = {
         attributes: {
-          name: name,
-          code: code
+          name:,
+          code:
         }
       }
 
-      Client.new.query(@platform_create_mutation, variables)
+      res = Client.new.query(@platform_create_mutation, variables)
+      res['data']['platformCreate']['platform']
     end
   end
 end

data/lib/bunny_app/portal_session.rb

@@ -16,7 +16,8 @@ module BunnyApp
         expiry: expiry_hours
       }
 
-      Client.new.query(@portal_session_create_mutation, variables)
+      res = Client.new.query(@portal_session_create_mutation, variables)
+      res['data']['portalSessionCreate']['token']
     end
   end
 end

data/lib/bunny_app/subscription.rb

@@ -38,6 +38,14 @@ module BunnyApp
     }
     GRAPHQL
 
+    @subscription_cancel_mutation = <<-'GRAPHQL'
+    mutation subscriptionCancel ($ids: [ID!]!) {
+      subscriptionCancel (ids: $ids) {
+          errors
+      }
+    }
+    GRAPHQL
+
     # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
     def self.create(price_list_code:, options: {})
       variables = {
@@ -67,7 +75,18 @@ module BunnyApp
         }
       end
 
-      Client.new.query(@subscription_create_mutation, variables)
+      res = Client.new.query(@subscription_create_mutation, variables)
+      res['data']['subscriptionCreate']['subscription']
+    end
+
+    def self.cancel(subscription_id:)
+      variables = {
+        ids: [subscription_id]
+      }
+
+      Client.new.query(@subscription_cancel_mutation, variables)
+
+      true
     end
   end
 end

data/lib/bunny_app/tenant.rb

@@ -1,8 +1,8 @@
 module BunnyApp
   class Tenant
     @tenant_create_mutation = <<-'GRAPHQL'
-    mutation tenantCreate ($attributes: TenantAttributes!, $subscriptionId: ID!) {
-      tenantCreate (attributes: $attributes, subscriptionId: $subscriptionId) {
+    mutation tenantCreate ($attributes: TenantAttributes!) {
+      tenantCreate (attributes: $attributes) {
         tenant {
           code
           id
@@ -18,17 +18,50 @@ module BunnyApp
     }
     GRAPHQL
 
-    def self.create(name:, code:, platform_code: 'main', subscription_id: nil)
+    @tenant_query = <<-'GRAPHQL'
+    query tenant ($code: String!) {
+      tenant (code: $code) {
+        id
+        code
+        name
+        subdomain
+        account {
+          id
+          name
+          billingDay
+        }
+        latestProvisioningChange {
+            change
+            createdAt
+            features
+            id
+            updatedAt
+        }
+      }
+    }
+    GRAPHQL
+
+    def self.create(name:, code:, account_id:, platform_code: 'main')
       variables = {
         attributes: {
           name:,
           code:,
-          platformCode: platform_code
-        },
-        subscriptionId: subscription_id
+          platformCode: platform_code,
+          accountId: account_id
+        }
+      }
+
+      res = Client.new.query(@tenant_create_mutation, variables)
+      res['data']['tenantCreate']['tenant']
+    end
+
+    def self.find_by(code:)
+      variables = {
+        code:
       }
 
-      Client.new.query(@tenant_create_mutation, variables)
+      res = Client.new.query(@tenant_query, variables)
+      res['data']['tenant']
     end
   end
 end

data/lib/bunny_app/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BunnyApp
-  VERSION = '1.30.0'
+  VERSION = '2.0.1'
 end

data/lib/bunny_app.rb

@@ -1,7 +1,7 @@
 require 'bunny_app/version'
 require 'bunny_app/errors'
 require 'bunny_app/client'
-require 'bunny_app/usage'
+require 'bunny_app/feature_usage'
 require 'bunny_app/platform'
 require 'bunny_app/tenant'
 require 'bunny_app/subscription'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny_app
 version: !ruby/object:Gem::Version
-  version: 1.30.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Bunny
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-17 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -139,11 +139,11 @@ files:
 - lib/bunny_app.rb
 - lib/bunny_app/client.rb
 - lib/bunny_app/errors.rb
+- lib/bunny_app/feature_usage.rb
 - lib/bunny_app/platform.rb
 - lib/bunny_app/portal_session.rb
 - lib/bunny_app/subscription.rb
 - lib/bunny_app/tenant.rb
-- lib/bunny_app/usage.rb
 - lib/bunny_app/version.rb
 - lib/bunny_app/webhook.rb
 - lib/generators/bunny_app/install_generator.rb