super_settings 1.0.1 → 2.0.0

data/lib/super_settings/rack_application.rb

@@ -122,7 +122,7 @@ module SuperSettings
     #
     # @return [Boolean]
     def web_ui_enabled?
-      true
+      SuperSettings.configuration.controller.web_ui_enabled?
     end
 
     private
@@ -159,7 +159,7 @@ module SuperSettings
 
     def handle_root_request(request)
       response = check_authorization(request, write_required: true) do |user|
-        [200, {"content-type" => "text/html; charset=utf-8", "cache-control" => "no-cache"}, [Application.new(:default, add_to_head(request)).render("index.html.erb")]]
+        [200, {"content-type" => "text/html; charset=utf-8", "cache-control" => "no-cache"}, [Application.new(layout: :default, add_to_head: add_to_head(request), color_scheme: SuperSettings.configuration.controller.color_scheme).render]]
       end
 
       if [401, 403].include?(response.first)
@@ -236,7 +236,7 @@ module SuperSettings
 
     def post_params(request)
       if request.content_type.to_s.match?(/\Aapplication\/json/i) && request.body
-        request.params.merge(JSON.parse(request.body.string))
+        request.params.merge(JSON.parse(request.body.read))
       else
         request.params
       end

data/lib/super_settings/rest_api.rb

@@ -23,7 +23,7 @@ module SuperSettings
       #     ...
       #   ]
       def index
-        settings = Setting.active.sort_by(&:key)
+        settings = Setting.active.reject(&:deleted?).sort_by(&:key)
         {settings: settings.collect(&:as_json)}
       end
 
@@ -46,7 +46,8 @@ module SuperSettings
       #     updated_at: iso8601 string
       #   }
       def show(key)
-        Setting.find_by_key(key)&.as_json
+        setting = Setting.find_by_key(key)
+        setting.as_json if setting && !setting.deleted?
       end
 
       # The update operation uses a transaction to atomically update all settings.
@@ -156,7 +157,7 @@ module SuperSettings
       #
       # @example
       #   GET /last_updated_at
-      #      #
+      #
       #   The response payload is:
       #   {
       #     last_updated_at: iso8601 string
@@ -188,7 +189,7 @@ module SuperSettings
       #   ]
       def updated_since(time)
         time = Coerce.time(time)
-        settings = Setting.updated_since(time)
+        settings = Setting.updated_since(time).reject(&:deleted?)
         {settings: settings.collect(&:as_json)}
       end
     end

data/lib/super_settings/setting.rb

@@ -54,7 +54,7 @@ module SuperSettings
       # @api private
       def storage
         if @storage == NOT_SET
-          if defined?(::SuperSettings::Storage::ActiveRecordStorage)
+          if defined?(ActiveRecord) && defined?(::SuperSettings::Storage::ActiveRecordStorage)
             ::SuperSettings::Storage::ActiveRecordStorage
           else
             raise ArgumentError.new("No storage class defined for #{name}")
@@ -109,6 +109,7 @@ module SuperSettings
       # @param time [Time]
       # @return [Array<Setting>]
       def updated_since(time)
+        time = SuperSettings::Coerce.time(time)
         storage.with_connection do
           storage.updated_since(time).collect { |record| new(record) }
         end
@@ -219,6 +220,16 @@ module SuperSettings
           next if Coerce.blank?(setting_params["key"])
           next if ["value_type", "value", "description", "deleted"].all? { |name| Coerce.blank?(setting_params[name]) }
 
+          key_was = setting_params["key_was"]
+          if key_was && !changed.include?(key_was)
+            old_setting = Setting.find_by_key(key_was)
+            if old_setting
+              old_setting.deleted = true
+              old_setting.changed_by = changed_by
+              changed[old_setting.key] = old_setting
+            end
+          end
+
           key = setting_params["key"]
           setting = changed[key] || Setting.find_by_key(key)
           unless setting
@@ -372,7 +383,7 @@ module SuperSettings
     #
     # @param val [Time, DateTime]
     def created_at=(val)
-      val = Coerce.time(val)
+      val = TimePrecision.new(val).time
       will_change!(:created_at, val) unless created_at == val
       @record.created_at = val
     end
@@ -388,7 +399,7 @@ module SuperSettings
     #
     # @param val [Time, DateTime]
     def updated_at=(val)
-      val = Coerce.time(val)
+      val = TimePrecision.new(val).time
       will_change!(:updated_at, val) unless updated_at == val
       @record.updated_at = val
     end

data/lib/super_settings/storage/active_record_storage/models.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module SuperSettings
+  module Storage
+    class ActiveRecordStorage
+      # Base class that the models extend from.
+      class ApplicationRecord < ActiveRecord::Base
+        self.abstract_class = true
+      end
+
+      class Model < ApplicationRecord
+        self.table_name = "super_settings"
+
+        has_many :history_items, class_name: "SuperSettings::Storage::ActiveRecordStorage::HistoryModel", foreign_key: :key, primary_key: :key
+      end
+
+      class HistoryModel < ApplicationRecord
+        self.table_name = "super_settings_histories"
+
+        # Since these models are created automatically on a callback, ensure that the data will
+        # fit into the database columns since we can't handle any validation errors.
+        before_validation do
+          self.changed_by = changed_by.to_s[0, 150] if changed_by.present?
+        end
+      end
+    end
+  end
+end

data/lib/super_settings/storage/active_record_storage.rb

@@ -10,26 +10,9 @@ module SuperSettings
     # @example
     #   rake app:super_settings:install:migrations
     class ActiveRecordStorage
-      # Base class that the models extend from.
-      class ApplicationRecord < ActiveRecord::Base
-        self.abstract_class = true
-      end
-
-      class Model < ApplicationRecord
-        self.table_name = "super_settings"
-
-        has_many :history_items, class_name: "SuperSettings::Storage::ActiveRecordStorage::HistoryModel", foreign_key: :key, primary_key: :key
-      end
-
-      class HistoryModel < ApplicationRecord
-        self.table_name = "super_settings_histories"
-
-        # Since these models are created automatically on a callback, ensure that the data will
-        # fit into the database columns since we can't handle any validation errors.
-        before_validation do
-          self.changed_by = changed_by.to_s[0, 150] if changed_by.present?
-        end
-      end
+      autoload :ApplicationRecord, File.join(__dir__, "active_record_storage/models")
+      autoload :Model, File.join(__dir__, "active_record_storage/models")
+      autoload :HistoryModel, File.join(__dir__, "active_record_storage/models")
 
       include Storage
 
@@ -77,6 +60,13 @@ module SuperSettings
           Model.transaction(&block)
         end
 
+        def destroy_all
+          ApplicationRecord.transaction do
+            Model.delete_all
+            HistoryModel.delete_all
+          end
+        end
+
         protected
 
         # Only load settings asynchronously if there is an extra database connection left in the

data/lib/super_settings/storage/history_attributes.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module SuperSettings
+  module Storage
+    # Generic class that can be extended to represent a history record for a setting in memory.
+    class HistoryAttributes
+      include SuperSettings::Attributes
+
+      attr_accessor :key, :value, :changed_by
+      attr_writer :deleted
+      attr_reader :created_at
+
+      def initialize(*)
+        @key = nil
+        @value = nil
+        @changed_by = nil
+        @created_at = nil
+        @deleted = false
+        super
+      end
+
+      def created_at=(val)
+        @created_at = TimePrecision.new(val).time
+      end
+
+      def deleted?
+        !!@deleted
+      end
+    end
+  end
+end

data/lib/super_settings/storage/http_storage.rb

@@ -1,59 +1,51 @@
 # frozen_string_literal: true
 
-require "json"
-require "net/http"
-
 module SuperSettings
   module Storage
     # SuperSettings::Storage model that reads from a remote service running the SuperSettings REST API.
     # This storage engine is read only. It is intended to allow microservices to read settings from a
     # central application that exposes the SuperSettings::RestAPI.
-    class HttpStorage
+    #
+    # You must the the base_url class attribute to the base URL of a SuperSettings REST API endpoint.
+    # You can also set the timeout, headers, and query_params used in reqeusts to the API.
+    class HttpStorage < StorageAttributes
       include Storage
+      include Transaction
 
       DEFAULT_HEADERS = {"Accept" => "application/json"}.freeze
       DEFAULT_TIMEOUT = 5.0
 
+      @base_url = nil
+      @timeout = nil
       @headers = {}
       @query_params = {}
+      @http_client = nil
+      @http_client_hash = nil
 
-      attr_reader :key, :raw_value, :description, :value_type, :updated_at, :created_at
-
-      class Error < StandardError
-      end
-
-      class NotFoundError < Error
+      class HistoryStorage < HistoryAttributes
       end
 
-      class InvalidRecordError < Error
-        attr_reader :errors
-
-        def initialize(message, errors:)
-          super(message)
-          @errors = errors
-        end
-      end
-
-      class HistoryStorage
-        include SuperSettings::Attributes
-
-        attr_accessor :key, :value, :changed_by, :deleted
+      class << self
+        # Set the base URL for the SuperSettings REST API.
+        attr_accessor :base_url
 
-        def initialize(*)
-          @deleted = false
-          super
-        end
+        # Set the timeout for requests to the SuperSettings REST API.
+        attr_accessor :timeout
 
-        def created_at=(val)
-          @created_at = SuperSettings::Coerce.time(val)
-        end
+        # Add headers to this hash to add them to all requests to the SuperSettings REST API.
+        #
+        # @example
+        #
+        # SuperSettings::HttpStorage.headers["Authorization"] = "Bearer 12345"
+        attr_reader :headers
 
-        def deleted?
-          !!@deleted
-        end
-      end
+        # Add query parameters to this hash to add them to all requests to the SuperSettings REST API.
+        #
+        # @example
+        #
+        # SuperSettings::HttpStorage.query_params["access_token"] = "12345"
+        attr_reader :query_params
 
-      class << self
         def all
           call_api(:get, "/settings")["settings"].collect do |attributes|
             new(attributes)
@@ -68,9 +60,9 @@ module SuperSettings
 
         def find_by_key(key)
           record = new(call_api(:get, "/setting", key: key))
-          record.send(:set_persisted!)
+          record.persisted = true
           record
-        rescue NotFoundError
+        rescue HttpClient::NotFoundError
           nil
         end
 
@@ -79,13 +71,30 @@ module SuperSettings
           SuperSettings::Coerce.time(value)
         end
 
-        attr_accessor :base_url
+        def save_all(changes)
+          payload = []
+          changes.each do |setting|
+            setting_payload = {key: setting.key}
 
-        attr_accessor :timeout
+            if setting.deleted?
+              setting_payload[:deleted] = true
+            else
+              setting_payload[:value] = setting.value
+              setting_payload[:value_type] = setting.value_type
+              setting_payload[:description] = setting.description
+            end
 
-        attr_reader :headers
+            payload << setting_payload
+          end
 
-        attr_reader :query_params
+          begin
+            call_api(:post, "/settings", settings: payload)
+          rescue HttpClient::InvalidRecordError
+            return false
+          end
+
+          true
+        end
 
         protected
 
@@ -96,115 +105,21 @@ module SuperSettings
         private
 
         def call_api(method, path, params = {})
-          url_params = ((method == :get) ? query_params.merge(params) : query_params)
-          uri = api_uri(path, url_params)
-
-          body = nil
-          request_headers = DEFAULT_HEADERS.merge(headers)
-          if method == :post && !params&.empty?
-            body = params.to_json
-            request_headers["content-type"] = "application/json; charset=utf8-"
-          end
-
-          response = http_request(method: method, uri: uri, headers: request_headers, body: body)
-
-          begin
-            response.value # raises exception unless response is a success
-            JSON.parse(response.body)
-          rescue Net::ProtocolError
-            if [404, 410].include?(response.code.to_i)
-              raise NotFoundError.new("#{response.code} #{response.message}")
-            elsif response.code.to_i == 422
-              raise InvalidRecordError.new("#{response.code} #{response.message}", errors: JSON.parse(response.body)["errors"])
-            else
-              raise Error.new("#{response.code} #{response.message}")
-            end
-          rescue JSON::JSONError => e
-            raise Error.new(e.message)
+          if method == :post
+            http_client.post(path, params)
+          else
+            http_client.get(path, params)
           end
         end
 
-        def http_request(method:, uri:, headers: {}, body: nil, redirect_count: 0)
-          response = nil
-          http = Net::HTTP.new(uri.host, uri.port || uri.inferred_port)
-          begin
-            http.read_timeout = (timeout || DEFAULT_TIMEOUT)
-            http.open_timeout = (timeout || DEFAULT_TIMEOUT)
-            if uri.scheme == "https"
-              http.use_ssl = true
-              http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-            end
-
-            request = ((method == :post) ? Net::HTTP::Post.new(uri.request_uri) : Net::HTTP::Get.new(uri.request_uri))
-            set_headers(request, headers)
-            request.body = body if body
-
-            response = http.request(request)
-          ensure
-            begin
-              http.finish if http.started?
-            rescue IOError
-            end
-          end
-
-          if response.is_a?(Net::HTTPRedirection)
-            location = resp["location"]
-            if redirect_count < 5 && SuperSettings::Coerce.present?(location)
-              return http_request(method: :get, uri: URI(location), headers: headers, body: body, redirect_count: redirect_count + 1)
-            end
-          end
-
-          response
-        end
-
-        def api_uri(path, params)
-          uri = URI("#{base_url.chomp("/")}#{path}")
-          if params && !params.empty?
-            q = []
-            q << uri.query unless uri.query.to_s.empty?
-            params.each do |name, value|
-              q << "#{URI.encode_www_form_component(name.to_s)}=#{URI.encode_www_form_component(value.to_s)}"
-            end
-            uri.query = q.join("&")
+        def http_client
+          hash = [base_url, timeout, headers, query_params].hash
+          if @http_client.nil? || @http_client_hash != hash
+            @http_client = HttpClient.new(base_url, headers: headers, params: query_params, timeout: timeout)
+            @http_client_hash = hash
           end
-          uri
-        end
-
-        def set_headers(request, headers)
-          headers.each do |name, value|
-            name = name.to_s
-            values = Array(value)
-            request[name] = values[0].to_s
-            values[1, values.length].each do |val|
-              request.add_field(name, val.to_s)
-            end
-          end
-        end
-      end
-
-      def initialize(*)
-        @persisted = false
-        @deleted = false
-        super
-      end
-
-      def save!
-        payload = {key: key}
-        if deleted?
-          payload[:deleted] = true
-        else
-          payload[:value] = value
-          payload[:value_type] = value_type
-          payload[:description] = description
-        end
-
-        begin
-          call_api(:post, "/settings", settings: [payload])
-          set_persisted!
-        rescue InvalidRecordError
-          return false
+          @http_client
         end
-        true
       end
 
       def history(limit: nil, offset: 0)
@@ -227,50 +142,11 @@ module SuperSettings
         self
       end
 
-      def key=(value)
-        @key = (Coerce.blank?(value) ? nil : value.to_s)
-      end
-
-      def raw_value=(value)
-        @raw_value = (Coerce.blank?(value) ? nil : value.to_s)
-      end
       alias_method :value=, :raw_value=
       alias_method :value, :raw_value
 
-      def value_type=(value)
-        @value_type = (Coerce.blank?(value) ? nil : value.to_s)
-      end
-
-      def description=(value)
-        @description = (Coerce.blank?(value) ? nil : value.to_s)
-      end
-
-      def deleted=(value)
-        @deleted = Coerce.boolean(value)
-      end
-
-      def created_at=(value)
-        @created_at = SuperSettings::Coerce.time(value)
-      end
-
-      def updated_at=(value)
-        @updated_at = SuperSettings::Coerce.time(value)
-      end
-
-      def deleted?
-        !!@deleted
-      end
-
-      def persisted?
-        !!@persisted
-      end
-
       private
 
-      def set_persisted!
-        @persisted = true
-      end
-
       def call_api(method, path, params = {})
         self.class.send(:call_api, method, path, params)
       end