subly 0.1.2 → 0.2.0

data/lib/subly.rb

@@ -38,10 +38,9 @@ module Subly
 
   module InstanceMethods
     def add_subscription(name, args = {})
-      value = args[:value] || nil
-      start_date = args[:start_date] || Time.now
-      end_date = args[:end_date] || nil
-      self.sublies.create(:name => name, :value => value, :starts_at => start_date, :ends_at => end_date)
+      args[:starts_at] ||=  Time.now
+      args[:name] = name
+      self.sublies.create(args)
     end
 
     def has_subscription?(name)
@@ -54,4 +53,4 @@ module Subly
   end
 end
 
-ActiveRecord::Base.send :extend, Subly
+ActiveRecord::Base.send :extend, Subly

data/lib/subly/model.rb

@@ -1,9 +1,12 @@
 module Subly
   class Model < ActiveRecord::Base
+    require 'chronic_duration'
     set_table_name 'subly_models'
 
     belongs_to :subscriber, :polymorphic => true
 
+    before_validation :convert_duration
+
     validates_presence_of :subscriber_type
     validates_presence_of :subscriber_id, :unless => Proc.new { |subly| subly.subscriber_type.nil? }
     validate :ends_after_starts
@@ -27,11 +30,31 @@ module Subly
       scoped(:conditions => {:name => name})
     end
 
+    def duration=(duration)
+      @duration = duration
+    end
+
+    def duration
+      @duration
+    end
+
+    def active?
+      now = Time.now
+      !!(starts_at <= now && (ends_at.nil? || ends_at > now))
+    end
+
     private
     def ends_after_starts
       if !starts_at.nil? && !ends_at.nil? && (ends_at < starts_at)
         raise "ends_at must be after starts_at"
       end
     end
+
+    def convert_duration
+      unless duration.blank?
+        self.starts_at = Time.zone.now if self.starts_at.blank?
+        self.ends_at = self.starts_at + ::ChronicDuration.parse(self.duration.to_s).seconds
+      end
+    end
   end
-end
+end

data/lib/subly/version.rb

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

data/spec/spec_helper.rb

@@ -15,6 +15,8 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 #ActiveRecord::Schema.verbose = false
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 
+ActiveRecord::Base.logger = Logger.new('/dev/null')
+
 ActiveRecord::Base.configurations = true
 ActiveRecord::Schema.define(:version => 1) do
   create_table :items do |t|
@@ -43,4 +45,4 @@ ActiveRecord::Schema.define(:version => 1) do
   add_index :subly_models, [:subscriber_type,:subscriber_id], :name => 'subscriber_idx'
   add_index :subly_models, :starts_at, :name => 'starts_idx'
   add_index :subly_models, :ends_at, :name => 'ends_idx'
-end
+end

data/spec/subly_model_spec.rb

@@ -20,4 +20,9 @@ describe Subly::Model do
   it "subscription should not be created when ends before starts" 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
+    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
 end

data/spec/subly_spec.rb

@@ -11,7 +11,7 @@ end
 describe Subly do
   it "should add a subscription" do
     thing_one = Thing.create(:name => 'Thing One', :description => 'foo')
-    thing_one.add_subscription('sub name','sub value').should be_true
+    thing_one.add_subscription('sub name',:value => 'sub value').should be_true
     thing_one.reload
     thing_one.sublies.count.should == 1
   end
@@ -26,7 +26,7 @@ describe Subly do
 
   it "has_subscription should return true even for expired subscription" do
     thing_one = Thing.create(:name => 'Thing One', :description => 'foo')
-    thing_one.add_subscription('sub name', :start_date => Time.now - 1.day, :end_date => Time.now - 2.hours).should be_true
+    thing_one.add_subscription('sub name', :starts_at => Time.now - 1.day, :ends_at => Time.now - 2.hours).should be_true
     thing_one.reload
     thing_one.has_subscription?('sub name').should be_true
   end
@@ -42,7 +42,7 @@ describe Subly do
   it "should find models with even expired subscriptions" do
     Thing.delete_all
     thing_one = Thing.create(:name => 'Thing One', :description => 'foo')
-    thing_one.add_subscription('sub name', :start_date => Time.now - 1.day, :end_date => Time.now - 2.hours).should be_true
+    thing_one.add_subscription('sub name', :starts_at => Time.now - 1.day, :ends_at => Time.now - 2.hours).should be_true
     Thing.with_subscription('sub name').should == [thing_one]
     thing_one.destroy
   end
@@ -62,4 +62,14 @@ describe Subly do
     item.add_subscription('subby')
     item.is_subby?.should be_true
   end
+
+  it "should convert duration to time" do
+    time = Time.parse('2001-01-01T010101+0000')
+    Time.stub!(:zone).and_return(Time)
+    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
 end

data/subly.gemspec

@@ -20,4 +20,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "sqlite3"
 
+  s.add_dependency "chronic_duration"
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subly
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-20 00:00:00.000000000Z
+date: 2012-01-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156236100 !ruby/object:Gem::Requirement
+  requirement: &2156449020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.3.12
   type: :development
   prerelease: false
-  version_requirements: *2156236100
+  version_requirements: *2156449020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156235620 !ruby/object:Gem::Requirement
+  requirement: &2156448640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156235620
+  version_requirements: *2156448640
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2156235100 !ruby/object:Gem::Requirement
+  requirement: &2156448120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156235100
+  version_requirements: *2156448120
+- !ruby/object:Gem::Dependency
+  name: chronic_duration
+  requirement: &2156447620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156447620
 description: This was purpose built to extend models with subscriptions that were
   controlled via SalesForce
 email: