Browse Source

Fold oauth_unix module into oauth module.

Tim Fletcher 14 years ago
parent
commit
546d0ee7e4
3 changed files with 13 additions and 17 deletions
  1. 0 1
      ebin/oauth.app
  2. 13 1
      src/oauth.erl
  3. 0 15
      src/oauth_unix.erl

+ 0 - 1
ebin/oauth.app

@@ -8,7 +8,6 @@
     oauth_http,
     oauth_plaintext,
     oauth_rsa_sha1,
-    oauth_unix,
     oauth_uri
   ]},
   {registered, []},

+ 13 - 1
src/oauth.erl

@@ -71,7 +71,7 @@ token_param(Token, Params) ->
 
 params(Consumer, Params) ->
   Nonce = base64:encode_to_string(crypto:rand_bytes(32)), % cf. ruby-oauth
-  params(Consumer, oauth_unix:timestamp(), Nonce, Params).
+  params(Consumer, unix_timestamp(), Nonce, Params).
 
 params(Consumer, Timestamp, Nonce, Params) ->
   [ {"oauth_version", "1.0"}
@@ -82,6 +82,18 @@ params(Consumer, Timestamp, Nonce, Params) ->
   | Params
   ].
 
+unix_timestamp() ->
+  unix_timestamp(calendar:universal_time()).
+
+unix_timestamp(DateTime) ->
+  unix_seconds(DateTime) - unix_epoch().
+
+unix_epoch() ->
+  unix_seconds({{1970,1,1},{00,00,00}}).
+
+unix_seconds(DateTime) ->
+  calendar:datetime_to_gregorian_seconds(DateTime).
+
 signature_method_string(Consumer) ->
   case signature_method(Consumer) of
     plaintext ->

+ 0 - 15
src/oauth_unix.erl

@@ -1,15 +0,0 @@
--module(oauth_unix).
-
--export([timestamp/0]).
-
-timestamp() ->
-  timestamp(calendar:universal_time()).
-
-timestamp(DateTime) ->
-  seconds(DateTime) - epoch().
-
-epoch() ->
-  seconds({{1970,1,1},{00,00,00}}).
-
-seconds(DateTime) ->
-  calendar:datetime_to_gregorian_seconds(DateTime).