userbin 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 213cb349e7987434937ef6fd4483b78ae0f5b4b7
-  data.tar.gz: 9f61c2eeb48ff12e2b9c22daf81dcab435699a53
+  metadata.gz: bfd28539bb9186bc657716210bd030988b426fc6
+  data.tar.gz: a96543da7ea30326ab56c7f44decfa1900fd34e4
 SHA512:
-  metadata.gz: 87aaede95dd81c178b522c0b9a39e77d67803f7164106c825db47b07da2c3619860e758778c29c7c915a3e1ad7b0bff2ec5145ae81e11d3d7641f88bf729f9e7
-  data.tar.gz: c3e27530f507731571a97320a75683bd16e13698118eadf2b16fb23ad8b7bfbf7759ef47bac05acc579e528a1f3f2431b3fb15d4dab4a7a6f7fae66f0f165381
+  metadata.gz: 5088cf23603aef48e2a00bd3ee2210a79c5da474ca972779bdcb5d44b94b2b97283441096487e024e5420b2c75e750500e6a9f59c4a008de9afc9907c7ee7daa
+  data.tar.gz: c55e51b05eada68f32b5a4ef52747b57e8d652090ed6e87432e97cb16a0ab8fa8395564caf53c59dcfd97a6a85cbc40943b355c5f69c6f6ac170d2349111fa7f

data/lib/userbin/client.rb

@@ -156,5 +156,8 @@ module Userbin
       session_token ? session_token.needs_challenge? : false
     end
 
+    def has_default_pairing?
+      session_token ? session_token.has_default_pairing? : false
+    end
   end
 end

data/lib/userbin/configuration.rb

@@ -23,7 +23,7 @@ module Userbin
     attr_accessor :request_timeout
 
     def initialize
-      self.request_timeout = 2.0
+      self.request_timeout = 30.0
     end
 
     def api_secret

data/lib/userbin/models/model.rb

@@ -1,5 +1,12 @@
 require 'her'
 
+class Her::Collection
+  # Call the overridden to_json in Userbin::Model
+  def to_json
+    self.map { |m| m.to_json }
+  end
+end
+
 module Userbin
   class Model
     include Her::Model
@@ -11,6 +18,15 @@ module Userbin
       super(args)
     end
 
+    # Remove the auto-generated embedded User model to prevent recursion
+    def to_json
+      attrs = attributes
+      if attrs['user'] && attrs['user']['id'] == 'current'
+        attrs.delete 'user'
+      end
+      attrs.to_json
+    end
+
     METHODS.each do |method|
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def self.instance_#{method}(action)

data/lib/userbin/session_token.rb

@@ -31,5 +31,9 @@ module Userbin
     def device_trusted?
       @jwt.payload['tru'] == 1
     end
+
+    def has_default_pairing?
+      @jwt.payload['dpr'] == 1
+    end
   end
 end

data/lib/userbin/version.rb

@@ -1,3 +1,3 @@
 module Userbin
-  VERSION = "1.4.3"
+  VERSION = "1.4.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: userbin
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Johan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: her