subly 0.2.0 → 0.3.0

data/lib/subly.rb

@@ -50,6 +50,17 @@ module Subly
     def has_active_subscription?(name)
       self.sublies.active.by_name(name).count > 0
     end
+
+    def cancel_active_subscriptions(name)
+      self.sublies.active.by_name(name).collect(&:expire_now)
+    end
+
+    def cancel_all_subscriptions(name)
+      self.sublies.unexpired.by_name(name).each do |sub|
+        #if active, deactivate, else destroy as and end_time greater than start is not valid
+        sub.active? ? sub.expire_now : sub.destroy
+      end
+    end
   end
 end
 

data/lib/subly/model.rb

@@ -21,6 +21,11 @@ module Subly
       scoped(:conditions => ['starts_at <= ? AND ends_at <= ?', now, now])
     end
 
+    def self.unexpired
+      now = Time.zone.now
+      scoped(:conditions => ['ends_at > ? OR ends_at IS NULL', now])
+    end
+
     def self.for_subscriber(sub)
       raise ArgumentError('wrong number of arguments (0 for 1)') if sub.blank?
       scoped(:conditions => ['subscriber_type = ? AND subscriber_id = ?',sub.class.to_s, sub.id])
@@ -43,6 +48,20 @@ module Subly
       !!(starts_at <= now && (ends_at.nil? || ends_at > now))
     end
 
+    def expired?
+      now = Time.now
+      !(ends_at.nil? || ends_at > now)
+    end
+
+    def in_the_future?
+      now = Time.now
+      !!(starts_at > now && (ends_at.nil? || ends_at > now))
+    end
+
+    def expire_now
+      self.update_attribute(:ends_at, Time.now)
+    end
+
     private
     def ends_after_starts
       if !starts_at.nil? && !ends_at.nil? && (ends_at < starts_at)

data/lib/subly/version.rb

@@ -1,3 +1,3 @@
 module Subly
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/spec_helper.rb

@@ -6,7 +6,9 @@ require 'subly'
 require 'sqlite3'
 
 #Time.zone.now doesn't work in test
-
+def stub_time_zone
+  Time.stub!(:zone).and_return(Time)
+end
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

data/spec/subly_model_spec.rb

@@ -21,8 +21,23 @@ describe Subly::Model do
     lambda{Subly::Model.create!(:name => 'Foo', :subscriber_type => 'Foo', :subscriber_id => 1, :starts_at => Time.now + 1.minute, :ends_at => Time.now - 1.minute)}.should raise_error
   end
 
-  it "should be active if it stats in the past and ends in the future" do
-    i = Item.create
+  it "should be expire immediately" do
+    s = Subly::Model.create(:name => 'Foo', :subscriber_type => 'Item', :subscriber_id => 1, :starts_at => Time.now - 5.minute)
+    s.active?.should be_true
+    s.expire_now.should be_true
+    s.reload
+    s.active?.should be_false
+  end
+
+  it "should be active if it starts in the past and ends in the future" do
     Subly::Model.new(:name => 'Foo', :subscriber_type => 'Item', :subscriber_id => 1, :starts_at => Time.now - 1.minute, :ends_at => Time.now + 1.hour).active?.should be_true
   end
+
+  it "should be expired if it ends in the past" do
+    Subly::Model.new(:name => 'Foo', :subscriber_type => 'Item', :subscriber_id => 1, :starts_at => Time.now - 5.minute, :ends_at => Time.now - 4.minutes).expired?.should be_true
+  end
+
+  it "should be in_the_future if it starts and ends in the future" do
+    Subly::Model.new(:name => 'Foo', :subscriber_type => 'Item', :subscriber_id => 1, :starts_at => Time.now + 5.minute, :ends_at => Time.now + 14.minutes).in_the_future?.should be_true
+  end
 end

data/spec/subly_spec.rb

@@ -17,7 +17,7 @@ describe Subly do
   end
 
   it "subscription should default to active" do
-    Time.stub!(:zone).and_return(Time)
+    stub_time_zone
     thing_one = Thing.create(:name => 'Thing One', :description => 'foo')
     thing_one.add_subscription('sub name').should be_true
     thing_one.reload
@@ -52,12 +52,12 @@ describe Subly do
   end
 
   it "is method should be false if it does not have an active sub" do
-    Time.stub!(:zone).and_return(Time)
+    stub_time_zone
     Item.new.is_subby?.should be_false
   end
 
   it "is method should be true if it has an active sub" do
-    Time.stub!(:zone).and_return(Time)
+    stub_time_zone
     item = Item.create(:name => 'foo')
     item.add_subscription('subby')
     item.is_subby?.should be_true
@@ -65,11 +65,35 @@ describe Subly do
 
   it "should convert duration to time" do
     time = Time.parse('2001-01-01T010101+0000')
-    Time.stub!(:zone).and_return(Time)
+    stub_time_zone
     Time.stub!(:now).and_return(time)
     item = Item.create(:name => 'foo')
     item.add_subscription('subby', :duration => "1 year")
     item.is_subby?.should be_true
     item.sublies.last.ends_at.should == time + 1.year
   end
+
+  it "should change the end date of all active subscriptions" do
+    stub_time_zone
+    thing_one = Thing.create(:name => 'Thing One', :description => 'foo')
+    thing_one.add_subscription('sub name',:value => 'sub value').should be_true
+    thing_one.add_subscription('sub name',:value => 'sub value', :starts_at => Time.now + 1.month).should be_true
+    thing_one.reload
+    thing_one.cancel_active_subscriptions('sub name')
+    thing_one.sublies.count.should == 2
+    thing_one.sublies.unexpired.count.should == 1
+    thing_one.sublies.expired.count.should == 1
+  end
+
+  it "should cancel all subscriptions" do
+    stub_time_zone
+    thing_one = Thing.create(:name => 'Thing One', :description => 'foo')
+    thing_one.add_subscription('sub name',:value => 'sub value').should be_true
+    thing_one.add_subscription('sub name',:value => 'sub value', :starts_at => Time.now + 1.month).should be_true
+    thing_one.reload
+    thing_one.cancel_all_subscriptions('sub name')
+    thing_one.sublies.count.should == 1
+    thing_one.sublies.unexpired.count.should == 0
+    thing_one.sublies.expired.count.should == 1
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subly
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-01-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156449020 !ruby/object:Gem::Requirement
+  requirement: &2156824500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.3.12
   type: :development
   prerelease: false
-  version_requirements: *2156449020
+  version_requirements: *2156824500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156448640 !ruby/object:Gem::Requirement
+  requirement: &2156824060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156448640
+  version_requirements: *2156824060
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2156448120 !ruby/object:Gem::Requirement
+  requirement: &2156823560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156448120
+  version_requirements: *2156823560
 - !ruby/object:Gem::Dependency
   name: chronic_duration
-  requirement: &2156447620 !ruby/object:Gem::Requirement
+  requirement: &2156823020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156447620
+  version_requirements: *2156823020
 description: This was purpose built to extend models with subscriptions that were
   controlled via SalesForce
 email: