i18nline 0.0.7.alpha → 0.0.8.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ab71e04609abfad11fb9a35f55fcefb3a71bdc9
-  data.tar.gz: 6e3f622bf37b69f3d3cba8680168a16d1b1b9931
+  metadata.gz: 190237220ad03c94845f1bc328fe174afb79b991
+  data.tar.gz: 5fc07ed257c12b829ec203ca7822cb98b95330d8
 SHA512:
-  metadata.gz: 146e08291d6a6aa9cf15e2e5605d44c2f2834fa9b6fe3d1945dfa43093670ea261650ded6912b66c483a605a53d6a0a3d46dd8f378e36d3232af9e2213116a3c
-  data.tar.gz: 30b6e055493069d17ea3826d47466ce67d24474bb234ea37c927260f09ca23ffa74eb286b8d066ae3ff2cbd47e31f3537da4758cb71cfc8bf1f8ae2848303b57
+  metadata.gz: 3e354c5232f27c88d5d9ad21622a47b9d47443e3639618745219e9b17bc0e561d772e52bc118a29fb37a51a8a56dbc006fa568d25fae67781221efb8135e9a72
+  data.tar.gz: 1c68a02650571a608efac21ae567a6abbfbf2669dcf3a38a0a07605f73d13fb80f965dd993e6d186dbbbce01600eaee12365c56595f77a6adbb3881ad4142e55

data/app/controllers/i18nline/application_controller.rb

@@ -4,10 +4,15 @@ module I18nline
 
     private
 
-    def check_authenticated_user
-      unless(I18nline.current_user and I18nline.current_user.try(I18nline.can_translate_method))
-        redirect_to I18nline::login_route, error: "You need to login first"
+      def check_authenticated_user
+        unless(get_current_user and get_current_user.try(I18nline.can_translate_method))
+          redirect_to I18nline::login_route, error: "You need to login first"
+        end
       end
-    end
+
+      def get_current_user
+        I18nline.current_user ||= send I18nline.current_user_method
+      end
+
   end
 end

data/app/models/i18nline/translation.rb

@@ -11,7 +11,7 @@ module I18nline
       if apply_this.present?
         where("value is null")
       else
-        scoped
+        self.all
       end
     end
 
@@ -20,7 +20,7 @@ module I18nline
         #value is serialized so searching for empty is complicated:
         where("value like ?", "".to_yaml)
       else
-        scoped
+        self.all
       end
     end
 
@@ -28,7 +28,7 @@ module I18nline
       if locale.present?
         where("locale = ?", locale)
       else
-        scoped
+        self.all
       end
     end
 
@@ -36,7 +36,7 @@ module I18nline
       if to_search.present?
         where("key like ?", "%#{to_search}%")
       else
-        scoped
+        self.all
       end
     end
 
@@ -44,7 +44,7 @@ module I18nline
       if to_search.present?
         where("value like ?", "%#{to_search}%")
       else
-        scoped
+        self.all
       end
     end
 

data/lib/i18nline/action_view_extension.rb

@@ -4,10 +4,9 @@ module I18nline
 
     included do
       def current_user_can_translate?
-        current_user = send I18nline.current_user_method
-        if current_user
-          if current_user.try I18nline.can_translate_method
-            I18nline.current_user = current_user
+        I18nline.current_user ||= send I18nline.current_user_method
+        if I18nline.current_user
+          if I18nline.current_user.try I18nline.can_translate_method
             return true
           end
         end

data/lib/i18nline/version.rb

@@ -1,3 +1,3 @@
 module I18nline
-  VERSION = "0.0.7.alpha"
+  VERSION = "0.0.8.alpha"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18nline
 version: !ruby/object:Gem::Version
-  version: 0.0.7.alpha
+  version: 0.0.8.alpha
 platform: ruby
 authors:
 - Rubén Díaz-Jorge Gil
@@ -73,7 +73,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -205,7 +205,6 @@ files:
 - test/dummy/tmp/cache/assets/development/sprockets/c5d518b12d9d712aa81c6c98a57ad3b5
 - test/dummy/tmp/cache/assets/development/sprockets/90b42249c96ca020cc4d4e5d209e3662
 - test/dummy/tmp/cache/assets/development/sprockets/1fed974ece9b46e9543a13bd2cfd39c6
-- test/dummy/tmp/pids/server.pid
 - test/dummy/bin/rake
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
@@ -317,7 +316,6 @@ test_files:
 - test/dummy/tmp/cache/assets/development/sprockets/c5d518b12d9d712aa81c6c98a57ad3b5
 - test/dummy/tmp/cache/assets/development/sprockets/90b42249c96ca020cc4d4e5d209e3662
 - test/dummy/tmp/cache/assets/development/sprockets/1fed974ece9b46e9543a13bd2cfd39c6
-- test/dummy/tmp/pids/server.pid
 - test/dummy/bin/rake
 - test/dummy/bin/bundle
 - test/dummy/bin/rails

data/test/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-3666