traco 3.1.4 → 3.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzMxZDEzNjdmODYxYjJmNWVkOGUxNzI4YWYwNjE0Zjc2OTE1OWIzNw==
+    NWNlZTU1ZDRiYjcwMzUwMTY0YWVhOGJjM2IwNTEwMjU1Y2ZhNWU3NQ==
   data.tar.gz: !binary |-
-    NjFmNjBhMDFhYzFhODgzYjkzYmFiYzJjZWQ4YzhlMTc0MTc1YWVkOQ==
+    MTQwZGExYWQ2NTNjNjcxN2Q0OGEyNWIyMmI4YTJmMTUyODhiYWFlYQ==
 SHA512:
   metadata.gz: !binary |-
-    NmNkMjExZjYwODBlOGIyMWU1ODhhNmI4NTRkMjIxNjY3M2ZlYTUxZjdhZTQ5
-    ZDU0MjJjNWRkZWFjZGZlMjg3ZDE1ZGVkZjY1NmNlZTk1ZTk5NTVmNmY3N2Mx
-    NzYzYzE2ZmZlNDkzYTg1ZWJkNzkyNWMwMTQ2NWMzNWRmNDIwMjk=
+    ODM0MDIwNTJiOWM4ODcwMGYyMmU3YWEyNzg5ZWMwN2ExMTRkMGUxZDFhZGVm
+    M2JmMmEzNWFlMjlhYjE0NWNmNzIxNmNlYmQ1MzI3OWM2Y2ZkN2MzMzhlODdm
+    MmQxZTY2MjVkZjc3Nzc2M2IzMGY2MWExOGMwN2FjNzUyNzVmODM=
   data.tar.gz: !binary |-
-    NDAxNjQ0NjM4NWY2ODcxYmFmZjA5ZTVlOTRkZTAwZjY4NDRjNGNhMGNmOTE4
-    NGE4NTQwYTFlODYzYjVhMDgzNWMwNTZlZmNkMjYzMjFjNTdjMTFlMmE0ODMy
-    MTA3OTMzZmIwMDkxMzYyZDcyZTIxNjE2NWQyMDBlYzNhYWVkYmI=
+    ZDkwN2E4NDg2YWQzODY1NDYwZjEwMGVmYmIxY2M3MzYwODc0Y2IyNjRkODVl
+    MDNmMmVkOGM5MzYxOTZjM2YzMzgxY2ZlZjZiZjQ2MmRlNzExZjJjZDJlNDI0
+    Njg1YWFiMjk0ZjFiZjk2YTkwMjdhMDFjYjNhNjM1OGQ3ZDBkNzg=

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
 
+## 3.1.5
+
+* Bugfix: don't raise error loading models before the DB is created. Thanks to PikachuEXE and Andrii Malyshko.
+
 ## 3.1.4
 
-* Bugfix: restore sorting of `locale_columns` and `locales_for_attribute` to put default locale first, not current locale. Thanks to Leung Ho Kuen.
+* Bugfix: restore sorting of `locale_columns` and `locales_for_attribute` to put default locale first, not current locale. Thanks to PikachuEXE.
 
 ## 3.1.3
 
@@ -12,11 +16,11 @@
 
 ## 3.1.2
 
-* Bugfix: `.current_locale_column` handles dashed locales like "pt-BR" correctly. Thanks to Leung Ho Kuen.
+* Bugfix: `.current_locale_column` handles dashed locales like "pt-BR" correctly. Thanks to PikachuEXE.
 
 ## 3.1.1
 
-* Bugfix around fallbacks and memoization. Thanks to Leung Ho Kuen.
+* Bugfix around fallbacks and memoization. Thanks to PikachuEXE.
 
 ## 3.1.0
 

data/README.md

@@ -162,7 +162,7 @@ Possible improvements to make:
 * Tobias Bohwalli
 * Mario Alberto Chavez
 * Philip Arndt
-* Leung Ho Kuen
+* [PikachuEXE](https://github.com/PikachuEXE)
 * Fernando Morgenstern
 * Tomáš Horáček
 * Joakim Kolsjö

data/lib/traco/attributes.rb

@@ -14,8 +14,6 @@ module Traco
       self.class.ensure_translatable_attributes(base)
       base.translatable_attributes |= @attributes
 
-      self.class.warm_up_activerecord_methods(base)
-
       base.extend ClassMethods
     end
 
@@ -58,14 +56,5 @@ module Traco
       base.class_attribute :translatable_attributes
       base.translatable_attributes = []
     end
-
-    # Force AR to create methods `title_en` etc, which are lazily evaluated,
-    # otherwise we can't safely check `.instance_methods`.
-    def self.warm_up_activerecord_methods(base)
-      random_attribute = base.translatable_attributes.first
-
-      instance = base.new
-      instance.send(Traco.column(random_attribute, I18n.default_locale))
-    end
   end
 end

data/lib/traco/class_methods.rb

@@ -58,11 +58,18 @@ module Traco
       per_attribute_cache = per_locale_cache[attribute] ||= {}
 
       per_attribute_cache[fallback] ||= begin
+        # AR methods are lazily evaluated, so we must use `instance.respond_to?(column)` rather
+        # than `instance_methods.include?(column)`.
+        #
+        # We previously forced AR to evaluate them, but that caused issues before the DB existed,
+        # e.g. running `rake db:create`.
+        instance = new
+
         locales_to_try = Traco.locale_with_fallbacks(I18n.locale, fallback)
 
         locales_to_try.each_with_object({}) do |locale, columns|
           column = Traco.column(attribute, locale)
-          columns[locale] = column if instance_methods.include?(column)
+          columns[locale] = column if instance.respond_to?(column)
         end
       end
     end

data/lib/traco/version.rb

@@ -1,3 +1,3 @@
 module Traco
-  VERSION = "3.1.4"
+  VERSION = "3.1.5"
 end

data/spec/spec_helper_models.rb

@@ -1,8 +1,8 @@
 RSpec.configure do |config|
   config.before(:each) do
     # Clear class state before each spec.
-    Object.send(:remove_const, 'Post')
-    Object.send(:remove_const, 'SubPost')
+    Object.send(:remove_const, "Post")
+    Object.send(:remove_const, "SubPost")
     load "app/post.rb"
 
     # Known state.

data/spec/traco_spec.rb

@@ -8,11 +8,11 @@ describe Traco, ".split_localized_column" do
   subject { described_class }
 
   it "returns attribute and locale" do
-    expect(subject.split_localized_column("title_sv")).to eq [:title, :sv]
+    expect(subject.split_localized_column("title_sv")).to eq [ :title, :sv ]
   end
 
   it "handles normalized locales" do
-    expect(subject.split_localized_column("title_pt_br")).to eq [:title, :"pt-BR"]
+    expect(subject.split_localized_column("title_pt_br")).to eq [ :title, :"pt-BR" ]
   end
 
   it "returns nil if column is not localized" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traco
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors:
 - Henrik Nyh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord