userbin 1.4.7 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe3459497c3122f6b5e380b429a1d9dbb5b485ea
-  data.tar.gz: 9df0a146b6cc26ff2b404354a58728a27ceda9ae
+  metadata.gz: bb87601eef49b0f5d845aadecd86b36c2aa2a5a2
+  data.tar.gz: d35d0620253e7702afbdddd95b1a94c586018b34
 SHA512:
-  metadata.gz: 1a2274aa29cfa87f220ababb741014d90946da71b0d31d2a20b208e2efd8b1b544befb43ba79820febfcaa82823ff78a4a0a0abc8b36cfa3c8ed8ed324f9c78e
-  data.tar.gz: 817146fe462f1147baccf117ea78f783d42173d2a2877142e9939c774eab0837cd73c96140329ec5da86dbf0a62f501fe4f57cc61bf656f6b2f5b0035cd57994
+  metadata.gz: 7a7d1ad419f59374579ecff1a8d3038671da449fc9b7dd4a637ba8db300c711fe07394d6fc9d842e50a935c0055acc2c375d5a5f53f8610588b37371d581feb3
+  data.tar.gz: 2cda728dfc00d9c03288037a5b6039ff04b40d0d5a150994d4a329a7e34a40f7feaf844b8ec41f4540346548a10b04d69d58674262cc486a3ee7c7169104863f

data/README.md

@@ -43,17 +43,6 @@ require 'userbin'
 Userbin.api_secret = "YOUR_API_SECRET"
 ```
 
-Add a reference to the Userbin client in your main controller so that it's globally accessible throughout a request. The initializer takes a Rack **request** as argument from which it extracts details such as IP address and user agent and sends it along all API requests. The second argument is a reference to the **cookies** hash, used for storing the trusted device token.
-
-```ruby
-class ApplicationController < ActionController::Base
-  def userbin
-    @userbin ||= Userbin::Client.new(request, cookies)
-  end
-  # ...
-end
-```
-
 ## Setup User Monitoring
 
 You should call `login` as soon as the user has logged in to your application. Pass a unique user identifier, and an *optional* hash of user properties which are used when searching for users in your dashboard. This will create a [Session](https://api.userbin.com/#POST--version-users--user_id-sessions---format-) resource and return a corresponding [session token](https://api.userbin.com/#session-tokens) which is stored in the Userbin client.

data/lib/userbin.rb

@@ -19,6 +19,15 @@ require 'userbin/utils'
 require 'userbin/request'
 require 'userbin/session_token'
 
+require 'userbin/support/rails' if defined?(Rails::Railtie)
+if defined?(Sinatra::Base)
+  if defined?(Padrino)
+    require 'userbin/support/padrino'
+  else
+    require 'userbin/support/sinatra'
+  end
+end
+
 module Userbin
   API = Userbin.setup_api
 end

data/lib/userbin/client.rb

@@ -115,6 +115,8 @@ module Userbin
 
       # Set the session token for use in all subsequent requests
       self.session_token = session.token
+
+      session
     end
 
     def trust_device(attrs = {})

data/lib/userbin/support/cookie_store.rb

@@ -0,0 +1,16 @@
+module Userbin
+  class CookieStore
+    def initialize(request, response)
+      @request = request
+      @response = response
+    end
+
+    def [](key)
+      @request.cookies[key]
+    end
+
+    def []=(key, value)
+      @response.set_cookie key, value
+    end
+  end
+end

data/lib/userbin/support/padrino.rb

@@ -0,0 +1,20 @@
+require_relative 'cookie_store'
+
+module Padrino
+  class Application
+    module Userbin
+      module Helpers
+        def userbin
+          store = ::Userbin::CookieStore.new(request, response)
+          @userbin ||= ::Userbin::Client.new(request, store)
+        end
+      end
+
+      def self.registered(app)
+        app.helpers Helpers
+      end
+    end
+
+    register Userbin
+  end
+end

data/lib/userbin/support/rails.rb

@@ -0,0 +1,11 @@
+module Userbin
+  module UserbinClient
+    def userbin
+      @userbin ||= Userbin::Client.new(request, cookies)
+    end
+  end
+
+  ActiveSupport.on_load(:action_controller) do
+    include UserbinClient
+  end
+end

data/lib/{sinatra/userbin.rb → userbin/support/sinatra.rb}

@@ -1,11 +1,11 @@
-require 'sinatra/base'
+require_relative 'cookie_store'
 
 module Sinatra
   module Userbin
     module Helpers
       def userbin
-        binding.pry
-        'hey'
+        store = ::Userbin::CookieStore.new(request, response)
+        @userbin ||= ::Userbin::Client.new(request, store)
       end
     end
 

data/lib/userbin/version.rb

@@ -1,3 +1,3 @@
 module Userbin
-  VERSION = "1.4.7"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: userbin
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.5.0
 platform: ruby
 authors:
 - Johan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: her
@@ -172,7 +172,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/sinatra/userbin.rb
 - lib/userbin.rb
 - lib/userbin/client.rb
 - lib/userbin/configuration.rb
@@ -192,6 +191,10 @@ files:
 - lib/userbin/request.rb
 - lib/userbin/session_store.rb
 - lib/userbin/session_token.rb
+- lib/userbin/support/cookie_store.rb
+- lib/userbin/support/padrino.rb
+- lib/userbin/support/rails.rb
+- lib/userbin/support/sinatra.rb
 - lib/userbin/trusted_token_store.rb
 - lib/userbin/utils.rb
 - lib/userbin/version.rb