Merge branch 'develop'

Conflicts:
	bower.json
	dist/oauth.js
	dist/oauth.min.js

Author: william26

.gitignore

@@ -4,3 +4,4 @@ coverage
 !/js/tools
 /js/tools/*
 !/js/tools/jquery-lite.js
+*sublime*

README.md

@@ -40,7 +40,7 @@ Usage
 
 To connect your user using facebook, 2 methods:
 
-Mode popup
+Popup mode
 ----------
 
  ```javascript
@@ -55,7 +55,7 @@ OAuth.popup('facebook')
 });
  ```
 
-Mode redirection
+Redirection mode
 ----------------
 
  ```javascript
@@ -290,4 +290,4 @@ This SDK is published under the Apache2 License.
 
 
 
-More information in [oauth.io documentation](http://oauth.io/#/docs)
+More information in [oauth.io documentation](http://oauth.io/#/docs)

bower.json

@@ -1,6 +1,6 @@
 {
     "name": "oauth-js",
-    "version": "0.3.0",
+    "version": "0.4.0",
     "main": "dist/oauth.min.js",
     "description": "OAuth that just works",
     "license": "apache2",

coffee/lib/api.coffee

@@ -0,0 +1,30 @@
+"use strict"
+
+module.exports = (Materia) ->
+	$ = Materia.getJquery()
+	return {
+		get: (url, params) =>
+			base = Materia.getOAuthdURL()
+			$.ajax
+				url: base + url
+				type: 'get'
+				data: params
+		post: (url, params) =>
+			base = Materia.getOAuthdURL()
+			$.ajax
+				url: base + url
+				type: 'post'
+				data: params
+		put: (url, params) =>
+			base = Materia.getOAuthdURL()
+			$.ajax
+				url: base + url
+				type: 'put'
+				data: params
+		del: (url, params) =>
+			base = Materia.getOAuthdURL()
+			$.ajax
+				url: base + url
+				type: 'delete'
+				data: params
+	}

coffee/lib/core.coffee

@@ -0,0 +1,46 @@
+"use strict"
+
+config = require('../config')
+Url = require("../tools/url")
+Location = require('../tools/location_operations')
+cookies = require("../tools/cookies")
+cache = require("../tools/cache")
+
+module.exports = (window, document, jquery, navigator) ->
+	Url = Url(document)
+	cookies.init config, document
+	location_operations = Location document
+
+	cache.init cookies, config
+
+	Materia =
+		initialize: (public_key, options) ->
+			config.key = public_key
+			if options
+				for i of options
+					config.options[i] = options[i]
+			return
+
+		setOAuthdURL: (url) ->
+			config.oauthd_url = url
+			config.oauthd_base = Url.getAbsUrl(config.oauthd_url).match(/^.{2,5}:\/\/[^/]+/)[0]
+			return
+
+		getOAuthdURL: () -> return config.oauthd_url
+		getVersion: () -> return config.version
+
+		extend: (name, module) ->
+			@[name] = module @
+
+		# private
+		getConfig: () -> return config
+		getWindow: () -> return window
+		getDocument: () -> return document
+		getNavigator: () -> return navigator
+		getJquery: () -> return jquery
+		getUrl: () -> return Url
+		getCache: () -> return cache
+		getCookies: () -> return cookies
+		getLocationOperations: () -> return location_operations
+
+	return Materia