localeapp 0.6.6 → 0.6.7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 0.6.7
+
+* Add rm and mv commands for deleting / renaming keys from the command line
+
 # Version 0.6.6
 
 * Add a timeout configuration setting

data/bin/localeapp

@@ -72,6 +72,33 @@ command :add do |c|
   end
 end
 
+desc "removes a key from the project"
+arg_name "<key>"
+command :rm do |c|
+  c.action do |global_options, options, args|
+    key = args.shift
+    if key.nil?
+      exit_now! "localeapp rm requires a key name", 1
+    else
+      Localeapp::CLI::Remove.new(global_options).execute(key, *args)
+    end
+  end
+end
+
+desc "renames a key in the project"
+arg_name "<current key name> <new key name>"
+command :mv do |c|
+  c.action do |global_options, options, args|
+    current_name = args.shift
+    new_name = args.shift
+    if current_name.nil? || new_name.nil?
+      exit_now! "localeapp mv requires a current key name and a new key name", 1
+    else
+      Localeapp::CLI::Rename.new(global_options).execute(current_name, new_name, *args)
+    end
+  end
+end
+
 desc "Pulls all translations from localeapp.com"
 command :pull do |c|
   c.action do |global_options, options, args|

data/features/mv.feature

@@ -0,0 +1,15 @@
+Feature: Renaming a translation from the command line
+
+  Scenario: Running mv
+    In order to rename an existing key
+    When I have a valid project on localeapp.com with api key "MYAPIKEY" and the translation key "foo.bar"
+    And an initializer file
+    When I run `localeapp mv foo.bar foo.baz`
+    Then the output should contain:
+    """
+    Localeapp mv
+
+    Renaming key: foo.bar to foo.baz
+    Success!
+    """
+

data/features/rm.feature

@@ -0,0 +1,14 @@
+Feature: Removing a translation from the command line
+
+  Scenario: Running rm
+    In order to remove an existing key
+    When I have a valid project on localeapp.com with api key "MYAPIKEY" and the translation key "foo.bar"
+    And an initializer file
+    When I run `localeapp rm foo.bar`
+    Then the output should contain:
+    """
+    Localeapp rm
+
+    Remove key: foo.bar
+    Success!
+    """

data/features/step_definitions/cli_steps.rb

@@ -27,6 +27,13 @@ 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 /^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')}"
+  add_fake_web_uri(:delete, uri, ['200', 'OK'], '')
+  add_fake_web_uri(:post, uri + '/rename', ['200', 'OK'], '')
+end
+
 When /^an initializer file$/ do
   steps %Q{
     And a file named "config/initializers/localeapp.rb" with:

data/lib/localeapp/cli/remove.rb

@@ -0,0 +1,26 @@
+module Localeapp
+  module CLI
+    class Remove < Command
+      include ::Localeapp::ApiCall
+
+      def execute(key, *rest)
+        @output.puts "Localeapp rm"
+        @output.puts ""
+        @output.puts "Remove key: #{key}"
+        api_call :remove,
+          :url_options => { :key => key },
+          :success => :report_success,
+          :failure => :report_failure,
+          :max_connection_attempts => 3
+      end
+
+      def report_success(response)
+        @output.puts "Success!"
+      end
+
+      def report_failure(response)
+        @output.puts "Failed!"
+      end
+    end
+  end
+end

data/lib/localeapp/cli/rename.rb

@@ -0,0 +1,27 @@
+module Localeapp
+  module CLI
+    class Rename < Command
+      include ::Localeapp::ApiCall
+
+      def execute(current_name, new_name,  *rest)
+        @output.puts "Localeapp mv"
+        @output.puts ""
+        @output.puts "Renaming key: #{current_name} to #{new_name}"
+        api_call :rename,
+          :url_options => { :current_name => current_name },
+          :payload => { :new_name => new_name },
+          :success => :report_success,
+          :failure => :report_failure,
+          :max_connection_attempts => 3
+      end
+
+      def report_success(response)
+        @output.puts "Success!"
+      end
+
+      def report_failure(response)
+        @output.puts "Failed!"
+      end
+    end
+  end
+end

data/lib/localeapp/routes.rb

@@ -1,3 +1,5 @@
+require 'rack/utils'
+
 module Localeapp
   module Routes
     VERSION = 'v1'
@@ -30,6 +32,24 @@ module Localeapp
       [:get, export_url(options)]
     end
 
+    def remove_endpoint(options = {})
+      [:delete, remove_url(options)]
+    end
+
+    def remove_url(options = {})
+      url = http_scheme.build(base_options.merge(:path => remove_path(options[:key], options[:format])))
+      url.to_s
+    end
+
+    def rename_endpoint(options = {})
+      [:post, rename_url(options)]
+    end
+
+    def rename_url(options = {})
+      url = http_scheme.build(base_options.merge(:path => rename_path(options[:current_name], options[:format])))
+      url.to_s
+    end
+
     def export_url(options = {})
       options[:format] ||= 'yml'
       url = http_scheme.build(base_options.merge(:path => export_path(options[:format])))
@@ -85,6 +105,24 @@ module Localeapp
       path
     end
 
+    def remove_path(key, format = nil)
+      raise "remove_path requires a key" if key.nil?
+      path = translations_path << "/#{escape_key(key)}"
+      path << ".#{format}" if format
+      path
+    end
+
+    def rename_path(current_name, format = nil)
+      raise "rename_path requires current name" if current_name.nil?
+      path = translations_path << "/#{escape_key(current_name)}" << '/rename'
+      path << ".#{format}" if format
+      path
+    end
+
+    def escape_key(key)
+      Rack::Utils.escape(key).gsub(/\./, '%2E')
+    end
+
     def export_path(format = nil)
       path = project_path << '/translations/all'
       path << ".#{format}" if format

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

data/lib/localeapp.rb

@@ -41,6 +41,8 @@ require 'localeapp/cli/pull'
 require 'localeapp/cli/push'
 require 'localeapp/cli/update'
 require 'localeapp/cli/add'
+require 'localeapp/cli/remove'
+require 'localeapp/cli/rename'
 require 'localeapp/cli/daemon'
 
 # AUDIT: Will this work on ruby 1.9.x

data/localeapp.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency('gli')
 
   s.add_development_dependency('rake')
+  s.add_development_dependency('rack')
   s.add_development_dependency('rspec', '2.11.0')
   s.add_development_dependency('yard', '0.6.7')
   s.add_development_dependency('RedCloth', '4.2.9')

data/spec/localeapp/cli/rename_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Localeapp::CLI::Add, "#execute(current_name, new_name, *rest)" do
+  def do_action(current_name = 'test.key', new_name = 'test.new_name')
+    @command.execute(current_name, new_name)
+  end
+
+  before(:each) do
+    @output = StringIO.new
+    @command = Localeapp::CLI::Rename.new(:output => @output)
+  end
+
+  it "makes the api call to the translations endpoint with the new name as the post body" do
+    with_configuration do
+      @command.should_receive(:api_call).with(
+        :rename,
+        :url_options => { :current_name => 'test.key' },
+        :payload => { :new_name => 'test.new_name' },
+        :success => :report_success,
+        :failure => :report_failure,
+        :max_connection_attempts => 3
+      )
+      do_action
+    end
+  end
+end

data/spec/localeapp/routes_spec.rb

@@ -82,6 +82,42 @@ describe Localeapp::Routes do
     end
   end
 
+  describe "#remove_endpoint(options = {})" do
+    it "returns :delete and the remove url for the options" do
+      with_configuration(@config) do
+        options = { :key => 'foo.bar' }
+        @routes.should_receive(:remove_url).with(options).and_return('url')
+        @routes.remove_endpoint(options).should == [:delete, 'url']
+      end
+    end
+  end
+
+  describe "#remove_url(options = {})" do
+    it "it extends the project_url and includes the escaped key name" do
+      with_configuration(@config) do
+        @routes.remove_url(:key => 'test.key').should == "https://test.host/v1/projects/API_KEY/translations/test%2Ekey"
+      end
+    end
+  end
+
+  describe "#rename_endpoint(options = {})" do
+    it "returns :post and the rename url for the options" do
+      with_configuration(@config) do
+        options = { :current_name => 'foo.bar' }
+        @routes.should_receive(:rename_url).with(options).and_return('url')
+        @routes.rename_endpoint(options).should == [:post, 'url']
+      end
+    end
+  end
+
+  describe "#rename_url(options = {})" do
+    it "it extends the project_url and includes the escaped key name" do
+      with_configuration(@config) do
+        @routes.rename_url(:current_name => 'test.key').should == "https://test.host/v1/projects/API_KEY/translations/test%2Ekey/rename"
+      end
+    end
+  end
+
   describe "#export_url" do
     it "it extends the project_url and defaults to yml" do
       with_configuration(@config) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: localeapp
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 6
-  - 6
-  version: 0.6.6
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Christopher Dell
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-08 00:00:00 Z
+date: 2012-11-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n
@@ -103,9 +103,23 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rack
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -117,11 +131,11 @@ dependencies:
         - 0
         version: 2.11.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -133,11 +147,11 @@ dependencies:
         - 7
         version: 0.6.7
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: RedCloth
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -149,11 +163,11 @@ dependencies:
         - 9
         version: 4.2.9
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: aruba
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -165,11 +179,11 @@ dependencies:
         - 11
         version: 0.4.11
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -181,7 +195,7 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 description: Synchronizes i18n translation keys and content with localeapp.com so you don't have to manage translations by hand.
 email: 
 - chris@tigrish.com
@@ -212,8 +226,10 @@ files:
 - 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
@@ -228,6 +244,8 @@ files:
 - lib/localeapp/cli/install.rb
 - lib/localeapp/cli/pull.rb
 - lib/localeapp/cli/push.rb
+- lib/localeapp/cli/remove.rb
+- lib/localeapp/cli/rename.rb
 - lib/localeapp/cli/update.rb
 - lib/localeapp/configuration.rb
 - lib/localeapp/default_value_handler.rb
@@ -256,6 +274,7 @@ files:
 - 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
@@ -309,8 +328,10 @@ test_files:
 - 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
@@ -325,6 +346,7 @@ test_files:
 - 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