softwear-lib 1.5.9 → 1.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20165a6e28e50bf2343b3616f440fe581c249b4d
-  data.tar.gz: 6f50638cdade6f465fc5d92372c4181f877d3718
+  metadata.gz: 6a40eaa94d306a370aa849c79ee0103357b5efbc
+  data.tar.gz: 6f3bf1251c6cd42617194b69e5b98327dc85949e
 SHA512:
-  metadata.gz: a67cfdbec3d95464d2c551420582fc65d7bad6083dd03b2602b04db2c12a9f0335b802c0a686b3a06fd88513184423bbafd07cf9339d918d6151afd29db1d699
-  data.tar.gz: 34f0a721a49c5e7cad13e9673b9767251f516b3a050b186b79c002e72fe4cc00f89b6b335f7454b073f0090cfbee06721033ad47043bef380e0539000a494a8b
+  metadata.gz: 21de19a13a1bda04e843bc16db4c31a23b38a60e363c2a841aae78cd61286f7f050f535f8e8672eba85bb48b94818c7cf43817d99d0d6c3a8d5c9e7af1f1dcf7
+  data.tar.gz: 7881d51694c1db6a20b3cad4bb9593288a0b0ad482d6ff89c15fdeb0d4ae99c954a7086f5ce07357661618bde11de56ce31b047b6dac8b2aecedda217310b6e9

data/lib/softwear/auth/model.rb

@@ -88,19 +88,45 @@ module Softwear
 
         # ====================
         # Not a fully featured has_many - must specify foreign_key if the association doesn't match
-        # the model name.
+        # the model name, through is inefficient.
         # ====================
         def has_many(assoc, options = {})
           assoc = assoc.to_s
 
-          class_name  = options[:class_name]  || assoc.singularize.camelize
-          foreign_key = options[:foreign_key] || 'user_id'
+          if through = options[:through]
+            source = options[:source] || assoc
 
-          class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def #{assoc}
-              #{class_name}.where(#{foreign_key}: id)
+            class_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def #{assoc}
+                #{through}.flat_map(&:#{source})
+              end
+            RUBY
+
+          else
+            class_name  = options[:class_name]  || assoc.singularize.camelize
+            foreign_key = options[:foreign_key] || 'user_id'
+
+            class_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def #{assoc}
+                #{class_name}.where(#{foreign_key}: id)
+              end
+            RUBY
+          end
+        end
+
+        # ====================
+        # Pretty much a map function - for activerecord compatibility.
+        # ====================
+        def pluck(*attrs)
+          if attrs.size == 1
+            all.map do |user|
+              user.send(attrs.first)
             end
-          RUBY
+          else
+            all.map do |user|
+              attrs.map { |a| user.send(a) }
+            end
+          end
         end
 
         def arel_table

data/lib/softwear/lib/controller_authentication.rb

@@ -77,11 +77,17 @@ module Softwear
       end
 
       def current_user
-        @current_user
+        return @current_user if @current_user
+
+        if @current_user.nil? && !user_token.blank?
+          @current_user = user_class.auth(user_token)
+        else
+          nil
+        end
       end
 
       def user_signed_in?
-        !@current_user.nil?
+        !!current_user
       end
 
       # -- url uelpers --

data/lib/softwear/lib/version.rb

@@ -1,5 +1,5 @@
 module Softwear
   module Lib
-    VERSION = "1.5.9"
+    VERSION = "1.5.13"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softwear-lib
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.5.13
 platform: ruby
 authors:
 - Nigel Baillie