translatable 0.3.1 → 1.2.2

data/test/cases/base_test.rb

@@ -0,0 +1,104 @@
+# encoding: utf-8
+require 'test_helper'
+
+class Paper
+end
+
+class TranslatedPaper
+end
+
+class DefiningBaseTest < Test::Unit::TestCase
+  setup do
+    @base = Translatable::Base.new(Paper)
+  end
+
+  #context "Defining" do
+    test "should Simple field" do
+      @base.field :title
+
+      assert_equal [[:title, {}]], @base.fields
+    end
+
+    test "should Several fields" do
+      @base.field :title
+      @base.field :content, :presence => true
+
+      assert_equal [[:title, {}], [:content, {:presence => true}]], @base.fields
+    end
+
+    test "should Have mapping" do
+      @base.field :title
+      @base.field :content, :as => :paper_content, :presence => true
+
+      assert_equal({:title => :title, :content => :paper_content, :locale => :locale}, @base.mapping)
+    end
+
+    test "should Have mapping (with locale)" do
+      @base.field :title
+      @base.field :content, :as => :paper_content, :presence => true
+      @base.locale_key :locale, :as => :language
+
+      assert_equal({:title => :title, :content => :paper_content, :locale => :language}, @base.mapping)
+    end
+
+    test "should Translation model (as class)" do
+      @base.class_name TranslatedPaper
+
+      assert_equal TranslatedPaper, @base.translation_model
+    end
+
+    test "should Translation model (as string)" do
+      @base.class_name "TranslatedPaper"
+
+      assert_equal TranslatedPaper, @base.translation_model
+    end
+
+    test "should Translation model (as symbol)" do
+      @base.class_name :TranslatedPaper
+
+      assert_equal TranslatedPaper, @base.translation_model
+    end
+
+    test "should Origin key" do
+      @base.foreign_key :article_id
+
+      assert_equal :article_id, @base.origin_key
+    end
+
+    test "should Reflection name" do
+      @base.reflection_name :article
+
+      assert_equal :article, @base.origin_reflection_name
+    end
+
+    test "should Locale key" do
+      @base.locale_key :language
+
+      assert_equal :language, @base.locale_column
+    end
+  #end
+end
+
+class DefaultingBaseTest < Test::Unit::TestCase
+  setup do
+    @base = Translatable::Base.new(Paper)
+  end
+
+  #context "Defaulting" do
+    test "should Translation model" do
+      assert_equal TranslatedPaper, @base.translation_model
+    end
+
+    test "should Origin key" do
+      assert_equal :origin_id, @base.origin_key
+    end
+
+    test "should Reflection name" do
+      assert_equal :origin, @base.origin_reflection_name
+    end
+
+    test "should Locale key" do
+      assert_equal :locale, @base.locale_column
+    end
+  #end
+end

data/test/generators/model_generator_test.rb

@@ -14,12 +14,16 @@ class ModelGeneratorTest < Rails::Generators::TestCase
     assert_file "app/models/article.rb", <<CONTENT
 class Article < ActiveRecord::Base
   translatable do
-    translatable :title, :presence => true#, :uniqueness => true
-    translatable :content, :presence => true#, :uniqueness => true
-    #translatable_model 'TranslatedArticle'
-    #translatable_origin :article
-    #translatable_locale :locale
+    field :title, :presence => true#, :uniqueness => true
+    field :content, :presence => true#, :uniqueness => true
+    #class_name 'TranslatedArticle'
+    #reflection_name :article
+    #foreign_key :origin_id
+    #locale_key :locale
   end
+
+  #accepts_nested_attributes_for :translations, :current_translation
+  #attr_accessible :translations_attributes, :current_translation_attributes
 end
 CONTENT
     assert_migration "db/migrate/create_articles.rb", <<CONTENT
@@ -39,12 +43,16 @@ CONTENT
     assert_file "app/models/article.rb", <<CONTENT
 class Article < ActiveRecord::Base
   translatable do
-    translatable :title, :presence => true#, :uniqueness => true
-    translatable :content, :presence => true#, :uniqueness => true
-    translatable_model 'ArticleTranslation'
-    translatable_origin :post
-    translatable_locale :language
+    field :title, :presence => true#, :uniqueness => true
+    field :content, :presence => true#, :uniqueness => true
+    class_name 'ArticleTranslation'
+    reflection_name :post
+    #foreign_key :origin_id
+    locale_key :language
   end
+
+  #accepts_nested_attributes_for :translations, :current_translation
+  #attr_accessible :translations_attributes, :current_translation_attributes
 end
 CONTENT
     assert_migration "db/migrate/create_articles.rb", <<CONTENT
@@ -66,12 +74,16 @@ CONTENT
     assert_file "app/models/article.rb", <<CONTENT
 class Article < ActiveRecord::Base
   translatable do
-    translatable :title, :presence => true#, :uniqueness => true
-    translatable :content, :presence => true#, :uniqueness => true
-    #translatable_model 'TranslatedArticle'
-    #translatable_origin :article
-    #translatable_locale :locale
+    field :title, :presence => true#, :uniqueness => true
+    field :content, :presence => true#, :uniqueness => true
+    #class_name 'TranslatedArticle'
+    #reflection_name :article
+    #foreign_key :origin_id
+    #locale_key :locale
   end
+
+  #accepts_nested_attributes_for :translations, :current_translation
+  #attr_accessible :translations_attributes, :current_translation_attributes
   attr_accessor :created_at, :updated_at
 end
 CONTENT

data/test/generators/translation_generator_test.rb

@@ -11,18 +11,18 @@ class TranslationGeneratorTest < Rails::Generators::TestCase
 
   should "Create required files (default)" do
     run_generator %w(article title:string content:string)
-    assert_file "app/models/translatable_article.rb", <<CONTENT
-class TranslatableArticle < ActiveRecord::Base
+    assert_file "app/models/translated_article.rb", <<CONTENT
+class TranslatedArticle < ActiveRecord::Base
   # This class deals purely with translations themselves. Hence, any edition of
   # should be avoided.
   # In later gem version its existance might not be necessary.
   #attr_protected :origin_id, :locale
 end
 CONTENT
-    assert_migration "db/migrate/create_translatable_articles.rb", <<CONTENT
-class CreateTranslatableArticles < ActiveRecord::Migration
+    assert_migration "db/migrate/create_translated_articles.rb", <<CONTENT
+class CreateTranslatedArticles < ActiveRecord::Migration
   def change
-    create_table :translatable_articles do |t|
+    create_table :translated_articles do |t|
       t.string :title
       t.string :content
       t.integer :origin_id

data/test/support/active_record.rb

@@ -1,4 +1,5 @@
 require 'logger'
+require 'active_record'
 
 ActiveRecord::Base.establish_connection(
   :adapter => "sqlite3",

data/test/support/models/messages.rb

@@ -1,6 +1,3 @@
-require 'active_record'
-require 'translatable'
-
 class CreateMessagesTables < ActiveRecord::Migration
   def up
     create_table(:writers, :force => true) do |t|
@@ -9,11 +6,11 @@ class CreateMessagesTables < ActiveRecord::Migration
       t.timestamps
     end
 
-    create_table(:translated_messages) do |t|
-      t.string :title, :null => false
-      t.string :content, :null => false
-      t.integer :message_id, :null => false
-      t.string :locale, :null => false, :limit => 2
+    create_table(:message_translations) do |t|
+      t.string  :title, :null => false
+      t.string  :content, :null => false
+      t.integer :origin_id, :null => false
+      t.string  :locale, :null => false, :limit => 2
       t.integer :writer_id
 
       t.timestamps
@@ -28,7 +25,7 @@ class CreateMessagesTables < ActiveRecord::Migration
 
   def down
     drop_table(:writers)
-    drop_table(:translated_messages)
+    drop_table(:message_translations)
     drop_table(:messages)
   end
 end
@@ -39,7 +36,7 @@ class Author < ActiveRecord::Base
   validates :name, :presence => true
 end
 
-class TranslatedMessage < ActiveRecord::Base
+class MessageTranslation < ActiveRecord::Base
   attr_accessible :title, :content
   attr_accessible :title, :content, :locale, :as => :editor
 
@@ -62,11 +59,13 @@ class Message < ActiveRecord::Base
   belongs_to  :writer
 
   translatable do
-    translatable  :title, :presence => true, :uniqueness => true
-    translatable  :content, :presence => true
-    translatable_model 'TranslatedMessage'
-    translatable_origin :message
+    field  :title, :presence => true, :uniqueness => true
+    field  :content, :presence => true
+    class_name 'MessageTranslation'
+    reflection_name :message
   end
 
+  accepts_nested_attributes_for :translations, :current_translation
+  attr_accessible :translations_attributes, :current_translation_attributes
   attr_accessible :writer_id, :writer
 end

data/test/support/models/news.rb

@@ -1,6 +1,3 @@
-require 'active_record'
-require 'translatable'
-
 class CreateNewsTables < ActiveRecord::Migration
   def up
     create_table(:authors) do |t|
@@ -9,7 +6,7 @@ class CreateNewsTables < ActiveRecord::Migration
       t.timestamps
     end
 
-    create_table(:translatable_news) do |t|
+    create_table(:translated_news) do |t|
       t.string :title, :null => false
       t.string :content, :null => false
       t.integer :origin_id, :null => false
@@ -38,11 +35,11 @@ class Author < ActiveRecord::Base
   validates :name, :presence => true
 end
 
-class TranslatableNews < ActiveRecord::Base
+class TranslatedNews < ActiveRecord::Base
   validates :title, :content, :presence => true
   validates :title, :uniqueness => true
 
-  attr_accessible :title, :content
+  attr_accessible :title, :content, :locale, :origin_id
 end
 
 class News < ActiveRecord::Base
@@ -50,10 +47,11 @@ class News < ActiveRecord::Base
   belongs_to  :author
 
   translatable do
-    translatable  :title
-    translatable  :content
-    translatable_attr_accessible
+    field  :title
+    field  :content
   end
 
+  accepts_nested_attributes_for :translations, :current_translation
+  attr_accessible :translations_attributes, :current_translation_attributes
   attr_accessible :author_id, :author
 end

data/test/support/models/posts.rb

@@ -1,6 +1,3 @@
-require 'active_record'
-require 'translatable'
-
 class CreatePostsTables < ActiveRecord::Migration
   def up
     create_table(:writers, :force => true) do |t|
@@ -13,7 +10,7 @@ class CreatePostsTables < ActiveRecord::Migration
       t.string :title, :null => false
       t.string :content, :null => false
       t.integer :post_id, :null => false
-      t.string :locale, :null => false, :limit => 2
+      t.string :language, :null => false, :limit => 2
       t.integer :writer_id
 
       t.timestamps
@@ -40,7 +37,7 @@ class Author < ActiveRecord::Base
 end
 
 class TranslatedPost < ActiveRecord::Base
-  attr_accessible :title, :content
+  attr_accessible :title, :content, :language
 
   before_create :duplicate_writer_id
 
@@ -56,12 +53,15 @@ class Post < ActiveRecord::Base
   belongs_to  :writer
 
   translatable do
-    translatable  :title, :as => :translated_title, :presence => true, :uniqueness => true
-    translatable  :content, :presence => true
-    translatable_model 'TranslatedPost'
-    translatable_origin :post
-    translatable_attr_accessible
+    field  :title, :as => :translated_title, :presence => true, :uniqueness => true
+    field  :content, :presence => true
+    class_name 'TranslatedPost'
+    reflection_name :post
+    foreign_key :post_id
+    locale_key :language
   end
 
+  accepts_nested_attributes_for :translations, :current_translation
+  attr_accessible :translations_attributes, :current_translation_attributes
   attr_accessible :writer_id, :writer
 end

data/test/test_helper.rb

@@ -3,15 +3,7 @@ require 'test/unit'
 require "shoulda-context"
 require "i18n"
 
-begin
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter "/test/"
-    add_filter "/vendor/"
-  end
-rescue LoadError
-  $stderr.puts "Simplecov is skipped"
-end
+require "protected_attributes"
 
 begin
   Bundler.setup(:default, :development)
@@ -26,14 +18,6 @@ require 'translatable'
 require File.expand_path("support/active_record", File.dirname(__FILE__))
 require File.expand_path("support/database_cleaner", File.dirname(__FILE__))
 
-# Test output styling
-# Turn do not want to play nicelly =(, skip it then....
-require 'turn/autorun'
-Turn.config do |c|
-  c.format  = :pretty
-  c.natural = true
-end
-
 class Test::Unit::TestCase
   include OrmSetup
 

data/translatable.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: translatable 1.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "translatable"
-  s.version = "0.3.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["E-Max"]
-  s.date = "2013-03-16"
+  s.date = "2014-01-31"
   s.description = "This game was build to make whole proccess of working with translation for DM to be almost invisble. That was THE AIM."
   s.email = "max@studentify.nl"
   s.extra_rdoc_files = [
@@ -17,7 +19,8 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
-    ".document",
+    ".ruby-gemset",
+    ".ruby-version",
     ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
@@ -28,10 +31,12 @@ Gem::Specification.new do |s|
     "lib/generators/translatable/model_generator.rb",
     "lib/generators/translatable/translation_generator.rb",
     "lib/translatable.rb",
-    "lib/translatable/active_record.rb",
+    "lib/translatable/base.rb",
     "lib/translatable/engine.rb",
     "lib/translatable/generator_helper.rb",
-    "test/cases/translatable_test.rb",
+    "lib/translatable/orm/active_record.rb",
+    "test/cases/active_record_test.rb",
+    "test/cases/base_test.rb",
     "test/generators/model_generator_test.rb",
     "test/generators/translation_generator_test.rb",
     "test/support/active_record.rb",
@@ -44,26 +49,25 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/kot-begemot/translatable"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "2.2.1"
   s.summary = "An esay way to manage the translations for datamapper"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 4.0.0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.0"])
     else
-      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 4.0.0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 4.0.0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.0"])