globalize2 0.1.0 → 0.2.0

data/test/data/models.rb

@@ -1,9 +1,16 @@
+#require 'ruby2ruby'
+#require 'parse_tree'
+#require 'parse_tree_extensions'
+#require 'pp'
+
 class PostTranslation < ActiveRecord::Base
   def existing_method ; end
 end
+
 class Post < ActiveRecord::Base
   translates :subject, :content
   validates_presence_of :subject
+  named_scope :foobar, :conditions => { :title => "foobar" }
 end
 
 class Blog < ActiveRecord::Base
@@ -38,3 +45,12 @@ class Reloader < Parent
     reload
   end
 end
+
+class Validatee < ActiveRecord::Base
+  translates :string
+end
+
+class User < ActiveRecord::Base
+  translates :name
+  validates_presence_of :name, :email
+end

data/test/data/schema.rb

@@ -1,7 +1,6 @@
 ActiveRecord::Schema.define do
-  
   create_table :blogs, :force => true do |t|
-    t.string      :description
+    t.string   :description
   end
 
   create_table :posts, :force => true do |t|
@@ -14,7 +13,7 @@ ActiveRecord::Schema.define do
     t.string     :subject
     t.text       :content
   end
-  
+
   create_table :parents, :force => true do |t|
   end
 
@@ -24,16 +23,33 @@ ActiveRecord::Schema.define do
     t.text       :content
     t.string     :type
   end
-  
+
   create_table :comments, :force => true do |t|
     t.references :post
   end
 
-  create_table :translated_comment_translations, :force => true do |t|
+  create_table :comment_translations, :force => true do |t|
     t.string     :locale
     t.references :comment
     t.string     :subject
     t.text       :content
   end
-  
-end
+
+  create_table :validatees, :force => true do |t|
+  end
+
+  create_table :validatee_translations, :force => true do |t|
+    t.string     :locale
+    t.references :validatee
+    t.string     :string
+  end
+
+  create_table :users, :force => true do |t|
+    t.string :email
+  end
+
+  create_table :users_translations, :force => true do |t|
+    t.references :user
+    t.string     :name
+  end
+end

data/test/i18n/missing_translations_test.rb

@@ -1,5 +1,5 @@
-require File.join( File.dirname(__FILE__), '..', 'test_helper' )
-require 'globalize/i18n/missing_translations_log_handler'
+require File.dirname(__FILE__) + '/../test_helper'
+require 'i18n/missing_translations_log_handler'
 
 class MissingTranslationsTest < ActiveSupport::TestCase
   test "defines I18n.missing_translations_logger accessor" do
@@ -19,18 +19,18 @@ class LogMissingTranslationsTest < ActiveSupport::TestCase
   def setup
     @locale, @key, @options = :en, :foo, {}
     @exception = I18n::MissingTranslationData.new(@locale, @key, @options)
-    
+
     @logger = TestLogger.new
     I18n.missing_translations_logger = @logger
   end
 
   test "still returns the exception message for MissingTranslationData exceptions" do
     result = I18n.send(:missing_translations_log_handler, @exception, @locale, @key, @options)
-    assert_equal 'translation missing: en, foo', result 
+    assert_equal 'translation missing: en, foo', result
   end
-  
+
   test "logs the missing translation to I18n.missing_translations_logger" do
     I18n.send(:missing_translations_log_handler, @exception, @locale, @key, @options)
-    assert_equal 'translation missing: en, foo', @logger 
+    assert_equal 'translation missing: en, foo', @logger
   end
 end

data/test/test_helper.rb

@@ -1,28 +1,41 @@
+$LOAD_PATH << File.expand_path( File.dirname(__FILE__) + '/../lib' )
+
 require 'rubygems'
 require 'test/unit'
+require 'active_record'
 require 'active_support'
 require 'active_support/test_case'
 require 'mocha'
+require 'globalize'
+# require 'validation_reflection'
 
-$LOAD_PATH << File.expand_path( File.dirname(__FILE__) + '/../lib' )
+config = { :adapter => 'sqlite3', :database => ':memory:' }
+ActiveRecord::Base.establish_connection(config)
 
 class ActiveSupport::TestCase
-  def reset_db!( schema_path )
-    ::ActiveRecord::Migration.verbose = false   # Quiet down the migration engine
-    ::ActiveRecord::Base.establish_connection({
-      :adapter => 'sqlite3',
-      :database => ':memory:'
-    })
-    ::ActiveRecord::Base.silence do
-      load schema_path
-    end
+  def reset_db!(schema_path = nil)
+    schema_path ||= File.expand_path(File.dirname(__FILE__) + '/data/schema.rb')
+    ActiveRecord::Migration.verbose = false
+    ActiveRecord::Base.silence { load(schema_path) }
   end
-  
-  def assert_member(item, arr)
-    assert_block "Item #{item} is not in array #{arr}" do
-      arr.member? item
+
+  def assert_member(item, array)
+    assert_block "Item #{item} is not in array #{array}" do
+      array.member?(item)
     end
   end
+
+  def assert_belongs_to(model, associated)
+    assert model.reflect_on_all_associations(:belongs_to).detect { |association|
+      association.name.to_s == associated.to_s
+    }
+  end
+
+  def assert_has_many(model, associated)
+    assert model.reflect_on_all_associations(:has_many).detect { |association|
+      association.name.to_s == associated.to_s
+    }
+  end
 end
 
 module ActiveRecord
@@ -33,4 +46,31 @@ module ActiveRecord
       end
     end
   end
-end
+end
+
+# module ActiveRecord
+#   class BaseWithoutTable < Base
+#     self.abstract_class = true
+#
+#     def create_or_update
+#       errors.empty?
+#     end
+#
+#     class << self
+#       def columns()
+#         @columns ||= []
+#       end
+#
+#       def column(name, sql_type = nil, default = nil, null = true)
+#         columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
+#         reset_column_information
+#       end
+#
+#       # Do not reset @columns
+#       def reset_column_information
+#         read_methods.each { |name| undef_method(name) }
+#         @column_names = @columns_hash = @content_columns = @dynamic_methods_hash = @read_methods = nil
+#       end
+#     end
+#   end
+# end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: globalize2
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Sven Fuchs, Joshua Harvey, Clemens Kofler
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-08 00:00:00 +01:00
+date: 2010-04-22 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -32,43 +37,26 @@ files:
 - generators/templates/db_backend_migration.rb
 - globalize2.gemspec
 - init.rb
-- lib/globalize/backend/chain.rb
-- lib/globalize/backend/pluralizing.rb
-- lib/globalize/backend/static.rb
-- lib/globalize/i18n/missing_translations_log_handler.rb
-- lib/globalize/i18n/missing_translations_raise_handler.rb
-- lib/globalize/load_path.rb
-- lib/globalize/locale/fallbacks.rb
-- lib/globalize/locale/language_tag.rb
-- lib/globalize/model/active_record.rb
-- lib/globalize/model/active_record/adapter.rb
-- lib/globalize/model/active_record/translated.rb
-- lib/globalize/translation.rb
-- lib/locale/root.yml
-- lib/rails_edge_load_path_patch.rb
-- notes.textile
+- lib/globalize.rb
+- lib/globalize/active_record.rb
+- lib/globalize/active_record/adapter.rb
+- lib/globalize/active_record/attributes.rb
+- lib/globalize/active_record/migration.rb
+- lib/i18n/missing_translations_log_handler.rb
+- lib/i18n/missing_translations_raise_handler.rb
+- test/active_record/fallbacks_test.rb
+- test/active_record/migration_test.rb
+- test/active_record/sti_translated_test.rb
+- test/active_record/translates_test.rb
+- test/active_record/translation_class_test.rb
+- test/active_record/validation_tests.rb
+- test/active_record_test.rb
 - test/all.rb
-- test/backends/chained_test.rb
-- test/backends/pluralizing_test.rb
-- test/backends/static_test.rb
-- test/data/locale/all.yml
-- test/data/locale/de-DE.yml
-- test/data/locale/en-US.yml
-- test/data/locale/en-US/module.yml
-- test/data/locale/fi-FI/module.yml
-- test/data/locale/root.yml
 - test/data/models.rb
 - test/data/no_globalize_schema.rb
 - test/data/schema.rb
 - test/i18n/missing_translations_test.rb
-- test/load_path_test.rb
-- test/locale/fallbacks_test.rb
-- test/locale/language_tag_test.rb
-- test/model/active_record/migration_test.rb
-- test/model/active_record/sti_translated_test.rb
-- test/model/active_record/translated_test.rb
 - test/test_helper.rb
-- test/translation_test.rb
 has_rdoc: true
 homepage: http://github.com/joshmh/globalize2
 licenses: []
@@ -82,35 +70,34 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: "Rails I18n: de-facto standard library for ActiveRecord data translation"
 test_files: 
+- test/active_record/fallbacks_test.rb
+- test/active_record/migration_test.rb
+- test/active_record/sti_translated_test.rb
+- test/active_record/translates_test.rb
+- test/active_record/translation_class_test.rb
+- test/active_record/validation_tests.rb
+- test/active_record_test.rb
 - test/all.rb
-- test/backends/chained_test.rb
-- test/backends/pluralizing_test.rb
-- test/backends/static_test.rb
 - test/data/models.rb
 - test/data/no_globalize_schema.rb
 - test/data/schema.rb
 - test/i18n/missing_translations_test.rb
-- test/load_path_test.rb
-- test/locale/fallbacks_test.rb
-- test/locale/language_tag_test.rb
-- test/model/active_record/migration_test.rb
-- test/model/active_record/sti_translated_test.rb
-- test/model/active_record/translated_test.rb
 - test/test_helper.rb
-- test/translation_test.rb

data/lib/globalize/backend/chain.rb

@@ -1,102 +0,0 @@
-module I18n
-  class << self
-    def chain_backends(*args)
-      self.backend = Globalize::Backend::Chain.new(*args)
-    end
-  end
-end
-  
-module Globalize  
-  module Backend
-    class Chain      
-      def initialize(*args)
-        add(*args) unless args.empty?
-      end
-      
-      # Change this to a) accept any number of backends and b) accept classes.
-      # When classes are passed instantiate them and add the instances as backends.
-      # Return the added backends from #add.
-      #
-      # Add an initialize method that accepts the same arguments and passes them
-      # to #add, so we could:
-      #   I18n.backend = Globalize::Backend::Chain.new(Globalize::Backend::Foo, Globalize::Backend::Bar)
-      #   Globalize::Backend::Chain.new(:foo, :bar)
-      #   Globalize.chain_backends :foo, :bar
-      def add(*backends)
-        backends.each do |backend|
-          backend = Globalize::Backend.const_get(backend.to_s.capitalize) if backend.is_a? Symbol
-          backend = backend.new if backend.is_a? Class
-          self.backends << backend
-        end
-      end
-      
-      def load_translations(*args)
-        backends.each{|backend| backend.load_translations(*args) }
-      end
-    
-      # For defaults:
-      # Never pass any default option to the backends but instead implement our own default
-      # mechanism (e.g. symbols as defaults would need to be passed to the whole chain to
-      # be translated).
-      #
-      # For namespace lookup: 
-      # Only return if the result is not a hash OR count is not present, otherwise merge them.
-      # So in effect the count variable would control whether we have a namespace lookup or a 
-      # pluralization going on.
-      #
-      # Exceptions:
-      # Make sure that we catch MissingTranslationData exceptions and raise
-      # one in the end when no translation was found at all.
-      #
-      # For bulk translation:
-      # If the key is an array we need to call #translate for each of the
-      # keys and collect the results.
-      
-      def translate(locale, key, options = {})
-        raise I18n::InvalidLocale.new(locale) if locale.nil?
-        return key.map{|k| translate locale, k, options } if key.is_a? Array
-        
-        default = options.delete(:default)
-        result = backends.inject({}) do |namespace, backend|
-          begin
-            translation = backend.translate(locale.to_sym, key, options) 
-            if namespace_lookup?(translation, options)
-              namespace.merge! translation
-            elsif translation
-              return translation 
-            end
-          rescue I18n::MissingTranslationData
-          end
-        end
-        result || default(locale, default, options) || raise(I18n::MissingTranslationData.new(locale, key, options))
-      end
-      
-      def localize(locale, object, format = :default)
-        backends.each do |backend|
-          result = backend.localize(locale, object, format) and return result
-        end
-      end
-    
-      protected
-        def backends
-          @backends ||= []
-        end
-        
-        def default(locale, default, options = {})
-          case default
-            when String then default
-            when Symbol then translate locale, default, options
-            when Array  then default.each do |obj| 
-              result = default(locale, obj, options.dup) and return result
-            end and nil
-          end
-        rescue I18n::MissingTranslationData
-          nil
-        end
-        
-        def namespace_lookup?(result, options)
-          result.is_a?(Hash) and not options.has_key?(:count)
-        end
-    end
-  end
-end

data/lib/globalize/backend/pluralizing.rb

@@ -1,37 +0,0 @@
-require 'i18n/backend/simple'
-
-module Globalize
-  module Backend
-    class Pluralizing < I18n::Backend::Simple
-      def pluralize(locale, entry, count)
-        return entry unless entry.is_a?(Hash) and count
-        key = :zero if count == 0 && entry.has_key?(:zero)
-        key ||= pluralizer(locale).call(count)
-        raise InvalidPluralizationData.new(entry, count) unless entry.has_key?(key)
-        translation entry[key], :plural_key => key
-      end
-
-      def add_pluralizer(locale, pluralizer)
-        pluralizers[locale.to_sym] = pluralizer
-      end
-
-      def pluralizer(locale)
-        pluralizers[locale.to_sym] || default_pluralizer
-      end
-
-      protected
-        def default_pluralizer
-          pluralizers[:en]
-        end
-
-        def pluralizers
-          @pluralizers ||= { :en => lambda{|n| n == 1 ? :one : :other } }
-        end
-
-        # Overwrite this method to return something other than a String
-        def translation(string, attributes)
-          string
-        end
-    end
-  end
-end