devise-track_locale 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d42d8baab177ab12d9307f6dc3735467f738483b
-  data.tar.gz: 1ca3d476811911db58bfd5bfaed8d0ae5d4f4a06
+  metadata.gz: db7291a96c9fa19229b50d62d6abaa6a0dcb55f3
+  data.tar.gz: f2ee7e4b6df4bd653e75d8cbd1354288b96d9a65
 SHA512:
-  metadata.gz: b955c1ae100810673295c06adfa33cf54facc711ec321cfe0b3fe33c4f8ec956fc027e966af8aa0c5f8cbc854c03ad063ae9ea53ed1c86b8a24fa5cb9f2b3a5a
-  data.tar.gz: ba715ebf37ad1f554294b4a6729d9c2d84ab54ee7fbfe7a0dbb9fe7b4eae8d3ee574bb171b798c9792b501265aaba489ab10d3bc854e9e29a42baad49dd00349
+  metadata.gz: 6a1a1e03598f363b77869e4b716119adb1900c9a28d0545d6ef03b88f2159f9d126b402158e2e69096dfb9b4b6640cf09b40b43d7487d985dd9a6f0ce051e78d
+  data.tar.gz: 84725fced06151d722d66d113f8644686a2451dd5b3d71afe885288cad89e93f861bddb0133df6d514a27780bd89d1aeb7b8a2b021db2eee72f27ac3fd3cae4f

data/README.md

@@ -17,6 +17,15 @@ gem "devise-track_locale"
 Usage
 -----
 
+Add a `locale` attribute to your users:
+
+```sh
+$ rails g migration AddLocaleToUsers locale
+$ rake db:migrate
+```
+
+### Save the locale on every sign-in
+
 In your model, add `:track_locale` as a devise module:
 
 ```rb
@@ -25,11 +34,14 @@ class User < ActiveRecord::Base
 end
 ```
 
-Add a `locale` attribute to your users:
+### Save the locale only once
 
-```sh
-$ rails g migration AddLocaleToUsers locale
-$ rake db:migrate
+In your model, add `:track_default_locale` as a devise module:
+
+```rb
+class User < ActiveRecord::Base
+  devise …, :track_default_locale
+end
 ```
 
 Copyright

data/lib/devise/models/track_default_locale.rb

@@ -0,0 +1,9 @@
+module Devise
+  module Models
+    module TrackDefaultLocale
+      def set_default_locale!
+        update_column(:locale, I18n.locale.to_s) if locale.blank?
+      end
+    end
+  end
+end

data/lib/devise/models/track_locale.rb

@@ -2,8 +2,8 @@ module Devise
   module Models
     module TrackLocale
       def set_locale!
-        if self.locale.to_s != I18n.locale.to_s
-          self.update_column(:locale, I18n.locale.to_s)
+        if locale.to_s != I18n.locale.to_s
+          update_column(:locale, I18n.locale.to_s)
         end
       end
     end

data/lib/devise/track_locale.rb

@@ -1,7 +1,12 @@
 require 'devise'
 
 Devise.add_module :track_locale, model: true
+Devise.add_module :track_default_locale, model: true
 
 Warden::Manager.after_set_user do |record, *|
   record.set_locale! if record.respond_to?(:set_locale!)
 end
+
+Warden::Manager.after_set_user do |record, *|
+  record.set_default_locale! if record.respond_to?(:set_default_locale!)
+end

data/lib/devise/track_locale/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module TrackLocale
-    VERSION = "0.2.0"
+    VERSION = "1.0.0"
   end
 end

data/spec/models/track_default_locale_spec.rb

@@ -0,0 +1,39 @@
+require "spec_helper"
+
+describe Devise::Models::TrackDefaultLocale do
+  class MockModel
+    include Devise::Models::TrackDefaultLocale
+  end
+
+  describe "#set_default_locale!" do
+    let(:model) { MockModel.new }
+    before do
+      allow(model).to receive(:update_column)
+      allow(model).to receive(:locale) { locale }
+    end
+
+    context "with no locale" do
+      let(:locale) { nil }
+
+      it "saves the new locale on the model" do
+        I18n.with_locale(:fr) do
+          model.set_default_locale!
+        end
+
+        expect(model).to have_received(:update_column).with(:locale, "fr")
+      end
+    end
+
+    context "with a locale already set" do
+      let(:locale) { "en" }
+
+      it "does not change the model" do
+        I18n.with_locale(:fr) do
+          model.set_default_locale!
+        end
+
+        expect(model).not_to have_received(:update_column)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise-track_locale
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Sunny Ripert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2016-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - sunny@sunfox.org
@@ -49,9 +63,11 @@ files:
 - README.md
 - Rakefile
 - lib/devise-track_locale.rb
+- lib/devise/models/track_default_locale.rb
 - lib/devise/models/track_locale.rb
 - lib/devise/track_locale.rb
 - lib/devise/track_locale/version.rb
+- spec/models/track_default_locale_spec.rb
 - spec/models/track_locale_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/sunny/devise-track_locale
@@ -78,5 +94,6 @@ signing_key:
 specification_version: 4
 summary: Track a user's last locale with Devise.
 test_files:
+- spec/models/track_default_locale_spec.rb
 - spec/models/track_locale_spec.rb
 - spec/spec_helper.rb