Merge branch 'master' of https://github.com/kegaretail/react-native-rabbitmq

Author: timhonders

README.md

@@ -1,7 +1,4 @@
 ## Todo
-React Native 0.40 fix
-
-
 
 ## Installation
 
@@ -11,17 +8,18 @@ npm install react-native-rabbitmq --save
 
  Installation with CocoaPods
 
-1. In the podfile uncommend "use_frameworks":
+1. In the Podfile uncomment "use_frameworks":
 
 ```
 use_frameworks!
 ```
 2. Add the following to your Podfile, use master because needed fix is not a tag:
 
 ```
+pod 'react-native-rabbitmq', :path => '../node_modules/react-native-rabbitmq'
 pod 'RMQClient', :git => 'https://github.com/rabbitmq/rabbitmq-objc-client.git'
 ```
-3. Instal the cocapods:
+3. Install the cocapods:
 
 ```
 pod install
@@ -73,7 +71,7 @@ to
 react-native link
 
 
-## Android 
+## Android
 
 npm install react-native-rabbitmq --save
 
@@ -82,11 +80,13 @@ react-native link
 
 ## Usage
 ```
+import { Connection, Exchange, Queue } from 'react-native-rabbitmq';
+
 const config = {
-	host:'', 
-	port:5672, 
-	username:'user', 
-	password:'password', 
+	host:'',
+	port:5672,
+	username:'user',
+	password:'password',
 	virtualhost:'vhost'
 }
 
@@ -99,28 +99,28 @@ connection.on('error', (event) => {
 connection.on('connected', (event) => {
 
 	let queue = new Queue( this.connection, {
-		name: 'queue_name', 
+		name: 'queue_name',
 		passive: false,
-		durable: true, 
+		durable: true,
 		exclusive: false,
 		consumer_arguments: {'x-priority': 1}
 	});
 
 	let exchange = new Exchange(connection, {
-		name: 'exchange_name', 
-		type: 'direct', 
-		durable: true, 
+		name: 'exchange_name',
+		type: 'direct',
+		durable: true,
 		autoDelete: false,
 		internal: false
 	});
 
 	queue.bind(exchange, 'queue_name');
-	
+
 	// Receive one message when it arrives
 	queue.on('message', (data) => {
 
 	});
-	
+
 	// Receive all messages send with in a second
 	queue.on('messages', (data) => {
 
@@ -136,4 +136,3 @@ let properties = {
 exchange.publish(data, routing_key, properties)
 
 ```
-

index.js

@@ -0,0 +1,7 @@
+import { Platform } from "react-native"
+import RNRabbitMqIos from "./index.ios.js"
+import RNRabbitMqAndroid from "./index.android.js"
+
+const RNRabbitMq = Platform.OS === "ios" ? RNRabbitMqIos : RNRabbitMqAndroid
+
+export default RNRabbitMq

ios/RCTReactNativeRabbitMq/RCTReactNativeRabbitMq.h

@@ -4,7 +4,7 @@
 #ifdef OLDER_IMPORT
     #import "RCTBridge.h"
 #else
-    #import <React/RCTBridge.h>
+    #import <React/RCTBridgeModule.h>
 #endif
 
 @interface ReactNativeRabbitMq : NSObject <RCTBridgeModule>

ios/RCTReactNativeRabbitMq/RabbitMqConnection.h

@@ -3,7 +3,7 @@
     #import "RCTBridge.h"
     #import "RCTEventDispatcher.h"
 #else
-    #import <React/RCTBridge.h>
+    #import <React/RCTBridgeModule.h>
     #import <React/RCTEventDispatcher.h>
 #endif
 
@@ -14,4 +14,4 @@
 
 @interface RabbitMqConnection : NSObject <RCTBridgeModule>
 
-@end
+@end

ios/RCTReactNativeRabbitMq/RabbitMqDelegateLogger.h

@@ -3,7 +3,7 @@
     #import "RCTBridge.h"
     #import "RCTEventDispatcher.h"
 #else
-    #import <React/RCTBridge.h>
+    #import <React/RCTBridgeModule.h>
     #import <React/RCTEventDispatcher.h>
 #endif
 
@@ -13,4 +13,4 @@
 
     - (nonnull id) initWithBridge:(nonnull RCTBridge *)bridge;
 
-@end
+@end

ios/RCTReactNativeRabbitMq/RabbitMqQueue.h

@@ -3,20 +3,20 @@
     #import "RCTBridge.h"
     #import "RCTEventDispatcher.h"
 #else
-    #import <React/RCTBridge.h>
+    #import <React/RCTBridgeModule.h>
     #import <React/RCTEventDispatcher.h>
 #endif
 
 #import <RMQClient/RMQClient.h>
 
 @interface RabbitMqQueue : NSObject <RCTBridgeModule>
 
-    - (nonnull id) initWithConfig:(nonnull NSDictionary *)config 
+    - (nonnull id) initWithConfig:(nonnull NSDictionary *)config
                           channel:(nonnull id<RMQChannel>)channel
                            bridge:(nonnull RCTBridge *)bridge;
 
     - (void) bind:(nonnull RMQExchange *)exchange routing_key:(NSString *)routing_key;
     - (void) unbind:(nonnull RMQExchange *)exchange routing_key:(NSString *)routing_key;
     - (void) delete;
     - (void) ack: (NSNumber *)deliveryTag;
-@end
+@end

lib/Exchange.js

@@ -2,17 +2,17 @@ import { DeviceEventEmitter } from 'react-native';
 
 export class Exchange {
 
-    constructor(connection, exchange_condig) {
+    constructor(connection, exchange_config) {
 
         this.callbacks = {};
         this.rabbitmqconnection = connection.rabbitmqconnection;
 
-        this.name = exchange_condig.name;
-        this.exchange_condig = exchange_condig;
+        this.name = exchange_config.name;
+        this.exchange_config = exchange_config;
 
         DeviceEventEmitter.addListener('RabbitMqExchangeEvent', this.handleEvent);
 
-        this.rabbitmqconnection.addExchange(exchange_condig);
+        this.rabbitmqconnection.addExchange(exchange_config);
     }
 
     handleEvent = (event) => {
@@ -23,20 +23,20 @@ export class Exchange {
 
     on(event, callback){
         this.callbacks[event] = callback;
-    } 
-    
+    }
+
     removeon(event){
         delete this.callbacks[event];
-    } 
+    }
 
     publish(message, routing_key = '', properties = {}){
-        this.rabbitmqconnection.publishToExchange(message, this.name, routing_key, properties);    
+        this.rabbitmqconnection.publishToExchange(message, this.name, routing_key, properties);
     }
 
     delete(){
-        this.rabbitmqconnection.deleteExchange(this.name);    
+        this.rabbitmqconnection.deleteExchange(this.name);
     }
 
 }
 
-export default Exchange;
+export default Exchange;

lib/Queue.js

@@ -2,22 +2,23 @@ import {DeviceEventEmitter} from 'react-native';
 
 export class Queue {
 
-    constructor(connection, queue_condig, args) {
+    constructor(connection, queue_config, args) {
 
         this.callbacks = {};
         this.rabbitmqconnection = connection.rabbitmqconnection;
 
-        this.name = queue_condig.name;
-        this.queue_condig = queue_condig;
+        this.name = queue_config.name;
+        this.queue_config = queue_config;
         this.arguments = args || {};
 
         this.message_buffer = [];
-        this.message_buffer_delay =  (queue_condig.buffer_delay ? queue_condig.buffer_delay : 1000);
+        this.message_buffer_delay =  (queue_config.buffer_delay ? queue_config.buffer_delay : 1000);
         this.message_buffer_timeout = null;
-        
+
         DeviceEventEmitter.addListener('RabbitMqQueueEvent', this.handleEvent);
-        
+     
         this.rabbitmqconnection.addQueue(queue_condig, this.arguments);
+
     }
 
     handleEvent = (event) => {
@@ -41,7 +42,7 @@ export class Queue {
                 clearTimeout(this.message_buffer_timeout);
 
                 this.message_buffer_timeout = setTimeout(() => { 
-  
+
                     if (this.message_buffer.length > 0){
                         if (this.callbacks.hasOwnProperty('messages')){
                             this.callbacks['messages'](this.message_buffer);
@@ -60,26 +61,26 @@ export class Queue {
 
     on(event, callback){
         this.callbacks[event] = callback;
-    } 
+    }
 
     removeon(event){
         delete this.callbacks[event];
-    } 
+    }
 
     bind(exchange, routing_key = ''){
-        this.rabbitmqconnection.bindQueue(exchange.name, this.name, routing_key);    
+        this.rabbitmqconnection.bindQueue(exchange.name, this.name, routing_key);
     }
 
     unbind(exchange, routing_key = ''){
-        this.rabbitmqconnection.unbindQueue(exchange.name, this.name, routing_key);    
+        this.rabbitmqconnection.unbindQueue(exchange.name, this.name, routing_key);
     }
 
     delete(){
         if (this.name != '') {
-            this.rabbitmqconnection.removeQueue(this.name);   
-        } 
+            this.rabbitmqconnection.removeQueue(this.name);
+        }
     }
-    
+
     close() {
         DeviceEventEmitter.removeListener('RabbitMqQueueEvent', this.handleEvent);
         clearTimeout(this.message_buffer_timeout);
@@ -89,9 +90,9 @@ export class Queue {
     basicAck(delivery_tag) {
 
         this.rabbitmqconnection.basicAck(this.name, delivery_tag);
-        
+
     }
 
 }
 
-export default Queue;
+export default Queue;

react-native-rabbitmq.podspec

@@ -0,0 +1,22 @@
+require 'json'
+
+package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+
+Pod::Spec.new do |s|
+  s.name           = package['name']
+  s.version        = package['version']
+  s.summary        = package['description']
+  s.description    = package['description']
+  s.license        = package['license']
+  s.author         = package['author']
+  s.homepage       = package['homepage']
+  s.source         = { :git => 'https://github.com/rabbitmq/rabbitmq-objc-client.git', :tag => s.version }
+
+  s.requires_arc   = true
+  s.platform       = :ios, '7.0'
+
+  s.preserve_paths = 'README.md', 'package.json', 'index.ios.js'
+  s.source_files   = 'iOS/RCTReactNativeRabbitMq/*.{h,m}'
+
+  s.dependency 'React'
+end