pisoni 1.23.2 → 1.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b32b9bf7d4534092ec0a19ef433f354ba6eb2aebf87b315ed53132541ada123
-  data.tar.gz: b45e5cf8b827909cb87b16336f20ee22186b9e302ce4ff6b948cd822aa556ae2
+  metadata.gz: a4dc7a68d6d7ae8b6523c0956c9425a587c53b4cac5a18eb7466e9455c38ef15
+  data.tar.gz: e930a4713a961846d6c84207a2435c72f1a957acc6c4ea313c48123a5d953678
 SHA512:
-  metadata.gz: 7ed1c92963ec49ba67db747d8070b5020119b5ff61599f499cf1fd628ff0c6d09c4adf286159c3c46dfd119f14ce326e05a0b429cc63b4784efeaee05478a007
-  data.tar.gz: 8138a68e836ac62f461de46659746b6cc66b2da121c8843132e08570cf141fb551c0ffa738cb5a081e87c5e4e816a969ae3cc3ba3ec95b99100ca8483213f4ae
+  metadata.gz: 5aa1351666750cd74d9b55652268155898ec5e3554bd085f8d0590fadc8d1a60d63152f6e31d7f7f48da191f26a503a543a6b6b31a470739f6af1a23d0aad11d
+  data.tar.gz: a40c08e47e58ec21db44a12e01dc0b202f0d264a34677ca9029fa23816689acb7426f4fe7d2a24abd6cb08f17c4833ea417a8d46e4833fdd3885b56b29c2d095

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 Notable changes to Pisoni will be tracked in this document.
 
+## 1.24.0 - 2018-06-29
+
+### Added
+
+- Services can now be activated/deactivated based on the `state` attribute.
+  ([#7](https://github.com/3scale/pisoni/pull/7))
+
 ## 1.23.2 - 2018-06-04
 
 ### Changed

data/README.md

@@ -1,5 +1,6 @@
 [![CircleCI](https://circleci.com/gh/3scale/pisoni.svg?style=shield)](https://circleci.com/gh/3scale/pisoni)
 [![Maintainability](https://api.codeclimate.com/v1/badges/4b18ae93abefdba17e0b/maintainability)](https://codeclimate.com/github/3scale/pisoni/maintainability)
+[![Gem Version](https://badge.fury.io/rb/pisoni.svg)](https://badge.fury.io/rb/pisoni)
 
 # Pisoni
 

data/lib/3scale/core/service.rb

@@ -3,7 +3,7 @@ module ThreeScale
     class Service < APIClient::Resource
       attributes :provider_key, :id, :backend_version, :referrer_filters_required,
                  :user_registration_required, :default_user_plan_id,
-                 :default_user_plan_name, :default_service
+                 :default_user_plan_name, :default_service, :state
 
       class << self
         def load_by_id(service_id)
@@ -66,6 +66,19 @@ module ThreeScale
         end
       end
 
+      def initialize(attributes = {})
+        @state = :active
+        super(attributes)
+      end
+
+      def activate
+        self.state = :active
+      end
+
+      def deactivate
+        self.state = :suspended
+      end
+
       def referrer_filters_required?
         @referrer_filters_required
       end
@@ -74,9 +87,20 @@ module ThreeScale
         @user_registration_required
       end
 
+      def active?
+        state == :active
+      end
+
       def save!
         self.class.save! attributes
       end
+
+      private
+
+      def state=(value)
+        # only :active or nil will be considered as :active
+        @state = value.nil? || value.to_sym == :active ? :active : :suspended
+      end
     end
   end
 end

data/lib/3scale/core/version.rb

@@ -1,5 +1,5 @@
 module ThreeScale
   module Core
-    VERSION = '1.23.2'
+    VERSION = '1.24.0'
   end
 end

data/spec/service_spec.rb

@@ -105,6 +105,28 @@ module ThreeScale
             Service.save!(@service_params)
           end.must_raise ServiceRequiresDefaultUserPlan
         end
+
+        it 'save active service' do
+          service = Service.new(@service_params)
+          service.wont_be_nil
+          service.activate
+          service.active?.must_equal true
+          service.save!
+          loaded_service = Service.load_by_id(@service_params[:id])
+          loaded_service.wont_be_nil
+          loaded_service.active?.must_equal true
+        end
+
+        it 'save disable service' do
+          service = Service.new(@service_params)
+          service.wont_be_nil
+          service.deactivate
+          service.active?.must_equal false
+          service.save!
+          loaded_service = Service.load_by_id(@service_params[:id])
+          loaded_service.wont_be_nil
+          loaded_service.active?.must_equal false
+        end
       end
 
       describe '.make_default' do
@@ -154,6 +176,51 @@ module ThreeScale
           end.must_raise InvalidProviderKeys
         end
       end
+
+      describe '.active?' do
+        it 'should be active when service is initialized as active' do
+          [
+            { state: :active },
+            { state: 'active' },
+            # even when state is not set
+            {},
+            # even when state is intentionally set as nil
+            { state: nil }
+          ].each do |svc_attrs|
+            Service.new(svc_attrs).active?.must_equal true
+          end
+        end
+
+        it 'should be inactive when service is initialized as disabled' do
+          [
+            { state: :suspended },
+            { state: 'suspended' },
+            { state: :something },
+            { state: :disable },
+            { state: :disabled },
+            { state: '1' },
+            { state: '0' },
+            { state: 'true' },
+            { state: 'false' }
+          ].each do |svc_attrs|
+            Service.new(svc_attrs).active?.must_equal false
+          end
+        end
+
+        it 'should be active when the service is activated' do
+          s = Service.new(state: :disable)
+          s.active?.must_equal false
+          s.activate
+          s.active?.must_equal true
+        end
+
+        it 'should be disabled when the service is deactivated' do
+          s = Service.new(state: :active)
+          s.active?.must_equal true
+          s.deactivate
+          s.active?.must_equal false
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pisoni
 version: !ruby/object:Gem::Version
-  version: 1.23.2
+  version: 1.24.0
 platform: ruby
 authors:
 - Alejandro Martinez Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday