sugester 0.5.1 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97350edffd2ec4dba08024b6b6168856c30a2631
-  data.tar.gz: 87d5b7a8d8fd8d3e7247ffdddcbdf59b66e30fa1
+  metadata.gz: 022cfc170f0b77327a4470217d52ef5534a06e2b
+  data.tar.gz: 3b4f70312007b06089e9a0a835fe1ca7bb6860fc
 SHA512:
-  metadata.gz: 22fb5a218ee12784c52a356c4159d34f56da8f87d2368e03f9b01cd8c58842afbaaf7b1810d5536fa8c2331ca3fca5108574e52acc437a61197781a1a63380aa
-  data.tar.gz: 5dda2c2d0ff4cbf16d26dd2f3ce3476040237f88f89fa244dc8fdbf51f1258fc5fc90ad731aa069cb540654ca1ddf5fa9237a08e8e5a901ac104f6a904afcf36
+  metadata.gz: 9299ab731c0ff54e46a6111fcb01f2059a6ac35a1f8ce41b82de3d50a944cea10f99459f831ad762f267cf31d197ffd7beb3e1021391097d8c9a583b764b9b9a
+  data.tar.gz: fd3149735267ffa8733867043d4777a6fae340fe8a246d430a2170d2712ef2096e6927b7f5cf01f5bd3b393999d1ff5b6fe548e0e0033d42c95a7c8f583b3aef

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sugester (0.5.1)
+    sugester (0.5.4)
       activesupport
       aws-sdk (~> 2)
 

data/lib/sugester.rb

@@ -4,11 +4,18 @@ require 'digest'
 
 module Sugester
 
-  VERSION = "0.5.1"
+  VERSION = "0.5.4"
+
+  private
+
+  def self.puts_warning msg
+    $stderr.puts("WARNING: #{msg}, sugester #{VERSION}")
+  end
 
   def self.assert(msg, v)
-    raise StandardError.new(msg) unless v
+    puts_warning msg unless v
   end
+
   def self.instance_assert(variable_name, variable, *klasses)
     assert(
       "#{variable_name} must be instance of #{klasses.join(" or ")}",
@@ -16,8 +23,14 @@ module Sugester
     )
   end
 
+  public
+
   class SugesterQueue
 
+    def self.secret_corrupted_warning
+      Sugester.puts_warning "Secret corrupted. Visit sugester to get valid data."
+    end
+
     private
 
     def self.decrypt(msg)
@@ -34,28 +47,37 @@ module Sugester
       return crypt
     end
 
-    def config(property)
+    def config(property, throwable = false)
       JSON.parse(SugesterQueue.decrypt(@secret)).deep_symbolize_keys[property]
-    rescue JSON::ParserError => e
-      raise "secret corrupted"
+    rescue StandardError => e
+      SugesterQueue.secret_corrupted_warning
+      nil
     end
 
 
     def push(kind, client_id, msg)
       Sugester.assert "unknown kind", MSG_KINDS.include?(kind)
       Sugester.instance_assert "client_id", client_id, Integer
-      raw_push msg.merge({client_id: client_id, kind: kind})
+      raw_push msg.merge({
+        client_id: client_id,
+        kind: kind,
+        vsn: VERSION,
+      })
     end
 
     def raw_push(msg)
       #TODO max length
-      @sqs.send_message({
-        queue_url: config(:url),
-        message_body: msg.merge({
-            token: config(:token),
-            prefix: config(:prefix),
-          }).to_json,
-      })
+      if @sqs
+        @sqs.send_message({
+          queue_url: config(:url),
+          message_body: msg.merge({
+              token: config(:token),
+              prefix: config(:prefix),
+            }).to_json,
+        })
+      else
+        SugesterQueue.secret_corrupted_warning
+      end
     end
 
     MSG_KINDS = [:activity, :property, :payment]
@@ -63,7 +85,8 @@ module Sugester
 
     def initialize(secret)
       @secret = secret
-      @sqs = Aws::SQS::Client.new(config(:config))
+      c = config(:config)
+      @sqs = Aws::SQS::Client.new(config(:config)) if c
     end
 
     def activity(client_id, name, options = {})
@@ -72,16 +95,16 @@ module Sugester
     end
 
     def property(client_id, options)
-      options.each do |name, value|
-        Sugester.instance_assert "name", name, String, Symbol
-        #TODO valid value
-      end
+      #options.enum do |name, value|
+      #  Sugester.instance_assert "name", name, String, Symbol
+      #  Sugester.instance_assert "value", value, String, Symbol, Numeric, Time, DateTime, Date
+      #end
       push :property, client_id, {options: options}
     end
 
     def payment(client_id, name, price, date_from, date_to)
-      Sugester.instance_assert "date_from", date_from, Time
-      Sugester.instance_assert "date_to", date_to, Time
+      Sugester.instance_assert "date_from", date_from, Time, Date, DateTime
+      Sugester.instance_assert "date_to", date_to, Time, Date, DateTime
       Sugester.instance_assert "price", price, Numeric
       Sugester.instance_assert "name", name, String, Symbol
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugester
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.4
 platform: ruby
 authors:
 - marcin