er18ern 0.0.6 → 0.0.7

data/Gemfile

@@ -0,0 +1,12 @@
+source :gemcutter
+
+gem 'ermahgerd'
+gem 'rack'
+gem 'sinatra'
+gem 'i18n'
+
+group :test do
+  gem 'rspec'
+  gem 'pry'
+  gem 'rack-test'
+end

data/Gemfile.lock

@@ -0,0 +1,43 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    coderay (1.0.8)
+    diff-lcs (1.1.3)
+    ermahgerd (0.0.1)
+    i18n (0.6.1)
+    method_source (0.8.1)
+    pry (0.9.10)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+    rack (1.4.3)
+    rack-protection (1.2.0)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.1)
+    sinatra (1.3.3)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    slop (3.3.3)
+    tilt (1.3.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ermahgerd
+  i18n
+  pry
+  rack
+  rack-test
+  rspec
+  sinatra

data/lib/er18ern.rb

@@ -1,241 +1,6 @@
-module Er18Ern
-
-  class LocaleCookie
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      request = Rack::Request.new(env)
-      request_locale = request.params["locale"] || request.cookies["eylocale"]
-      if request_locale && I18n.available_locales.include?(request_locale.to_sym)
-        I18n.locale = request_locale
-      else
-        I18n.locale = I18n.default_locale
-      end
-      status, headers, body = @app.call(env)
-      cookie = {:value => I18n.locale, :expires => Time.now + 10.days, :domain => request.host.gsub(/^[^\.]*/,""), :path => "/"}
-      Rack::Utils.set_cookie_header!(headers, "eylocale", cookie)
-      [status, headers, body]
-    end
-  end
-
-  class JustRaise
-    def call(exception, locale, key, options)
-      raise "Missing Translation: #{exception}"
-    end
-  end
-
-  class RailsApp
-    def self.setup!
-      if ["test", "development"].include?(Rails.env)
-        I18n.exception_handler = JustRaise.new
-      end
-      Array.class_eval do
-        def to_br_sentence
-          case length
-            when 0
-              ""
-            when 1
-              self[0].to_s.dup
-            when 2
-              two_words_connector = I18n.translate(:'support.array.br_two_words_connector')
-              "#{self[0]}#{two_words_connector}#{self[1]}".html_safe
-            else
-              words_connector = I18n.translate(:'support.array.br_words_connector')
-              last_word_connector = I18n.translate(:'support.array.br_last_word_connector')
-              "#{self[0...-1].join(words_connector)}#{last_word_connector}#{self[-1]}".html_safe
-          end
-        end
-      end
-      ActiveModel::Errors.class_eval do
-        def full_message(attribute, message)
-          return message if attribute == :base
-          attr_name = attribute.to_s.tr('.', '_').humanize
-          attr_name = @base.class.human_attribute_name(attribute, :default => attr_name)
-          I18n.t(:"errors.formats.attributes.#{attribute}", {
-            :default   => [:"errors.format","%{attribute} %{message}"],
-            :attribute => attr_name,
-            :message   => message
-          })
-        end
-      end
-    end
-  end
-
-  require 'ermahgerd'
-  module ImprovedErmahgerd
-
-    def self.translate(words)
-      words.gsub(/([{]?)([&]?)\w+/) do |word|
-        if $1 == "{" || $2 == "&"
-          word
-        else
-          translate_word(word.upcase)
-        end
-      end
-    end
-
-    def self.translate_word(word)
-      case word
-      when "ENGINE"
-        "ERNGIN"
-      when "YARD"
-        "YERD"
-      else
-        Ermahgerd.translate_word(word)
-      end
-    end
-
-  end
-
-  class Translator
-    attr_accessor :locales_dir, :google_translator_hax_locale_dirs
-
-    def en_source_yaml
-      @en_source_yaml ||= YAML::load_file(File.expand_path('en.yml', self.locales_dir))
-    end
-
-    def generate_ermahgerd!
-      traverse = Proc.new do |x, translator|
-        if x.is_a?(Hash)
-          result = {}
-          x.each do |k, v|
-            result[k] = traverse.call(v, translator)
-          end
-          result
-        else
-          translator.call(x)
-        end
-      end
-
-      errm = {}
-      errm['ermahgerd'] = en_source_yaml["en"]
-
-      #save ermahgerd
-      File.open(File.expand_path('ermahgerd.yml', self.locales_dir), "w") do |fp|
-        fp.write(traverse.call(errm, lambda{|x| ImprovedErmahgerd.translate(x)}).to_yaml)
-      end
-    end
+require File.dirname(__FILE__) + '/er18ern/middleware'
+require File.dirname(__FILE__) + '/er18ern/rails_app_helper'
+require File.dirname(__FILE__) + '/er18ern/improved_ermahgerd'
 
-    def resave_en!
-      #re-save EN
-      File.open(File.expand_path('en.yml', self.locales_dir), "w") do |fp|
-        fp.write(en_source_yaml.to_yaml)
-      end
-    end
-
-    def found_keys
-      @found_keys ||= begin
-        found_keys = {}
-        key_collector = Proc.new do |x, key_prefix|
-          if x.is_a?(Hash)
-            result = {}
-            x.each do |k, v|
-              result[k] = key_collector.call(v, "#{key_prefix}.#{k}")
-            end
-            result
-          else
-            found_keys[key_prefix] = x
-          end
-        end
-        key_collector.call(en_source_yaml["en"], "")
-        found_keys
-      end
-    end
-
-    def generate_google_translations!
-      vals = found_keys.values.uniq.map do |val|
-        strip_string(val)
-      end
-
-      File.open(File.expand_path('GOOGLE_TRANSLATE_INPUT', self.google_translator_hax_locale_dirs), "w") do |fp|
-        fp.write(vals.join("\n---\n"))
-      end
-    end
-
-    def save_engrish!
-      enstuff = File.read(File.expand_path('GOOGLE_TRANSLATE_INPUT', self.google_translator_hax_locale_dirs)).split("\n---\n")
-      engrishstuff = File.read(File.expand_path('GOOGLE_TRANSLATE_AGAIN', self.google_translator_hax_locale_dirs)).split("\n---\n")
-      engrish = doitstuff(enstuff, found_keys, "engrish", engrishstuff)
-
-      File.open(File.expand_path('engrish.yml', self.locales_dir), "w") do |fp|
-        fp.write(engrish.to_yaml)
-      end
-    end
-
-    def save_jp!
-      enstuff = File.read(File.expand_path('GOOGLE_TRANSLATE_INPUT', self.google_translator_hax_locale_dirs)).split("\n---\n")
-      jpstuff = File.read(File.expand_path('GOOGLE_TRANSLATE_OUTPUT', self.google_translator_hax_locale_dirs)).split("\n---\n")
-      jp = doitstuff(enstuff, found_keys, "jp", jpstuff)
-
-      File.open(File.expand_path('jp.yml', self.locales_dir), "w") do |fp|
-        fp.write(jp.to_yaml)
-      end
-    end
-
-    def copy_missing_into!(place)
-      en_source_yaml["en"]
-      output = YAML::load_file(File.expand_path("#{place}.yml", self.locales_dir))
-      traverse = Proc.new do |x, y|
-        if x.is_a?(Hash)
-          x.each do |k, v|
-            y[k] ||= v
-            traverse.call(v, y[k])
-          end
-        end
-      end
-      traverse.call(en_source_yaml["en"], output[place])
-      File.open(File.expand_path("#{place}.yml", self.locales_dir), "w") do |fp|
-        fp.write(output.to_yaml)
-      end
-    end
-
-    private
-
-    def doitstuff(enstuff, found_keys, locale, stuff)
-      lookup = {}
-      found_keys.each do |k, v|
-        if index = enstuff.index(strip_string(v))
-          lookup[k] = stuff && stuff[index]
-        end
-      end
-
-      jp = {locale => {}}
-      lookup.each do |k, v|
-        hash = jp[locale]
-        last = nil
-        k.split(".").each do |key_part|
-          unless key_part.empty?
-            last_hash = hash
-            last = Proc.new do |str|
-              en_string = found_keys[k]
-              en_string_parts = strip_string(en_string).split("***")
-              jp_string_parts = str.split("***")
-              en_string_parts.each_with_index do |part, index|
-                jp_corresponding = jp_string_parts[index] || "" # "MISSING TRANSLATION"
-                en_string = en_string.gsub(part.to_s, jp_corresponding)
-              end
-              last_hash[key_part] = en_string
-            end
-            hash[key_part] ||= {}
-            hash = hash[key_part]
-          end
-        end
-        last.call(v)
-      end
-      jp
-    end
-
-    def strip_string(str)
-      str.gsub(/([%]?)([&]?)([{]?)\w+([;]?)([}]?)/) do |word|
-        if $1 == "%" || $2 == "&"
-          "***"
-        else
-          word
-        end
-      end
-    end
-
-  end
+module Er18Ern
 end

data/lib/er18ern/improved_ermahgerd.rb

@@ -0,0 +1,178 @@
+require 'ermahgerd'
+
+module Er18Ern
+  module ImprovedErmahgerd
+
+    def self.translate(words)
+      words.gsub(/([{]?)([&]?)\w+/) do |word|
+        if $1 == "{" || $2 == "&"
+          word
+        else
+          translate_word(word.upcase)
+        end
+      end
+    end
+
+    def self.translate_word(word)
+      case word
+      when "ENGINE"
+        "ERNGIN"
+      when "YARD"
+        "YERD"
+      else
+        Ermahgerd.translate_word(word)
+      end
+    end
+
+  end
+
+  class Translator
+    attr_accessor :locales_dir, :google_translator_hax_locale_dirs
+
+    def en_source_yaml
+      @en_source_yaml ||= YAML::load_file(File.expand_path('en.yml', self.locales_dir))
+    end
+
+    def generate_ermahgerd!
+      traverse = Proc.new do |x, translator|
+        if x.is_a?(Hash)
+          result = {}
+          x.each do |k, v|
+            result[k] = traverse.call(v, translator)
+          end
+          result
+        else
+          translator.call(x)
+        end
+      end
+
+      errm = {}
+      errm['ermahgerd'] = en_source_yaml["en"]
+
+      #save ermahgerd
+      File.open(File.expand_path('ermahgerd.yml', self.locales_dir), "w") do |fp|
+        fp.write(traverse.call(errm, lambda{|x| ImprovedErmahgerd.translate(x)}).to_yaml)
+      end
+    end
+
+    def resave_en!
+      #re-save EN
+      File.open(File.expand_path('en.yml', self.locales_dir), "w") do |fp|
+        fp.write(en_source_yaml.to_yaml)
+      end
+    end
+
+    def found_keys
+      @found_keys ||= begin
+        found_keys = {}
+        key_collector = Proc.new do |x, key_prefix|
+          if x.is_a?(Hash)
+            result = {}
+            x.each do |k, v|
+              result[k] = key_collector.call(v, "#{key_prefix}.#{k}")
+            end
+            result
+          else
+            found_keys[key_prefix] = x
+          end
+        end
+        key_collector.call(en_source_yaml["en"], "")
+        found_keys
+      end
+    end
+
+    def generate_google_translations!
+      vals = found_keys.values.uniq.map do |val|
+        strip_string(val)
+      end
+
+      File.open(File.expand_path('GOOGLE_TRANSLATE_INPUT', self.google_translator_hax_locale_dirs), "w") do |fp|
+        fp.write(vals.join("\n---\n"))
+      end
+    end
+
+    def save_engrish!
+      enstuff = File.read(File.expand_path('GOOGLE_TRANSLATE_INPUT', self.google_translator_hax_locale_dirs)).split("\n---\n")
+      engrishstuff = File.read(File.expand_path('GOOGLE_TRANSLATE_AGAIN', self.google_translator_hax_locale_dirs)).split("\n---\n")
+      engrish = doitstuff(enstuff, found_keys, "engrish", engrishstuff)
+
+      File.open(File.expand_path('engrish.yml', self.locales_dir), "w") do |fp|
+        fp.write(engrish.to_yaml)
+      end
+    end
+
+    def save_jp!
+      enstuff = File.read(File.expand_path('GOOGLE_TRANSLATE_INPUT', self.google_translator_hax_locale_dirs)).split("\n---\n")
+      jpstuff = File.read(File.expand_path('GOOGLE_TRANSLATE_OUTPUT', self.google_translator_hax_locale_dirs)).split("\n---\n")
+      jp = doitstuff(enstuff, found_keys, "jp", jpstuff)
+
+      File.open(File.expand_path('jp.yml', self.locales_dir), "w") do |fp|
+        fp.write(jp.to_yaml)
+      end
+    end
+
+    def copy_missing_into!(place)
+      en_source_yaml["en"]
+      output = YAML::load_file(File.expand_path("#{place}.yml", self.locales_dir))
+      traverse = Proc.new do |x, y|
+        if x.is_a?(Hash)
+          x.each do |k, v|
+            y[k] ||= v
+            traverse.call(v, y[k])
+          end
+        end
+      end
+      traverse.call(en_source_yaml["en"], output[place])
+      File.open(File.expand_path("#{place}.yml", self.locales_dir), "w") do |fp|
+        fp.write(output.to_yaml)
+      end
+    end
+
+    private
+
+    def doitstuff(enstuff, found_keys, locale, stuff)
+      lookup = {}
+      found_keys.each do |k, v|
+        if index = enstuff.index(strip_string(v))
+          lookup[k] = stuff && stuff[index]
+        end
+      end
+
+      jp = {locale => {}}
+      lookup.each do |k, v|
+        hash = jp[locale]
+        last = nil
+        k.split(".").each do |key_part|
+          unless key_part.empty?
+            last_hash = hash
+            last = Proc.new do |str|
+              en_string = found_keys[k]
+              en_string_parts = strip_string(en_string).split("***")
+              jp_string_parts = str.split("***")
+              en_string_parts.each_with_index do |part, index|
+                jp_corresponding = jp_string_parts[index] || "" # "MISSING TRANSLATION"
+                en_string = en_string.gsub(part.to_s, jp_corresponding)
+              end
+              last_hash[key_part] = en_string
+            end
+            hash[key_part] ||= {}
+            hash = hash[key_part]
+          end
+        end
+        last.call(v)
+      end
+      jp
+    end
+
+    def strip_string(str)
+      str.gsub(/([%]?)([&]?)([{]?)\w+([;]?)([}]?)/) do |word|
+        if $1 == "%" || $2 == "&"
+          "***"
+        else
+          word
+        end
+      end
+    end
+
+  end
+end

data/lib/er18ern/middleware.rb

@@ -0,0 +1,26 @@
+require 'i18n'
+
+module Er18Ern
+  class LocaleCookie
+
+    DAYS = 24 * 60 * 60
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      request = Rack::Request.new(env)
+      request_locale = request.params["locale"] || request.cookies["eylocale"]
+      if request_locale && I18n.available_locales.include?(request_locale.to_sym)
+        I18n.locale = request_locale
+      else
+        I18n.locale = I18n.default_locale
+      end
+      status, headers, body = @app.call(env)
+      cookie = {:value => I18n.locale, :expires => Time.now + (10 * DAYS), :domain => request.host.gsub(/^[^\.]*/,""), :path => "/"}
+      Rack::Utils.set_cookie_header!(headers, "eylocale", cookie)
+      [status, headers, body]
+    end
+  end
+end

data/lib/er18ern/rails_app_helper.rb

@@ -0,0 +1,44 @@
+module Er18Ern
+  class JustRaise
+    def call(exception, locale, key, options)
+      raise "Missing Translation: #{exception}"
+    end
+  end
+
+  class RailsApp
+    def self.setup!
+      if ["test", "development"].include?(Rails.env)
+        I18n.exception_handler = JustRaise.new
+      end
+      Array.class_eval do
+        def to_br_sentence
+          case length
+            when 0
+              ""
+            when 1
+              self[0].to_s.dup
+            when 2
+              two_words_connector = I18n.translate(:'support.array.br_two_words_connector')
+              "#{self[0]}#{two_words_connector}#{self[1]}".html_safe
+            else
+              words_connector = I18n.translate(:'support.array.br_words_connector')
+              last_word_connector = I18n.translate(:'support.array.br_last_word_connector')
+              "#{self[0...-1].join(words_connector)}#{last_word_connector}#{self[-1]}".html_safe
+          end
+        end
+      end
+      ActiveModel::Errors.class_eval do
+        def full_message(attribute, message)
+          return message if attribute == :base
+          attr_name = attribute.to_s.tr('.', '_').humanize
+          attr_name = @base.class.human_attribute_name(attribute, :default => attr_name)
+          I18n.t(:"errors.formats.attributes.#{attribute}", {
+            :default   => [:"errors.format","%{attribute} %{message}"],
+            :attribute => attr_name,
+            :message   => message
+          })
+        end
+      end
+    end
+  end
+end

data/lib/er18ern/version.rb

@@ -1,3 +1,3 @@
 module Er18Ern
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/script/ci

@@ -0,0 +1,3 @@
+ruby -v
+bundle install
+bundle exec rspec -cfs spec

data/spec/improved_ermahgerd_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Er18Ern::ImprovedErmahgerd do
+  it 'is improved' do
+    # check yaml loading and whatever else it is doing
+  end
+end

data/spec/middleware_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+require 'support/my_app'
+require 'rack/test'
+
+include Rack::Test::Methods
+
+def app
+  MyApp
+end
+
+describe Er18Ern::LocaleCookie do
+  describe 'setting a cookie' do
+    
+    before do
+      I18n.available_locales = [:en, :jp]
+    end
+
+    it 'will set a default locale cookie of :en if no locale is passed' do
+      rack_mock_session.cookie_jar["eylocale"].should == nil
+      get "/"
+      rack_mock_session.cookie_jar["eylocale"].should == "en"
+    end
+    
+    it 'will set the locale cookie of locale passed' do
+      rack_mock_session.cookie_jar["eylocale"].should == nil
+      get "/?locale=jp"
+      rack_mock_session.cookie_jar["eylocale"].should == "jp"
+    end
+    
+    it 'will keep the locale cookie if exist, when no locale is passed' do
+      get "/?locale=jp"
+      rack_mock_session.cookie_jar["eylocale"].should == "jp"
+      get "/"
+      rack_mock_session.cookie_jar["eylocale"].should == "jp"
+    end
+
+    it 'will reset the cookie if a locale is passed' do
+      get "/"
+      rack_mock_session.cookie_jar["eylocale"].should == "en"
+      get "/?locale=jp"
+      rack_mock_session.cookie_jar["eylocale"].should == "jp"
+    end
+
+  end
+end

data/spec/rails_app_helper_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Er18Ern::RailsApp do
+
+    # hax
+    class Rails
+      def self.env
+        "test"
+      end
+    end
+    class ActiveModel
+      class Errors
+      end
+    end
+
+  describe 'has a setup method which does things that depend on the Rails environment' do
+     before do
+      Er18Ern::RailsApp.setup!
+    end
+  
+    it 'sets exception handler' do
+      I18n.exception_handler.class.should == Er18Ern::JustRaise
+    end
+
+    it 'monkey patches Array' do
+      Array.new.methods.map(&:to_s).include?("to_br_sentence").should be_true
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+require File.dirname(__FILE__) + '/../lib/er18ern'
+require 'rack'
+require 'pry'
+require 'sinatra'
+require 'sinatra/base'

data/spec/support/my_app.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + '/../../lib/er18ern'
+require 'sinatra/base'
+
+class MyApp < Sinatra::Base
+
+  use Er18Ern::LocaleCookie
+
+  get '/' do
+    'WAZZA'
+  end
+
+end

metadata

@@ -1,82 +1,82 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: er18ern
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.0.7
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
 platform: ruby
-authors: 
+authors:
 - Jacob & Others too ashamed to admit it
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ermahgerd
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: i18n helpers (with ermahgerd)
-email: 
+email:
 - jacob@engineyard.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- Gemfile
+- Gemfile.lock
 - README.md
 - er18ern.gemspec
 - lib/er18ern.rb
+- lib/er18ern/improved_ermahgerd.rb
+- lib/er18ern/middleware.rb
+- lib/er18ern/rails_app_helper.rb
 - lib/er18ern/version.rb
+- script/ci
+- spec/improved_ermahgerd_spec.rb
+- spec/middleware_spec.rb
+- spec/rails_app_helper_spec.rb
+- spec/spec_helper.rb
+- spec/support/my_app.rb
 homepage: https://github.com/engineyard/er18ern
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: i18n helpers
-test_files: []
-
+test_files:
+- spec/improved_ermahgerd_spec.rb
+- spec/middleware_spec.rb
+- spec/rails_app_helper_spec.rb
+- spec/spec_helper.rb
+- spec/support/my_app.rb
+has_rdoc: