angie-core-api 0.6.3 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ea3063768ff0118db6784ddd38b7e52dd869c44b477d0029dcd6af81a66b44f
-  data.tar.gz: 4c5267be414bf1ac4c2ee1d7a03918d4e4b38e187880ec356a9335e151096fc7
+  metadata.gz: 6e29f2ff5be3eda44a58b4bed2924dfc1178017c60a4a5de05ed7730d03e26c5
+  data.tar.gz: 1ddeff04ad553d403df11213624337e9e92d28f08781a4917c3d249acbaefa12
 SHA512:
-  metadata.gz: 1d6becb990c27a6a2eeb6a8a57cf2e2bdd9c4b88b70f2a35d4a70170df4858d8664eb48f7a963e1e5886b69d9989100ec8de3c23324a4bad95f88892b74641ca
-  data.tar.gz: 163f269738c85b2ef69951d1aeb3fc0e69513f4578a597f720a0ba6b11a4a48d5c3a8295e77b26c823d78c905d33f0f17959d0bdd9e2c06b2db23a42e26f7cf3
+  metadata.gz: 0faa69a92791402a85ef41a079b7b8ba6572ceb2d4bdf07ae419ffb816741299247bd5227cfde8a14d671c870648a000b9d7604e4b66b1450fb0400f06753c69
+  data.tar.gz: b6674e47f7f0c2189ba614d03b53bf236adf20c2fd4d0fd602f20b28a393d0f2c76be73b2fb8c820d42a95a0dbca657225d92bfbe172c23f2cf744f737b9b62a

data/lib/angie-core-api/{message → messaging}/amqp_client.rb

@@ -3,7 +3,7 @@
 require "bunny"
 
 module AngieCoreApi
-  module Message
+  module Messaging
     class AMQPClient
       include Singleton
 
@@ -14,9 +14,7 @@ module AngieCoreApi
       end
 
       def initialize
-        @rabbitmq_config = AngieCoreApi.configuration.rabbitmq
-        @config          = HashWithIndifferentAccess.new(@rabbitmq_config)
-
+        @config = AngieCoreApi.configuration.rabbitmq.with_indifferent_access
         @connection = Bunny.new(config[:url])
         @connection.start
 
@@ -28,33 +26,24 @@ module AngieCoreApi
       end
 
       def self.classes
-        Dir["app/topics/*.rb"].
+        Dir["app/exchanges/*.rb", "engines/**/app/exchanges/*.rb"].
           map { |file| File.basename(file, ".rb") }.
-          select { |type| type != "application_topic" }.
           map(&:camelize).
           map(&:constantize)
       end
 
       def self.connect
         AMQPClient.instance
-
         classes.each { |k| k.new }
       end
 
       def self.disconnect!
-        amqp_url = AMQPClient.instance.amqp_url
-
-        AMQPClient.instance.channel.close
         AMQPClient.instance.connection.close
         @@instance = nil
-
-        puts "Disconnected from #{amqp_url}"
+        puts "Disconnected from #{AMQPClient.instance.amqp_url}"
       end
 
-      def self.reconnect!
-        disconnect!
-        connect
-      end
+      private
 
       def amqp_url
         @config[:url].sub(/\/\/.*@/, "//")

data/lib/angie-core-api/messaging/exchange.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module AngieCoreApi
+  module Messaging
+    class Exchange
+      def self.exchange(exchange_name, type:, routing_key:, queue: nil, exchange_options: {}, queue_options: {})
+        channel = AMQPClient.instance.channel
+        @exchange_name = exchange_name
+
+        # TODO: implement direct and fanout
+        @exchange, @queue = case type
+                            when :topic
+                              x = channel.topic(exchange_name, { durable: true }.merge(exchange_options))
+                              q = channel.queue(queue, queue_options).bind(x, routing_key:) if queue
+                              [x, q]
+                            end
+      end
+
+      def self.subscribe(options = { manual_ack: false })
+        # TODO: show usage?
+        raise "Exchange is not defined" unless @exchange
+        raise "Queue is not defined" unless @queue
+
+        @queue.subscribe({ block: false }.merge(options)) do |delivery_info, properties, payload|
+          r = { delivery_info:, properties:, payload: }
+          yield r
+          AMQPClient.instance.channel.acknowledge(delivery_info.delivery_tag) if options[:manual_ack]
+        end
+      end
+
+      def self.publish(payload, options = {})
+        # TODO: show usage?
+        raise "Exchange is not defined" unless @exchange
+        raise "Routing key is not defined" unless options.has_key?(:routing_key)
+
+        @exchange.publish(payload,
+                          {
+                            routing_key: options[:routing_key],
+                            message_id: SecureRandom.uuid,
+                            persistent: true,
+                            content_type: "application/json",
+                            content_encoding: "UTF-8"
+                          }.merge(options))
+      end
+    end
+  end
+end

data/lib/angie-core-api/messaging.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module AngieCoreApi
+  module Messaging
+    autoload :AMQPClient, "angie-core-api/messaging/amqp_client"
+    autoload :Exchange, "angie-core-api/messaging/exchange"
+  end
+end

data/lib/angie-core-api/railtie.rb

@@ -7,5 +7,11 @@ module AngieCoreApi
         ActionMailer::Base.add_delivery_method(:angie_core_api, AngieCoreApi::DeliveryMethod)
       end
     end
+
+    initializer "angie_core_api.connect_to_messaging" do
+      ActiveSupport.on_load(:active_record) do
+        # AngieCoreApi::Messaging::AMQPClient.connect
+      end
+    end
   end
 end

data/lib/angie-core-api.rb

@@ -10,7 +10,7 @@ module AngieCoreApi
   autoload :TV, "angie-core-api/tv"
   autoload :Weather, "angie-core-api/weather"
   autoload :DeliveryMethod, "angie-core-api/delivery_method"
-  autoload :Message, "angie-core-api/message"
+  autoload :Messaging, "angie-core-api/messaging"
 
   def self.configuration
     @configuration ||= Configuration.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angie-core-api
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.1
 platform: ruby
 authors:
 - Nomadix
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-17 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actioncable
@@ -53,47 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.18.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.18.0
-- !ruby/object:Gem::Dependency
-  name: stomp
+  name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.20'
 - !ruby/object:Gem::Dependency
-  name: bunny
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: 0.18.0
 description: Nomadix CoreAPI Ruby gem
 email:
 - rubygems@nomadix.com
@@ -107,11 +93,9 @@ files:
 - lib/angie-core-api/delivery_method.rb
 - lib/angie-core-api/flight.rb
 - lib/angie-core-api/map.rb
-- lib/angie-core-api/message.rb
-- lib/angie-core-api/message/amqp_client.rb
-- lib/angie-core-api/message/queue.rb
-- lib/angie-core-api/message/stomp_client.rb
-- lib/angie-core-api/message/topic.rb
+- lib/angie-core-api/messaging.rb
+- lib/angie-core-api/messaging/amqp_client.rb
+- lib/angie-core-api/messaging/exchange.rb
 - lib/angie-core-api/notification.rb
 - lib/angie-core-api/railtie.rb
 - lib/angie-core-api/thermostat.rb
@@ -121,7 +105,7 @@ homepage: https://nomadix.com
 licenses: []
 metadata:
   homepage_uri: https://nomadix.com
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -136,8 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Nomadix CoreAPI Ruby gem
 test_files: []

data/lib/angie-core-api/message/queue.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module AngieCoreApi
-  module Message
-    class Queue
-      def self.classes
-        Dir["app/queues/*.rb"].
-          map { |file| File.basename(file, ".rb") }.
-          select { |type| type != "application_queue" }.
-          map(&:camelize).
-          map(&:constantize)
-      end
-
-      def self.queue
-        path = name.underscore.sub("_queue", "")
-        "/queue/#{path}"
-      end
-
-      def self.publish(message)
-        StompClient.new.async.publish(queue, message)
-      end
-
-      def self.subscribe
-        StompClient.new.async.subscribe(queue) do |message|
-          self.new.receive(message)
-        end
-      end
-    end
-  end
-end

data/lib/angie-core-api/message/stomp_client.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require "stomp"
-
-module AngieCoreApi
-  module Message
-    class StompClient
-      include Concurrent::Async
-
-      def initialize
-        config  = HashWithIndifferentAccess.new(AngieCoreApi.configuration.activemq)
-        @client = Stomp::Client.new(config)
-      end
-
-      def publish(queue, data)
-        @client.publish(queue, data.to_json)
-        @client.close
-      end
-
-      def subscribe(queue)
-        @client.subscribe(queue) { |msg| yield JSON.parse(msg.body) }
-      end
-    end
-  end
-end

data/lib/angie-core-api/message/topic.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module AngieCoreApi
-  module Message
-    class Topic
-      def self.topic_name
-        @topic_name ||= name.underscore.dasherize
-      end
-
-      def self.exchange
-        @exchange ||= AMQPClient.instance.channel.topic(topic_name, durable: true, auto_delete: true)
-      end
-
-      def self.subscribe(routing_key, options = { manual_ack: false })
-        queue = AMQPClient.instance.channel.queue(queue_name(routing_key), durable: true)
-        queue.bind(exchange, routing_key: routing_key)
-
-        queue.subscribe(options.merge(block: false)) do |delivery_info, properties, payload|
-          yield delivery_info, properties, payload
-          AMQPClient.instance.channel.acknowledge(delivery_info.delivery_tag) if options[:manual_ack]
-        end
-      rescue Interrupt => _
-        AMQPClient.reconnect!
-      end
-
-      def self.publish(routing_key, message_id, payload)
-        exchange.publish(payload,
-                         message_id:       message_id,
-                         routing_key:      routing_key,
-                         persistent:       true,
-                         content_type:     "application/json",
-                         content_encoding: "UTF-8")
-      end
-
-      private
-
-      def self.queue_name(routing_key)
-        "#{AMQPClient.instance.config[:app]}.#{routing_key}"
-      end
-    end
-  end
-end

data/lib/angie-core-api/message.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module AngieCoreApi
-  module Message
-    autoload :AMQPClient, "angie-core-api/message/amqp_client"
-    autoload :StompClient, "angie-core-api/message/stomp_client"
-    autoload :Queue, "angie-core-api/message/queue"
-    autoload :Topic, "angie-core-api/message/topic"
-  end
-end