mingle_events 0.1.1 → 0.1.3

data/lib/mingle_events/poller.rb

@@ -16,7 +16,7 @@ module MingleEvents
       MingleEvents.log.info("MingleEvents::Poller about to poll once...")
       @processors_by_project_identifier.each do |project_identifier, processors|
         fetcher = ProjectEventFetcher.new(project_identifier, @mingle_access)
-        fetcher.reset if options[:clean]
+        fetcher.set_current_state_to_now_if_no_current_state 
         latest_events = fetcher.fetch_latest.to_a
         processors.each{|p| p.process_events(latest_events)}        
       end

data/lib/mingle_events/project_event_fetcher.rb

@@ -20,9 +20,8 @@ module MingleEvents
       FileUtils.rm_rf(@state_dir)
     end
     
-    # setup fetcher to only fetch new events, occuring beyond "right now"
-    def reset_to_now
-      return if last_entry_fetched
+    def set_current_state_to_now_if_no_current_state
+      return if has_current_state?
       
       latest_event = page_with_latest_entries.entries.first
       return if latest_event.nil?
@@ -74,13 +73,13 @@ module MingleEvents
     # only public to facilitate testing
     def update_current_state(oldest_new_entry, most_recent_new_entry)
       current_state = load_current_state
-      if most_recent_new_entry
+      # if most_recent_new_entry
         current_state.merge!(:last_fetched_entry_info_file => file_for_entry(most_recent_new_entry))
         if current_state[:first_fetched_entry_info_file].nil?
           current_state.merge!(:first_fetched_entry_info_file => file_for_entry(oldest_new_entry))
         end
         File.open(current_state_file, 'w'){|out| YAML.dump(current_state, out)}
-      end
+      # end
     end 
     
     # only public to facilitate testing
@@ -116,6 +115,10 @@ module MingleEvents
       File.join(@state_dir, *relative_path_parts)
     end
     
+    def has_current_state?
+      File.exist?(current_state_file)
+    end
+    
     def current_state_file
       File.expand_path(File.join(@state_dir, 'current_state.yml'))
     end
@@ -131,7 +134,7 @@ module MingleEvents
     end
         
     def load_current_state
-      if File.exist?(current_state_file)
+      if has_current_state?
         YAML.load(File.new(current_state_file))
       else
         {:last_fetched_entry_info_file => nil, :first_fetched_entry_info_file => nil}

data/test/mingle_events/poller_test.rb

@@ -9,7 +9,11 @@ module MingleEvents
       processor_1 = DummyProcessor.new
       processor_2 = DummyProcessor.new
       poller = Poller.new(mingle_access, {'atlas' => [processor_1, processor_2]})
-      poller.run_once(:clean => true)
+      
+      mingle_access.register_page_content('/api/v2/projects/atlas/feeds/events.xml', EMPTY_EVENTS_XML)
+      poller.run_once
+      mingle_access.register_page_content('/api/v2/projects/atlas/feeds/events.xml', LATEST_EVENTS_XML) 
+      poller.run_once
       
       expected_entry_ids = [
         'https://mingle.example.com/projects/atlas/events/index/23',

data/test/mingle_events/project_event_fetcher_test.rb

@@ -40,15 +40,7 @@ module MingleEvents
     def test_no_new_entries_with_no_current_state
       state_dir = temp_dir
       mingle_access = StubMingleAccess.new
-      mingle_access.register_page_content('/api/v2/projects/atlas/feeds/events.xml',%{
-<?xml version="1.0" encoding="UTF-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xmlns:mingle="http://www.thoughtworks-studios.com/ns/mingle">
-  <title>Mingle Events: Blank Project</title>
-  <id>https://mingle.example.com/api/v2/projects/blank_project/feeds/events.xml</id>
-  <link href="https://mingle.example.com/api/v2/projects/blank_project/feeds/events.xml" rel="current"/>
-  <link href="https://mingle.example.com/api/v2/projects/blank_project/feeds/events.xml" rel="self"/>
-  <updated>2011-08-04T19:42:04Z</updated>
-</feed>})
+      mingle_access.register_page_content('/api/v2/projects/atlas/feeds/events.xml', EMPTY_EVENTS_XML)
       fetcher = ProjectEventFetcher.new('atlas', mingle_access, state_dir)
       
       assert fetcher.fetch_latest.to_a.empty?
@@ -56,12 +48,12 @@ module MingleEvents
       assert_nil fetcher.last_entry_fetched
     end
     
-    def test_reset_to_now_when_project_has_previous_history
+    def test_set_current_state_to_now_if_no_current_state_when_project_has_previous_history
       state_dir = temp_dir
       mingle_access = stub_mingle_access
       fetcher = ProjectEventFetcher.new('atlas', mingle_access, state_dir)
 
-      fetcher.reset_to_now
+      fetcher.set_current_state_to_now_if_no_current_state
       assert fetcher.fetch_latest.to_a.empty?
       
       mingle_access.register_page_content('/api/v2/projects/atlas/feeds/events.xml',%{
@@ -89,7 +81,7 @@ module MingleEvents
       assert_equal([entry(104)], fetcher.fetch_latest.to_a)
     end
     
-    def test_reset_to_now_is_ignored_if_there_is_already_local_current_state
+    def test_set_current_state_to_now_if_no_current_state_is_ignored_if_there_is_already_local_current_state
       state_dir = temp_dir
       mingle_access = stub_mingle_access
       fetcher = ProjectEventFetcher.new('atlas', mingle_access, state_dir)
@@ -117,26 +109,16 @@ module MingleEvents
         </feed>
       })
             
-      fetcher.reset_to_now # if not ignored, next call would return no events rather than 104
+      fetcher.set_current_state_to_now_if_no_current_state
       assert_equal([entry(104)], fetcher.fetch_latest.to_a)
     end
     
-    def test_reset_to_now_when_project_has_no_previous_history
+    def test_subseuqnce_set_current_state_to_now_if_no_current_state_calls_when_project_initially_had_no_history_do_not_prevent_initial_events_from_being_seen
       state_dir = temp_dir
       mingle_access = StubMingleAccess.new
-      mingle_access.register_page_content('/api/v2/projects/atlas/feeds/events.xml',%{
-<?xml version="1.0" encoding="UTF-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xmlns:mingle="http://www.thoughtworks-studios.com/ns/mingle">
-  <title>Mingle Events: Blank Project</title>
-  <id>https://mingle.example.com/api/v2/projects/blank_project/feeds/events.xml</id>
-  <link href="https://mingle.example.com/api/v2/projects/blank_project/feeds/events.xml" rel="current"/>
-  <link href="https://mingle.example.com/api/v2/projects/blank_project/feeds/events.xml" rel="self"/>
-  <updated>2011-08-04T19:42:04Z</updated>
-</feed>})
+      mingle_access.register_page_content('/api/v2/projects/atlas/feeds/events.xml', EMPTY_EVENTS_XML)
       fetcher = ProjectEventFetcher.new('atlas', mingle_access, state_dir)
-      fetcher.fetch_latest
-      
-      fetcher.reset_to_now
+      fetcher.set_current_state_to_now_if_no_current_state
       assert fetcher.fetch_latest.to_a.empty?
       
       mingle_access.register_page_content('/api/v2/projects/atlas/feeds/events.xml',%{
@@ -153,6 +135,7 @@ module MingleEvents
           </entry>
         </feed>
       })
+      fetcher.set_current_state_to_now_if_no_current_state      
             
       assert_equal([entry(104)], fetcher.fetch_latest.to_a)
     end

data/test/test_helper.rb

@@ -12,8 +12,19 @@ MingleEvents.log.level = Logger::WARN
 
 class Test::Unit::TestCase 
   
+  EMPTY_EVENTS_XML = %{
+    <?xml version="1.0" encoding="UTF-8"?>
+    <feed xmlns="http://www.w3.org/2005/Atom" xmlns:mingle="http://www.thoughtworks-studios.com/ns/mingle">
+      <title>Mingle Events: Blank Project</title>
+      <id>https://mingle.example.com/api/v2/projects/blank_project/feeds/events.xml</id>
+      <link href="https://mingle.example.com/api/v2/projects/blank_project/feeds/events.xml" rel="current"/>
+      <link href="https://mingle.example.com/api/v2/projects/blank_project/feeds/events.xml" rel="self"/>
+      <updated>2011-08-04T19:42:04Z</updated>
+    </feed>
+  }
+  
   # page 3
-  LATEST_PAGE_CONTENT = %{
+  LATEST_EVENTS_XML = %{
     <feed xmlns="http://www.w3.org/2005/Atom" xmlns:mingle="http://www.thoughtworks-studios.com/ns/mingle">
     
       <link href="https://mingle.example.com/api/v2/projects/atlas/feeds/events.xml" rel="current"/>
@@ -42,7 +53,7 @@ class Test::Unit::TestCase
   }  
    
   # page 2
-  PAGE_2_CONTENT = %{
+  PAGE_2_EVENTS_XML = %{
     <feed xmlns="http://www.w3.org/2005/Atom" xmlns:mingle="http://www.thoughtworks-studios.com/ns/mingle">
     
       <link href="https://mingle.example.com/api/v2/projects/atlas/feeds/events.xml" rel="current"/>
@@ -74,7 +85,7 @@ class Test::Unit::TestCase
   }    
     
   # page 1
-  PAGE_1_CONTENT = %{
+  PAGE_1_EVENTS_XML = %{
     <feed xmlns="http://www.w3.org/2005/Atom" xmlns:mingle="http://www.thoughtworks-studios.com/ns/mingle">
     
       <link href="https://mingle.example.com/api/v2/projects/atlas/feeds/events.xml" rel="current"/>
@@ -92,14 +103,14 @@ class Test::Unit::TestCase
   
   def stub_mingle_access
     stub = StubMingleAccess.new
-    stub.register_page_content('https://mingle.example.com/api/v2/projects/atlas/feeds/events.xml', LATEST_PAGE_CONTENT)
-    stub.register_page_content('https://mingle.example.com/api/v2/projects/atlas/feeds/events.xml?page=2', PAGE_2_CONTENT)
-    stub.register_page_content('https://mingle.example.com/api/v2/projects/atlas/feeds/events.xml?page=1', PAGE_1_CONTENT)
-    stub.register_page_content('https://mingle.example.com/api/v2/projects/atlas/feeds/events.xml?page=3', LATEST_PAGE_CONTENT)
-    stub.register_page_content('/api/v2/projects/atlas/feeds/events.xml', LATEST_PAGE_CONTENT)
-    stub.register_page_content('/api/v2/projects/atlas/feeds/events.xml?page=2', PAGE_2_CONTENT)
-    stub.register_page_content('/api/v2/projects/atlas/feeds/events.xml?page=1', PAGE_1_CONTENT)
-    stub.register_page_content('/api/v2/projects/atlas/feeds/events.xml?page=3', LATEST_PAGE_CONTENT)
+    stub.register_page_content('https://mingle.example.com/api/v2/projects/atlas/feeds/events.xml', LATEST_EVENTS_XML)
+    stub.register_page_content('https://mingle.example.com/api/v2/projects/atlas/feeds/events.xml?page=2', PAGE_2_EVENTS_XML)
+    stub.register_page_content('https://mingle.example.com/api/v2/projects/atlas/feeds/events.xml?page=1', PAGE_1_EVENTS_XML)
+    stub.register_page_content('https://mingle.example.com/api/v2/projects/atlas/feeds/events.xml?page=3', LATEST_EVENTS_XML)
+    stub.register_page_content('/api/v2/projects/atlas/feeds/events.xml', LATEST_EVENTS_XML)
+    stub.register_page_content('/api/v2/projects/atlas/feeds/events.xml?page=2', PAGE_2_EVENTS_XML)
+    stub.register_page_content('/api/v2/projects/atlas/feeds/events.xml?page=1', PAGE_1_EVENTS_XML)
+    stub.register_page_content('/api/v2/projects/atlas/feeds/events.xml?page=3', LATEST_EVENTS_XML)
 
     stub
   end 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mingle_events
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - David Rice