localeapp 0.6.1 → 0.6.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 0.6.2
+
+* Fix bug updating synchronization files that caused polling_interval to be ignored
+
 # Version 0.6.1
 
 * Fix bug where default handler was sending array rather than resolved content

data/lib/localeapp/poller.rb

@@ -27,7 +27,7 @@ module Localeapp
 
     def write_synchronization_data!(polled_at, updated_at)
       File.open(Localeapp.configuration.synchronization_data_file, 'w+') do |f|
-        f.write({:polled_at => polled_at, :updated_at => updated_at}.to_yaml)
+        f.write({:polled_at => polled_at.to_i, :updated_at => updated_at.to_i}.to_yaml)
       end
     end
 
@@ -49,13 +49,24 @@ module Localeapp
     end
 
     def handle_success(response)
+      Localeapp.log_with_time "poll success"
       @success = true
       Localeapp.updater.update(Localeapp.load_yaml(response))
-      write_synchronization_data!(Time.now.to_i, Time.parse(response.headers[:date]).to_i)
+      write_synchronization_data!(current_time, Time.parse(response.headers[:date]))
     end
 
     def handle_failure(response)
+      if response.code == 304
+        Localeapp.log_with_time "No new data"
+        # Nothing new, update synchronization files
+        write_synchronization_data!(current_time, updated_at)
+      end
       @success = false
     end
+
+    private
+    def current_time
+      Time.now
+    end
   end
 end

data/lib/localeapp/rails/controller.rb

@@ -8,16 +8,16 @@ module Localeapp
 
       def handle_translation_updates
         unless ::Localeapp.configuration.polling_disabled?
-          ::Localeapp.log Time.now.to_i.to_s << '-- Handling translation updates'
+          ::Localeapp.log_with_time 'Handling translation updates'
           if ::Localeapp.poller.needs_polling?
-            ::Localeapp.log Time.now.to_i.to_s << ' - polling'
+            ::Localeapp.log_with_time 'polling'
             ::Localeapp.poller.poll!
           end
         end
 
         unless ::Localeapp.configuration.reloading_disabled?
           if ::Localeapp.poller.needs_reloading?
-            ::Localeapp.log Time.now.to_i.to_s << '- reloading I18n'
+            ::Localeapp.log_with_time 'reloading I18n'
             I18n.reload!
             ::Localeapp.poller.updated_at = ::Localeapp.poller.synchronization_data[:updated_at]
           end

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/lib/localeapp.rb

@@ -75,6 +75,10 @@ module Localeapp
       logger.info LOG_PREFIX + message if logger
     end
 
+    def log_with_time(message)
+      log [Time.now.to_i, message].join(' - ')
+    end
+
     def debug(message)
       logger.debug(LOG_PREFIX + message) if logger
     end

data/spec/localeapp/poller_spec.rb

@@ -40,37 +40,85 @@ describe Localeapp::Poller do
   end
 
   describe "#write_synchronization_data!(polled_at, updated_at)" do
+    let(:polled_at_time) { Time.at(1000000) }
+    let(:updated_at_time) { Time.at(1000010) }
+
     it "updates polled_at in the synchronization file" do
       polled_at = lambda { @poller.synchronization_data[:polled_at] }
-      expect { @poller.write_synchronization_data!(01234, 56789) }.to change(polled_at, :call).to(01234)
+      expect { @poller.write_synchronization_data!(polled_at_time, updated_at_time) }.to change(polled_at, :call).to(polled_at_time.to_i)
     end
 
     it "updates updated_at in the synchronization file" do
       updated_at = lambda { @poller.synchronization_data[:updated_at] }
-      expect { @poller.write_synchronization_data!(01234, 56789) }.to change(updated_at, :call).to(56789)
+      expect { @poller.write_synchronization_data!(polled_at_time, updated_at_time) }.to change(updated_at, :call).to(updated_at_time.to_i)
     end
   end
-    
+
   describe "#poll!" do
-    it "returns false if get returns 304 Not Modified" do
-      FakeWeb.register_uri(:get, "https://api.localeapp.com/v1/projects/TEST_KEY/translations.yml?updated_at=#{@updated_at}", :body => '', :status => ['304', 'Not Modified'])
-      @poller.poll!.should == false
-    end
+    let(:polled_at_time) { Time.at(1000000) }
+    let(:updated_at_time) { Time.at(1000010) }
+
+    describe "when response is 304 Not Modified" do
+      before do
+        FakeWeb.register_uri(:get, "https://api.localeapp.com/v1/projects/TEST_KEY/translations.yml?updated_at=#{@updated_at}", :body => '', :status => ['304', 'Not Modified'], :date => updated_at_time.httpdate)
+      end
+
+      it "returns false" do
+        @poller.poll!.should == false
+      end
+
+      it "updates the polled_at but not the updated_at synchronization data" do
+        @poller.stub!(:current_time).and_return(polled_at_time)
+        @poller.should_receive(:write_synchronization_data!).with(polled_at_time, @updated_at)
+        @poller.poll!
+      end
 
-    it "returns false if get returns a 50x response" do
-      FakeWeb.register_uri(:get, "https://api.localeapp.com/v1/projects/TEST_KEY/translations.yml?updated_at=#{@updated_at}", :body => '', :status => ['500', 'Internal Server Error'])
-      @poller.poll!.should == false
+      it "updates the synchronization data" do
+        @poller.should_receive(:write_synchronization_data!)
+        @poller.poll!
+      end
     end
 
-    it "returns false if get returns 200 OK" do
-      FakeWeb.register_uri(:get, "https://api.localeapp.com/v1/projects/TEST_KEY/translations.yml?updated_at=#{@updated_at}", :body => @hash.to_yaml, :status => ['200', 'OK'], :date => Time.now.httpdate)
-      @poller.poll!.should == true
+    describe "when response is 50x" do
+      before do
+        FakeWeb.register_uri(:get, "https://api.localeapp.com/v1/projects/TEST_KEY/translations.yml?updated_at=#{@updated_at}", :body => '', :status => ['500', 'Internal Server Error'])
+      end
+
+      it "returns false" do
+        @poller.poll!.should == false
+      end
+
+      it "doesn't update the synchronization data" do
+        @poller.should_not_receive(:write_synchronization_data!)
+        @poller.poll!
+      end
     end
 
-    it "passes the data through to the Updater" do
-      FakeWeb.register_uri(:get, "https://api.localeapp.com/v1/projects/TEST_KEY/translations.yml?updated_at=#{@updated_at}", :body => @hash.to_yaml, :status => ['200', 'OK'], :date => Time.now.httpdate)
-      Localeapp.updater.should_receive(:update).with(@hash)
-      @poller.poll!
+    describe "when response is 200" do
+      before do
+        FakeWeb.register_uri(:get,
+          "https://api.localeapp.com/v1/projects/TEST_KEY/translations.yml?updated_at=#{@updated_at}",
+          :body => @hash.to_yaml,
+          :status => ['200', 'OK'],
+          :date => updated_at_time.httpdate
+        )
+      end
+
+      it "returns true" do
+        @poller.poll!.should == true
+      end
+
+      it "updates the polled_at and the updated_at synchronization data" do
+        @poller.stub!(:current_time).and_return(polled_at_time)
+        @poller.should_receive(:write_synchronization_data!).with(polled_at_time, updated_at_time)
+        @poller.poll!
+      end
+
+      it "passes the data through to the Updater" do
+        FakeWeb.register_uri(:get, "https://api.localeapp.com/v1/projects/TEST_KEY/translations.yml?updated_at=#{@updated_at}", :body => @hash.to_yaml, :status => ['200', 'OK'], :date => Time.now.httpdate)
+        Localeapp.updater.should_receive(:update).with(@hash)
+        @poller.poll!
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: localeapp
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Christopher Dell
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-09 00:00:00 Z
+date: 2012-10-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n