mobilize-base 1.378 → 1.379

data/lib/mobilize-base/models/job.rb

@@ -125,22 +125,8 @@ module Mobilize
         else
           return false
         end
-      elsif unit == "day_of_week"
-        if curr_time.wday==number and (last_comp_time.nil? or last_comp_time.to_date != curr_time.to_date)
-          if mark
-            #check if it already ran today
-            last_mark_time = Time.at_marks_ago(1,"day",mark)
-            if last_comp_time < last_mark_time
-              return true
-            else
-              return false
-            end
-          else
-            return true
-          end
-        end
       elsif unit == "day_of_month"
-        if curr_time.day==number and (last_comp_time.nil? or last_comp_time.to_date != curr_time.to_date)
+        if curr_time.day==number.to_i and (last_comp_time.nil? or last_comp_time.to_date != curr_time.to_date)
           if mark
             #check if it already ran today
             last_mark_time = Time.at_marks_ago(1,"day",mark)

data/lib/mobilize-base/version.rb

@@ -1,5 +1,5 @@
 module Mobilize
   module Base
-    VERSION = "1.378"
+    VERSION = "1.379"
   end
 end

data/mobilize-base.gemspec

@@ -31,4 +31,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'google_drive','0.3.2'
   s.add_runtime_dependency 'popen4','0.1.2'
   s.add_runtime_dependency 'actionmailer','3.1.1'
+
+  s.add_development_dependency 'mocha'
 end

data/test/fixtures/is_due.yml

@@ -89,3 +89,33 @@
   parent: {completed_at: Time.now.utc - 1.second}
   completed_at: Time.now.utc
   expected: false
+- name: day_of_month
+  active: true
+  trigger: 'every 1.day_of_month'
+  status: ""
+  stage1: gsheet.method source:"source", target:"target"
+  now: Time.utc(2013,9,1)
+  expected: true
+- name: not_day_of_month
+  active: true
+  trigger: 'every 1.day_of_month'
+  status: ""
+  stage1: gsheet.method source:"source", target:"target"
+  now: Time.utc(2013,9,2)
+  expected: false
+- name: day_of_month_aft0100_comp_1monthago
+  active: true
+  trigger: 'every 1.day_of_month after 01:00'
+  status: ""
+  stage1: gsheet.method source:"source", target:"target"
+  now: Time.utc(2013,9,1,1,30)
+  completed_at: Time.utc(2013,8,1,1,15)
+  expected: true
+- name: day_of_month_aft0100_comp0115
+  active: true
+  trigger: 'every 1.day_of_month after 01:00'
+  status: ""
+  stage1: gsheet.method source:"source", target:"target"
+  now: Time.utc(2013,9,1,1,30)
+  completed_at: Time.utc(2013,9,1,1,15)
+  expected: false

data/test/unit/mobilize-base_test.rb

@@ -1,34 +1,46 @@
 require 'test_helper'
+require 'mocha/setup'
+
 class TestUnit < MiniTest::Unit::TestCase
-  def setup
+  def self.test_order
+    :sorted
+  end
+
+  def self.setup_test
     TestHelper.restart_test_redis
     TestHelper.drop_test_db
   end
 
-  #this test checks that several job triggers work as expected
-  def test_is_due
+  def self.define_tests(fixture)
     u = TestHelper.owner_user
-    job_hashes = TestHelper.load_fixture("is_due")
-    job_hashes.each do |jh|
-      job_path = "#{u.runner.path}/#{jh['name']}"
-      j = Mobilize::Job.find_or_create_by_path(job_path)
-      #update job params
-      j.update_from_hash(jh)
-      #apply the completed_at, failed at, and parent attributes where appropriate
-      if jh['completed_at']
-        j.stages.last.update_attributes(:completed_at=>eval(jh['completed_at']))
+    TestHelper.load_fixture(fixture).each_with_index do |jh, i|
+      name = "%03d_%s" % [i, jh['name']]
+      define_method(:"test_#{name}") do
+        job_path = "#{u.runner.path}/#{jh['name']}"
+        j = Mobilize::Job.find_or_create_by_path(job_path)
+        #update job params
+        j.update_from_hash(jh)
+        #apply the completed_at, failed at, and parent attributes where appropriate
+        if jh['completed_at']
+          j.stages.last.update_attributes(:completed_at=>eval(jh['completed_at']))
+        end
+        if jh['failed_at']
+          j.stages.last.update_attributes(:failed_at=>eval(jh['failed_at']))
+        end
+        if jh['parent']
+          j.parent.stages.last.update_attributes(:completed_at=>eval(jh['parent']['completed_at'])) if jh['parent']['completed_at']
+          j.parent.stages.last.update_attributes(:failed_at=>eval(jh['parent']['failed_at'])) if jh['parent']['failed_at']
+        end
+        if jh['now']
+          Time.stubs(:now).returns(eval(jh['now']))
+        end
+        expected = jh['expected']
+        #check if is_due
+        assert expected == j.is_due?
       end
-      if jh['failed_at']
-        j.stages.last.update_attributes(:failed_at=>eval(jh['failed_at']))
-      end
-      if jh['parent']
-        j.parent.stages.last.update_attributes(:completed_at=>eval(jh['parent']['completed_at'])) if jh['parent']['completed_at']
-        j.parent.stages.last.update_attributes(:failed_at=>eval(jh['parent']['failed_at'])) if jh['parent']['failed_at']
-      end
-      expected = jh['expected']
-      #check if is_due
-      puts "checking #{j.name}"
-      assert expected == j.is_due?
     end
   end
+
+  setup_test
+  define_tests("is_due")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-base
 version: !ruby/object:Gem::Version
-  version: '1.378'
+  version: '1.379'
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -156,6 +156,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.1.1
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "Manage your organization's workflows entirely through Google Docs
   and irb.\n                     Mobilize schedules jobs, queues workers, sends failure
   notifications, and\n                     integrates mobilize-hadoop, -http, -mysql,
@@ -237,7 +253,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2038085441569804169
+      hash: -754745545664310301
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -246,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2038085441569804169
+      hash: -754745545664310301
 requirements: []
 rubyforge_project: mobilize-base
 rubygems_version: 1.8.23