barnyard_market 0.0.6 → 0.0.7

data/barnyard_market.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "barnyard_harvester"
   gem.add_runtime_dependency "crack"
   gem.add_runtime_dependency "uuid"
+  gem.add_runtime_dependency "bunny"
 
 
 end

data/lib/barnyard_market/version.rb

@@ -1,3 +1,3 @@
 module BarnyardMarket
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/barnyard_market.rb

@@ -5,8 +5,10 @@ require "crack"
 require "aws-sdk"
 require "uuid"
 require "json"
+require "bunny"
 
 module BarnyardMarket
+
   class ProcessSubscriptions
 
     def initialize(args)
@@ -14,30 +16,25 @@ module BarnyardMarket
       @debug = args.fetch(:debug) { false }
       @log = args.fetch(:logger) { Logger.new(STDOUT) }
 
-      @sqs_settings = args.fetch(:sqs_settings) { raise "You must provide :sqs_settings" }
-      @dynamodb_settings = args.fetch(:dynamodb_settings) { raise "You must provide :dynamodb_settings" }
       @cachecow_settings = args.fetch(:cachecow_settings) { raise "You must provide :cachecow_settings" }
 
       @cachecow = BarnyardCcfeeder::CacheCow.new(@cachecow_settings)
 
-      @sqs = AWS::SQS.new(@sqs_settings)
-
-      @farmer_queue = @sqs.queues.create("barnyard-farmer")
-      @transaction_queue = @sqs.queues.create("barnyard-transactions")
+      @q = BarnyardHarvester::GenericQueue.new(args)
 
       deliver_subscriptions
     end
 
-
     def deliver_subscriptions
 
       count = 0
 
-      while (msg = @farmer_queue.receive_message) do
+
+      while (msg = @q.pop("barnyard-farmer")) do
 
         count += 1
 
-        payload = Crack::JSON.parse(msg.body)
+        payload = Crack::JSON.parse(msg)
 
         @log.info "#{count} Received #{payload["transaction_type"].upcase} for crop #{payload["crop_number"]}"
 
@@ -48,18 +45,17 @@ module BarnyardMarket
         subscribed.each do |subscription|
 
           queue_name = "barnyard-transactions-subscriber-#{subscription["subscriber"]["id"]}-crop-#{subscription["crop"]["crop_number"]}"
-          queue = @sqs.queues.create(queue_name)
 
           payload["subscription_id"] = subscription["id"]
           payload["transaction_uuid"] = UUID.new.generate
 
           @log.info "Sending message for change #{payload["change_uuid"]} to queue #{queue_name}"
           json_payload = payload.to_json
-          queue.send_message(json_payload)
-          @transaction_queue.send_message(json_payload)
-        end
 
-        msg.delete
+          @q.push(queue_name, json_payload)
+          @q.push("barnyard-transaction", json_payload)
+
+        end
 
       end
 

data/spec/market_spec.rb

@@ -1,18 +1,6 @@
 require "rspec"
 require "barnyard_market"
 
-#DYNAMODB_SETTINGS = {
-#    :dynamo_db_endpoint => "dynamodb.us-west-1.amazonaws.com",
-#    :access_key_id => ENV["AWS_ACCESS_KEY_ID"],
-#    :secret_access_key => ENV["AWS_SECRET_ACCESS_KEY"]
-#}
-#
-#SQS_SETTINGS = {
-#    :sqs_endpoint => "sqs.us-west-1.amazonaws.com",
-#    :access_key_id => ENV["AWS_ACCESS_KEY_ID"],
-#    :secret_access_key => ENV["AWS_SECRET_ACCESS_KEY"]
-#}
-
 ["BACKEND_AWS_SECRET_ACCESS_KEY",
  "BACKEND_AWS_ACCESS_KEY_ID",
  "BACKEND_AWS_REGION",
@@ -36,28 +24,49 @@ SQS_SETTINGS = {
     :secret_access_key => BACKEND_AWS_SECRET_ACCESS_KEY
 }
 
+REDIS_SETTINGS = {
+    :host => "localhost",
+    :port => 6379,
+}
+
+RABBITMQ_SETTINGS = {
+    :host => "localhost"
+#    :port => 6163
+}
+
 CACHECOW_SETTINGS = {
     #:url => "http://localhost:3000"
     :url => "https://cachecow.c.qaapollogrp.edu"
 }
 
-describe "i should" do
+describe "Distributor" do
 
-  it "should work" do
+  it "should empty the RabbitMQ Farmer" do
 
     my_logger = Logger.new(STDOUT)
     my_logger.level = Logger::DEBUG
 
-    h = BarnyardMarket::ProcessSubscriptions.new(:queueing => :sqs,
-                                                 :sqs_settings => SQS_SETTINGS,
-                                                 :backend => :dynamodb,
+    h = BarnyardMarket::ProcessSubscriptions.new(:queueing => :rabbitmq,
+                                                 :rabbitmq_settings => RABBITMQ_SETTINGS,
+                                                 :backend => :redis,
                                                  :debug => true,
-                                                 :dynamodb_settings => DYNAMODB_SETTINGS,
                                                  :cachecow_settings => CACHECOW_SETTINGS,
                                                  :logger => my_logger)
 
+  end
+
+  it "should empty the SQS Farmer" do
 
-    #To change this template use File | Settings | File Templates.
-    true.should == true
+    my_logger = Logger.new(STDOUT)
+    my_logger.level = Logger::DEBUG
+
+    h = BarnyardMarket::ProcessSubscriptions.new(:queueing => :sqs,
+                                                 :sqs_settings => SQS_SETTINGS,
+                                                 :backend => :redis,
+                                                 :debug => true,
+                                                 :redis_settings => REDIS_SETTINGS,
+                                                 :cachecow_settings => CACHECOW_SETTINGS,
+                                                 :logger => my_logger)
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barnyard_market
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70224690969660 !ruby/object:Gem::Requirement
+  requirement: &70111117644060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70224690969660
+  version_requirements: *70111117644060
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70224690968780 !ruby/object:Gem::Requirement
+  requirement: &70111117642800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70224690968780
+  version_requirements: *70111117642800
 - !ruby/object:Gem::Dependency
   name: barnyard_ccfeeder
-  requirement: &70224690967940 !ruby/object:Gem::Requirement
+  requirement: &70111117641660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70224690967940
+  version_requirements: *70111117641660
 - !ruby/object:Gem::Dependency
   name: barnyard_harvester
-  requirement: &70224690967060 !ruby/object:Gem::Requirement
+  requirement: &70111121753580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70224690967060
+  version_requirements: *70111121753580
 - !ruby/object:Gem::Dependency
   name: crack
-  requirement: &70224690966520 !ruby/object:Gem::Requirement
+  requirement: &70111121751680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70224690966520
+  version_requirements: *70111121751680
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &70224690966100 !ruby/object:Gem::Requirement
+  requirement: &70111121748100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70224690966100
+  version_requirements: *70111121748100
+- !ruby/object:Gem::Dependency
+  name: bunny
+  requirement: &70111121746980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70111121746980
 description: Deliver subscriptions to queues.
 email:
 - supercoder@gmail.com