globalize-accessors 0.1.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fb81591d0892a68040b226ca603d12e538aaa430
-  data.tar.gz: 4b4e3a579c5eff87286b320b7177f86fa8313b1f
+SHA256:
+  metadata.gz: b24dfdcadad659639d275ef9598edd54b74623afcddc067bb3539b9379516d50
+  data.tar.gz: b6f234105d5bc9911feba08771b05dd82cd796fc1d767234aec5d1982a0a059b
 SHA512:
-  metadata.gz: 89c74b3362d3fcadeb5999bd19a55ff8695cb421efa1553f08a6dedf2c8375d19956a4cba63cdaf393e4edcf6cd65cf276e9ed9096dd3533498075e74d71fa50
-  data.tar.gz: 52283201db4341df4b3bb5bef75f77be4d1247a8ccff3f29cd3e79968f9e631b9089e75634f370ef857bbd5fb6ecc442d0b4baf2d1952ad7b4c393ca37c1736e
+  metadata.gz: 94a313445016b3967875ac18778e52f80c344936914fe4bbef3083c2e8d596be7013f9ff55c520079ad78351ed445671ca427060957255bab4531cdc0eafd7e0
+  data.tar.gz: ad260c54dd05b22081f6c3ac42588c73f634952beeda208f6534584133d07d3b8f686112fd69fb2af68b5c6d401c908858628bf5b58a295baa89a64bfa07fe9d

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
+sudo: false
+cache: bundler
 before_script:
   - "cp test/db/database.yml.travis test/db/database.yml"
 script: "bundle exec rake"
-env:
-  - RAILS_3=true
-  - RAILS_4=true
 rvm:
+  - 2.2
+  - 2.1
   - 2.0.0
-  - 1.9.3

data/MIT-LICENSE

@@ -1,4 +1,5 @@
-Copyright (c) 2009 [name of plugin creator]
+Copyright (c) 2009, 2010, 2011, 2012, 2013 Tomek "Tomash" Stachewicz,
+Robert Pankowecki, Chris Salzberg
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -13,7 +13,7 @@ require 'rake'
 desc 'Default: run unit tests.'
 task :default => :test
 
-desc 'Test the easy_globalize_accessors plugin.'
+desc 'Test globalize-accessors gem.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
@@ -21,7 +21,7 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
-desc 'Generate documentation for the easy_globalize_accessors plugin.'
+desc 'Generate documentation for globalize-accessors gem.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'EasyGlobalizeAccessors'

data/globalize-accessors.gemspec

@@ -3,7 +3,7 @@ require File.expand_path("../lib/globalize-accessors/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "globalize-accessors"
-  s.version     = GlobalizeAccessors::VERSION
+  s.version     = Globalize::Accessors::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Tomasz Stachewicz", "Wojciech Pietrzak", "Steve Verlinden", "Robert Pankowecki", "Chris Salzberg"]
   s.email       = ["tomekrs@o2.pl", "steve.verlinden@gmail.com", "robert.pankowecki@gmail.com", "rpa@gavdi.com", "chrissalzberg@gmail.com"]
@@ -11,21 +11,14 @@ Gem::Specification.new do |s|
   s.summary     = "Define methods for accessing translated attributes"
   s.description = "Define methods for accessing translated attributes"
 
-  s.required_rubygems_version = ">= 1.3.6"
+  s.required_rubygems_version = ">= 1.3"
   s.rubyforge_project         = "globalize-accessors"
 
-  if ENV['RAILS_3']
-    s.add_dependency "globalize", "~> 3.0.0"
-  elsif ENV['RAILS_4']
-    s.add_dependency "globalize", "~> 4.0.0.alpha.1"
-  else
-    s.add_dependency "globalize", ">= 3"
-  end
+  s.add_dependency "globalize", ">= 5.0.0"
 
-  s.add_development_dependency "bundler", "~> 1.3.5"
-  s.add_development_dependency "rake", "~> 0.9.2"
   s.add_development_dependency "sqlite3"
-
+  s.add_development_dependency "rake"
+  s.add_development_dependency "minitest", "~> 5.1"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/lib/globalize-accessors.rb

@@ -11,29 +11,34 @@ module Globalize::Accessors
     each_attribute_and_locale(options) do |attr_name, locale|
       define_accessors(attr_name, locale)
     end
+
+    include InstanceMethods
   end
 
+  def localized_attr_name_for(attr_name, locale)
+    "#{attr_name}_#{locale.to_s.underscore}"
+  end
 
   private
 
-
   def define_accessors(attr_name, locale)
     define_getter(attr_name, locale)
     define_setter(attr_name, locale)
   end
 
-
   def define_getter(attr_name, locale)
-    define_method :"#{attr_name}_#{locale.to_s.underscore}" do
-      read_attribute(attr_name, :locale => locale)
+    define_method localized_attr_name_for(attr_name, locale) do
+      globalize.stash.contains?(locale, attr_name) ? globalize.send(:fetch_stash, locale, attr_name) : globalize.send(:fetch_attribute, locale, attr_name)
     end
   end
 
   def define_setter(attr_name, locale)
-    localized_attr_name = "#{attr_name}_#{locale.to_s.underscore}"
+    localized_attr_name = localized_attr_name_for(attr_name, locale)
 
     define_method :"#{localized_attr_name}=" do |value|
+      attribute_will_change!(localized_attr_name) if value != send(localized_attr_name)
       write_attribute(attr_name, value, :locale => locale)
+      translation_for(locale)[attr_name] = value
     end
     if respond_to?(:accessible_attributes) && accessible_attributes.include?(attr_name)
       attr_accessible :"#{localized_attr_name}"
@@ -49,6 +54,11 @@ module Globalize::Accessors
     end
   end
 
+  module InstanceMethods
+    def localized_attr_name_for(attr_name, locale)
+      self.class.localized_attr_name_for(attr_name, locale)
+    end
+  end
 end
 
 ActiveRecord::Base.extend Globalize::Accessors

data/lib/globalize-accessors/version.rb

@@ -1,3 +1,5 @@
-module GlobalizeAccessors
-  VERSION = '0.1.3'
+module Globalize
+  module Accessors
+    VERSION = '0.3.0'
+  end
 end

data/readme.md

@@ -26,7 +26,7 @@ class Product
 end
 ````
 
-Gives you access to methods: `title_pl`, `title_en`, `title_pl=`, `title_en=` (and a similar set of description_* methods). These work seamlessly with Globalize (not even touching the "core" `title`, `title=` methods used by Globalize itself).
+Gives you access to methods: `title_pl`, `title_en`, `title_pl=`, `title_en=`. These work seamlessly with Globalize (not even touching the "core" `title`, `title=` methods used by Globalize itself).
 
 The `:locales` and `:attributes` options are optional. Their default values are:
 
@@ -70,7 +70,7 @@ If you wish to always define accessors and don't want to call the `globalize_acc
 module TranslatesWithAccessors
 
   def translates(*params)
-    options = params.extract_options!
+    options = params.dup.extract_options!
     options.reverse_merge!(:globalize_accessors => true)
     accessors = options.delete(:globalize_accessors)
     super
@@ -82,4 +82,6 @@ end
 
 ## Licence
 
-Copyright (c) 2009-2013 Tomek "Tomash" Stachewicz (http://tomash.wrug.eu),  Robert Pankowecki (http://robert.pankowecki.pl) released under the MIT license
+Copyright (c) 2009-2013 Tomek "Tomash" Stachewicz (http://tomash.wrug.eu),
+Robert Pankowecki (http://robert.pankowecki.pl), Chris Salzberg (http://dejimata.com)
+released under the MIT license

data/test/globalize_accessors_test.rb

@@ -17,29 +17,33 @@ class GlobalizeAccessorsTest < ActiveSupport::TestCase
   end
 
   class UnitInheritedWithOptions < ActiveRecord::Base
+    self.table_name = :units
     translates :color
     globalize_accessors :locales => [:de], :attributes => [:color]
   end
 
-  if ENV['RAILS_3']
-    class UnitWithAttrAccessible < ActiveRecord::Base
-      self.table_name = :units
-      attr_accessible :name
-      translates :name, :title
-      globalize_accessors
-    end
-  end
-
   class UnitWithDashedLocales < ActiveRecord::Base
     self.table_name = :units
     translates :name
     globalize_accessors :locales => [:"pt-BR", :"en-AU"], :attributes => [:name]
   end
 
+  class UnitWithoutAccessors < ActiveRecord::Base
+    self.table_name = :units
+  end
+
   setup do
     assert_equal :en, I18n.locale
   end
 
+  test "return localized attribute names" do
+    u = UnitWithDashedLocales.new
+
+    assert_equal "name_en", u.localized_attr_name_for(:name, :en)
+    assert_equal "name_pt_br", u.localized_attr_name_for(:name, :"pt-BR")
+    assert_equal "name_zh_cn", u.class.localized_attr_name_for(:name, :"zh-CN")
+  end
+
   test "read and write on new object" do
     u = Unit.new(:name_en => "Name en", :title_pl => "Title pl")
 
@@ -51,6 +55,12 @@ class GlobalizeAccessorsTest < ActiveSupport::TestCase
     assert_nil u.title_en
   end
 
+  test "build translations for a new object" do
+    u = Unit.new(:name_en => "Name en", :title_pl => "Title pl")
+    assert_equal 2, u.translations.size # size of the collection
+    assert_equal 0, u.translations.count # count from database
+  end
+
   test "write on new object and read on saved" do
     u = Unit.create!(:name_en => "Name en", :title_pl => "Title pl")
 
@@ -62,6 +72,14 @@ class GlobalizeAccessorsTest < ActiveSupport::TestCase
     assert_nil u.title_en
   end
 
+   test "updates translations for existing object" do
+    u = Unit.create!(:name_en => "Name en", :title_pl => "Title pl")
+    u.name_en = "New name en"
+    assert_equal "New name en", u.translations.find {|t| t.locale == :en }.name
+    assert_equal "Title pl", u.translations.find {|t| t.locale == :pl }.title
+    assert_equal 2, u.translations.count
+  end
+
   test "read on existing object" do
     u = Unit.create!(:name_en => "Name en", :title_pl => "Title pl")
     u = Unit.find(u.id)
@@ -106,18 +124,6 @@ class GlobalizeAccessorsTest < ActiveSupport::TestCase
     assert_equal "Name pl",  u.name_pl
   end
 
-  if ENV['RAILS_3']
-    test "whitelist locale accessors if the original attribute is whitelisted" do
-      u = UnitWithAttrAccessible.new()
-      u.update_attributes(:name => "Name en", :name_pl => "Name pl", :title => "Title en", :title_pl => "Title pl")
-
-      assert_equal "Name en",  u.name
-      assert_equal "Name pl",  u.name_pl
-      assert_nil  u.title
-      assert_nil  u.title_pl
-    end
-  end
-
   test "globalize locales on class without locales specified in options" do
     assert_equal [:en, :pl], Unit.globalize_locales
   end
@@ -144,6 +150,17 @@ class GlobalizeAccessorsTest < ActiveSupport::TestCase
     assert_equal "Name en-AU",  u.name_en_au
   end
 
+  test "read when fallbacks present" do
+    u = Unit.create!(:name_en => "Name en", :title_pl => "Title pl")
+    u = Unit.find(u.id)
+    def u.globalize_fallbacks(locale)
+      locale == :pl ? [:pl, :en] : [:en, :pl]
+    end
+
+    assert_equal "Name en",  u.name
+    assert_nil u.title_en
+  end
+
   test "globalize attribute names on class without attributes specified in options" do
     assert_equal [:name_en, :name_pl, :title_en, :title_pl], Unit.globalize_attribute_names
   end
@@ -166,4 +183,17 @@ class GlobalizeAccessorsTest < ActiveSupport::TestCase
     assert_raise(NoMethodError) { Unit.new.globalize_attribute_names = [:name] }
     assert_raise(NoMethodError) { Unit.new.globalize_locales = [:en, :de] }
   end
+
+  test "instance without accessors" do
+    refute UnitWithoutAccessors.new.respond_to?(:localized_attr_name_for)
+  end
+
+  test "dirty checking" do
+    u = Unit.create!(:name_en => "Name en")
+    u.name_en = "New name en"
+    assert u.changed.include?("name_en")
+    assert ["Name en", "New name en"], u.changes["name_en"]
+    u.save!
+    assert ! u.changed.include?("name_en")
+  end
 end

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'i18n'
 I18n.available_locales = [:en, :pl]
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'active_support'
 require 'active_support/test_case'
 require 'logger'
@@ -12,6 +12,7 @@ plugin_test_dir = File.dirname(__FILE__)
 
 ActiveRecord::Base.logger = Logger.new(File.join(plugin_test_dir, "debug.log"))
 ActiveRecord::Base.configurations = YAML::load(  IO.read( File.join(plugin_test_dir, 'db', 'database.yml')  ) )
-ActiveRecord::Base.establish_connection("sqlite3mem")
+ActiveRecord::Base.establish_connection(:sqlite3mem)
 ActiveRecord::Migration.verbose = false
+ActiveSupport::TestCase.test_order = :sorted
 load(File.join(plugin_test_dir, "db", "schema.rb"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: globalize-accessors
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Tomasz Stachewicz
@@ -9,67 +9,67 @@ authors:
 - Steve Verlinden
 - Robert Pankowecki
 - Chris Salzberg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-25 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: globalize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
 description: Define methods for accessing translated attributes
 email:
 - tomekrs@o2.pl
@@ -81,8 +81,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - Rakefile
@@ -98,24 +98,23 @@ files:
 homepage: http://rubygems.org/gems/globalize-accessors
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '1.3'
 requirements: []
-rubyforge_project: globalize-accessors
-rubygems_version: 2.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Define methods for accessing translated attributes
 test_files: []