phrase 0.3.1 → 0.3.2

data/lib/phrase/tool/formats/qt_phrase_book.rb

@@ -4,4 +4,8 @@ class Phrase::Tool::Formats::QtPhraseBook < Phrase::Tool::Formats::Base
   def self.filename_for_locale(locale)
     "phrase.#{locale.name}.qph"
   end
+  
+  def self.locale_aware?
+    true
+  end
 end

data/lib/phrase/tool/formats/qt_translation_source.rb

@@ -4,4 +4,8 @@ class Phrase::Tool::Formats::QtTranslationSource < Phrase::Tool::Formats::Base
   def self.filename_for_locale(locale)
     "phrase.#{locale.name}.ts"
   end
+  
+  def self.locale_aware?
+    true
+  end
 end

data/lib/phrase/tool/formats/resx.rb

@@ -4,4 +4,8 @@ class Phrase::Tool::Formats::Resx < Phrase::Tool::Formats::Base
   def self.filename_for_locale(locale)
     "phrase.#{locale.name}.resx"
   end
+  
+  def self.locale_aware?
+    true
+  end
 end

data/lib/phrase/tool/formats/strings.rb

@@ -10,14 +10,22 @@ class Phrase::Tool::Formats::Strings < Phrase::Tool::Formats::Base
     "Localizable.strings"
   end
   
+  def self.target_directory
+    "./"
+  end
+
   def self.extract_locale_name_from_file_path(file_path)
     file_path.scan(/\/([a-zA-Z\-_]*).lproj\//i).first.try(:first)
   end
   
+  def self.locale_aware?
+    true
+  end
+  
   def self.formatted(name)
     return name unless name.include?("-")
     parts = name.split("-")
     "#{parts.first}_#{parts.last.upcase}"
   end
   private_class_method :formatted
-end
+end

data/lib/phrase/tool/formats/xliff.rb

@@ -4,4 +4,8 @@ class Phrase::Tool::Formats::Xliff < Phrase::Tool::Formats::Base
   def self.filename_for_locale(locale)
     "phrase.#{locale.name}.xlf"
   end
+  
+  def self.locale_aware?
+    true
+  end
 end

data/lib/phrase/tool/formats/xml.rb

@@ -13,6 +13,10 @@ class Phrase::Tool::Formats::Xml < Phrase::Tool::Formats::Base
   def self.filename_for_locale(locale)
     "strings.xml"
   end
+
+  def self.target_directory
+    "res/"
+  end
   
   def self.extract_locale_name_from_file_path(file_path)
     return default_locale_name if file_path.scan(/\/values\/strings.xml/i).first
@@ -24,10 +28,9 @@ class Phrase::Tool::Formats::Xml < Phrase::Tool::Formats::Base
     end
   end
   
-  def self.default_locale_name
-    Phrase::Tool::Locale.find_default_locale.try(:name)
+  def self.locale_aware?
+    true
   end
-  private_class_method :default_locale_name
   
   def self.formatted(name)
     return name unless name.include?("-")
@@ -35,4 +38,4 @@ class Phrase::Tool::Formats::Xml < Phrase::Tool::Formats::Base
     "#{parts.first}-r#{parts.last.upcase}"
   end
   private_class_method :formatted
-end
+end

data/lib/phrase/tool/formats/yaml.rb

@@ -4,4 +4,8 @@ class Phrase::Tool::Formats::Yaml < Phrase::Tool::Formats::Base
   def self.filename_for_locale(locale)
     "phrase.#{locale.name}.yml"
   end
+  
+  def self.locale_aware?
+    true
+  end
 end

data/lib/phrase/tool/options.rb

@@ -1,11 +1,11 @@
 # -*- encoding : utf-8 -*-
 
-require 'optparse'
+require File.expand_path('../options_factory', __FILE__)
 
 class Phrase::Tool::Options
-  
   def initialize(args, command="")
     @command = command
+    # specify all possible arguments here
     @data = {
       default: {
         version: false,
@@ -13,7 +13,13 @@ class Phrase::Tool::Options
       },
       init: {
         secret: "",
-        default_locale: "en"
+        default_locale: "en",
+        domain: "phrase",
+        default_target: nil,
+        format: nil,
+        locale_filename: nil,
+        locale_directory: nil,
+        target_directory: nil 
       },
       push: {
         tags: [],
@@ -21,8 +27,8 @@ class Phrase::Tool::Options
         locale: nil
       },
       pull: {
-        format: "yml",
-        target: "./phrase/locales/"
+        format: nil,
+        target: nil
       }
     }
     options.parse!(args)
@@ -37,55 +43,10 @@ class Phrase::Tool::Options
 private
   
   def options
-    case command_name
-      when :init
-        OptionParser.new do |opts|
-          opts.on("--secret=YOUR_AUTH_TOKEN", String, "Your auth token") do |secret|
-            @data[command_name][:secret] = secret
-          end
-          
-          opts.on("--default-locale=en", String, "The default locale for your application") do |default_locale|
-            @data[command_name][:default_locale] = default_locale
-          end
-        end
-      when :push
-        OptionParser.new do |opts|
-          opts.on("--tags=foo,bar", Array, "List of tags for phrase push (separated by comma)") do |tags|
-            @data[command_name][:tags] = tags
-          end
-          
-          opts.on("-R", "--recursive", "Push files in subfolders as well (recursively)") do |recursive|
-            @data[command_name][:recursive] = true
-          end
-          
-          opts.on("--locale=en", String, "Locale of the translations your file contain (required for formats that do not include the name of the locale in the file content)") do |locale|
-            @data[command_name][:locale] = locale
-          end
-        end
-      when :pull
-        OptionParser.new do |opts|
-          opts.on("--format=yml", String, "See documentation for list of allowed locales") do |format|
-            @data[command_name][:format] = format
-          end
-          
-          opts.on("--target=./phrase/locales", String, "Target folder to store locale files") do |target|
-            @data[command_name][:target] = target
-          end
-        end
-      else
-        OptionParser.new do |opts|
-          opts.on_tail("-v", "--version", "Show version number") do |version|
-            @data[:default][:version] = true
-          end
-          
-          opts.on_tail("-h", "--help", "Show help") do |help|
-            @data[:default][:help] = true
-          end
-        end
-    end
+    OptionsFactory.options_for(command_name, @data)
   end
   
   def command_name
     @command_name ||= (@command.present? and @data.has_key?(@command.to_sym)) ? @command.to_sym : :default
   end
-end
+end

data/lib/phrase/tool/options_factory.rb

@@ -0,0 +1,77 @@
+require 'optparse'
+
+class OptionsFactory
+  def self.options_for(command, options)
+    OptionParser.new do |opts|
+      self.send(command, opts, options[command])
+    end
+  end
+
+  def self.init(opts, set)
+    opts.on("--secret=YOUR_AUTH_TOKEN", String, "Your auth token") do |secret|
+      set[:secret] = secret
+    end
+    
+    opts.on("--default-locale=en", String, "The default locale for your application") do |default_locale|
+      set[:default_locale] = default_locale
+    end
+
+    opts.on("--default-format=json", String, "The default format for locale files") do |format|
+      set[:format] = format
+    end
+    
+    opts.on("--domain=phrase", String, "The default domain or app prefix for locale files") do |domain|
+      set[:domain] = domain
+    end
+    
+    opts.on("--locale-directory=./", String, "The directory naming for locale files, e.g ./<locale.name>/ for subfolders with 'en' or 'de'") do |locale_directory|
+      set[:locale_directory] = locale_directory
+    end
+    
+    opts.on("--locale-filename=<domain>.<format>", String, "The filename for locale files") do |locale_filename|
+      set[:locale_filename] = locale_filename
+    end
+    
+    opts.on("--default-target=phrase/locales/", String, "The default target directory for locale files") do |target_directory|
+      set[:target_directory] = target_directory
+    end
+  end
+  private_class_method :init
+
+  def self.push(opts, set)
+    opts.on("--tags=foo,bar", Array, "List of tags for phrase push (separated by comma)") do |tags|
+      set[:tags] = tags
+    end
+    
+    opts.on("-R", "--recursive", "Push files in subfolders as well (recursively)") do |recursive|
+      set[:recursive] = true
+    end
+    
+    opts.on("--locale=en", String, "Locale of the translations your file contain (required for formats that do not include the name of the locale in the file content)") do |locale|
+      set[:locale] = locale
+    end
+  end
+  private_class_method :push
+
+  def self.pull(opts, set)
+    opts.on("--format=yml", String, "See documentation for list of allowed locales") do |format|
+      set[:format] = format
+    end
+    
+    opts.on("--target=./phrase/locales", String, "Target folder to store locale files") do |target|
+      set[:target] = target
+    end
+  end
+  private_class_method :pull
+  
+  def self.default(opts, set)
+    opts.on_tail("-v", "--version", "Show version number") do |version|
+     set[:version] = true
+    end
+    
+    opts.on_tail("-h", "--help", "Show help") do |help|
+      set[:help] = true
+    end
+  end
+  private_class_method :default
+end

data/lib/phrase/version.rb

@@ -1,3 +1,3 @@
 module Phrase
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70346162428660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346162428660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70346162428200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 2.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *70346162428200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.8
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70346162427820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346162427820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70346162427360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346162427360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70346162426940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346162426940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70346162426520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346162426520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70346162426100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346162426100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70346162425680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346162425680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70346162425260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +149,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346162425260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: phrase allows you to edit translations in-place on the page itself. More
   information at phraseapp.com
 email:
@@ -122,12 +167,15 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/phrase
 - cacert.pem
 - lib/phrase.rb
+- lib/phrase/adapters/fast_gettext.rb
+- lib/phrase/adapters/i18n.rb
 - lib/phrase/api.rb
 - lib/phrase/api/client.rb
 - lib/phrase/api/config.rb
@@ -138,6 +186,8 @@ files:
 - lib/phrase/cache.rb
 - lib/phrase/config.rb
 - lib/phrase/delegate.rb
+- lib/phrase/delegate/fast_gettext.rb
+- lib/phrase/delegate/i18n.rb
 - lib/phrase/engine.rb
 - lib/phrase/hash_flattener.rb
 - lib/phrase/tool.rb
@@ -152,7 +202,9 @@ files:
 - lib/phrase/tool/encoding_detector.rb
 - lib/phrase/tool/formats.rb
 - lib/phrase/tool/formats/base.rb
+- lib/phrase/tool/formats/custom.rb
 - lib/phrase/tool/formats/gettext.rb
+- lib/phrase/tool/formats/gettext_pot.rb
 - lib/phrase/tool/formats/ini.rb
 - lib/phrase/tool/formats/json.rb
 - lib/phrase/tool/formats/plist.rb
@@ -166,6 +218,7 @@ files:
 - lib/phrase/tool/formats/yaml.rb
 - lib/phrase/tool/locale.rb
 - lib/phrase/tool/options.rb
+- lib/phrase/tool/options_factory.rb
 - lib/phrase/tool/tag_validator.rb
 - lib/phrase/version.rb
 - lib/phrase/view_helpers.rb
@@ -190,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: phrase
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: The best way to manage i18n.