userbin 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c40c4ccf07102c60c287a9fdc9c833355a36dec
-  data.tar.gz: 03b447d4208fe3dba8558bf945efa15ce9806c19
+  metadata.gz: fe3459497c3122f6b5e380b429a1d9dbb5b485ea
+  data.tar.gz: 9df0a146b6cc26ff2b404354a58728a27ceda9ae
 SHA512:
-  metadata.gz: 803533d561e23e4415d7b7510bf933eb335dd427d3b10d7e9e44beaaf547cb92eb70dedd35cf10ae7d80343ab1978a4f124a757bc4e957f1117a323b5e650edc
-  data.tar.gz: f7dd0954673aecae7967d8948fbd0cd2030347921ca88b20d9fb51b70c1ed5191b94fce1787f84d0facb5da8df13a852b3624b324ffccca299e46247e4e680fe
+  metadata.gz: 1a2274aa29cfa87f220ababb741014d90946da71b0d31d2a20b208e2efd8b1b544befb43ba79820febfcaa82823ff78a4a0a0abc8b36cfa3c8ed8ed324f9c78e
+  data.tar.gz: 817146fe462f1147baccf117ea78f783d42173d2a2877142e9939c774eab0837cd73c96140329ec5da86dbf0a62f501fe4f57cc61bf656f6b2f5b0035cd57994

data/README.md

@@ -201,8 +201,8 @@ end
 For the sake of flexibility, two-factor authentication isn't enabled automatically when you add your first pairing.
 
 ```ruby
-userbin.enable_mfa
-userbin.disable_mfa
+userbin.enable_mfa!
+userbin.disable_mfa!
 ```
 
 ### Authenticating
@@ -278,7 +278,7 @@ end
 Set a pairing as the default one.
 
 ```ruby
-userbin.pairings.set_default('yt9BkoHzcQoou4jqbQbJUqqMdxyxvCBr')
+userbin.pairings.set_default!('yt9BkoHzcQoou4jqbQbJUqqMdxyxvCBr')
 ```
 
 Remove a pairing. If you remove the default pairing, two-factor authentication will be disabled.

data/lib/sinatra/userbin.rb

@@ -0,0 +1,18 @@
+require 'sinatra/base'
+
+module Sinatra
+  module Userbin
+    module Helpers
+      def userbin
+        binding.pry
+        'hey'
+      end
+    end
+
+    def self.registered(app)
+      app.helpers Helpers
+    end
+  end
+
+  register Userbin
+end

data/lib/userbin/client.rb

@@ -15,7 +15,7 @@ module Userbin
 
     install_proxy_methods :challenges, :events, :sessions, :pairings,
       :backup_codes, :generate_backup_codes, :trusted_devices,
-      :enable_mfa, :disable_mfa
+      :enable_mfa!, :disable_mfa!
 
     def initialize(request, cookies, opts = {})
       # Save a reference in the per-request store so that the request

data/lib/userbin/models/context.rb

@@ -0,0 +1,18 @@
+module Userbin
+  class Context < Model
+    def user_agent
+      if attributes['user_agent']
+        Userbin::Location.new(attributes['user_agent'])
+      end
+    end
+
+    def location
+      if attributes['location']
+        Userbin::Location.new(attributes['location'])
+      end
+    end
+  end
+
+  class UserAgent < Model; end
+  class Location < Model; end
+end

data/lib/userbin/models/event.rb

@@ -2,5 +2,6 @@ module Userbin
   class Event < Model
     collection_path "users/:user_id/events"
     belongs_to :user
+    has_one :context
   end
 end

data/lib/userbin/models/model.rb

@@ -18,6 +18,16 @@ module Userbin
       super(args)
     end
 
+    # Transform model.user.id to model.user_id to allow calls on nested models
+    def attributes
+      attrs = super
+      if attrs['user'] && attrs['user']['id']
+        attrs.merge!('user_id' => attrs['user']['id'])
+        attrs.delete 'user'
+      end
+      attrs
+    end
+
     # Remove the auto-generated embedded User model to prevent recursion
     def to_json
       attrs = attributes
@@ -53,7 +63,7 @@ module Userbin
       #
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{action}(params={})
-          self.class.#{method}("\#{request_path}/#{action}", params)
+          self.class.#{method}("\#{request_path}/#{action.to_s.delete('!')}", params)
         end
       RUBY
     end

data/lib/userbin/models/pairing.rb

@@ -2,7 +2,7 @@ module Userbin
   class Pairing < Model
     collection_path "users/:user_id/pairings"
     instance_post :verify
-    instance_post :set_default
+    instance_post :set_default!
     belongs_to :user
   end
 end

data/lib/userbin/models/session.rb

@@ -1,5 +1,6 @@
 module Userbin
   class Session < Model
     collection_path "users/:user_id/sessions"
+    has_one :context
   end
 end

data/lib/userbin/models/user.rb

@@ -1,10 +1,7 @@
 module Userbin
   class User < Model
-    custom_post :import
-    instance_post :lock
-    instance_post :unlock
-    instance_post :enable_mfa
-    instance_post :disable_mfa
+    instance_post :enable_mfa!
+    instance_post :disable_mfa!
 
     has_many :challenges
     has_many :events

data/lib/userbin/version.rb

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

data/lib/userbin.rb

@@ -27,6 +27,7 @@ end
 require 'userbin/models/model'
 require 'userbin/models/event'
 require 'userbin/models/challenge'
+require 'userbin/models/context'
 require 'userbin/models/monitoring'
 require 'userbin/models/pairing'
 require 'userbin/models/backup_codes'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: userbin
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - Johan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: her
@@ -172,6 +172,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- lib/sinatra/userbin.rb
 - lib/userbin.rb
 - lib/userbin/client.rb
 - lib/userbin/configuration.rb
@@ -180,6 +181,7 @@ files:
 - lib/userbin/jwt.rb
 - lib/userbin/models/backup_codes.rb
 - lib/userbin/models/challenge.rb
+- lib/userbin/models/context.rb
 - lib/userbin/models/event.rb
 - lib/userbin/models/model.rb
 - lib/userbin/models/monitoring.rb