translatable 0.3.1 → 1.2.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWMzNWU3MzZlNmUxNzViZmM4ZmU3ODAxNGEzZTdkMDRkMzZkNjI1Nw==
+  data.tar.gz: !binary |-
+    N2I5NTk0MTA3YTBlMjIwMDRhMjcxZGVhYjExYWU5YjQwZWY1MDA0NA==
+SHA512:
+  metadata.gz: !binary |-
+    OWE5NzU5YzhlYmJjZDRkYTBiOGZkNTJlOGQwNmViODY1NTliYjc2ZTBhMGJm
+    NGQ1YjEwZWY4MzEyNmVlNzNlZTBkNTc0ZmUyMGQzNTFmNjg0Y2M5M2Q1YTcy
+    YmQ3YjdlYmU1MzAyNWU5NGJjYjU4MDUzMjgzZDk3ZGEyNTI4OGM=
+  data.tar.gz: !binary |-
+    ZWY2YzQwNjcwNTlmY2IzN2I5MjllZWNiYjAyZWQxNDU3MzhlMmQyOWRjYTg1
+    ZWVhNGY5NjAxMmM0N2FlNGYzMzFlMmYwMzczYzEwODAyMDVjNTAzYzBmMTRm
+    ZGYzOGY4MjdkZDhmNjg0Yjg5YzkyNjc3NDRmODg1ZjEzZTU1NWI=

data/.ruby-gemset

@@ -0,0 +1 @@
+translatable

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.0.0

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
 bundler_args: --without=debug development

data/Gemfile

@@ -1,33 +1,31 @@
 source "http://rubygems.org"
 
-gem "activerecord"
+gem "activerecord", ">= 4.0.0"
 gem "activesupport", :require => false
 gem "i18n"
 
 group :debug do
-  gem "debugger", "~> 1.2.2", :platform => :ruby_19
-  gem "ruby-debug", :platform => :ruby_18
+  gem "byebug", :platform => :ruby_20
+  #gem "debugger", "~> 1.2.2", :platform => :ruby_19
+  #gem "ruby-debug", :platform => :ruby_18
 end
 
-group :development do
+group :development, :test do
   gem "jeweler", "~> 1.8.0"
 end
 
 group :debug, :test do
   gem "yard"  
   gem "redcarpet"
-
-  gem "simplecov", "~> 0.7.1", :require => false, :platform => :ruby_19
-  gem "rcov", "~> 1.0.0", :require => false, :platform => :ruby_18
 end
 
 group :test do
   gem "sqlite3"
   gem "database_cleaner"
+  gem "protected_attributes", "~> 1.0.5"
 
   gem "rails"
 
-  gem 'minitest'
   gem "test-unit"
   gem "shoulda"
 

data/Gemfile.lock

@@ -1,144 +1,151 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.8)
-      actionpack (= 3.1.8)
-      mail (~> 2.3.3)
-    actionpack (3.1.8)
-      activemodel (= 3.1.8)
-      activesupport (= 3.1.8)
-      builder (~> 3.0.0)
+    actionmailer (4.0.2)
+      actionpack (= 4.0.2)
+      mail (~> 2.5.4)
+    actionpack (4.0.2)
+      activesupport (= 4.0.2)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.6)
-      rack-cache (~> 1.2)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.4)
-    activemodel (3.1.8)
-      activesupport (= 3.1.8)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.8)
-      activemodel (= 3.1.8)
-      activesupport (= 3.1.8)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.8)
-      activemodel (= 3.1.8)
-      activesupport (= 3.1.8)
-    activesupport (3.1.8)
-      multi_json (>= 1.0, < 1.3)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
+      builder (~> 3.1.0)
+    activerecord (4.0.2)
+      activemodel (= 4.0.2)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.2)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.2)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    addressable (2.3.5)
     ansi (1.4.3)
-    arel (2.2.3)
-    builder (3.0.0)
+    arel (4.0.1)
+    atomic (1.1.14)
+    builder (3.1.4)
+    byebug (2.5.0)
+      columnize (~> 0.3.6)
+      debugger-linecache (~> 1.2.0)
     columnize (0.3.6)
-    database_cleaner (0.7.2)
-    debugger (1.2.4)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.7)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.9)
+    database_cleaner (1.2.0)
+    debugger-linecache (1.2.0)
     erubis (2.7.0)
-    git (1.2.5)
-    hike (1.2.1)
-    i18n (0.6.0)
-    jeweler (1.8.4)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.20)
+    hike (1.2.3)
+    httpauth (0.2.0)
+    i18n (0.6.9)
+    jeweler (1.8.8)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.7.5)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    mail (2.3.3)
-      i18n (>= 0.4.0)
+    json (1.8.1)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    minitest (4.6.2)
-    multi_json (1.2.0)
+    mime-types (1.25.1)
+    minitest (4.7.5)
+    multi_json (1.8.2)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
     polyglot (0.3.3)
-    rack (1.3.6)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.2)
-      rack
+    protected_attributes (1.0.5)
+      activemodel (>= 4.0.1, < 5.0)
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.1.8)
-      actionmailer (= 3.1.8)
-      actionpack (= 3.1.8)
-      activerecord (= 3.1.8)
-      activeresource (= 3.1.8)
-      activesupport (= 3.1.8)
-      bundler (~> 1.0)
-      railties (= 3.1.8)
-    railties (3.1.8)
-      actionpack (= 3.1.8)
-      activesupport (= 3.1.8)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.2)
+      actionmailer (= 4.0.2)
+      actionpack (= 4.0.2)
+      activerecord (= 4.0.2)
+      activesupport (= 4.0.2)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.2)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.2)
+      actionpack (= 4.0.2)
+      activesupport (= 4.0.2)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rbx-require-relative (0.0.9)
-    rcov (1.0.0)
-    rdoc (3.12)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    rdoc (4.0.1)
       json (~> 1.4)
-    redcarpet (2.2.2)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    shoulda (3.3.2)
-      shoulda-context (~> 1.0.1)
-      shoulda-matchers (~> 1.4.1)
-    shoulda-context (1.0.1)
-    shoulda-matchers (1.4.1)
+    redcarpet (3.0.0)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.1.6)
+    shoulda-matchers (2.4.0)
       activesupport (>= 3.0.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sprockets (2.0.4)
+    sprockets (2.10.1)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    test-unit (2.5.3)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.12)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.8)
+    test-unit (2.5.5)
+    thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     turn (0.9.6)
       ansi
-    tzinfo (0.3.33)
-    yard (0.6.8)
+    tzinfo (0.3.38)
+    yard (0.8.7.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord
+  activerecord (>= 4.0.0)
   activesupport
+  byebug
   database_cleaner
-  debugger (~> 1.2.2)
   i18n
   jeweler (~> 1.8.0)
-  minitest
+  protected_attributes (~> 1.0.5)
   rails
-  rcov (~> 1.0.0)
   redcarpet
-  ruby-debug
   shoulda
-  simplecov (~> 0.7.1)
   sqlite3
   test-unit
   turn

data/README.rdoc

@@ -27,57 +27,48 @@ Check out the examples below.
 Just define inside of your model `translatable` with block.
 Block accepts following methods:
 
-  translatable *args
+  field *args
     Params:
       first - Here should be specified an attribute that will be translated.
       second - Define here a hash that will be later provided for validation to model.
 
       This method may be called multiple times.
     Examples:
-      translatable :title,   :presence => true, :uniqueness => true
-      translatable :content, :presence => true
-      translatable :notes
+      field :title,   :presence => true, :uniqueness => true
+      field :content, :presence => true
+      field :notes
 
-  translatable_model model_name
+  class_name model_name
     Params:
       model_name - Define the model name here if it is different from following "Translatable<CURRENT_MODEL>".
         For News model, TranslatableNews will be used as the one that keeping translations. It can be defined 
         in a three ways: as constant, string or symbol.
     Examples:
-      translatable_model TranslatedNews
+      class_name "TranslatedNews"
       OR
-      translatable_model "TranslatedNews"
-      OR
-      translatable_model :TranslatedNews
+      class_name :TranslatedNews
 
-  translatable_origin origin_key
+  foreign_key origin_key
     Params:
       origin_key - This key will be used to define the the relations for translations model.
       By default it will be :origin. Translations model should also have such attribute defined.
 
       This value will also be used for validation, as its presence is compulsory for translations model.
     Examples:
-      translatable_origin :message
+      foreign_key :message
       OR
-      translatable_origin :post
+      foreign_key :post
 
-  translatable_locale locale_attr
+  locale_key locale_attr
     Params:
       locale_attr - This key will be used to define the attribute that is keeping the locale of the translation.
       By default it will be :locale. Translations model should also have such attribute defined.
 
       This value will also be used for validation, as its presence is compulsory for translations model.
     Examples:
-      translatable_locale :language
+      locale_key :language
       OR
-      translatable_locale :lang
-
-  translatable_attr_accessible
-  translatable_attr_protected
-    If this line is set then the attributes :locale and :origin will be allowed or protected
-    from for mass-assigment.
-
-    Note: Note sure that this is the best implementation. Would appreciate any better ideas.
+      locale_key :lang
 
 == Now to create the translations?
 
@@ -99,7 +90,7 @@ Migrations:
           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
@@ -124,26 +115,19 @@ Migrations:
 
 Models:
 
-    class Author < ActiveRecord::Base
-      validates :name, :presence => true
-    end
-
-    class TranslatableNews < ActiveRecord::Base
-      attr_accessible :title, :content
-    end
-
     class News < ActiveRecord::Base
-
+ 
       belongs_to  :author
-
+ 
       translatable do
-        translatable  :title, :presence => true, :uniqueness => true
-        translatable  :content, :presence => true
-        translatable_model "TranslatedNews"
-        translatable_origin :origin_id
-        translatable_attr_accessible
+        field  :title, :presence => true, :uniqueness => true
+        field  :content, :presence => true
+        class_name "TranslatedNews"
+        foreign_key :origin_id
       end
-
+ 
+      accepts_nested_attributes_for :translations, :current_translation
+      attr_accessible :translations_attributes, :current_translation_attributes
       attr_accessible :author_id, :author
     end
 
@@ -151,19 +135,19 @@ An example of application:
 
     news = News.create :translations_attributes => [{title: "Resent News", content: "That is where the text goes", locale: "en"}]
     news.translations.create title: "Заголовок", content: "Содержание",locale: "ru"
-
+ 
     news.content
     # => "That is where the text goes"
-
-    ::I18n.locale = "ru"
+ 
+    news.set_current_translation :ru
     news.content
     # => "Сюди идет текст"
-
-    ::I18n.locale = "de"
+ 
+    news.set_current_translation :de
     news.content
     # => nil
-
-    ::I18n.locale = ::I18n.default_locale
+ 
+    news.set_current_translation
     news.content
     # => "That is where the text goes"