phrase 0.1.4 → 0.2.0.beta.2

data/Gemfile

@@ -6,6 +6,6 @@ gem "activesupport", :require => "active_support"
 group :test do
   gem 'rspec'
   gem 'i18n'
-  gem 'webmock', '~>1.7.0'
-  gem 'vcr', '~>1.11'
+  gem 'webmock'
+  gem 'vcr'
 end

data/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     activesupport (3.0.0)
-    addressable (2.2.7)
+    addressable (2.2.8)
     crack (0.3.1)
     diff-lcs (1.1.3)
     i18n (0.6.0)
@@ -15,9 +15,9 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    vcr (1.11.3)
-    webmock (1.7.10)
-      addressable (~> 2.2, > 2.2.5)
+    vcr (2.2.1)
+    webmock (1.8.7)
+      addressable (>= 2.2.7)
       crack (>= 0.1.7)
 
 PLATFORMS
@@ -28,5 +28,5 @@ DEPENDENCIES
   i18n
   json
   rspec
-  vcr (~> 1.11)
-  webmock (~> 1.7.0)
+  vcr
+  webmock

data/bin/phrase

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 require 'phrase/tool'
-PhraseGem::Tool.new(ARGV).run
+Phrase::Tool.new(ARGV).run

data/lib/phrase/api/client.rb

@@ -0,0 +1,168 @@
+# -*- encoding : utf-8 -*-
+
+require 'net/http'
+require 'net/https'
+require 'phrase'
+require 'phrase/api'
+
+class Phrase::Api::Client
+  
+  METHOD_GET = :get
+  METHOD_POST = :post
+  METHOD_PUT = :put
+  
+  attr_reader :auth_token
+  
+  def initialize(auth_token)
+    raise "No auth token specified!" if (auth_token.nil? or auth_token.blank?)
+    @auth_token = auth_token
+  end
+  
+  def fetch_locales
+    result = perform_api_request("/locales", :get)
+    locales = []
+    JSON.parse(result).map do |locale| 
+      locales << locale['name']
+    end
+    locales
+  end
+  
+  def translate(key)
+    raise "You must specify a key" if key.nil? or key.blank?
+    keys = {}    
+    result = JSON.parse(perform_api_request("/translation_keys/translate", :get, {:key => key}))
+    if result["translate"]
+      keys = result["translate"]
+    end
+    keys
+  end
+  
+  def create_locale(name)
+    raise "You must specify a name" if name.nil? or name.blank?
+    
+    begin
+      perform_api_request("/locales", :post, {
+        "locale[name]" => name
+      })
+    rescue Phrase::Api::Exceptions::ServerError => e
+      raise "Locale #{name} could not be created (Maybe it already exists)"
+    end
+    true
+  end
+  
+  def make_locale_default(name)
+    raise "You must specify a name" if name.nil? or name.blank?
+    
+    begin
+      perform_api_request("/locales/#{name}/make_default", :put)
+    rescue Phrase::Api::Exceptions::ServerError => e
+      raise "Locale #{name} could not be made the default locale"
+    end
+    true
+  end
+  
+  def download_translations_for_locale(name)
+    raise "You must specify a name" if name.nil? or name.blank?
+    
+    begin
+      content = perform_api_request("/translations/download", :get, {'locale' => name})
+      return content
+    rescue Phrase::Api::Exceptions::ServerError => e
+      raise "Translations #{name} could not be downloaded"
+    end
+  end
+  
+  def upload(filename, file_content)  
+    begin
+      perform_api_request("/translation_keys/upload", :post, {
+        "filename" => filename,
+        "file_content" => file_content,
+      })
+    rescue Phrase::Api::Exceptions::ServerError => e
+      raise "File #{filename} could not be uploaded"
+    end
+    true
+  end
+  
+private
+  def display_api_error(response)
+    error_message = api_error_message(response)
+    $stderr.puts error_message
+  end
+
+  def api_error_message(response)
+    message = ""
+    begin
+      error = JSON.parse(response.body)["error"]
+      if error.class == String
+        message = error
+      else
+        message = JSON.parse(response.body)["message"]
+      end
+    rescue JSON::ParserError
+    end
+    message = "Unknown Error" if message.blank?
+    "Error: #{message} (#{response.code})"
+  end
+
+  def perform_api_request(endpoint, method=METHOD_GET, params={})
+    request = case method
+      when METHOD_GET
+        get_request(endpoint, params)
+      when METHOD_POST
+        post_request(endpoint, params)
+      when METHOD_PUT
+        put_request(endpoint, params)
+      else
+        raise "Invalid Request Method: #{method}"
+    end
+    response = http_client.request(request)
+    code = response.code.to_i
+    if (code == 200)
+      return response.body
+    else
+      error_message = api_error_message(response)
+      raise Phrase::Api::Exceptions::Unauthorized.new(error_message) if (code == 401)
+      raise Phrase::Api::Exceptions::ServerError.new(error_message)
+    end
+  end
+  
+  def get_request(endpoint, params={})
+    query_string = "?auth_token=#{@auth_token}"
+    params.each do |key, value|
+      query_string << "&#{key}=#{value}"
+    end unless params.empty?
+    request = Net::HTTP::Get.new("#{api_path_for(endpoint)}#{query_string}")
+    request
+  end
+  
+  def post_request(endpoint, params={})
+    request = Net::HTTP::Post.new("#{api_path_for(endpoint)}")
+    params.merge!({
+      'auth_token' => @auth_token
+    })
+    request.set_form_data(params)
+    request
+  end
+  
+  def put_request(endpoint, params={})
+    request = Net::HTTP::Put.new("#{api_path_for(endpoint)}")
+    params.merge!({
+      'auth_token' => @auth_token
+    })
+    request.set_form_data(params)
+    request
+  end
+  
+  def api_path_for(endpoint)
+    "#{Phrase::Api::Config.api_path_prefix}#{endpoint}"
+  end
+  
+  def http_client
+    client = Net::HTTP.new(Phrase::Api::Config.api_host, Phrase::Api::Config.api_port)
+    client.use_ssl = true if Phrase::Api::Config.api_use_ssl?
+    client.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    client.ca_file = File.join(File.dirname(__FILE__), "..", "..", "cacert.pem")
+    client
+  end
+end

data/lib/phrase/api/config.rb

@@ -0,0 +1,22 @@
+# -*- encoding : utf-8 -*-
+
+require 'phrase'
+require 'phrase/api'
+
+class Phrase::Api::Config
+  def self.api_port
+    ENV.fetch("PHRASE_API_PORT", "443")
+  end
+  
+  def self.api_host
+    ENV.fetch("PHRASE_API_HOST", "phraseapp.com")
+  end
+  
+  def self.api_path_prefix
+    "/api/#{Phrase::API_VERSION}"
+  end
+  
+  def self.api_use_ssl?
+    (ENV.fetch("PHRASE_API_USE_SSL", "1") == "1")
+  end
+end

data/lib/phrase/api/exceptions.rb

@@ -0,0 +1,9 @@
+# -*- encoding : utf-8 -*-
+
+require 'phrase'
+require 'phrase/api'
+
+module Phrase::Api::Exceptions
+  class Unauthorized < StandardError; end
+  class ServerError < StandardError; end
+end  

data/lib/phrase/api.rb

@@ -0,0 +1,6 @@
+module Phrase::Api
+end
+
+require 'phrase/api/client'
+require 'phrase/api/config'
+require 'phrase/api/exceptions'

data/lib/phrase/backend/base.rb

@@ -1,20 +1,22 @@
 # -*- encoding : utf-8 -*-
 
+require 'phrase/delegate'
+
 module Phrase::Backend::Base
   
   def translate(*args)
     if Phrase.enabled?
       key = lookup_normalized_key(*args)
-      decorate_translation(key[:key])
+      phrase_delegate_for(key[:key])
     else
       I18n.translate_without_phrase(*args)
     end
   end
 
   protected
-    def decorate_translation(key=nil)
+    def phrase_delegate_for(key=nil)
       return nil unless key.presence
-      "#{Phrase.prefix}phrase_#{key}#{Phrase.suffix}"
+      Phrase::Delegate.new(key)
     end
 
     def lookup_normalized_key(*args)

data/lib/phrase/config.rb

@@ -1,68 +1,70 @@
 # -*- encoding : utf-8 -*-
 
-module Phrase
-  class Config
-    def client_version
-      Phrase::CLIENT_VERSION
-    end
+class Phrase::Config
+  def client_version
+    Phrase::CLIENT_VERSION
+  end
   
-    def auth_token
-      @@auth_token = "" if !defined? @@auth_token or @@auth_token.nil?
-      @@auth_token
-    end
-    
-    def auth_token=(auth_token)
-      @@auth_token = auth_token
-    end
-    
-    def enabled
-      @@enabled = true if !defined? @@enabled or @@enabled.nil?
-      @@enabled
-    end
-    
-    def enabled=(enabled)
-      @@enabled = enabled
-    end
-      
-    def backend
-      @@backend ||= Backend::PhraseService.new
-    end
-    
-    def backend=(backend)
-      @@backend = backend
-    end
-    
-    def prefix
-      @@prefix ||= "{{__"
-    end
-    
-    def prefix=(prefix)
-      @@prefix = prefix
-    end
-    
-    def suffix
-      @@suffix ||= "__}}"
-    end
-    
-    def suffix=(suffix)
-      @@suffix = suffix
-    end
-    
-    def js_host
-      @@js_host ||= 'phraseapp.com'
-    end
-    
-    def js_host=(js_host)
-      @@js_host = js_host
-    end
-    
-    def js_use_ssl
-      @@js_use_ssl = true if !defined? @@js_use_ssl or @@js_use_ssl.nil?
-      @@js_use_ssl
-    end
+  def api_version
+    Phrase::API_VERSION
+  end
+
+  def auth_token
+    @@auth_token = "" if !defined? @@auth_token or @@auth_token.nil?
+    @@auth_token
+  end
+  
+  def auth_token=(auth_token)
+    @@auth_token = auth_token
+  end
+  
+  def enabled
+    @@enabled = true if !defined? @@enabled or @@enabled.nil?
+    @@enabled
+  end
+  
+  def enabled=(enabled)
+    @@enabled = enabled
+  end
     
-    def js_use_ssl=(js_use_ssl)
-      @@js_use_ssl = js_use_ssl
-    end
+  def backend
+    @@backend ||= Phrase::Backend::PhraseService.new
+  end
+  
+  def backend=(backend)
+    @@backend = backend
+  end
+  
+  def prefix
+    @@prefix ||= "{{__"
+  end
+  
+  def prefix=(prefix)
+    @@prefix = prefix
+  end
+  
+  def suffix
+    @@suffix ||= "__}}"
+  end
+  
+  def suffix=(suffix)
+    @@suffix = suffix
+  end
+  
+  def js_host
+    @@js_host ||= 'phraseapp.com'
+  end
+  
+  def js_host=(js_host)
+    @@js_host = js_host
+  end
+  
+  def js_use_ssl
+    @@js_use_ssl = true if !defined? @@js_use_ssl or @@js_use_ssl.nil?
+    @@js_use_ssl
+  end
+  
+  def js_use_ssl=(js_use_ssl)
+    @@js_use_ssl = js_use_ssl
   end
 end

data/lib/phrase/delegate.rb

@@ -0,0 +1,55 @@
+require 'phrase/api'
+
+class Phrase::Delegate
+  attr_accessor :key, :api_client
+  
+  def initialize(key)
+    @key = key
+  end
+  
+  def to_s
+    "#{decorated_key_name}"
+  end
+  
+  def method_missing(*args, &block)
+    if @key.respond_to?(args.first)
+      to_s.send(*args)
+    else
+      data = translation_or_subkeys
+      if data.is_a?(String)
+        to_s
+      elsif data.respond_to?(args.first)
+        data.send(*args, &block)
+      else
+        log "You are trying to execute the method ##{args.first} on a translation key which is not supported. Please make sure you treat your translations as strings only."
+        nil
+      end
+    end
+  end
+  
+private
+  def decorated_key_name
+    "#{Phrase.prefix}phrase_#{@key}#{Phrase.suffix}"
+  end
+  
+  def translation_or_subkeys
+    begin
+      api_client.translate(@key)
+    rescue Exception => e
+      log "Server Error: #{e.message}"
+    end
+  end
+  
+  def api_client
+    @api_client ||= Phrase::Api::Client.new(Phrase.auth_token)
+  end
+  
+  def log(message)
+    message = "phrase: #{message}"
+    if defined?(Rails)
+      Rails.logger.warn(message)
+    else
+      $stderr.puts message
+    end
+  end
+end

data/lib/phrase/engine.rb

@@ -4,11 +4,9 @@ require 'phrase'
 require 'i18n'
 
 if defined? Rails
-  module Phrase
-    class Engine < Rails::Engine
-      initializer 'phrase' do |app|
-        ActionView::Base.send :include, Phrase::ViewHelpers
-      end
+  class Phrase::Engine < Rails::Engine
+    initializer 'phrase' do |app|
+      ActionView::Base.send :include, Phrase::ViewHelpers
     end
   end
 end

data/lib/phrase/tool.rb

@@ -1,277 +1,240 @@
 # -*- encoding : utf-8 -*-
 
-require 'phrase/tool_config'
-
 require 'optparse'
 require 'net/http'
 require 'net/https'
 require 'fileutils'
+require 'phrase/tool_config'
 
-module PhraseGem
-  class Tool
+class Phrase::Tool
+  
+  attr_accessor :config
+  
+  def initialize(argv)
+    @args = argv
+  end
 
-    def initialize(argv)
-      @args = argv
+  def run
+    @config = Phrase::ToolConfig.new
+    command = args.first
+
+    case command
+      when /init/
+        init
+      when /push/
+        push
+      when /pull/
+        pull
+      else
+        print_usage
     end
+  end
 
-    def run
-      config = ToolConfig.new
-      command = args.first
-
-      case command
-        when /init/
-          init(config)
-        when /push/
-          push(config)
-        when /pull/
-          pull(config)
-        else
-          print_usage
-      end
+protected  
+  def init
+    secret_param = args.find{ |arg| arg =~ /secret=/ }
+    unless secret_param.to_s.match(/secret=.+/)
+      $stderr.puts "Need a secret to init, but found none."
+      $stderr.puts "Please provide the --secret=YOUR_SECRET parameter."
+      exit(41)
     end
 
-    private
+    secret = secret_param.split("=", 2).last
+    @config.secret = secret
+    puts "Wrote secret to config file .phrase"
     
-    def init(config)
-      secret_param = args.find{ |arg| arg =~ /secret=/ }
-      unless secret_param.to_s.match(/secret=.+/)
-        $stderr.puts "Need a secret to init, but found none."
-        $stderr.puts "Please provide the --secret=YOUR_SECRET parameter."
-        exit(41)
-      end
+    default_locale_param = args.find{ |arg| arg =~ /default-locale=/ }
+    if default_locale_param.to_s.match(/default-locale=.+/)
+      locale_name = default_locale_param.split("=", 2).last
+    else 
+      locale_name = "en"
+    end
+    create_locale(locale_name)
+    make_locale_default(locale_name)
+  end
 
-      secret = secret_param.split("=", 2).last
-      config.secret = secret
-      puts "Wrote secret to config file .phrase"
-      
-      default_locale_param = args.find{ |arg| arg =~ /default-locale=/ }
-      if default_locale_param.to_s.match(/default-locale=.+/)
-        locale_name = default_locale_param.split("=", 2).last
-      else 
-        locale_name = "en"
-      end
-      create_locale(locale_name, config)
-      make_locale_default(locale_name, config)
+  def push
+    check_config_available
+    
+    files = choose_files_to_upload
+    if files.empty?
+      puts "Could not find any files to upload :("
+      exit(43)
     end
+    upload_files(files)
+  end
 
-    def push(config)
-      files = choose_files_to_upload
-      if files.empty?
-        puts "Could not find any files to upload :("
-        exit(43)
-      end
-      
-      if !config.secret || config.secret.empty?
-        puts "No config present. Please initialize phrase before pushing or pulling."
-        exit(43)
-      end
-          
-      upload_files(files, config)
+  def pull
+    check_config_available
+    
+    create_locales_folder!
+    
+    locale = args[1]
+    locales = []
+    if locale && locale.strip != ''
+      locales = [locale]
+    else
+      locales = fetch_locales
     end
+    
+    locales.each do |locale_name|
+      print "Downloading phrase.#{locale_name}.yml..."
+      fetch_translations_for_locale(locale_name)
+    end
+  end
+  
+  def print_usage
+    $stderr.puts <<USAGE
+Welcome to phrase!
 
-    def choose_files_to_upload
-      file_name = args[1]
-      
-      unless file_name
-        if self.class.rails_default_locale_folder_is_available
-          file_name = self.class.rails_default_locale_folder
-          puts "No file or directory specified, using #{self.class.rails_default_locale_folder}"
-        else 
-          $stderr.puts "Need either a file or directory:"
-          $stderr.puts "phrase push FILE"
-          $stderr.puts "phrase push DIRECTORY"
-          exit(46)
-        end
-      end
+  phrase           Prints usage
 
-      unless File.exist?(file_name)
-        $stderr.puts "The file #{file_name} could not be found."
-        exit(42)
-      end
+  phrase init --secret=<YOUR SECRET> --default-locale=<YOUR DEFAULT LOCALE>
 
-      if File.directory?(file_name)
-        files = Dir.glob("#{File.expand_path(file_name)}/**")
-      else
-        files = [file_name]
+  phrase push FILE
+  phrase push DIRECTORY
+USAGE
+  end
+  
+private
+  def choose_files_to_upload
+    file_name = args[1]
+  
+    unless file_name
+      if self.class.rails_default_locale_folder_is_available
+        file_name = self.class.rails_default_locale_folder
+        puts "No file or directory specified, using #{self.class.rails_default_locale_folder}"
+      else 
+        $stderr.puts "Need either a file or directory:"
+        $stderr.puts "phrase push FILE"
+        $stderr.puts "phrase push DIRECTORY"
+        exit(46)
       end
     end
 
-    def upload_files(files, config)
-      files.each do |file|
-        proceed_with_upload = true
-        
-        if File.directory?(file)
-          proceed_with_upload = false
-        end
-        
-        if is_yaml_file(file)
-          proceed_with_upload = false
-          $stderr.puts "Notice: Could not upload #{file} (extension not supported - see http://phraseapp.com/help for more information)"
-        end
-        
-        if proceed_with_upload
-          puts "Uploading #{file}..."
-          params = {
-            'auth_token' => config.secret,
-            'filename' => file,
-            'file_content' => File.read(file)
-          }
-
-          http = http_client(config)
-        
-          request = Net::HTTP::Post.new("#{config.api_path_prefix}/translation_keys/upload")
-          request.set_form_data(params)
-          res = http.request(request)
-
-          unless res.code.to_s =~ /^[23]/
-            print_server_error(res, file)
-          end
-        end
-      end
+    unless File.exist?(file_name)
+      $stderr.puts "The file #{file_name} could not be found."
+      exit(42)
     end
 
-    def pull(config)
-      locale = args[1]
-      
-      locales = []
-      if locale && locale.strip != ''
-        locales = [locale]
-      else
-        locales = fetch_locales(config)
-      end
-      
-      locales.each do |locale|
-        fetch_translation_for_locale(config, locale)
-      end
+    if File.directory?(file_name)
+      files = Dir.glob("#{File.expand_path(file_name)}/**")
+    else
+      files = [file_name]
     end
+  end
+
+  def upload_files(files)
+    files.each do |file|
+      proceed_with_upload = true
     
-    def fetch_translation_for_locale(config, locale)
-      print "Downloading phrase.#{locale}.yml..."
-      ::FileUtils.mkdir_p("phrase/locales")
-    
-      http = http_client(config)
-    
-      request = Net::HTTP::Get.new("#{config.api_path_prefix}/translations/download?auth_token=#{config.secret}&locale=#{locale}")
-      res = http.request(request)
-    
-      if res.code.to_s =~ /200/
-        puts "OK"
-        File.open("phrase/locales/phrase.#{locale}.yml", "w") do |file|
-          file.write(res.body)
-        end
-      else
-        puts "Failed"
-        print_server_error(res)
+      if File.directory?(file)
+        proceed_with_upload = false
       end
-    end
     
-    def fetch_locales(config)
-      http = http_client(config)
-      
-      request = Net::HTTP::Get.new("#{config.api_path_prefix}/locales?auth_token=#{config.secret}")
-      res = http.request(request)
-      
-      if res.code.to_s =~ /200/
-        puts "Fetched all locales"
-        return JSON.parse(res.body).map { |locale| locale['name'] }
-      else
-        puts "Failed"
-        print_server_error(res)
-        exit(47)
+      if is_yaml_file(file)
+        proceed_with_upload = false
+        $stderr.puts "Notice: Could not upload #{file} (extension not supported - see http://phraseapp.com/help for more information)"
       end
-    end
     
-    def create_locale(locale_name, config)
-      params = {
-        'auth_token' => config.secret,
-        'locale[name]' => locale_name
-      }
-
-      http = http_client(config)
-    
-      request = Net::HTTP::Post.new("#{config.api_path_prefix}/locales")
-      request.set_form_data(params)
-      res = http.request(request)
-      
-      if res.code.to_s =~ /200/
-        puts "Created locale \"#{locale_name}\""
-      else
-        puts "Notice: Locale \"#{locale_name}\" could not be created (maybe it already exists)"
+      if proceed_with_upload
+        begin
+          puts "Uploading #{file}..."
+          api_client.upload(file, File.read(file))
+          puts "OK"
+        rescue Exception => e
+          puts "Failed"
+          print_server_error(e.message, file)
+        end
       end
     end
-    
-    def make_locale_default(locale_name, config)
-      params = {
-        'auth_token' => config.secret,
-      }
+  end
 
-      http = http_client(config)
-    
-      request = Net::HTTP::Put.new("#{config.api_path_prefix}/locales/#{locale_name}/make_default")
-      request.set_form_data(params)
-      res = http.request(request)
-      
-      if res.code.to_s =~ /200/
-        puts "Locale \"#{locale_name}\" is now the default locale"
-      else
-        puts "Notice: Locale \"#{locale_name}\" could not be made the default locale"
-        print_server_error(res)
-      end
+  def fetch_translations_for_locale(name)
+    begin
+      content = api_client.download_translations_for_locale(name)
+      puts "OK"
+      store_translations_file(name, content)
+    rescue Exception => e
+      puts "Failed"
+      print_server_error(e.message)
     end
-
-    def print_server_error(res, filename=nil)
-      error_message = server_error_message(res.body)
-      $stderr.puts "Server error: #{res.code} - #{error_message} (#{filename})"
+  end
+  
+  def store_translations_file(name, content)
+    File.open("phrase/locales/phrase.#{name}.yml", "w") do |file|
+      file.write(content)
     end
-
-    def server_error_message(body)
-      begin
-        JSON.parse(body)["error"]
-      rescue JSON::ParserError
-        "Unknown error"
-      end
+  end
+  
+  def fetch_locales
+    begin
+      locales = api_client.fetch_locales
+      puts "Fetched all locales"
+      return locales
+    rescue Exception => e
+      puts "Failed"
+      print_server_error(e.message)
+      exit(47)
     end
-
-    def print_usage
-      $stderr.puts <<USAGE
-Welcome to phrase!
-
-    phrase           Prints usage
-
-    phrase init --secret=<YOUR SECRET> --default-locale=<YOUR DEFAULT LOCALE>
-
-    phrase push FILE
-    phrase push DIRECTORY
-USAGE
+  end
+  
+  def create_locale(name)
+    begin
+      api_client.create_locale(name)
+      puts "Created locale \"#{name}\""
+    rescue Exception => e
+      puts "Notice: Locale \"#{name}\" could not be created (maybe it already exists)"
     end
-
-    def args
-      @args
+  end
+  
+  def make_locale_default(name)
+    begin
+      api_client.make_locale_default(name)
+      puts "Locale \"#{name}\" is now the default locale"
+    rescue Exception => e
+      puts "Notice: Locale \"#{name}\" could not be made the default locale"
+      print_server_error(e.message)
     end
+  end
+  
+  def api_client
+    Phrase::Api::Client.new(@config.secret)
+  end
 
-    def puts_debug_info
-      puts "ARGS: #{args.join(",")}"
-      puts "Dir.pwd: #{Dir.pwd}"
-    end
-    
-    def http_client(config)
-      http = Net::HTTP.new(config.api_host, config.api_port)
-      http.use_ssl = true if config.api_use_ssl == "1"
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      http.ca_file = File.join(File.dirname(__FILE__), "..", "..", "cacert.pem")
-      http
-    end
-    
-    def is_yaml_file(filepath)
-      !File.directory?(filepath) && filepath.split('.').last != 'yml'
-    end
-    
-    def self.rails_default_locale_folder
-      "./config/locales/"
-    end
-    
-    def self.rails_default_locale_folder_is_available
-      File.exist?(rails_default_locale_folder) && File.directory?(rails_default_locale_folder)
+  def print_server_error(message, filename=nil)
+    $stderr.puts "#{message} (#{filename})"
+  end
+
+  def args
+    @args
+  end
+
+  def puts_debug_info
+    puts "ARGS: #{args.join(",")}"
+    puts "Dir.pwd: #{Dir.pwd}"
+  end
+  
+  def is_yaml_file(filepath)
+    !File.directory?(filepath) && filepath.split('.').last != 'yml'
+  end
+  
+  def create_locales_folder!
+    ::FileUtils.mkdir_p("phrase/locales")
+  end
+  
+  def check_config_available
+    if !@config.secret || @config.secret.empty?
+      $stderr.puts "No config present. You need to initialize phrase first."
+      exit(43)
     end
   end
-end
+  
+  def self.rails_default_locale_folder
+    "./config/locales/"
+  end
+  
+  def self.rails_default_locale_folder_is_available
+    File.exist?(rails_default_locale_folder) && File.directory?(rails_default_locale_folder)
+  end
+end

data/lib/phrase/tool_config.rb

@@ -1,56 +1,37 @@
 # -*- encoding : utf-8 -*-
 
+require 'phrase'
 require 'json'
 
-module PhraseGem
-  class ToolConfig
-
-    def initialize
-      if File.exist?(".phrase")
-        begin
-          contents = File.read(".phrase")
-          @config = JSON.parse(contents)
-        rescue JSON::ParserError => err
-          $stderr.puts "Could not parse config file: #{err}"
-        end
+class Phrase::ToolConfig
+  def initialize
+    if File.exist?(".phrase")
+      begin
+        contents = File.read(".phrase")
+        @config = JSON.parse(contents)
+      rescue JSON::ParserError => err
+        $stderr.puts "Could not parse config file: #{err}"
       end
     end
+  end
+  
+  def secret
+    config["secret"]
+  end
 
-    def secret
-      config["secret"]
-    end
-
-    def secret=(new_secret)
-      config["secret"] = new_secret
-      save_config!
-    end
-    
-    def api_port
-      ENV.fetch("PHRASE_API_PORT", "443")
-    end
-    
-    def api_host
-      ENV.fetch("PHRASE_API_HOST", "phraseapp.com")
-    end
-    
-    def api_path_prefix
-      "/api/v1"
-    end
-    
-    def api_use_ssl
-      ENV.fetch("PHRASE_API_USE_SSL", "1")
-    end
-
-    private
-    
-    def config
-      @config ||= {}
-    end
+  def secret=(new_secret)
+    config["secret"] = new_secret
+    save_config!
+  end
+  
+private  
+  def config
+    @config ||= {}
+  end
 
-    def save_config!
-      File.open(".phrase", "w+") do |file|
-        file.write(JSON.pretty_generate(config))
-      end
+  def save_config!
+    File.open(".phrase", "w+") do |file|
+      file.write(JSON.pretty_generate(config))
     end
   end
 end

data/lib/phrase.rb

@@ -6,6 +6,7 @@ module Phrase
   autoload :Config, 'phrase/config'
   
   CLIENT_VERSION = "0.1"
+  API_VERSION = "v1"
   
   class << self
     

data/phrase.gemspec

@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name = "phrase"
-  s.version = "0.1.4"
+  s.version = "0.2.0.beta.2"
   s.platform = Gem::Platform::RUBY
   s.authors = ["Dynport GmbH"]
   s.email = ["info@phraseapp.com"]

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.1.4
-  prerelease: 
+  version: 0.2.0.beta.2
+  prerelease: 6
 platform: ruby
 authors:
 - Dynport GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2012-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70112071528200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,12 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112071528200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: phrase allows you to edit translations inline, on the page itself. More
   information at phraseapp.com
 email:
@@ -38,10 +43,15 @@ files:
 - bin/phrase
 - cacert.pem
 - lib/phrase.rb
+- lib/phrase/api.rb
+- lib/phrase/api/client.rb
+- lib/phrase/api/config.rb
+- lib/phrase/api/exceptions.rb
 - lib/phrase/backend.rb
 - lib/phrase/backend/base.rb
 - lib/phrase/backend/phrase_service.rb
 - lib/phrase/config.rb
+- lib/phrase/delegate.rb
 - lib/phrase/engine.rb
 - lib/phrase/tool.rb
 - lib/phrase/tool_config.rb
@@ -67,7 +77,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.