localeapp 0.6.2 → 0.6.3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# Version 0.6.3
+
+* Pulling translations now completely replaces the contents of the yaml
+  files instead of selectively updating certain translations.
+
 # Version 0.6.2
 
 * Fix bug updating synchronization files that caused polling_interval to be ignored

data/features/step_definitions/cli_steps.rb

@@ -16,8 +16,8 @@ When /^I have a valid project on localeapp\.com but an incorrect api key "([^"]*
 end
 
 When /^I have a translations on localeapp\.com for the project with api key "([^"]*)"$/ do |api_key|
-  uri = "https://api.localeapp.com/v1/projects/#{api_key}/translations.yml"
-  body = valid_translation_data.to_yaml
+  uri = "https://api.localeapp.com/v1/projects/#{api_key}/translations/all.yml"
+  body = valid_export_data.to_yaml
   add_fake_web_uri(:get, uri, ['200', 'OK'], body)
 end
 

data/lib/localeapp/cli/pull.rb

@@ -8,7 +8,7 @@ module Localeapp
         @output.puts ""
 
         @output.puts "Fetching translations:"
-        api_call :translations,
+        api_call :export,
           :success => :update_backend,
           :failure => :report_failure,
           :max_connection_attempts => 3
@@ -17,7 +17,7 @@ module Localeapp
       def update_backend(response)
         @output.puts "Success!"
         @output.puts "Updating backend:"
-        Localeapp.updater.update(Localeapp.load_yaml(response))
+        Localeapp.updater.dump(Localeapp.load_yaml(response))
         @output.puts "Success!"
         Localeapp.poller.write_synchronization_data!(Time.now.to_i, Time.now.to_i)
       end

data/lib/localeapp/routes.rb

@@ -26,6 +26,17 @@ module Localeapp
       [:post, translations_url(options)]
     end
 
+    def export_endpoint(options = {})
+      [:get, export_url(options)]
+    end
+
+    def export_url(options = {})
+      options[:format] ||= 'yml'
+      url = http_scheme.build(base_options.merge(:path => export_path(options[:format])))
+      url.query = options[:query].map { |k,v| "#{k}=#{v}" }.join('&') if options[:query]
+      url.to_s
+    end
+
     def missing_translations_endpoint(options = {})
       [:post, missing_translations_url(options)]
     end
@@ -74,6 +85,12 @@ module Localeapp
       path
     end
 
+    def export_path(format = nil)
+      path = project_path << '/translations/all'
+      path << ".#{format}" if format
+      path
+    end
+
     def missing_translations_path(format = nil)
       path = project_path << '/translations/missing'
       path << ".#{format}" if format

data/lib/localeapp/updater.rb

@@ -31,6 +31,15 @@ module Localeapp
       end
     end
 
+    def dump(data)
+      data.each do |locale, translations|
+        filename = File.join(Localeapp.configuration.translation_data_directory, "#{locale}.yml")
+        atomic_write(filename) do |file|
+          file.write generate_yaml({locale => translations})
+        end
+      end
+    end
+
     private
 
     def generate_yaml(translations)

data/lib/localeapp/version.rb

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

data/spec/localeapp/cli/pull_spec.rb

@@ -10,7 +10,7 @@ describe Localeapp::CLI::Pull, "#execute" do
   it "makes the api call to the translations endpoint" do
     with_configuration do
       @puller.should_receive(:api_call).with(
-        :translations,
+        :export,
         :success => :update_backend,
         :failure => :report_failure,
         :max_connection_attempts => 3
@@ -30,14 +30,14 @@ describe Localeapp::CLI::Pull, "#update_backend(response)" do
   it "calls the updater" do
     with_configuration do
       Localeapp.poller.stub!(:write_synchronization_data!)
-      Localeapp.updater.should_receive(:update).with(['test data'])
+      Localeapp.updater.should_receive(:dump).with(['test data'])
       @puller.update_backend(@test_data)
     end
   end
 
   it "writes the synchronization data" do
     with_configuration do
-      Localeapp.updater.stub!(:update)
+      Localeapp.updater.stub!(:dump)
       Localeapp.poller.should_receive(:write_synchronization_data!)
       @puller.update_backend(@test_data)
     end

data/spec/localeapp/routes_spec.rb

@@ -82,6 +82,38 @@ describe Localeapp::Routes do
     end
   end
 
+  describe "#export_url" do
+    it "it extends the project_url and defaults to yml" do
+      with_configuration(@config) do
+        @routes.export_url.should == "https://test.host/v1/projects/API_KEY/translations/all.yml"
+      end
+    end
+
+    it "adds query parameters on to the url" do
+      with_configuration(@config) do
+        url = @routes.export_url(:query => {:updated_at => '2011-04-19', :foo => :bar})
+        url.should match(/\?.*updated_at=2011-04-19/)
+        url.should match(/\?.*foo=bar/)
+      end
+    end
+
+    it "can be changed to another content type" do
+      with_configuration(@config) do
+        @routes.export_url(:format => :json).should == 'https://test.host/v1/projects/API_KEY/translations/all.json'
+      end
+    end
+  end
+
+  describe "#export_endpoint(options = {})" do
+    it "returns :get and the export url for the options" do
+      with_configuration(@config) do
+        options = { :foo => :bar }
+        @routes.should_receive(:export_url).with(options).and_return('url')
+        @routes.export_endpoint(options).should == [:get, 'url']
+      end
+    end
+  end
+
   describe "#missing_translations_endpoint(options = {})" do
     it "returns :post and the missing_translations url for the options" do
       with_configuration(@config) do

data/spec/localeapp/updater_spec.rb

@@ -182,3 +182,65 @@ JA
     mode.to_s(8)[3, 3].should == "644"
   end
 end
+
+describe Localeapp::Updater, ".dump(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
+    end
+  end
+
+  after(:each) do
+    FileUtils.rm_rf @yml_dir
+  end
+
+  def do_dump(data)
+    @updater.dump(data)
+  end
+
+  it "replaces the content of an existing yml file" do
+    filepath = File.join(@yml_dir, 'en.yml')
+    content = lambda { File.read(filepath) }
+    if defined? Psych
+      expect { do_dump({'en' => {'updated' => 'content'}}) }.to change(content, :call).to <<-EN
+en:
+  updated: content
+EN
+    else
+      expect { do_dump({'en' => {'updated' => 'content'}}) }.to change(content, :call).to <<-EN
+en: 
+  updated: content
+EN
+    end
+  end
+
+  it "creates a new yml file if an unknown locale is passed" do
+    do_dump({'ja' => { 'foo' => 'bar'} })
+    if defined? Psych
+      File.read(File.join(@yml_dir, 'ja.yml')).should == <<-JA
+ja:
+  foo: bar
+JA
+    else
+      File.read(File.join(@yml_dir, 'ja.yml')).should == <<-JA
+ja: 
+  foo: bar
+JA
+    end
+  end
+
+  it "doesn't change a yml file's permissions" do
+    filepath = File.join(@yml_dir, 'en.yml')
+    File.chmod(0777, filepath)
+    permissions = lambda { File.stat(filepath).mode.to_s(8) }
+    expect { do_dump({'en' => { 'foo' => 'bar'} }) }.to_not change(permissions, :call)
+  end
+
+  it "creates new yml files chmodded with 644" do
+    do_dump({'ja' => { 'foo' => 'bar'} })
+    mode = File.stat(File.join(@yml_dir, 'ja.yml')).mode # octal
+    mode.to_s(8)[3, 3].should == "644"
+  end
+end

data/spec/support/localeapp_integration_data.rb

@@ -30,4 +30,14 @@ module LocaleappIntegrationData
       'locales' => %w{en es}
     }
   end
+
+  def valid_export_data
+    { 'en' => {
+        'foo' => {'monkey' => 'hello', 'night' => 'night'}
+      },
+      'es' => {
+        'foo' => {'monkey' => 'hola', 'night' => 'noche'}
+      }
+    }
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: localeapp
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Christopher Dell
@@ -16,12 +16,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-15 00:00:00 Z
+date: 2012-10-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +31,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: json
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +45,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: rest-client
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,12 +59,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: ya2yaml
+  type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -72,12 +73,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: gli
+  type: :runtime
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -86,12 +87,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   name: rake
+  type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -100,12 +101,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id006
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec
+  type: :development
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -116,12 +117,12 @@ dependencies:
         - 11
         - 0
         version: 2.11.0
-  type: :development
-  version_requirements: *id007
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   name: yard
+  type: :development
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -132,12 +133,12 @@ dependencies:
         - 6
         - 7
         version: 0.6.7
-  type: :development
-  version_requirements: *id008
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   name: RedCloth
+  type: :development
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -148,12 +149,12 @@ dependencies:
         - 2
         - 9
         version: 4.2.9
-  type: :development
-  version_requirements: *id009
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   name: aruba
+  type: :development
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -164,12 +165,12 @@ dependencies:
         - 4
         - 11
         version: 0.4.11
-  type: :development
-  version_requirements: *id010
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   name: fakeweb
+  type: :development
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -180,8 +181,7 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  type: :development
-  version_requirements: *id011
+  requirement: *id011
 description: Synchronizes i18n translation keys and content with localeapp.com so you don't have to manage translations by hand.
 email: 
 - chris@tigrish.com
@@ -300,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: localeapp
-rubygems_version: 1.8.24
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Easy i18n translation management with localeapp.com