caboose-cms 0.9.94 → 0.9.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df217f87faf8c93c8aa06947ee169d1459902087
-  data.tar.gz: 870c6ace2742e5f57e80c26581d9b0727ec0b8b0
+  metadata.gz: 48d3ccbb53621efe566b03eed61919faeb957615
+  data.tar.gz: 54d28c881b9c08d143d9819cd2c04355047f3ee1
 SHA512:
-  metadata.gz: 5f01c6c85faa7e8ce92599d7a87f7f0fdacbd8a799614f43a748b848867e57324d1165f8aacef65d642cd40487d58915435a17786948df65fcd5178905b838e9
-  data.tar.gz: 7e6027f08532f803027cd5e2df55256a1213984e48ec49767d5c3e0feb72f95a648ef6836a7baadb9d2b4a16a07c50df6fe91320606a76bddd2e56ac6595c8b0
+  metadata.gz: af02565698684f101906a9f652933b8fd532aa62d6fbf2ff0354ed09a727b26e7b1fd459e615ddad66a535953b12002355b2f4cbc7b760dec4676aa0275771ce
+  data.tar.gz: 0a00afaa195d2c0dc383e6de747f5d436dff3ddd7e5b93bcc7f47580861c709b4f6314b02a6e53cfc7f70d01f5675036aa49e9ec0a6afc4967c6db9287bf2bcc

data/app/controllers/caboose/sns_controller.rb

@@ -4,7 +4,7 @@ module Caboose
     skip_before_filter :verify_authenticity_token
 
     # @route GET /admin/sns
-    def admin_index      
+    def admin_index
       render :json => true
     end
 
@@ -12,32 +12,33 @@ module Caboose
     def admin_add
       body = JSON.parse(request.raw_post, {symbolize_names: true})
       Caboose.log(body)
-      if body[:Type] && body[:Type] == "SubscriptionConfirmation"
-        Caboose.log("SNS Subscription SubscribeURL\n#{body[:SubscribeURL]}")
-      elsif body[:Subject] == 'Amazon S3 Notification'
-        msg = JSON.parse(body[:Message])
-        if msg['Records']
-          msg['Records'].each do |r|
-            if r['eventName'] && r['eventName'].starts_with?('ObjectCreated')          
-              if r['s3'] && r['s3']['object'] && r['s3']['object']['key']
-                                
-                key = URI.decode(r['s3']['object']['key']).gsub('+', ' ')
-                Caboose.log("Processing #{key}")
-
-                arr = key.split('_')
-                media_category_id = arr.shift
-                original_name = arr.join('_')  
-                name = Caboose::Media.upload_name(original_name)
-                                                                      
-                m = Media.where(:media_category_id => media_category_id, :original_name => original_name, :name => name).first
-                m = Media.create(:media_category_id => media_category_id, :original_name => original_name, :name => name, :processed => false) if m.nil?                
-                m.delay(:queue => 'caboose_media').process
-      
-              end
-            end                  
-          end
+      # if body[:Records]
+      #   records = body[:Records]
+      #   # if body[:Type] && body[:Type] == "SubscriptionConfirmation"
+      #   #   Caboose.log("SNS Subscription SubscribeURL\n#{body[:SubscribeURL]}")
+      #   if records['eventSource'] == "aws:s3"
+      #     msg = JSON.parse(body[:Message])
+      #     if msg['Records']
+      if body && body['Records']
+        body['Records'].each do |r|
+          if r['eventName'] && r['eventName'].starts_with?('ObjectCreated')          
+            if r['s3'] && r['s3']['object'] && r['s3']['object']['key']
+              key = URI.decode(r['s3']['object']['key']).gsub('+', ' ')
+              Caboose.log("Processing #{key}")
+              arr = key.split('_')
+              media_category_id = arr.shift
+              original_name = arr.join('_')  
+              name = Caboose::Media.upload_name(original_name)                                       
+              m = Media.where(:media_category_id => media_category_id, :original_name => original_name, :name => name).first
+              m = Media.create(:media_category_id => media_category_id, :original_name => original_name, :name => name, :processed => false) if m.nil?                
+              m.delay(:queue => 'caboose_media').process
+            end
+          end                  
         end
       end
+      #     end
+      #   end
+      # end
       render :json => true
     end
     

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.94'
+  VERSION = '0.9.95'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.94
+  version: 0.9.95
 platform: ruby
 authors:
 - William Barry