motion-firebase 1.0.8 → 1.0.9

data/README.md

@@ -105,6 +105,14 @@ SDK
       disconnect: proc { |error| 'completion block', },
       )
     firebase.unauth
+    # when using FirebaseAuthClient to authenticate, this child node should be
+    # monitored for changes
+    firebase.auth_state
+    # usually you'll want to monitor its value, so this is a helper for that:
+    handle = firebase.on_auth do |snapshot|
+    end
+    # be a good citizen and turn off the listener later!
+    firebase.off(handle)
 
 ##### Transactions
 
@@ -166,7 +174,7 @@ For `update`, `credentials` should include `:email`, `:old_password` and
 
 `credentials` should include `:app_id` and `:permissions`
 
-    auth.login_facebook(app_id: '123abc', permissions: ['email']) { |error, user| }
+    auth.login_to_facebook(app_id: '123abc', permissions: ['email']) { |error, user| }
 
 ##### Twitter authentication methdos
 

data/lib/firebase/firebase.rb

@@ -147,6 +147,10 @@ class Firebase
     return self
   end
 
+  def on_auth(options={}, &block)
+    auth_state.on(:value, options, &block)
+  end
+
   def on_disconnect(value, &and_then)
     if and_then
       if value.nil?

data/lib/firebase/version.rb

@@ -1,5 +1,5 @@
 module Motion
   module Firebase
-    Version = '1.0.8'
+    Version = '1.0.9'
   end
 end

data/lib/firebase-auth/firebase_auth_client.rb

@@ -9,57 +9,74 @@ class FirebaseAuthClient
   end
 
   def create(credentials, &block)
+    raise "email is required in #{__method__}" unless credentials.key?(:email)
+    raise "password is required in #{__method__}" unless credentials.key?(:password)
     email = credentials[:email]
-    raise "email is required in #{__method__}" unless email
     password = credentials[:password]
-    raise "password is required in #{__method__}" unless password
-    createUserWithEmail(email, password:password, andCompletionBlock:block)
+    begin
+      createUserWithEmail(email, password:password, andCompletionBlock:block)
+    rescue RuntimeError => e
+      block.call(e, nil)
+    end
   end
 
   def remove(credentials, &block)
+    raise "email is required in #{__method__}" unless credentials.key?(:email)
+    raise "password is required in #{__method__}" unless credentials.key?(:password)
     email = credentials[:email]
-    raise "email is required in #{__method__}" unless email
     password = credentials[:password]
-    raise "password is required in #{__method__}" unless password
     removeUserWithEmail(email, password:password, andCompletionBlock:block)
   end
 
   def login(credentials, &block)
+    raise "email is required in #{__method__}" unless credentials.key?(:email)
+    raise "password is required in #{__method__}" unless credentials.key?(:password)
     email = credentials[:email]
-    raise "email is required in #{__method__}" unless email
     password = credentials[:password]
-    raise "password is required in #{__method__}" unless password
-    loginWithEmail(email, andPassword:password, withCompletionBlock:block)
+    begin
+      loginWithEmail(email, andPassword:password, withCompletionBlock:block)
+    rescue RuntimeError => e
+      block.call(e, nil)
+    end
   end
 
   def update(credentials, &block)
+    raise "email is required in #{__method__}" unless credentials.key?(:email)
+    raise "old_password is required in #{__method__}" unless credentials.key?(:old_password)
+    raise "new_password is required in #{__method__}" unless credentials.key?(:new_password)
     email = credentials[:email]
-    raise "email is required in #{__method__}" unless email
     old_password = credentials[:old_password]
-    raise "old_password is required in #{__method__}" unless old_password
     new_password = credentials[:new_password]
-    raise "new_password is required in #{__method__}" unless new_password
     changePasswordForEmail(email, oldPassword:old_password, newPassword:new_password, completionBlock:block)
   end
 
-  def login_facebook(credentials, &block)
-    app_id = credentials[:app_id]
-    raise "app_id is required in #{__method__}" unless app_id
-    permissions = credentials[:permissions]
-    raise "permissions is required in #{__method__}" unless permissions
-    loginToFacebookAppWithId(app_id, permissions:permissions, withCompletionBlock:block)
+  def login_to_facebook(credentials, &block)
+    if credentials.is_a?(NSString)
+      app_id = credentials
+      credentials = {}
+    else
+      app_id = credentials[:app_id]
+      raise "app_id is required in #{__method__}" unless app_id
+    end
+    permissions = credentials[:permissions] || ['email']
+    audience = credentials[:audience] || ACFacebookAudienceOnlyMe
+    loginToFacebookAppWithId(app_id, permissions:permissions, audience:audience, withCompletionBlock:block)
   end
 
   def login_to_twitter(credentials, &block)
-    app_id = credentials[:app_id]
-    raise "app_id is required in #{__method__}" unless app_id
-    on_multiple = credentials[:on_multiple]
-    raise "on_multiple is required in #{__method__}" unless on_multiple
+    if credentials.is_a?(String)
+      app_id = credentials
+      credentials = {}
+    else
+      app_id = credentials[:app_id]
+      raise "app_id is required in #{__method__}" unless app_id
+    end
+    on_multiple = credentials[:on_multiple] || ->(accounts) { accounts[0] }
     loginToTwitterAppWithId(app_id, multipleAccountsHandler:on_multiple, withCompletionBlock:block)
   end
 
-  def inspect
-    "#<#{self.class}:0x#{self.object_id.to_s(16)}>"
-  end
+  # def inspect
+  #   "#<#{self.class}:0x#{self.object_id.to_s(16)}>"
+  # end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-firebase
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec