rack-webtranslateit 0.1.1 → 0.1.2

data/lib/rack/webtranslateit/configuration.rb

@@ -4,17 +4,20 @@ class Rack::Webtranslateit::Configuration
   attr_accessor :api_key, :files, :master_locale, :password
 
   def initialize
-    root = defined?(RAILS_ROOT) && RAILS_ROOT
-    root ||= defined?(RACK_ROOT) && RACK_ROOT
-    root ||= File.expand_path(".")
-    file = File.join(root, 'config', 'translation.yml')
+    unless file = self.class.config_location
+      root = defined?(RAILS_ROOT) && RAILS_ROOT
+      root ||= defined?(RACK_ROOT) && RACK_ROOT
+      root ||= File.expand_path(".")
+      file = File.join(root, 'config', 'translation.yml')
+    end
+
     configuration       = YAML.load_file(file)
     self.api_key        = configuration['api_key']
     self.password       = configuration['password']
     self.master_locale  = configuration['master_locale'].to_s
     self.files          = []
     configuration['files'].each do |file_id, file_path|
-      self.files.push(Rack::Webtranslateit::TranslationFile.new(file_id, file_path, api_key))
+      self.files.push(Rack::Webtranslateit::TranslationFile.new(file_id, file_path, api_key, master_locale))
     end
   end
 
@@ -32,8 +35,12 @@ class Rack::Webtranslateit::Configuration
     end
   end
 
-  def self.method_missing(name, *args)
-    @configuration ||= new
-    @configuration.send(name, *args)
+  class << self
+    def method_missing(name, *args)
+      @configuration ||= new
+      @configuration.send(name, *args)
+    end
+
+    attr_accessor :config_location
   end
 end

data/lib/rack/webtranslateit/translation_file.rb

@@ -1,12 +1,15 @@
 require 'net/https'
+require 'net/http/post/multipart'
 require 'ftools'
+
 class Rack::Webtranslateit::TranslationFile
-  attr_accessor :id, :file_path, :api_key
+  attr_accessor :id, :file_path, :api_key, :master_locale
 
-  def initialize(id, file_path, api_key)
+  def initialize(id, file_path, api_key, master_locale)
     self.id        = id
     self.file_path = file_path
     self.api_key   = api_key
+    self.master_locale = master_locale
   end
 
   def for(locale)
@@ -30,34 +33,38 @@ class Rack::Webtranslateit::TranslationFile
       ! $?.success?
     end
 
+    def master?
+      @file.master_locale == locale
+    end
+
     def modified_remotely?
-      get_translations.code.to_i == 200
+      get_translations.code.to_i == 200 unless master?
     end
 
     def get_translations(respect_modified_since = true)
       http_connection do |http|
         request           = Net::HTTP::Get.new(api_url)
         request.add_field('If-Modified-Since', File.mtime(File.new(file_path, 'r')).rfc2822) if File.exist?(file_path) and respect_modified_since
-        return http.request(request)
+        http.request(request)
       end
     end
 
     def fetch
       response = get_translations
-      File.open(file_path, 'w'){|f| f << response.body } if response.code.to_i == 200 and not response.body.blank?
+      File.open(file_path, 'w'){|f| f << response.body } if response.code.to_i == 200 and not response.body == ""
     end
 
     def fetch!
       response = get_translations(false)
-      File.open(file_path, 'w'){|f| f << response.body } if response.code.to_i == 200 and not response.body.blank?
+      File.open(file_path, 'w'){|f| f << response.body } if response.code.to_i == 200 and not response.body == ""
     end
 
-    def send
+    def upload
       File.open(file_path) do |file|
         http_connection do |http|
           request  = Net::HTTP::Put::Multipart.new(api_url, "file" => UploadIO.new(file, "text/plain", file.path))
           response = http.request(request)
-          return response.code.to_i
+          raise "Failed to Upload File, #{response.code} response recieved" unless response.code.to_i < 400
         end
       end
     end

data/lib/rack/webtranslateit/ui.rb

@@ -4,7 +4,6 @@ class Rack::Webtranslateit::Ui < Sinatra::Base
   set :views => File.join(File.dirname(__FILE__), *%w[.. .. .. templates])
 
   use Rack::ShowExceptions
-  use Rack::Lint
   use Rack::Static, :urls => ["/static"], :root => File.join(File.dirname(__FILE__), *%w[.. .. .. public])
 
   get(''){redirect "/"}
@@ -19,8 +18,14 @@ class Rack::Webtranslateit::Ui < Sinatra::Base
     redirect "/"
   end
 
+  post '/upload' do
+    upload_master_file
+    redirect '/'
+  end
+
   helpers do
     def highlight_unless_equal(value, expected)
+      return if value.nil?
       value == expected ? value : "<em>#{value}</em>"
     end
 
@@ -42,10 +47,16 @@ protected
   def fetch_translations
     config.files.each do |file|
       config.locales.each do |locale|
-        next if config.ignore_locales.include?(locale)
+        next if config.master_locale == locale
         response_code = file.for(locale).fetch!
       end
     end
   end
 
+  def upload_master_file
+    config.files.each do |file|
+      file.for(config.master_locale).upload
+    end
+  end
+
 end

data/templates/index.erb

@@ -29,7 +29,7 @@
             <tbody>
               <% locales.each do |locale| locale_file = file.for(locale) %>
                 <tr>
-                  <th style="width: 5px;"><%= locale %></th>
+                  <th style="width: 5px;"><%= locale %><%= " (master)" if locale_file.master? %></th>
                   <td><abbr title="<%= locale_file.file_path %>"><%= File.basename(locale_file.file_path) %></abbr></td>
                   <td><%= highlight_unless_equal(locale_file.exists?, true) %></td>
                   <td><%= highlight_unless_equal(locale_file.committed?, true) %></td>
@@ -43,6 +43,10 @@
         <form method="post" action="<%= base_path %>/update">
           <input type="submit" value="Update All Translations" />
         </form>
+
+        <form method="post" action="<%= base_path %>/upload">
+          <input type="submit" value="Upload Master File" onclick="javascript: return confirm('This will immediately make new required translations available on webtranslateit.com. Are you sure you with to continue?')" />
+        </form>
       </div>
     </div>
     <div id="footer">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-webtranslateit
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Tom Lea
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 +00:00
+date: 2010-01-06 00:00:00 +00:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
   type: :runtime
@@ -22,6 +32,36 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: multipart-post
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: webmock
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: contrib@tomlea.co.uk
 executables: []