localeapp 0.7.1 → 0.7.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGQwZjkzZTQ5NmM5YTQ5N2ZjMmY5ZjNiMGU1ODhkNDYwMmQ0ZmM1NA==
+    ODgxZTYzZjkxY2VlZDBiM2E4ODI5ZjU3MTMxNGRkMjNiMGM0MTNlZA==
   data.tar.gz: !binary |-
-    ZTQxODY3ZDBiNWQwMWRkNGJmYzUxMzEzNDkyODY5MGM3N2ZhNDA0Yg==
+    ZDc5YzViOWJjNTVlNGU5NGNiNjI1MjI4MTM1ZDQyN2E0OWMwZWY1ZA==
 SHA512:
   metadata.gz: !binary |-
-    YTE4ZGQ0MmM4MjQ2N2U1YTgzMDJhM2FlZmU4ZTJlZTNiZTRiYjgzNWZlYzEx
-    MTAwZGM0ZGNmMzhmZTNlMzkxZGI5YWZiMDQxODJiNGE2OTk4OTVlM2IzNDY4
-    OWFlOWI1MTdjNzI3ODE2MTEwNmQxN2RlMjQ0ZDQ3NDQwYzczNDE=
+    MDYyOWNkNDBiZTRjODI0MmYxZDc5MjA2YjkwY2NmZWNmMmZkZGU3MjYzN2My
+    YTJiZDJmYzAzMjRmYWUzYzU2NWJjMjRlYTQ5MTUwNWZkNjQ3YTA4ZThhNmNl
+    ZmQ1ZDY2MGRiN2Y3NzQ1ODNlYTQxMWVmMzM1N2Q5OTA3ZDdkMjU=
   data.tar.gz: !binary |-
-    Yjg2YjcxMzliM2Q0MDlmNmI3ZGRiODA5NWMzZjkzNmFhMmNhNTFjZmE5Y2Q1
-    MDk3ZjIzOTU0ZTllNTQyZDhiMmU0MzJjNmJmZjQ3MGZjOGNhYzJhMWZmZTMz
-    ZTE5M2IyNDAwMDY4M2UzZTVkNGJmZmZkOTZmOWJmOTU2MzI2MmU=
+    ZjhjZTlkNDJmMzE4ODQ0NzNhMmI2ZjA1OWY1ZjNlYTRlOTY2ZmI1MjgyZjEy
+    NmU3N2JiNTJhYjQ3YjQ5ZjAxMjljYmUyNmE1YzMwMzJjNzgyYzk3NmRhNTM3
+    MzRiMzNlYzhhMDg1ZDA5OGI3MWZiMTNlNzdjNjYxNDBlNzk1Mjk=

data/.rvmrc

@@ -1 +1 @@
-rvm ruby-1.9.3@localeapp
+rvm use --create ruby-1.9.3@localeapp

data/.travis.yml

@@ -3,9 +3,8 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
-  - jruby-19mode
-  - jruby-20mode
-  - jruby-21mode
+  - jruby
+  - jruby-head
 gemfile:
   - Gemfile.i18n_037
   - Gemfile.i18n_050
@@ -16,7 +15,5 @@ matrix:
       gemfile: Gemfile.i18n_037
     - rvm: 2.1.0
       gemfile: Gemfile.i18n_037
-    - rvm: jruby-20mode
-      gemfile: Gemfile.i18n_037
-    - rvm: jruby-21mode
+    - rvm: jruby-head
       gemfile: Gemfile.i18n_037

data/CONTRIBUTING.md

@@ -0,0 +1,27 @@
+# Contributing
+
+In the spirit of [free software][1], **everyone** is encouraged to help improve this project.
+
+Here are some ways *you* can contribute:
+
+* by using prerelease versions
+* by reporting [bugs][2]
+* by suggesting new features
+* by writing or editing documentation
+* by writing specifications
+* by writing code (*no patch is too small*: fix typos, add comments, clean up inconsistent whitespace)
+* by refactoring code
+* by resolving [issues][2]
+* by reviewing patches
+
+Starting point:
+
+* Fork the repo
+* Clone your repo
+* Run `bundle install`
+* Make your changes
+* Ensure specs pass by running `bundle exec rake`
+* Submit your pull request
+
+[1]: http://www.fsf.org/licensing/essays/free-sw.html
+[2]: https://github.com/Locale/localeapp/issues

data/README.md

@@ -1,23 +1,16 @@
 # Locale
 
-[![Build status](https://secure.travis-ci.org/Locale/localeapp.png)](http://travis-ci.org/Locale/localeapp) [![Code Climate](https://codeclimate.com/github/Locale/localeapp.png)](https://codeclimate.com/github/Locale/localeapp) [![Gem Version](https://badge.fury.io/rb/localeapp.png)](http://badge.fury.io/rb/localeapp)
+[![Build status](https://secure.travis-ci.org/Locale/localeapp.png)](http://travis-ci.org/Locale/localeapp)
+[![Code Climate](https://codeclimate.com/github/Locale/localeapp.png)](https://codeclimate.com/github/Locale/localeapp)
+[![Gem Version](https://badge.fury.io/rb/localeapp.png)](http://badge.fury.io/rb/localeapp)
 
-The localeapp gem connects your rails app to the Locale service on
-http://www.localeapp.com. Locale makes hand editing translation files something
-you don't have to do.
+The localeapp gem connects your rails app to the Locale service on http://www.localeapp.com. Locale makes hand editing translation files something you don't have to do.
 
-The gem hooks into the i18n exception mechanism to send missing translations to
-the app. When translated content has been added it's automatically pulled down
-so you can see it straight away.
+The gem hooks into the i18n exception mechanism to send missing translations to the app. When translated content has been added it's automatically pulled down so you can see it straight away.
 
 ## Security
 
-Though the i18n gem uses YAML as it's default file format it doesn't require
-serialization of ruby objects. To prevent the kind of security problems
-detailed in [CVE-2013-0156][1] the localeapp gem will not load any YAML containing
-the string !ruby/ as of version 0.6.9.
-
-[1]: https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/61bkgvnSGTQ
+Though the i18n gem uses YAML as it's default file format it doesn't require serialization of ruby objects. To prevent the kind of security problems detailed in [CVE-2013-0156][1] the localeapp gem will not load any YAML containing the string !ruby/ as of version 0.6.9.
 
 ## Installation
 
@@ -32,8 +25,7 @@ Create a project on localeapp.com and get the api key. Then run:
 
     bundle exec localeapp install <YOUR_API_KEY>
 
-This will check everything looks good and create
-`config/initializers/localeapp.rb` for you.
+This will check everything looks good and create `config/initializers/localeapp.rb` for you.
 
 ### Rails 2.3
 
@@ -48,13 +40,13 @@ Install the gem:
 Create a project on localeapp.com and get the api key. Then run:
 
     localeapp install <YOUR_API_KEY>
-    
+
 ### Non rails projects
 
 Install the gem and run:
 
     localeapp install --standalone <YOUR_API_KEY>
-    
+
 This will create a `.localeapp` directory for your configuration files.
 
 ### Public projects
@@ -63,45 +55,33 @@ Install the gem and run:
 
     localeapp install --github <YOUR_API_KEY>
 
-This will create a skeleton project you can push to `<your_gem>-i18n` on
-github.  You get a `.localeapp` directory for your configuration files, a
-`locales` directory for the yaml, a `.gitignore` file that ignores `.localeapp`
-and a `README.md` explaining to translators how to find the project on
-localeapp.com.
+This will create a skeleton project you can push to `<your_gem>-i18n` on github.  You get a `.localeapp` directory for your configuration files, a `locales` directory for the yaml, a `.gitignore` file that ignores `.localeapp` and a `README.md` explaining to translators how to find the project on localeapp.com.
 
 ## Importing existing content
 
-You can import via localeapp.com or with the command line tool. To import
-existing translations do:
+You can import via localeapp.com or with the command line tool. To import existing translations do:
 
     localeapp push config/locales/en.yml
 
-This will queue importing the file. The projects pages on localeapp.com will
-automatically refresh so you can see the import progress.
+This will queue importing the file. The projects pages on localeapp.com will automatically refresh so you can see the import progress.
 
-If you've more than one locale to import you can import all files in a directory :
+If you've more than one locale to import you can import all files in a directory:
 
     localeapp push config/locales/
 
 ## Default Rails Translations
 
-Locale will automatically add the standard rails translations when a project is
-created. If for some reason you don't want these, you can remove them using in
-the project libraries area on localeapp.com
+Locale will automatically add the standard rails translations when a project is created. If for some reason you don't want these, you can remove them using in the project libraries area on localeapp.com
 
 ## Automatically sending missing translations
 
-Missing translations are automatically sent only in the development environment
-by default. When a page is refreshed any missing translations will be sent to
-localeapp.com.
+Missing translations are automatically sent only in the development environment by default. When a page is refreshed any missing translations will be sent to localeapp.com.
 
-If you want to disable sending missing translations in the development
-environment then edit `config/initializers/localeapp.rb` to include:
+If you want to disable sending missing translations in the development environment then edit `config/initializers/localeapp.rb` to include:
 
     config.sending_environments = []
 
-This is just an array, so you can configure it to match send in any environment
-you wish.
+This is just an array, so you can configure it to match send in any environment you wish.
 
 ## Manually create translations
 
@@ -109,27 +89,19 @@ You can create translations on the command line by running:
 
     localeapp add key.name en:"test content" es:"spanish content"
 
-You must provide at least one translation and the locale code must already
-exist in the project.
+You must provide at least one translation and the locale code must already exist in the project.
 
 ## Automatically pulling translations
 
-There are two ways to do this, one that suits a single developer working the
-code locally and one where the translations are being pulled down to a staging
-(or live) server.
+There are two ways to do this, one that suits a single developer working the code locally and one where the translations are being pulled down to a staging (or live) server.
 
 ### Single developer
 
-In this mode the gem pulls any updated translations from localeapp.com at the
-beginning of each request. This is the default setting so you don't need to do
-anything special.
+In this mode the gem pulls any updated translations from localeapp.com at the beginning of each request. This is the default setting so you don't need to do anything special.
 
 ### Staging server
 
-In this mode you configure the individual listeners to not poll every request
-and instead run localeapp in daemon mode to fetch updated translations. This is
-useful when you have more than one listener and don't want them to race to
-update the translations.
+In this mode you configure the individual listeners to not poll every request and instead run localeapp in daemon mode to fetch updated translations. This is useful when you have more than one listener and don't want them to race to update the translations.
 
 #### Disabling polling
 
@@ -141,49 +113,34 @@ Run the daemon with:
 
     localeapp daemon
 
-The listeners will automatically reload translations when they see there are
-new ones. The daemon has two options:
+The listeners will automatically reload translations when they see there are new ones. The daemon has two options:
 
   -b will run in the background and put a pid file in tmp/pids/localeapp.pid
   -i X will change the polling interval to X from it's default five seconds.
 
 ### Disabling Reloading
 
-Automatic reloading is only enabled in the development environment by default and
-can be disabled in a similar way to polling and sending:
+Automatic reloading is only enabled in the development environment by default and can be disabled in a similar way to polling and sending:
 
     config.reloading_environments = []
 
 ### Caching
 
-To prevent localeapp from sending translations every time they are missing,
-add this config setting:
+To prevent localeapp from sending translations every time they are missing, add this config setting:
 
     config.cache_missing_translations = true
 
 ## Inviting other developers and translators
 
-You can invite other developers and translators via localeapp.com.  Developers
-have access to all the content and all the locales. Translators are restricted
-to editing only the locales you give them access too.
+You can invite other developers and translators via localeapp.com.  Developers have access to all the content and all the locales. Translators are restricted to editing only the locales you give them access too.
 
 ## Adding a locale
 
-If we find an unknown locale during an import we'll add it to your project.
-You can also add a new locale to a project via localeapp.com. This will create
-missing translations for every translation key. You will need to restart any
-listeners completely to pick up the new locale.
+If we find an unknown locale during an import we'll add it to your project. You can also add a new locale to a project via localeapp.com. This will create missing translations for every translation key. You will need to restart any listeners completely to pick up the new locale.
 
 ## Syck, Psych, and creating YAML
 
-Since ruby 1.9.3-p0 Psych has been the default YAML engine in Ruby. Psych is
-based on libyaml and fixes a number of issues with the previous YAML library,
-Syck. localeapp.com uses 1.9.3 and Psych for all its YAML processing. The
-localeapp gem will use Psych if it is available but falls back to the ya2yaml
-library if not. ya2yaml supports UTF-8 (which Syck doesn't handle very well)
-but it does write YAML differently to Psych so you will notice differences
-between exporting directly from localeapp.com and doing localeapp pull on the
-command line unless you're using 1.9.3+ or have installed Psych as a gem.
+Since ruby 1.9.3-p0 Psych has been the default YAML engine in Ruby. Psych is based on libyaml and fixes a number of issues with the previous YAML library, Syck. localeapp.com uses 1.9.3 and Psych for all its YAML processing. The localeapp gem will use Psych if it is available but falls back to the ya2yaml library if not. ya2yaml supports UTF-8 (which Syck doesn't handle very well) but it does write YAML differently to Psych so you will notice differences between exporting directly from localeapp.com and doing localeapp pull on the command line unless you're using 1.9.3+ or have installed Psych as a gem.
 
 ## Proxies
 
@@ -193,23 +150,28 @@ If you need to go through a proxy server, you can configure it with:
 
 ## SSL Certificate verification
 
-localeapp.com uses https everywhere but certificate validation is turned off by
-default. This is because ruby doesn't know how to read the certs from the OSX
-keychain. You can turn verification on and tell the gem where the latest CA
-certificates are by adding:
+localeapp.com uses https everywhere but certificate validation is turned off by default. This is because ruby doesn't know how to read the certs from the OSX keychain. You can turn verification on and tell the gem where the latest CA certificates are by adding:
 
     config.ssl_verify = true
     config.ssl_ca_file = /path/to/ca_cert.pm
 
-See [this article on Ruby Inside][1] for some more details.
-
-[1]: http://www.rubyinside.com/how-to-cure-nethttps-risky-default-https-behavior-4010.html
+See [this article on Ruby Inside][2] for some more details.
 
 ## Support and feedback
 
-You can contact us via the support link at the bottom of the page or emailing
-support@localeapp.com
+You can contact us via the support link at the bottom of the page or emailing support@localeapp.com
+
+## Contributing
+
+See corresponding [contributing guidelines][3].
 
 ## License
 
-The code for `localeapp` is released under the [MIT License](http://opensource.org/licenses/MIT).
+Copyright (c) 2014 [Locale][5] and other [contributors][6], released under the [MIT License][4].
+
+[1]: https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/61bkgvnSGTQ
+[2]: http://www.rubyinside.com/how-to-cure-nethttps-risky-default-https-behavior-4010.html
+[3]: https://github.com/Locale/localeapp/blob/master/CONTRIBUTING.md
+[4]: http://opensource.org/licenses/MIT
+[5]: https://github.com/Locale
+[6]: https://github.com/Locale/localeapp/graphs/contributors

data/features/step_definitions/cli_steps.rb

@@ -34,6 +34,11 @@ When /^new translations for the api key "([^"]*)" since "([^"]*)" with time "([^
   add_fake_web_uri(:get, uri, ['200', 'OK'], body, 'date' => Time.at(new_time.to_i).httpdate)
 end
 
+When /^new translations for the api key "([^"]*)" since last fetch with time "([^"]*)" seconds later$/ do |api_key, time_shift|
+  steps %Q{
+    When new translations for the api key "#{api_key}" since "#{@timestamp}" with time "#{@timestamp + time_shift.to_i}"
+  }
+end
 
 When /^I have a valid project on localeapp\.com with api key "([^"]*)" and the translation key "([^"]*)"/ do |api_key, key_name|
   uri = "https://api.localeapp.com/v1/projects/#{api_key}/translations/#{key_name.gsub(/\./, '%2E')}"
@@ -78,3 +83,25 @@ When /^help should not be displayed$/ do
     """
   }
 end
+
+When /^the timestamp is (\d+) months? old$/ do |months|
+  @timestamp = Time.now.to_i - months.to_i * 2592000
+  steps %Q{
+    And a file named "log/localeapp.yml" with:
+    """
+    ---
+    :updated_at: #{@timestamp}
+    :polled_at: #{@timestamp}
+    """
+  }
+end
+
+Then /^translations should be fetched since last fetch only$/ do
+  steps %Q{
+    Then the output should contain:
+    """
+    Localeapp update: checking for translations since #{@timestamp}
+    Found and updated new translations
+    """
+  }
+end

data/features/update.feature

@@ -4,20 +4,11 @@ Feature: Getting new translations
     In order to receive the translations that have been updated since the last check
     When I have a valid project on localeapp.com with api key "MYAPIKEY"
     And an initializer file
-    And a file named "log/localeapp.yml" with:
-    """
-    ---
-    :updated_at: 120
-    :polled_at: 130
-    """
-    And new translations for the api key "MYAPIKEY" since "120" with time "140"
+    And the timestamp is 2 months old
+    And new translations for the api key "MYAPIKEY" since last fetch with time "60" seconds later
     And a directory named "config/locales"
     When I run `localeapp update`
-    Then the output should contain:
-    """
-    Localeapp update: checking for translations since 120
-    Found and updated new translations
-    """
+    Then translations should be fetched since last fetch only
     And help should not be displayed
     And a file named "config/locales/en.yml" should exist
     # check the content here
@@ -26,19 +17,22 @@ Feature: Getting new translations
   Scenario: Running update with no initializer file, passing the key on the command line
     In order to receive the translations that have been updated since the last check
     When I have a valid project on localeapp.com with api key "MYAPIKEY"
-    And a file named "log/localeapp.yml" with:
-    """
-    ---
-    :updated_at: 120
-    :polled_at: 130
-    """
-    And new translations for the api key "MYAPIKEY" since "120" with time "140"
+    And the timestamp is 2 months old
+    And new translations for the api key "MYAPIKEY" since last fetch with time "60" seconds later
     And a directory named "config/locales"
     When I run `localeapp -k MYAPIKEY update`
+    Then translations should be fetched since last fetch only
+    And help should not be displayed
+    And a file named "config/locales/en.yml" should exist
+
+  Scenario: Running update with a too old timestamp
+    In order to receive the translations that have been updated since the last check
+    When I have a valid project on localeapp.com with api key "MYAPIKEY"
+    And an initializer file
+    And the timestamp is 8 months old
+    When I run `localeapp update`
     Then the output should contain:
     """
-    Localeapp update: checking for translations since 120
-    Found and updated new translations
+    Timestamp is missing or too old
     """
     And help should not be displayed
-    And a file named "config/locales/en.yml" should exist

data/lib/localeapp/api_caller.rb

@@ -70,6 +70,7 @@ module Localeapp
         RestClient::InternalServerError,
         RestClient::BadGateway,
         RestClient::ServiceUnavailable,
+        RestClient::UnprocessableEntity,
         RestClient::GatewayTimeout => error
         return error.response
       rescue RestClient::ServerBrokeConnection => error

data/lib/localeapp/cli/update.rb

@@ -1,15 +1,28 @@
 module Localeapp
   module CLI
     class Update < Command
+      attr_accessor :poller
+
       def execute
-        poller = Localeapp::Poller.new
-        @output.puts("Localeapp update: checking for translations since #{poller.updated_at}")
-        if poller.poll!
-          @output.puts "Found and updated new translations"
+        self.poller = Localeapp::Poller.new
+        if timestamp_too_old?
+          @output.puts("Timestamp is missing or too old. Please run `localeapp pull` first.")
         else
-          @output.puts "No new translations"
+          @output.puts("Localeapp update: checking for translations since #{poller.updated_at}")
+          success = poller.poll!
+          @output.puts(success ? "Found and updated new translations" : "No new translations")
         end
       end
+
+    protected
+
+      def timestamp_too_old?
+        poller.updated_at < six_months_ago
+      end
+
+      def six_months_ago
+        Time.now.to_i - 15552000 # This is 6.months.to_i according to ActiveRecord
+      end
     end
   end
 end

data/lib/localeapp/rails.rb

@@ -3,34 +3,14 @@ require 'fileutils'
 module Localeapp
   module Rails
     def self.initialize
-      if defined?(::Rails.logger)
-        rails_logger = ::Rails.logger
-      elsif defined?(RAILS_DEFAULT_LOGGER)
-        rails_logger = RAILS_DEFAULT_LOGGER
-      end
-
-      if defined?(::Rails.env)
-        rails_env = ::Rails.env
-      elsif defined?(RAILS_ENV)
-        rails_env = RAILS_ENV
-      end
-
-      if defined?(::Rails.root)
-        rails_root = ::Rails.root
-      elsif defined?(RAILS_ROOT)
-        rails_root = RAILS_ROOT
-      end
 
       ActionController::Base.send(:include, Localeapp::Rails::Controller)
 
-      if ::Rails::VERSION::MAJOR == 2 && ::Rails::VERSION::MINOR >= 3 # TODO: Check previous rails versions if required
+      if rails_version_matches? '~> 2.3' # TODO: Check previous rails versions if required
         require 'localeapp/rails/2_3_translation_helper_monkeypatch'
       end
 
-      # Rails >= 4.0.2 || Rails >= 3.2.16
-      # ie: after CVE-2013-4491 patch (https://github.com/rails/rails/commit/78790e4bceedc632cb40f9597792d7e27234138a)
-      if (::Rails::VERSION::MAJOR == 4 && (::Rails::VERSION::MINOR > 0 or (::Rails::VERSION::MINOR == 0 && ::Rails::VERSION::TINY >= 2))) or
-         (::Rails::VERSION::MAJOR == 3 && (::Rails::VERSION::MINOR > 2 or (::Rails::VERSION::MINOR == 2 && ::Rails::VERSION::TINY >= 16)))
+      if rails_version_matches_any? '~> 3.2.16', '~> 4.0.2' # ie: after CVE-2013-4491 patch (https://github.com/rails/rails/commit/78790e4bceedc632cb40f9597792d7e27234138a)
         require 'localeapp/rails/force_exception_handler_in_translation_helper'
         require 'localeapp/rails/mimic_rails_missing_translation_display'
       end
@@ -39,8 +19,8 @@ module Localeapp
         config.logger                     = rails_logger
         config.environment_name           = rails_env
         config.project_root               = rails_root
-        config.synchronization_data_file  = File.join([rails_root, 'log', 'localeapp.yml'])
-        config.translation_data_directory = File.join([rails_root, 'config', 'locales'])
+        config.synchronization_data_file  = File.join([config.project_root, 'log', 'localeapp.yml'])
+        config.translation_data_directory = File.join([config.project_root, 'config', 'locales'])
       end
       initialize_synchronization_data_file
     end
@@ -54,6 +34,41 @@ module Localeapp
         end
       end
     end
+
+    protected
+
+    def self.rails_logger
+      if defined?(::Rails.logger)
+        ::Rails.logger
+      elsif defined?(RAILS_DEFAULT_LOGGER)
+        RAILS_DEFAULT_LOGGER
+      end
+    end
+
+    def self.rails_env
+      if defined?(::Rails.env)
+        ::Rails.env
+      elsif defined?(RAILS_ENV)
+        RAILS_ENV
+      end
+    end
+
+    def self.rails_root
+      if defined?(::Rails.root)
+        ::Rails.root
+      elsif defined?(RAILS_ROOT)
+        RAILS_ROOT
+      end
+    end
+
+    def self.rails_version_matches?(requirement)
+      Gem::Requirement.new(requirement).satisfied_by? Gem::Version.new(::Rails::VERSION::STRING)
+    end
+
+    def self.rails_version_matches_any?(*requirements)
+      requirements.map{ |r| rails_version_matches?(r) }.reduce(:|)
+    end
+
   end
 end
 

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/spec/localeapp/api_caller_spec.rb

@@ -197,6 +197,7 @@ describe Localeapp::ApiCaller, "#call(object)" do
     {
       304 => 'Not Modified',
       404 => 'Resource Not Found',
+      422 => 'Unprocessable Entity',
       500 => 'Internal Server Error',
       # Work out when this could happen
       # 501 => 'Not Implemented',

data/spec/localeapp/cli/update_spec.rb

@@ -2,17 +2,38 @@ require 'spec_helper'
 require 'localeapp/cli/update'
 
 describe Localeapp::CLI::Update, "#execute" do
-  before do
-    @output = StringIO.new
-    @updater = Localeapp::CLI::Update.new(:output => @output)
+  let(:output)  { StringIO.new }
+  let(:updater) { Localeapp::CLI::Update.new(:output => output) }
+  let(:poller)  { Localeapp::Poller.new }
+
+  before(:each) { Localeapp::Poller.stub(:new => poller) }
+
+  context "when timestamp is recent" do
+    before(:each) { poller.stub(:updated_at => Time.now.to_i - 60) }
+
+    it "creates a Poller and calls poll! on it" do
+      with_configuration do
+        poller.should_receive(:poll!)
+        updater.execute
+      end
+    end
   end
 
-  it "creates a Poller and calls poll! on it" do
-    with_configuration do
-      poller = Localeapp::Poller.new
-      poller.should_receive(:poll!)
-      Localeapp::Poller.should_receive(:new).and_return(poller)
-      @updater.execute
+  context "when timestamp is too old" do
+    before(:each) { poller.stub(:updated_at => 0) }
+
+    it "warns the user" do
+      with_configuration do
+        updater.execute
+        output.string.should include("Timestamp is missing or too old.")
+      end
+    end
+
+    it "does not even call the API" do
+      with_configuration do
+        poller.should_not_receive(:poll!)
+        updater.execute
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localeapp
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Christopher Dell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -195,6 +195,7 @@ files:
 - .rvmrc
 - .travis.yml
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.github_project.rb
 - Gemfile.i18n_037
@@ -295,9 +296,48 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: localeapp
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easy i18n translation management with localeapp.com
-test_files: []
+test_files:
+- features/add.feature
+- features/bad_command.feature
+- features/help.feature
+- features/install.feature
+- features/mv.feature
+- features/pull.feature
+- features/push.feature
+- features/rm.feature
+- features/step_definitions/cli_steps.rb
+- features/support/env.rb
+- features/support/hooks.rb
+- features/update.feature
+- spec/fixtures/empty_log.yml
+- spec/fixtures/en.yml
+- spec/fixtures/es.yml
+- spec/localeapp/api_call_spec.rb
+- spec/localeapp/api_caller_spec.rb
+- spec/localeapp/cli/add_spec.rb
+- spec/localeapp/cli/daemon_spec.rb
+- spec/localeapp/cli/install_spec.rb
+- spec/localeapp/cli/pull_spec.rb
+- spec/localeapp/cli/push_spec.rb
+- spec/localeapp/cli/rename_spec.rb
+- spec/localeapp/cli/update_spec.rb
+- spec/localeapp/configuration_spec.rb
+- spec/localeapp/default_value_handler_spec.rb
+- spec/localeapp/exception_handler_spec.rb
+- spec/localeapp/key_checker_spec.rb
+- spec/localeapp/missing_translations_spec.rb
+- spec/localeapp/poller_spec.rb
+- spec/localeapp/rails/controller_spec.rb
+- spec/localeapp/routes_spec.rb
+- spec/localeapp/sender_spec.rb
+- spec/localeapp/updater_spec.rb
+- spec/localeapp_spec.rb
+- spec/spec_helper.rb
+- spec/support/i18n/missing_translation.rb
+- spec/support/localeapp_integration_data.rb
+- spec/support/localeapp_synchronization_data.rb
 has_rdoc: