userbin 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a53b7ce5956e924c312988da213d450af0452dd9
-  data.tar.gz: f23fff56bb22109692e8a56799b3c6a432b2db74
+  metadata.gz: ffb33696d1a2f483737a9fa8b0a01e7e128c5f10
+  data.tar.gz: bb3e04e484ce61941564925cfc22a17aa851157a
 SHA512:
-  metadata.gz: 0285983c3614f68e4072ffa316bf145ea3a3590220c8e517a649c084876b3b78212ef1b687feaac0b443af810b143d2deae74f1d388a9571fcce48b5c16b039d
-  data.tar.gz: ecc1820bd394efe36441919b64e3de39ebf33b9d10fce94d0581d1d0f8080b8bd619c459447ba62a0ad96d886c7aa74d48e02d900269fa2e62c92ed428ebbe8b
+  metadata.gz: fb74e2140435c17f7862de7691965bab6ed7cf486c7f5df408c11be0f233b0aea410880165b8fae9cd369eebb438cf61915682e616cc5a1312d8fb0abf7969e9
+  data.tar.gz: 76260d3eac6214681540d5c96ef5eca265737992d6a763f17d5d27db07069f2adde2b05e5773bf81675405f7ce3e063d3c513b7b1f62ff790f8a286dc36162d3

data/lib/userbin/authentication.rb

@@ -60,12 +60,6 @@ module Userbin
       LINK_TAGS
     end
 
-    def meta_tag
-      <<-META_TAG
-<meta property="userbin:events" content="/userbin" />
-      META_TAG
-    end
-
     def script_tag
       script_url = ENV.fetch('USERBIN_SCRIPT_URL') {
         "https://js.userbin.com"
@@ -97,7 +91,6 @@ module Userbin
     def inject_tags(body, login_path = restrict)
       if body[CLOSING_HEAD_TAG]
         body = body.gsub(CLOSING_HEAD_TAG, link_tags(login_path) + '\\0')
-        body = body.gsub(CLOSING_HEAD_TAG, meta_tag + '\\0')
       end
       if body[CLOSING_BODY_TAG]
         body = body.gsub(CLOSING_BODY_TAG, script_tag + '\\0')

data/lib/userbin/configuration.rb

@@ -2,8 +2,8 @@ module Userbin
   class Configuration
     attr_accessor :app_id
     attr_accessor :api_secret
+    attr_accessor :current_user
     attr_accessor :auto_include_tags
-    attr_accessor :user_model
     attr_accessor :restricted_path
 
     def initialize

data/lib/userbin/events.rb

@@ -26,10 +26,6 @@ module Userbin
             event.object
           end
           model = event.instance_exec object, &callback.block
-
-          if event.type =~ /user\.created/ && model.respond_to?(:id)
-            object.update_local_id(model.id)
-          end
         end
       end
     end

data/lib/userbin/rails/auth_helpers.rb

@@ -1,15 +1,11 @@
 module Userbin
   module AuthHelpers
-    def userbin_current_user
-      local_id = Userbin.current_user.local_id
-
-      if local_id
-        user_klass = if Userbin.config.user_model
-          Userbin.config.user_model.call
-        else
-          User
-        end
-        @current_user ||= user_klass.find(local_id)
+    def current_user
+      return unless Userbin.authenticated?
+      if Userbin.config.current_user
+        @current_user ||= Userbin.config.current_user.call(Userbin.current_user)
+      else
+        raise "Userbin: No method configured for returning 'current_user'"
       end
     end
   end

data/lib/userbin/session.rb

@@ -5,12 +5,7 @@ module Userbin
     include Her::Model
   end
 
-  class User < Model
-    def update_local_id(local_id)
-      self.local_id = local_id
-      save
-    end
-  end
+  class User < Model; end
 
   class Session < Model
     has_one :user

data/lib/userbin/userbin.rb

@@ -19,7 +19,6 @@ module Userbin
       current = Userbin::Session.new(MultiJson.decode(data))
 
       if current.authenticated?
-        # FIXME: NoMethodError (undefined method `/' for nil:NilClass):
         if now > Time.at(current.expires_at / 1000)
           signature, data = refresh_session(current.user.id)
         end

data/lib/userbin/version.rb

@@ -1,3 +1,3 @@
 module Userbin
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: userbin
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Johan
@@ -80,7 +80,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Plug n’ play user accounts. The simplest way to integrate a full authentication
+description: Plug n' play user accounts. The simplest way to integrate a full authentication
   and user management stack into your web application.
 email: johan@userbin.com
 executables: []