urbane 0.0.1 → 0.1.0

data/README.md

@@ -37,12 +37,7 @@ directory as JSON files. It uses the googles JSON api as opposed to the XML api.
 
 ## Output format
 
-For now it only supports JSON
-
-	{
-		"sun_intro_step2"=>"Build another one…",
-		"sun_intro_step3"=>"... and another one."
-	}
+Support for YAML, JSON and XML
 
 ## Output structure
 
@@ -65,4 +60,4 @@ For now it needs to have a certain format. Check the [demo document](https://doc
 2. Click on File -> Publish To The Web
 3. Check 'Automatically republish when changes are made'
 4. Find the spreadsheet id in the generated link. It is marked with 'key='. In the following url, the key would be '0Auo5c2PWMqR4dHlOSjlXcjY0X01udzNPdHlKZ09QTVE': https://docs.google.com/spreadsheet/pub?hl=en_US&hl=en_US&key=0Auo5c2PWMqR4dHlOSjlXcjY0X01udzNPdHlKZ09QTVE&output=html
-5. Click on the close button
+5. Click on the close button

data/lib/urbane/version.rb

@@ -1,3 +1,3 @@
 module Urbane
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/urbane.rb

@@ -1,11 +1,29 @@
 require "urbane/version"
 require "urbane/vendor/ordered_hash"
 require "json"
+require "yaml"
+require "nokogiri"
 require "open-uri"
 
 module Urbane
   class Generator
 
+    GENERATORS = {
+      :json => lambda{|content| JSON.pretty_generate(content)},
+      :yaml => lambda{|content| content.to_yaml},
+      :xml  => lambda do |content|
+                  builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
+                    xml.send('resource-bundle', 'xmlns' => '',
+                                  'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance') do
+                      content.each do |key, translation|
+                        xml.resource(translation, 'key' => key)
+                      end
+                    end
+                  end
+                  builder.to_xml(:indent => 2,  :encoding => 'UTF-8')
+               end
+    }
+
     def initialize(options)
       @target_dir = options[:target_dir]
       @spreadsheet_id = options[:spreadsheet_id]
@@ -13,6 +31,7 @@ module Urbane
       @language_locale_map = options[:languages]
       @languages = @language_locale_map.keys
       @fallback_language = options[:fallback_language]
+      @format = options[:format] || :json
     end
 
     def run
@@ -35,7 +54,7 @@ module Urbane
       @language_locale_map.each do |language, locale|
         `mkdir -p #{@target_dir}/#{locale}`
         File.open("#{@target_dir}/#{locale}/#{@file_name_for_translation_file}", 'w') do |f|
-          f.write JSON.pretty_generate(sorted_hash_for_language(language))
+          f.write GENERATORS[@format].call(sorted_hash_for_language(language))
         end
       end
     end

data/test/urbane_test.rb

@@ -1,9 +1,18 @@
 # encoding: UTF-8
 require 'test_helper'
 
+FIXTURE_FILE_PATH = File.join('test', 'fixtures')
+TARGET_DIR = File.join('/tmp', 'translation_generator_test')
+
+def read_file(path)
+  File.open(File.join(TARGET_DIR, path), "r"){ |f| f.read  }
+end
+
+def read_json_file(path)
+  JSON.parse(read_file(path))
+end
+
 class Urbane::GeneratorTest < Test::Unit::TestCase
-  FIXTURE_FILE_PATH = File.join('test', 'fixtures')
-  TARGET_DIR = File.join('/tmp', 'translation_generator_test')
 
   context 'generator' do
     setup do
@@ -33,17 +42,17 @@ class Urbane::GeneratorTest < Test::Unit::TestCase
           :spanish => 'es',
           :portuguese => 'pt'
         },
-        :fallback_language => :english
+        :fallback_language => :english,
+        :format => :json
       }
-      @generator = Urbane::Generator.new(@options)
-      @generator.run
-    end
+   end
 
     teardown do
       FileUtils.rm_rf(TARGET_DIR)
     end
 
     should 'create a folder and a document for each locale' do
+      Urbane::Generator.new(@options).run
       @options[:languages].values.each do |locale|
         expected_file = File.join(TARGET_DIR, locale,'text_ids.json')
         assert File.exists?(expected_file), "file #{expected_file} should exist"
@@ -51,14 +60,32 @@ class Urbane::GeneratorTest < Test::Unit::TestCase
     end
 
     should 'fall back if a key is empty' do
-      info_hash_fr = JSON.parse(File.open(File.join(TARGET_DIR,'fr', 'text_ids.json'), "r"){ |f| f.read  })
-      info_hash_us = JSON.parse(File.open(File.join(TARGET_DIR,'en', 'text_ids.json'), "r"){ |f| f.read  })
+      Urbane::Generator.new(@options).run
+      info_hash_fr = read_json_file(File.join('fr', 'text_ids.json'))
+      info_hash_us = read_json_file(File.join('en', 'text_ids.json'))
       assert_equal info_hash_us['sun_intro_step2'], info_hash_fr['sun_intro_step2']
     end
 
     should 'handle special chars' do
-      info_hash_de = JSON.parse(File.open(File.join(TARGET_DIR,'de', 'text_ids.json'), "r"){ |f| f.read  })
+      Urbane::Generator.new(@options).run
+      info_hash_de = read_json_file(File.join('de', 'text_ids.json'))
       assert info_hash_de['sun_intro_step2'].include?('äÄö')
     end
+
+    # How do I test this? JSON is a subset of YAML, so most JSON will actually
+    # be valid YAML
+    should 'support yaml output' do
+      @options[:format] = :yaml
+      @options[:file_name] = 'text_ids.yml'
+      Urbane::Generator.new(@options).run
+      assert YAML.load(read_file(File.join('en', 'text_ids.yml')));
+    end
+
+    should 'support xml' do
+      @options[:format] = :xml
+      @options[:file_name] = 'text_ids.xml'
+      Urbane::Generator.new(@options).run
+      assert Nokogiri::XML(read_file(File.join('en', 'text_ids.xml')));
+    end
   end
 end

data/urbane.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
 
   s.add_runtime_dependency "json", "1.6.1"
+  s.add_runtime_dependency "nokogiri", "1.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: urbane
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70255489866860 !ruby/object:Gem::Requirement
+  requirement: &70150065933880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70255489866860
+  version_requirements: *70150065933880
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &70255489866240 !ruby/object:Gem::Requirement
+  requirement: &70150065933200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70255489866240
+  version_requirements: *70150065933200
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70255489865520 !ruby/object:Gem::Requirement
+  requirement: &70150065932440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70255489865520
+  version_requirements: *70150065932440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70255489864700 !ruby/object:Gem::Requirement
+  requirement: &70150065931700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70255489864700
+  version_requirements: *70150065931700
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70255489863920 !ruby/object:Gem::Requirement
+  requirement: &70150065930840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,7 +65,18 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70255489863920
+  version_requirements: *70150065930840
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70150065930040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70150065930040
 description: Read google spreadsheet and generate translation files out of it
 email:
 - patrick.huesler@gmail.com