wbase 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8b7267ae68a8d23ffb06b86500da19abe87eceb
-  data.tar.gz: 116c552a0b2c659a04d376c102c4dd8ae59c1b80
+  metadata.gz: 2fc1b31c1bad008c9385eea4f1b18bbfa4fdaf53
+  data.tar.gz: 8ede718e893069afdedffdc3c814256ad628319c
 SHA512:
-  metadata.gz: 3881fe18e1969423ef46ddd51eecd9c06efa411aeae4ac78505d919fa7138a7a5ff5ea743455a298adf6a8dd1a4be876a9a67cea230e7ebb11a4e5be7d7a7202
-  data.tar.gz: ab8f977627a9275c91ae77a38a501290baf5a3aa7a95b804b40d7c9899f7780ea1756e4cf5049ce4c11c298c2bc876802a7431aa5992a50e8a8671d83ae03fee
+  metadata.gz: cd9c72e591182dff9cba0297db769861eb87329d2f46eb72e772771621e683d8abb5959c63cd3d2916b95784ac1e2eb475f8474324e9caf2aebbc5d38167696b
+  data.tar.gz: 2152b79398bb3a95cea228d6673875437ba0d40bb908fc86b800ae84ee7e1d1d120d6ad1e41140e3323c1ec41004243ca27eb1e5795926f83c1aeb59a16e17c1

data/app/models/wbase/userable.rb

@@ -65,7 +65,19 @@ module Wbase
     end
 
     def subscribed?
-      trial? || (subscription && subscription.current?)
+      return true if trial?
+      active_subscriptions = subscriptions.where('paid_thru > ?', 7.days.ago)
+      return true if active_subscriptions.exists?
+      subscriptions.each do |sub|
+        if sub.update_paid_thru! && sub.paid_thru > 7.days.ago
+          return true
+        end
+      end
+      false
+    end
+
+    def subscriptions
+      Subscription.where(user: self)
     end
 
     def trial?

data/lib/wbase/version.rb

@@ -1,3 +1,3 @@
 module Wbase
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wbase
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - CJ Avilla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-05 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails