localeapp 0.0.11 → 0.1.1

data/CHANGELOG.md

@@ -0,0 +1,19 @@
+# Version 0.1.1
+
+* Gem compiled with 1.8.7
+
+# Version 0.1.0
+
+* Added support for Heroku's Cedar stack
+* Added a safer configuration style where enabled environments are explicitly
+  defined
+* Removed some unnecessary default options from config files generated with 
+  `localeapp install`
+* Fixed `localeapp push` with no arguments
+
+## NOTICE
+
+If you've added disabled_polling_environments, 
+disabled_reloading_environments or disabled_sending_environments to your 
+initializer you should change these to polling_environments, 
+reloading_environments and sending_environments and configure as per the README

data/{README.textile → README.md}

@@ -1,8 +1,10 @@
-h1. Locale
+# Locale
+
+[![Build status](https://secure.travis-ci.org/Locale/localeapp.png)](http://travis-ci.org/Locale/localeapp)
 
 The localeapp gem connects your rails app to the Locale service on
-"localeapp.com":http://www.localeapp.com. Locale makes hand editing translation
-files something you don't have to do.
+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
@@ -12,54 +14,42 @@ We're still in private beta but if you think Locale would be useful to you and
 are willing to provide feedback then please get in touch at info@localeapp.com
 and we'll see what we can do.
 
-h2. Installation
+## Installation
 
-h3. Rails 3
+### Rails 3
 
-Add the localeapp gem to your Gemfile and install it:
+Add the localeapp gem to your `Gemfile` and install it:
 
-<pre>
-  echo "gem 'localeapp'" >> Gemfile
-  bundle install
-</pre>
+    echo "gem 'localeapp'" >> Gemfile
+    bundle install
 
 Create a project on localeapp.com and get the api key. Then run:
 
-<pre>
-  bundle exec localeapp install <YOUR_API_KEY>
-</pre>
+    bundle exec localeapp install <YOUR_API_KEY>
 
 This will check everything looks good and create
-config/initializers/localeapp.rb for you.
+`config/initializers/localeapp.rb` for you.
 
-h3. Rails 2.3
+### Rails 2.3
 
-Define localeapp in config/environment.rb:
+Define localeapp in `config/environment.rb`:
 
-<pre>
-  config.gem 'localeapp'
-</pre>
+    config.gem 'localeapp'
 
 Install the gem:
 
-<pre>
-  rake gems:install
-</pre>
+    rake gems:install
 
 Create a project on localeapp.com and get the api key. Then run:
 
-<pre>
-  localeapp install <YOUR_API_KEY>
-</pre>
+    localeapp install <YOUR_API_KEY>
 
-h2. Importing existing content
+## Importing existing content
 
 You can import via localeapp.com or with the command line tool. To import
 existing translations do:
 
-<pre>
-  localeapp import config/locales/en.yml
-</pre>
+    localeapp import 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.
@@ -67,81 +57,73 @@ automatically refresh so you can see the import progress.
 If you've more than one locale to import you can zip up the yml files. Both
 localeapp.com and the localeapp import command accept zip files.
 
-h2. Automatically sending missing translations
+## 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.
 
 If you want to disable sending missing translations in the development
-environment then edit config/initializers/localeapp.rb to include:
+environment then edit `config/initializers/localeapp.rb` to include:
 
-<pre>
-  config.disabled_sending_environments << 'development'
-</pre>
+    config.sending_environments = []
 
-This is just an array, so you can configure it to match any environment you
-wish.
+This is just an array, so you can configure it to match send in any environment
+you wish.
 
-h2. Automatically pulling translations
+## 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.
 
-h3. Single developer
+### 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.
 
-h3. Staging server
+### 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.
 
-h4. Disabling polling
+#### Disabling polling
 
 Edit config/initializers/localeapp.rb to include:
 
-<pre>
-  config.disabled_polling_environments << 'development'
-</pre>
+    config.polling_environments = []
 
 Run the daemon with:
 
-<pre>
-  localeapp daemon
-</pre>
+    localeapp daemon
 
 The listeners will automatically reload translations when they see there are
 new ones.
 
-h3. Disabling Reloading
+### Disabling Reloading
 
-Automatic reloading is disabled everywhere but the development environment, and
-can be disabled there 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:
 
-<pre>
-  config.disabled_reloading_environments << 'development'
-</pre>
+    config.reloading_environments = []
 
-h3. Inviting other developers and translators
+### 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.
 
-h3. Adding a locale
+### 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.
 
-h3. Support and feedback
+### Support and feedback
 
 You can contact us via the support link at the bottom of the page, emailing
-info@localeapp.com, or on campfire at https://localeapp.campfirenow.com/d77b5
+info@localeapp.com, or on campfire at https://localeapp.campfirenow.com/d77b5

data/bin/localeapp

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
 
+require 'slop'
 require 'localeapp'
 
 # Don't connect to the net if we're running under cucumber for testing
@@ -14,48 +15,122 @@ if ENV['FAKE_WEB_DURING_CUCUMBER_RUN'] && fake_data_as_json = ENV['FAKE_WEB_FAKE
   end
 end
 
-args = ARGV.dup
-
-command = args.shift.strip rescue nil
-
-unless %w{help install}.include?(command)
+def include_config_file
   unless Localeapp.include_config_file
     puts "Could not load config file"
-    exit
+    exit 1
   end
 end
+slop = Slop.new(ARGV, :help => true, :strict => true) do
+  banner "Usage: localeapp COMMAND [options]"
+  description <<-COMMANDS
+    COMMAND:
+    install <api_key> - Creates new configuration files and confirms key works
+    pull              - Pulls all translations from localeapp.com
+    push <file>       - Pushes a translation file to localeapp.com
+    update            - Gets any changes since the last poll and updates the yml
+    daemon            - Simple daemon (checks every 5 seconds for new translations)
+COMMANDS
 
-case command
-when 'install'
-  key = args.shift.strip rescue nil
-  installer = Localeapp::CLI::Install.new
-  if installer.execute(key)
-    exit 0
-  else
-    exit 1
+  on_empty { puts self.to_s }
+end
+
+slop.command :install do
+  execute do |opts, args|
+    key = args.first
+    installer = Localeapp::CLI::Install.new
+    if installer.execute(key)
+      exit 0
+    else
+      exit 1
+    end
   end
-when 'pull'
-  Localeapp::CLI::Pull.new.execute
-when 'push'
-  file = args.shift.strip rescue nil
-  pusher = Localeapp::CLI::Push.new
-  pusher.execute(file)
-when 'update'
-  Localeapp::CLI::Update.new.execute
-when 'daemon'
-  while true do
+end
+
+slop.command :pull do
+  execute do |opts, args|
+    include_config_file
+    Localeapp::CLI::Pull.new.execute
+  end
+end
+
+slop.command :push do
+  on_empty { puts "localeapp push requires an file to push" }
+
+  execute do |opts, args|
+    file = args.first
+    exit 1 if file.nil?
+    include_config_file
+    pusher = Localeapp::CLI::Push.new
+    pusher.execute(file)
+  end
+end
+
+slop.command :update do
+  execute do |opts, args|
+    include_config_file
     Localeapp::CLI::Update.new.execute
-    sleep 5
   end
-else
-puts <<-HELP
-Usage: localeapp COMMAND [ARGS]
-
-Commands:
-  install <api_key> - Creates new configuration files and confirms key works
-  pull              - Pulls all translations from localeapp.com
-  push <file>       - Pushes a translation file to localeapp.com
-  update            - Gets any changes since the last poll and updates the yml files
-  daemon            - Simple daemon that checks every 5 seconds for new translations
-HELP
 end
+
+slop.command :daemon do
+  execute do |opts, args|
+    include_config_file
+    while true do
+      Localeapp::CLI::Update.new.execute
+      sleep 5
+    end
+  end
+end
+
+begin
+  slop.parse
+rescue Slop::InvalidOptionError
+  puts slop
+end
+
+# args = ARGV.dup
+# 
+# command = args.shift.strip rescue nil
+# 
+# unless %w{help install}.include?(command)
+#   unless Localeapp.include_config_file
+#     puts "Could not load config file"
+#     exit
+#   end
+# end
+# 
+# case command
+# when 'install'
+#   key = args.shift.strip rescue nil
+#   installer = Localeapp::CLI::Install.new
+#   if installer.execute(key)
+#     exit 0
+#   else
+#     exit 1
+#   end
+# when 'pull'
+#   Localeapp::CLI::Pull.new.execute
+# when 'push'
+#   file = args.shift.strip rescue nil
+#   pusher = Localeapp::CLI::Push.new
+#   pusher.execute(file)
+# when 'update'
+#   Localeapp::CLI::Update.new.execute
+# when 'daemon'
+#   while true do
+#     Localeapp::CLI::Update.new.execute
+#     sleep 5
+#   end
+# else
+# puts <<-HELP
+# Usage: localeapp COMMAND [ARGS]
+# 
+# Commands:
+#   install <api_key> - Creates new configuration files and confirms key works
+#   pull              - Pulls all translations from localeapp.com
+#   push <file>       - Pushes a translation file to localeapp.com
+#   update            - Gets any changes since the last poll and updates the yml files
+#   daemon            - Simple daemon that checks every 5 seconds for new translations
+# HELP
+# end

data/features/localeapp_binary.feature

@@ -2,14 +2,14 @@ Feature: localeapp executable
 
   Scenario: Viewing help
     In order to see what options I have
-    When I run `localeapp help`
+    When I run `localeapp --help`
     Then the output should contain:
     """
-    Usage: localeapp COMMAND [ARGS]
+    Usage: localeapp COMMAND [options]
 
-    Commands:
-      install <api_key> - Creates new configuration files and confirms key works
-      pull              - Pulls all translations from localeapp.com
+        COMMAND:
+        install <api_key> - Creates new configuration files and confirms key works
+        pull              - Pulls all translations from localeapp.com
     """
 
   Scenario: Running install

data/lib/localeapp/configuration.rb

@@ -20,17 +20,44 @@ module Localeapp
     # RAILS_ROOT
     attr_accessor :project_root
 
+    # The names of environments where notifications are sent
+    # (defaults to 'development')
+    attr_accessor :sending_environments
+
+    # The names of environments where I18n.reload is called for each request
+    # (defaults to 'development')
+    attr_accessor :reloading_environments
+
+    # The names of environments where updates aren't pulled
+    # (defaults to 'development')
+    attr_accessor :polling_environments
+
+    # @deprecated Use {#sending_environments} instead. This is safer but make sure to reverse your logic if you've changed the defaults
     # The names of environments where notifications aren't sent (defaults to
     # 'test', 'cucumber', 'production')
     attr_accessor :disabled_sending_environments
+    def disabled_sending_environments=(value)
+      @deprecated_environment_config_used = true
+      @disabled_sending_environments = value
+    end
 
+    # @deprecated Use {#reloading_environments} instead. This is safer but make sure to reverse your logic if you've changed the defaults
     # The names of environments where I18n.reload isn't called for each request
     # (defaults to 'test', 'cucumber', 'production')
     attr_accessor :disabled_reloading_environments
+    def disabled_reloading_environments=(value)
+      @deprecated_environment_config_used = true
+      @disabled_reloading_environments = value
+    end
 
+    # @deprecated Use {#polling_environments} instead. This is safer but make sure to reverse your logic if you've changed the defaults
     # The names of environments where updates aren't pulled (defaults to
     # 'test', 'cucumber', 'production')
     attr_accessor :disabled_polling_environments
+    def disabled_polling_environments=(value)
+      @deprecated_environment_config_used = true
+      @disabled_polling_environments = value
+    end
 
     # The logger used by Localeapp
     attr_accessor :logger
@@ -47,12 +74,19 @@ module Localeapp
     # The complete path to the directory where translations are stored
     attr_accessor :translation_data_directory
 
+    def deprecated_environment_config_used?
+      @deprecated_environment_config_used
+    end
+
     def initialize
       @host                            = 'api.localeapp.com'
       @port                            = 80
       @disabled_sending_environments   = %w(test cucumber production)
       @disabled_reloading_environments = %w(test cucumber production)
       @disabled_polling_environments   = %w(test cucumber production)
+      @sending_environments    = %w(development)
+      @reloading_environments  = %w(development)
+      @polling_environments    = %w(development)
       @poll_interval                   = 0
       @synchronization_data_file       = File.join('log', 'localeapp.yml')
       @translation_data_directory      = File.join('config', 'locales')
@@ -63,15 +97,30 @@ module Localeapp
     end
 
     def polling_disabled?
-      disabled_polling_environments.include?(environment_name)
+      if deprecated_environment_config_used?
+        ::Localeapp.log "DEPRECATION: disabled_polling_environments is deprecated and will be removed. Use polling_environments instead and reverse the logic if you've changed the defaults"
+        disabled_polling_environments.include?(environment_name)
+      else
+        !polling_environments.include?(environment_name)
+      end
     end
 
     def reloading_disabled?
-      disabled_reloading_environments.include?(environment_name)
+      if deprecated_environment_config_used?
+        ::Localeapp.log "DEPRECATION: disabled_reloading_environments is deprecated and will be removed. Use reloading_environments instead and reverse the logic if you've changed the defaults"
+        disabled_reloading_environments.include?(environment_name)
+      else
+        !reloading_environments.include?(environment_name)
+      end
     end
 
     def sending_disabled?
-      disabled_sending_environments.include?(environment_name)
+      if deprecated_environment_config_used?
+        ::Localeapp.log "DEPRECATION: disabled_sending_environments is deprecated and will be removed. Use sending_environments instead and reverse the logic if you've changed the defaults"
+        disabled_sending_environments.include?(environment_name)
+      else
+        !sending_environments.include?(environment_name)
+      end
     end
 
     def write_initial(path)
@@ -83,8 +132,6 @@ require 'localeapp/rails'
 
 Localeapp.configure do |config|
   config.api_key = '#{@api_key}'
-  config.host = '#{@host}'
-  config.port = #{@port}
 end
 CONTENT
       end

data/lib/localeapp/updater.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Localeapp
   class Updater
 
@@ -53,12 +55,16 @@ module Localeapp
       end
     end
 
-    # from ActiveSupport
+    # originally from ActiveSupport
     def atomic_write(file_name, temp_dir = Dir.tmpdir)
       temp_file = Tempfile.new(File.basename(file_name), temp_dir)
       yield temp_file
       temp_file.close
-      File.rename(temp_file.path, file_name)
+      # heroku has /tmp on a different fs
+      # so move first to sure they're on the same fs
+      # so rename will work
+      FileUtils.mv(temp_file.path, "#{file_name}.tmp")
+      File.rename("#{file_name}.tmp", file_name)
     end
   end
 end

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "0.0.11"
+  VERSION = "0.1.1"
 end

data/localeapp.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency('json')
   s.add_dependency('rest-client')
   s.add_dependency('ya2yaml')
+  s.add_dependency('slop')
 
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec', '2.5.0')

data/spec/localeapp/configuration_spec.rb

@@ -1,99 +1,220 @@
 require 'spec_helper'
 
 describe Localeapp::Configuration do
-  before(:each) do
-    @configuration = Localeapp::Configuration.new
-  end
+  let(:configuration) { Localeapp::Configuration.new }
 
   it "sets the host by default" do
-    @configuration.host.should == 'api.localeapp.com'
+    configuration.host.should == 'api.localeapp.com'
   end
 
   it "allows the host to be overwritten" do
-    expect { @configuration.host = 'test.host' }.to change(@configuration, :host).to('test.host')
+    expect { configuration.host = 'test.host' }.to change(configuration, :host).to('test.host')
   end
 
   it "includes http_auth_username defaulting to nil" do
-    @configuration.http_auth_username.should == nil
-    @configuration.http_auth_username = "test"
-    @configuration.http_auth_username.should == "test"
+    configuration.http_auth_username.should == nil
+    configuration.http_auth_username = "test"
+    configuration.http_auth_username.should == "test"
   end
 
   it "includes http_auth_password defaulting to nil" do
-    @configuration.http_auth_password.should == nil
-    @configuration.http_auth_password = "test"
-    @configuration.http_auth_password.should == "test"
+    configuration.http_auth_password.should == nil
+    configuration.http_auth_password = "test"
+    configuration.http_auth_password.should == "test"
   end
 
   it "includes translation_data_directory defaulting to config/locales" do
-    @configuration.translation_data_directory.should == File.join("config", "locales")
-    @configuration.translation_data_directory = "test"
-    @configuration.translation_data_directory.should == "test"
+    configuration.translation_data_directory.should == File.join("config", "locales")
+    configuration.translation_data_directory = "test"
+    configuration.translation_data_directory.should == "test"
+  end
+
+  context "enabled_sending_environments" do
+    it "is only development by default" do
+      configuration.sending_environments.should == ['development']
+    end
+  end
+
+  context "enabled_reloading_environments" do
+    it "is only development by default" do
+      configuration.reloading_environments.should == ['development']
+    end
+  end
+
+  context "enabled_polling_environments" do
+    it "is only development by default" do
+      configuration.polling_environments.should == ['development']
+    end
   end
 
   context "disabled_sending_environments" do
+    it "sets deprecated_environment_config_used flag to true" do
+      configuration.disabled_sending_environments = %(foo bar)
+      configuration.deprecated_environment_config_used?.should be_true
+    end
+
     it "does not include development by default" do
-      @configuration.environment_name = 'development'
-      @configuration.sending_disabled?.should be_false
+      configuration.environment_name = 'development'
+      configuration.sending_disabled?.should be_false
     end
 
     it "include cucumber by default" do
-      @configuration.environment_name = 'cucumber'
-      @configuration.sending_disabled?.should be_true
+      configuration.environment_name = 'cucumber'
+      configuration.sending_disabled?.should be_true
     end
 
     it "include test by default" do
-      @configuration.environment_name = 'test'
-      @configuration.sending_disabled?.should be_true
+      configuration.environment_name = 'test'
+      configuration.sending_disabled?.should be_true
     end
 
     it "include production by default" do
-      @configuration.environment_name = 'production'
-      @configuration.sending_disabled?.should be_true
+      configuration.environment_name = 'production'
+      configuration.sending_disabled?.should be_true
     end
   end
 
   context "disabled_reloading_environments" do
+    it "sets deprecated_environment_config_used flag to true" do
+      configuration.disabled_reloading_environments = %(foo bar)
+      configuration.deprecated_environment_config_used?.should be_true
+    end
+
     it "does not include development by default" do
-      @configuration.environment_name = 'development'
-      @configuration.reloading_disabled?.should be_false
+      configuration.environment_name = 'development'
+      configuration.reloading_disabled?.should be_false
     end
 
     it "include cucumber by default" do
-      @configuration.environment_name = 'cucumber'
-      @configuration.reloading_disabled?.should be_true
+      configuration.environment_name = 'cucumber'
+      configuration.reloading_disabled?.should be_true
     end
 
     it "include test by default" do
-      @configuration.environment_name = 'test'
-      @configuration.reloading_disabled?.should be_true
+      configuration.environment_name = 'test'
+      configuration.reloading_disabled?.should be_true
     end
 
     it "include production by default" do
-      @configuration.environment_name = 'production'
-      @configuration.reloading_disabled?.should be_true
+      configuration.environment_name = 'production'
+      configuration.reloading_disabled?.should be_true
     end
   end
   
   context "disabled_polling_environments" do
+    it "sets deprecated_environment_config_used flag to true" do
+      configuration.disabled_polling_environments = %(foo bar)
+      configuration.deprecated_environment_config_used?.should be_true
+    end
+
     it "does not include development by default" do
-      @configuration.environment_name = 'development'
-      @configuration.polling_disabled?.should be_false
+      configuration.environment_name = 'development'
+      configuration.polling_disabled?.should be_false
     end
 
     it "include cucumber by default" do
-      @configuration.environment_name = 'cucumber'
-      @configuration.polling_disabled?.should be_true
+      configuration.environment_name = 'cucumber'
+      configuration.polling_disabled?.should be_true
     end
 
     it "include test by default" do
-      @configuration.environment_name = 'test'
-      @configuration.polling_disabled?.should be_true
+      configuration.environment_name = 'test'
+      configuration.polling_disabled?.should be_true
     end
 
     it "include production by default" do
-      @configuration.environment_name = 'production'
-      @configuration.polling_disabled?.should be_true
+      configuration.environment_name = 'production'
+      configuration.polling_disabled?.should be_true
+    end
+  end
+
+  describe "polling_disabled?" do
+    context "deprecated syntax used" do
+      it "is true when environment is disabled" do
+        configuration.disabled_polling_environments = %(foo)
+        configuration.environment_name = 'foo'
+        configuration.should be_polling_disabled
+      end
+
+      it "is false when environment is not disabled" do
+        configuration.disabled_polling_environments = %(foo)
+        configuration.environment_name = 'bar'
+        configuration.should_not be_polling_disabled
+      end
+    end
+
+    context "new syntax used" do
+      it "is true when environment is not enabled" do
+        configuration.polling_environments = %(foo)
+        configuration.environment_name = 'bar'
+        configuration.should be_polling_disabled
+      end
+
+      it "is false when environment is enabled" do
+        configuration.polling_environments = %(foo)
+        configuration.environment_name = 'foo'
+        configuration.should_not be_polling_disabled
+      end
+    end
+  end
+
+  describe "reloading_disabled?" do
+    context "deprecated syntax used" do
+      it "is true when environment is disabled" do
+        configuration.disabled_reloading_environments = %(foo)
+        configuration.environment_name = 'foo'
+        configuration.should be_reloading_disabled
+      end
+
+      it "is false when environment is not disabled" do
+        configuration.disabled_reloading_environments = %(foo)
+        configuration.environment_name = 'bar'
+        configuration.should_not be_reloading_disabled
+      end
+    end
+
+    context "new syntax used" do
+      it "is true when environment is not enabled" do
+        configuration.reloading_environments = %(foo)
+        configuration.environment_name = 'bar'
+        configuration.should be_reloading_disabled
+      end
+
+      it "is false when environment is enabled" do
+        configuration.reloading_environments = %(foo)
+        configuration.environment_name = 'foo'
+        configuration.should_not be_reloading_disabled
+      end
+    end
+  end
+
+  describe "sending_disabled?" do
+    context "deprecated syntax used" do
+      it "is true when environment is disabled" do
+        configuration.disabled_sending_environments = %(foo)
+        configuration.environment_name = 'foo'
+        configuration.should be_sending_disabled
+      end
+
+      it "is false when environment is not disabled" do
+        configuration.disabled_sending_environments = %(foo)
+        configuration.environment_name = 'bar'
+        configuration.should_not be_sending_disabled
+      end
+    end
+
+    context "new syntax used" do
+      it "is true when environment is not enabled" do
+        configuration.sending_environments = %(foo)
+        configuration.environment_name = 'bar'
+        configuration.should be_sending_disabled
+      end
+
+      it "is false when environment is enabled" do
+        configuration.sending_environments = %(foo)
+        configuration.environment_name = 'foo'
+        configuration.should_not be_sending_disabled
+      end
     end
   end
 end
@@ -109,8 +230,6 @@ require 'localeapp/rails'
 
 Localeapp.configure do |config|
   config.api_key = 'APIKEY'
-  config.host = 'api.localeapp.com'
-  config.port = 80
 end
 CONTENT
     File.should_receive(:open).with(path, 'w+').and_yield(file)

data/spec/localeapp/rails/controller_spec.rb

@@ -23,8 +23,7 @@ describe Localeapp::Rails::Controller, '#handle_translation_updates' do
 
   context "when polling is enabled" do
     before do
-      Localeapp.configuration.environment_name = 'development' # reloading enabled
-      Localeapp.configuration.disabled_reloading_environments << 'development'
+      Localeapp.configuration.environment_name = 'development'
     end
  
     it "calls poller.poll! when the synchronization file's polled_at has changed" do
@@ -41,8 +40,7 @@ describe Localeapp::Rails::Controller, '#handle_translation_updates' do
 
   context "when polling is disabled" do
     before do
-      Localeapp.configuration.environment_name = 'production' # reloading disabled
-      Localeapp.configuration.disabled_reloading_environments << 'production'
+      Localeapp.configuration.environment_name = 'production'
     end
 
     it "doesn't poller.poll! when the synchronization file's polled_at has changed" do
@@ -59,8 +57,8 @@ describe Localeapp::Rails::Controller, '#handle_translation_updates' do
  
   context "when reloading is enabled" do
     before do
-      Localeapp.configuration.environment_name = 'development' # reloading enabled
-      Localeapp.configuration.disabled_polling_environments << 'development'
+      Localeapp.configuration.environment_name = 'development'
+      Localeapp.poller.stub!(:poll!)
     end
  
     it "calls I18n.reload! when the synchronization file's updated_at has changed" do
@@ -77,8 +75,7 @@ describe Localeapp::Rails::Controller, '#handle_translation_updates' do
  
   context "when reloading is disabled" do
     before do
-      Localeapp.configuration.environment_name = 'production' # reloading disabled
-      Localeapp.configuration.disabled_polling_environments << 'production'
+      Localeapp.configuration.environment_name = 'production'
     end
 
     it "doesn't call I18n.reload! when the synchronization file's updated_at has changed" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: localeapp
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 25
   prerelease: 
   segments: 
   - 0
-  - 0
-  - 11
-  version: 0.0.11
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Christopher Dell
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-25 00:00:00 Z
+date: 2011-09-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n
@@ -75,7 +75,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: slop
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -86,12 +86,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -103,11 +117,11 @@ dependencies:
         - 0
         version: 2.5.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -119,11 +133,11 @@ dependencies:
         - 7
         version: 0.6.7
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: RedCloth
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -135,11 +149,11 @@ dependencies:
         - 7
         version: 4.2.7
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: aruba
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -151,11 +165,11 @@ dependencies:
         - 6
         version: 0.3.6
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -167,7 +181,7 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 description: Post any unfound translation keys to the Locale SaaS
 email: 
 - chris@tigrish.com
@@ -184,11 +198,12 @@ files:
 - .rspec
 - .rvmrc
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Gemfile.i18n_037
 - Gemfile.i18n_050
 - Gemfile.i18n_060
-- README.textile
+- README.md
 - Rakefile
 - bin/localeapp
 - cucumber.yml