Browse Source

Fix signature for empty/never/throw;

bjorn 9 years ago
parent
commit
d91176cbea
3 changed files with 11 additions and 13 deletions
  1. 3 3
      doc/README.md
  2. 5 7
      rx.lua
  3. 3 3
      src/observable.lua

+ 3 - 3
doc/README.md

@@ -163,19 +163,19 @@ Shorthand for creating an Observer and passing it to this Observable's subscript
 
 
 ---
 ---
 
 
-#### `:empty()`
+#### `.empty()`
 
 
 Returns an Observable that immediately completes without producing a value.
 Returns an Observable that immediately completes without producing a value.
 
 
 ---
 ---
 
 
-#### `:never()`
+#### `.never()`
 
 
 Returns an Observable that never produces values and never completes.
 Returns an Observable that never produces values and never completes.
 
 
 ---
 ---
 
 
-#### `:throw(message)`
+#### `.throw(message)`
 
 
 Returns an Observable that immediately produces an error.
 Returns an Observable that immediately produces an error.
 
 

+ 5 - 7
rx.lua

@@ -115,19 +115,19 @@ function Observable:subscribe(onNext, onError, onCompleted)
 end
 end
 
 
 --- Returns an Observable that immediately completes without producing a value.
 --- Returns an Observable that immediately completes without producing a value.
-function Observable:empty()
+function Observable.empty()
   return Observable.create(function(observer)
   return Observable.create(function(observer)
     observer:onCompleted()
     observer:onCompleted()
   end)
   end)
 end
 end
 
 
 --- Returns an Observable that never produces values and never completes.
 --- Returns an Observable that never produces values and never completes.
-function Observable:never()
+function Observable.never()
   return Observable.create(function(observer) end)
   return Observable.create(function(observer) end)
 end
 end
 
 
 --- Returns an Observable that immediately produces an error.
 --- Returns an Observable that immediately produces an error.
-function Observable:throw(message)
+function Observable.throw(message)
   return Observable.create(function(observer)
   return Observable.create(function(observer)
     observer:onError(message)
     observer:onError(message)
   end)
   end)
@@ -1264,9 +1264,7 @@ end
 -- if nothing has been emitted yet.
 -- if nothing has been emitted yet.
 -- @returns {*...}
 -- @returns {*...}
 function BehaviorSubject:getValue()
 function BehaviorSubject:getValue()
-  if self.value then
-    return util.unpack(self.value)
-  end
+  return self.value and util.unpack(self.value)
 end
 end
 
 
 return {
 return {
@@ -1278,4 +1276,4 @@ return {
   CooperativeScheduler = CooperativeScheduler,
   CooperativeScheduler = CooperativeScheduler,
   Subject = Subject,
   Subject = Subject,
   BehaviorSubject = BehaviorSubject
   BehaviorSubject = BehaviorSubject
-}
+}

+ 3 - 3
src/observable.lua

@@ -30,19 +30,19 @@ function Observable:subscribe(onNext, onError, onCompleted)
 end
 end
 
 
 --- Returns an Observable that immediately completes without producing a value.
 --- Returns an Observable that immediately completes without producing a value.
-function Observable:empty()
+function Observable.empty()
   return Observable.create(function(observer)
   return Observable.create(function(observer)
     observer:onCompleted()
     observer:onCompleted()
   end)
   end)
 end
 end
 
 
 --- Returns an Observable that never produces values and never completes.
 --- Returns an Observable that never produces values and never completes.
-function Observable:never()
+function Observable.never()
   return Observable.create(function(observer) end)
   return Observable.create(function(observer) end)
 end
 end
 
 
 --- Returns an Observable that immediately produces an error.
 --- Returns an Observable that immediately produces an error.
-function Observable:throw(message)
+function Observable.throw(message)
   return Observable.create(function(observer)
   return Observable.create(function(observer)
     observer:onError(message)
     observer:onError(message)
   end)
   end)