intellisense-ruby 0.7.5 → 0.7.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    intellisense-ruby (0.7.5)
+    intellisense-ruby (0.7.6)
       aws-sdk
       faraday (>= 0.8, < 0.10)
       faraday_middleware (>= 0.8, < 0.10)

data/lib/intellisense-ruby/client.rb

@@ -25,7 +25,8 @@ module IntellisenseRuby
       check_api_key
 
       @consumer = IntellisenseRuby::Consumer.new(@queue, @secret, options)
-      @thread = Thread.new { @consumer.run }
+      # TODO - make the use of the thread configurable
+      #@thread = Thread.new { @consumer.run }
 
       @logger = options[:logger]
       log('intellisense-ruby: SENSOR initialized!')
@@ -231,6 +232,8 @@ module IntellisenseRuby
       queue_full = @queue.length >= @max_queue_size
       @queue << action.to_json unless queue_full
 
+      @consumer.flush # flush right away
+
       !queue_full
     end
 

data/lib/intellisense-ruby/consumer.rb

@@ -7,6 +7,8 @@ module IntellisenseRuby
 
   class Consumer
 
+    attr_accessor :transport
+
     # public: Creates a new consumer
     #
     # The consumer continuously takes messages off the queue
@@ -31,7 +33,7 @@ module IntellisenseRuby
       @mutex = Mutex.new
 
       @logger = options[:logger]
-      log('intellisense-ruby: SENSOR initialized! with transport ' + @transport)
+      log("intellisense-ruby: SENSOR initialized! with transport #{@transport}")
 
     end
 
@@ -71,7 +73,14 @@ module IntellisenseRuby
       when 'sqs'
         log("intellisense-ruby: SENSOR using SQS transport to send #{@current_batch.to_s}")
         sqs = IntellisenseRuby::SQS_Publisher.new @options
-        sqs.send_message(@current_batch)
+        @current_batch.each {
+          |msg_data|
+          sent = sqs.send_message(msg_data)
+          if !sent #put the message back on the queue
+            @queue << msg_data
+          end
+        }
+        # sqs.send_message(@current_batch)
         @mutex.synchronize {
           @current_batch = []
         }

data/lib/intellisense-ruby/sqs_publisher.rb

@@ -36,13 +36,15 @@ module IntellisenseRuby
           return false
       end
 
-    	val = message.to_s
-    	msg = @sqs_queue.send_message(val)
-
-      log_info("intellisense-ruby: SQS_Publisher - Sent message: #{msg.id}")
-
-      return true
-
+      begin
+        val = message.to_s
+        msg = @sqs_queue.send_message(val)
+        log_info("intellisense-ruby: SQS_Publisher - Sent message: #{msg.id}")
+        return true
+      rescue => ex
+        log_error("intellisense-ruby: SQS_Publisher - FAILED to send messages due to: #{ex.class.name}")
+        return false
+      end
     end
 
     private

data/lib/intellisense-ruby/version.rb

@@ -1,3 +1,3 @@
 module IntellisenseRuby
-  VERSION = '0.7.5'
+  VERSION = '0.7.8'
 end

data/spec/consumer_spec.rb

@@ -1,6 +1,7 @@
 require 'intellisense-ruby'
 require 'thread'
 require 'spec_helper'
+require 'mocha/setup' 
 
 describe Intellisense::Consumer do
 
@@ -85,4 +86,52 @@ describe Intellisense::Consumer do
       consumer.is_requesting?.should == true
     end
   end
+
+  describe '#flush' do
+
+    it 'should initialize transport as http or sqs correctly' do
+
+      queue = Queue.new
+      options = Hash.new
+
+      options[:transport] = 'sqs'
+      consumer = Intellisense::Consumer.new(queue, 'testsecret', options)
+      expect(consumer.transport).to eq('sqs')
+
+      options[:transport] = 'http'
+      consumer = Intellisense::Consumer.new(queue, 'testsecret', options)
+      expect(consumer.transport).to eq('http')
+
+    end
+
+    it 'should iterate through the batch one at a time when sending to SQS' do
+
+      queue = Queue.new
+      msg1 = {:make => "bmw", :year => "2014"}
+      msg2 = {:make => "audi", :year => "2013"}
+      queue << msg1.to_json
+      queue << msg2.to_json
+
+      options = Hash.new
+      options[:warehouse_access_key_id] = 'AKIAJPYU646KQOWWZ4SA'
+      options[:warehouse_secret_access_key] = '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'
+      options[:warehouse_queue_url] = 'https://sqs.us-east-1.amazonaws.com/691677686063/yoda-events-dev'
+
+      options[:transport] = 'sqs'
+      consumer = Intellisense::Consumer.new(queue, 'testsecret', options)
+
+      # Stub send_message on all instances of SQS_Publisher
+      IntellisenseRuby::SQS_Publisher.any_instance.expects(:send_message).with(msg1.to_json)
+      IntellisenseRuby::SQS_Publisher.any_instance.expects(:send_message).with(msg2.to_json)
+      IntellisenseRuby::SQS_Publisher.any_instance.expects(:send_message).at_least(2)
+      IntellisenseRuby::SQS_Publisher.any_instance.expects(:send_message).at_most(2)
+
+      sentMessage = AWS::SQS::Queue::SentMessage.new
+      sentMessage.stubs(:id).returns('fake-id-12323123')
+      AWS::SQS::Queue.any_instance.stubs(:send_message).returns(sentMessage)
+
+      consumer.flush # should trigger expectations set above
+
+    end
+  end
 end

data/spec/sqs_publisher_spec.rb

@@ -30,10 +30,16 @@ describe IntellisenseRuby::SQS_Publisher do
   describe '#send_message' do
 
     it 'should send with valid credentials' do
+      options = Hash.new
+      options[:warehouse_access_key_id] = 'AKIAJPYU646KQOWWZ4SA'
+      options[:warehouse_secret_access_key] = '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'
+      options[:warehouse_queue_url] = 'https://sqs.us-east-1.amazonaws.com/691677686063/yoda-events-dev'
       # AWS::SQS::Queue.any_instance.stubs(:send_message).returns('STUBBED send_message')
       # sqs_publisher.stubs(:send_message).returns('STUBBED send_message')
-      # sqs_publisher = IntellisenseRuby::SQS_Publisher.new
-      # expect(sqs_publisher.send_message(value: 'test')).to eq(false)
+
+      # NOTE - uncomment only when trying to test - since this actually sends message
+      #sqs_publisher = IntellisenseRuby::SQS_Publisher.new options
+      #expect(sqs_publisher.send_message(value: 'test')).to eq(true)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intellisense-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -150,25 +150,20 @@ files:
 - lib/intellisense-ruby/consumer.rb
 - lib/intellisense-ruby/client.rb
 - lib/intellisense-ruby/defaults.rb
-- intellisense-ruby-0.7.4.gem
-- intellisense-ruby-0.7.3.gem
 - intellisense-ruby.sublime-project
-- intellisense-ruby-0.6.6.gem
-- intellisense-ruby-0.6.8.gem
-- intellisense-ruby-0.7.2.gem
 - intellisense-ruby.sublime-workspace
+- intellisense-ruby-0.7.5.gem
 - README.md
 - Gemfile
+- intellisense-ruby-0.7.6.gem
 - Gemfile.lock
 - intellisense-ruby.gemspec
 - Rakefile
-- intellisense-ruby-0.7.0.gem
 - spec/consumer_spec.rb
 - spec/module_spec.rb
 - spec/spec_helper.rb
 - spec/sqs_publisher_spec.rb
 - spec/client_spec.rb
-- intellisense-ruby-0.6.7.gem
 homepage: https://github.com/pnayak/intellisense-ruby.git
 licenses: []
 post_install_message: