fast_gettext 0.5.5 → 0.5.6

data/README.markdown

@@ -59,7 +59,7 @@ Or yaml files (use I18n syntax/indentation)
 Or database (scaleable, good for many locales/translators)
     # db access is cached <-> only first lookup hits the db 
     require "fast_gettext/translation_repository/db"
-    include FastGettext::TranslationRepository::Db.require_models #load and include default models
+    FastGettext::TranslationRepository::Db.require_models #load and include default models
     FastGettext.add_text_domain('my_app', :type=>:db, :model=>TranslationKey)
 
 ### 3. Choose text domain and locale for translation

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/fast_gettext.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fast_gettext}
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]

data/lib/fast_gettext/translation_repository/db.rb

@@ -48,9 +48,14 @@ module FastGettext
       end
 
       def self.require_models
-        require 'fast_gettext/translation_repository/db_models/translation_key'
-        require 'fast_gettext/translation_repository/db_models/translation_text'
-        FastGettext::TranslationRepository::DbModels
+        folder = "fast_gettext/translation_repository/db_models"
+        require "#{folder}/translation_key"
+        require "#{folder}/translation_text"
+        Module.new do
+          def self.included(base)
+            puts "you no longer need to include the result of require_models"
+          end
+        end
       end
     end
   end

data/lib/fast_gettext/translation_repository/db_models/translation_key.rb

@@ -1,37 +1,18 @@
-module FastGettext::TranslationRepository
-  module DbModels
-    class TranslationKey < ActiveRecord::Base
-      has_many :translations, :class_name=>'TranslationText'
-      accepts_nested_attributes_for :translations, :allow_destroy => true
-      
-      validates_uniqueness_of :key
-      validates_presence_of :key
+class TranslationKey < ActiveRecord::Base
+  has_many :translations, :class_name => 'TranslationText'
 
-      def self.translation(key, locale)
-        return unless translation_key = find_by_key(key)
-        return unless translation_text = translation_key.translations.find_by_locale(locale)
-        translation_text.text
-      end
+  accepts_nested_attributes_for :translations, :allow_destroy => true
 
-      def self.available_locales
-        @@available_locales ||= TranslationText.count(:group=>:locale).keys.sort
-      end
+  validates_uniqueness_of :key
+  validates_presence_of :key
 
-      # get polymorphic_url FastGettext::... namespace free
-      # !! copied in translation_text.rb
-      def self.name
-        'TranslationKey'
-      end
+  def self.translation(key, locale)
+    return unless translation_key = find_by_key(key)
+    return unless translation_text = translation_key.translations.find_by_locale(locale)
+    translation_text.text
+  end
 
-      def self.model_name
-        if defined? ActiveSupport::ModelName # Rails 2
-          ActiveSupport::ModelName.new(name)
-        elsif defined? ActiveModel::Name # Rails 3
-          ActiveModel::Name.new(self)
-        else # Fallback
-          name
-        end
-      end
-    end
+  def self.available_locales
+    @@available_locales ||= TranslationText.count(:group=>:locale).keys.sort
   end
-end
+end

data/lib/fast_gettext/translation_repository/db_models/translation_text.rb

@@ -1,25 +1,5 @@
-module FastGettext::TranslationRepository
-  module DbModels
-    class TranslationText < ActiveRecord::Base
-      belongs_to :key, :class_name=>'TranslationKey'
-      validates_presence_of :locale
-      validates_uniqueness_of :locale, :scope=>:translation_key_id
-
-      # get polymorphic_url FastGettext::... namespace free
-      # !! copied in translation_key.rb
-      def self.name
-        'TranslationKey'
-      end
-
-      def self.model_name
-        if defined? ActiveSupport::ModelName # Rails 2
-          ActiveSupport::ModelName.new(name)
-        elsif defined? ActiveModel::Name # Rails 3
-          ActiveModel::Name.new(self)
-        else # Fallback
-          name
-        end
-      end
-    end
-  end
+class TranslationText < ActiveRecord::Base
+  belongs_to :key, :class_name=>'TranslationKey'
+  validates_presence_of :locale
+  validates_uniqueness_of :locale, :scope=>:translation_key_id
 end

data/spec/fast_gettext/translation_repository/db_spec.rb

@@ -2,8 +2,7 @@ require 'spec/spec_helper'
 
 require 'active_record'
 require 'fast_gettext/translation_repository/db'
-
-include FastGettext::TranslationRepository::Db.require_models
+FastGettext::TranslationRepository::Db.require_models
 describe FastGettext::TranslationRepository::Db do
 
   before :all do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 5
-  version: 0.5.5
+  - 6
+  version: 0.5.6
 platform: ruby
 authors: 
 - Michael Grosser