localeapp 0.0.7 → 0.0.8

data/spec/{locale_app → localeapp}/sender_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe LocaleApp::Sender, "#post_translation(locale, key, options, value = nil)" do
+describe Localeapp::Sender, "#post_translation(locale, key, options, value = nil)" do
   before(:each) do
     with_configuration(:api_key => "TEST_KEY") do
-      @sender = LocaleApp::Sender.new
+      @sender = Localeapp::Sender.new
     end
   end
 
@@ -22,10 +22,10 @@ describe LocaleApp::Sender, "#post_translation(locale, key, options, value = nil
   end
 end
 
-describe LocaleApp::Sender, "#post_missing_translations" do
+describe Localeapp::Sender, "#post_missing_translations" do
   before(:each) do
     with_configuration(:api_key => 'TEST_KEY') do
-      @sender = LocaleApp::Sender.new
+      @sender = Localeapp::Sender.new
     end
   end
 
@@ -34,7 +34,7 @@ describe LocaleApp::Sender, "#post_missing_translations" do
       { :key => "test.key", :locale => "en" },
       { :key => "test.key2", :locale => "en" }
     ]
-    LocaleApp.missing_translations.should_receive(:to_send).and_return(missing_to_send)
+    Localeapp.missing_translations.should_receive(:to_send).and_return(missing_to_send)
     data = { :translations => missing_to_send }
     # have to stub RestClient here as FakeWeb doesn't support looking at the post body yet
     RestClient.should_receive(:post).with(@sender.missing_translations_url, data.to_json, :content_type => :json).and_return(double('response', :code => 200))
@@ -42,7 +42,7 @@ describe LocaleApp::Sender, "#post_missing_translations" do
   end
 
   it "does nothing if there are no missing translations to send" do
-    LocaleApp.missing_translations.should_receive(:to_send).and_return([])
+    Localeapp.missing_translations.should_receive(:to_send).and_return([])
     RestClient.should_not_receive(:post)
     @sender.post_missing_translations
   end

data/spec/{locale_app → localeapp}/updater_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe LocaleApp::Updater, ".update(data)" do
+describe Localeapp::Updater, ".update(data)" do
   before(:each) do
     @yml_dir = Dir.mktmpdir
     Dir.glob(File.join(File.dirname(__FILE__), '..', 'fixtures', '*.yml')).each { |f| FileUtils.cp f, @yml_dir }
     with_configuration(:translation_data_directory => @yml_dir) do
-      @updater = LocaleApp::Updater.new
+      @updater = Localeapp::Updater.new
     end
   end
 

data/spec/spec_helper.rb

@@ -1,13 +1,13 @@
 require 'i18n'
-require 'locale_app'
+require 'localeapp'
 require 'fakeweb'
-require 'support/locale_app_integration_data'
-require 'support/locale_app_synchronization_data'
+require 'support/localeapp_integration_data'
+require 'support/localeapp_synchronization_data'
 require 'logger'
 
 def with_configuration(options = {})
-  LocaleApp.configuration = nil
-  LocaleApp.configure do |configuration|
+  Localeapp.configuration = nil
+  Localeapp.configure do |configuration|
     options.each do |option, value| 
       configuration.send("#{option}=", value)
     end
@@ -16,8 +16,8 @@ def with_configuration(options = {})
 end
 
 RSpec.configure do |config|
-  config.include(LocaleAppIntegrationData)
-  config.include(LocaleAppSynchronizationData)
+  config.include(LocaleappIntegrationData)
+  config.include(LocaleappSynchronizationData)
   config.before(:each) do
     FakeWeb.allow_net_connect = false
   end

data/spec/support/{locale_app_integration_data.rb → localeapp_integration_data.rb}

@@ -1,7 +1,7 @@
 # This module is the source for all data that simulates what the real app would return.
 # It's included in the specs and cucumber tests, so if our format changes we
 # should only have to change here
-module LocaleAppIntegrationData
+module LocaleappIntegrationData
   def valid_project_data
     {
       'name' => "Test Project",

data/spec/support/{locale_app_synchronization_data.rb → localeapp_synchronization_data.rb}

@@ -1,4 +1,4 @@
-module LocaleAppSynchronizationData
+module LocaleappSynchronizationData
   def self.file(dir)
     File.join(dir, 'test_sync.yml')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: localeapp
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Christopher Dell
@@ -196,50 +196,49 @@ files:
 - features/support/env.rb
 - features/support/hooks.rb
 - init.rb
-- lib/locale_app.rb
-- lib/locale_app/api_call.rb
-- lib/locale_app/api_caller.rb
-- lib/locale_app/cli/install.rb
-- lib/locale_app/cli/pull.rb
-- lib/locale_app/cli/push.rb
-- lib/locale_app/cli/update.rb
-- lib/locale_app/configuration.rb
-- lib/locale_app/exception_handler.rb
-- lib/locale_app/key_checker.rb
-- lib/locale_app/missing_translations.rb
-- lib/locale_app/poller.rb
-- lib/locale_app/rails.rb
-- lib/locale_app/rails/2_3_translation_helper_monkeypatch.rb
-- lib/locale_app/rails/controller.rb
-- lib/locale_app/rails/flatten.rb
-- lib/locale_app/routes.rb
-- lib/locale_app/sender.rb
-- lib/locale_app/tasks/locale_app.rake
-- lib/locale_app/updater.rb
-- lib/locale_app/version.rb
 - lib/localeapp.rb
+- lib/localeapp/api_call.rb
+- lib/localeapp/api_caller.rb
+- lib/localeapp/cli/install.rb
+- lib/localeapp/cli/pull.rb
+- lib/localeapp/cli/push.rb
+- lib/localeapp/cli/update.rb
+- lib/localeapp/configuration.rb
+- lib/localeapp/exception_handler.rb
+- lib/localeapp/key_checker.rb
+- lib/localeapp/missing_translations.rb
+- lib/localeapp/poller.rb
+- lib/localeapp/rails.rb
+- lib/localeapp/rails/2_3_translation_helper_monkeypatch.rb
+- lib/localeapp/rails/controller.rb
+- lib/localeapp/rails/flatten.rb
+- lib/localeapp/routes.rb
+- lib/localeapp/sender.rb
+- lib/localeapp/tasks/localeapp.rake
+- lib/localeapp/updater.rb
+- lib/localeapp/version.rb
 - localeapp.gemspec
 - run_ci
 - spec/fixtures/en.yml
 - spec/fixtures/es.yml
-- spec/locale_app/api_call_spec.rb
-- spec/locale_app/api_caller_spec.rb
-- spec/locale_app/cli/install_spec.rb
-- spec/locale_app/cli/pull_spec.rb
-- spec/locale_app/cli/push_spec.rb
-- spec/locale_app/cli/update_spec.rb
-- spec/locale_app/configuration_spec.rb
-- spec/locale_app/exception_handler_spec.rb
-- spec/locale_app/key_checker_spec.rb
-- spec/locale_app/missing_translations_spec.rb
-- spec/locale_app/poller_spec.rb
-- spec/locale_app/rails/controller_spec.rb
-- spec/locale_app/routes_spec.rb
-- spec/locale_app/sender_spec.rb
-- spec/locale_app/updater_spec.rb
+- spec/localeapp/api_call_spec.rb
+- spec/localeapp/api_caller_spec.rb
+- spec/localeapp/cli/install_spec.rb
+- spec/localeapp/cli/pull_spec.rb
+- spec/localeapp/cli/push_spec.rb
+- spec/localeapp/cli/update_spec.rb
+- spec/localeapp/configuration_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/spec_helper.rb
-- spec/support/locale_app_integration_data.rb
-- spec/support/locale_app_synchronization_data.rb
+- spec/support/localeapp_integration_data.rb
+- spec/support/localeapp_synchronization_data.rb
 homepage: http://rubygems.org/gems/localeapp
 licenses: []
 
@@ -280,21 +279,21 @@ test_files:
 - features/support/hooks.rb
 - spec/fixtures/en.yml
 - spec/fixtures/es.yml
-- spec/locale_app/api_call_spec.rb
-- spec/locale_app/api_caller_spec.rb
-- spec/locale_app/cli/install_spec.rb
-- spec/locale_app/cli/pull_spec.rb
-- spec/locale_app/cli/push_spec.rb
-- spec/locale_app/cli/update_spec.rb
-- spec/locale_app/configuration_spec.rb
-- spec/locale_app/exception_handler_spec.rb
-- spec/locale_app/key_checker_spec.rb
-- spec/locale_app/missing_translations_spec.rb
-- spec/locale_app/poller_spec.rb
-- spec/locale_app/rails/controller_spec.rb
-- spec/locale_app/routes_spec.rb
-- spec/locale_app/sender_spec.rb
-- spec/locale_app/updater_spec.rb
+- spec/localeapp/api_call_spec.rb
+- spec/localeapp/api_caller_spec.rb
+- spec/localeapp/cli/install_spec.rb
+- spec/localeapp/cli/pull_spec.rb
+- spec/localeapp/cli/push_spec.rb
+- spec/localeapp/cli/update_spec.rb
+- spec/localeapp/configuration_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/spec_helper.rb
-- spec/support/locale_app_integration_data.rb
-- spec/support/locale_app_synchronization_data.rb
+- spec/support/localeapp_integration_data.rb
+- spec/support/localeapp_synchronization_data.rb

data/lib/locale_app/exception_handler.rb

@@ -1,21 +0,0 @@
-module LocaleApp
-  class ExceptionHandler
-    def self.call(exception, locale, key, options)
-      LocaleApp.log(exception.message)
-      if I18n::MissingTranslationData === exception
-        LocaleApp.log("Detected missing translation for key(s) #{key.inspect}")
-
-        [*key].each do |key|
-          LocaleApp.missing_translations.add(locale, key, options)
-        end
-
-        [locale, key].join(', ')
-      else
-        LocaleApp.log('Raising exception')
-        raise
-      end
-    end
-  end
-end
-
-I18n.exception_handler = LocaleApp::ExceptionHandler

data/lib/locale_app/rails/controller.rb

@@ -1,34 +0,0 @@
-module LocaleApp
-  module Rails
-    module Controller
-      def self.included(base)
-        base.before_filter :handle_translation_updates
-        base.after_filter  :send_missing_translations
-      end
-
-      def handle_translation_updates
-        unless ::LocaleApp.configuration.polling_disabled?
-          ::LocaleApp.log Time.now.to_i.to_s << '-- Handling translation updates'
-          if ::LocaleApp.poller.needs_polling?
-            ::LocaleApp.log Time.now.to_i.to_s << ' - 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'
-            I18n.reload!
-            ::LocaleApp.poller.updated_at = ::LocaleApp.poller.synchronization_data[:updated_at]
-          end
-        end
-      end
-
-      def send_missing_translations
-        return if ::LocaleApp.configuration.sending_disabled?
-
-        ::LocaleApp.sender.post_missing_translations
-      end
-    end
-  end
-end

data/lib/locale_app/version.rb

@@ -1,3 +0,0 @@
-module LocaleApp
-  VERSION = "0.0.7"
-end

data/lib/locale_app.rb

@@ -1,98 +0,0 @@
-# AUDIT: Find a better way of doing this
-begin
-  require 'i18n'
-rescue LoadError
-  # we're in 2.3 and we need to load rails to get the vendored i18n
-  require 'thread' # for rubygems > 1.6.0 support
-  require 'active_support'
-end
-
-begin
-  require 'i18n/core_ext/hash'
-rescue LoadError
-  # Assume that we're in rails 2.3 and AS supplies deep_merge
-end
-
-
-require 'locale_app/version'
-require 'locale_app/configuration'
-require 'locale_app/routes'
-require 'locale_app/api_call'
-require 'locale_app/api_caller'
-require 'locale_app/sender'
-require 'locale_app/poller'
-require 'locale_app/updater'
-require 'locale_app/key_checker'
-require 'locale_app/missing_translations'
-  
-require 'locale_app/cli/install'
-require 'locale_app/cli/pull'
-require 'locale_app/cli/push'
-require 'locale_app/cli/update'
-
-# AUDIT: Will this work on ruby 1.9.x
-$KCODE="UTF8" if RUBY_VERSION < '1.9'
-
-require 'ya2yaml'
-
-module LocaleApp
-  API_VERSION = "1"
-  LOG_PREFIX = "** [LocaleApp] "
-
-  class << self
-    # An LocaleApp configuration object.
-    attr_accessor :configuration
-    
-    # The sender object is responsible for delivering formatted data to the LocaleApp server.
-    attr_accessor :sender
-
-    # The poller object is responsible for retrieving data for the LocaleApp server
-    attr_accessor :poller
-
-    # The updater object is responsible for merging translations into the i18n backend
-    attr_accessor :updater
-
-    # The missing_translations object is responsible for keeping track of missing translations
-    # that will be sent to the backend
-    attr_reader :missing_translations
-
-
-    # Writes out the given message to the #logger
-    def log(message)
-      logger.info LOG_PREFIX + message if logger
-    end
-
-    def debug(message)
-      logger.debug(LOG_PREFIX + message) if logger
-    end
-
-    # Look for the Rails logger currently defined
-    def logger
-      self.configuration && self.configuration.logger
-    end
-  
-    # @example Configuration
-    # LocaleApp.configure do |config|
-    #   config.api_key = '1234567890abcdef'
-    # end
-    def configure
-      self.configuration ||= Configuration.new
-      yield(configuration)
-      self.sender  = Sender.new
-      self.poller  = Poller.new
-      self.updater = Updater.new
-      @missing_translations = MissingTranslations.new
-    end
-
-    # requires the LocaleApp configuration
-    def include_config_file(file_path=nil)
-      file_path ||= File.join(Dir.pwd, 'config', 'initializers', 'locale_app')
-      begin
-        require file_path
-        true
-      rescue
-        false
-      end
-    end
-  end
-end

data/spec/locale_app/cli/update_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-require 'locale_app/cli/update'
-
-describe LocaleApp::CLI::Update, "#execute" do
-  before do
-    @output = StringIO.new
-    @updater = LocaleApp::CLI::Update.new(@output)
-  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
-    end
-  end
-end