quaderno 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e23b1598201122ad5c4862ddba902cf6ab99042
-  data.tar.gz: 6d6e84f98d3132194e00ee7baaa04ab26a485700
+  metadata.gz: 743fadc9baad6881ff2e39d6e9784dd482596859
+  data.tar.gz: 089e04d74bfe23087315f9f44befd55a409adeba
 SHA512:
-  metadata.gz: d266fee84e76e0c104006f89433d89a9a9da7bf2ac4fd4efa7b880e7cb5c09a55a8631ec5177e2eb98c39d071347cd7d77ac5e821bf76d4dbb6a3c1c0501db50
-  data.tar.gz: 7783e07debc8f356d8257d4c38d1dc7fcb1dea8939fac86a6ebb130682fb2273acbd0fa7b8961e758e0440348becb8b4289d0ac400a1ed8f16920a89f526bf06
+  metadata.gz: bd454d87f075a5243cf63099075aa2f72135fcdd88b9cd1403933a086b360050603923ddf2ce53d1a7607e92d7505f5ec2dc87bc7f5b84301af056f2d77ed2c8
+  data.tar.gz: e414be003e40de2ef81fa2caa9c8b6b6eabb31d3614f1af0049e2fbcd4cf1d7611dca6caa965c04cfe7c5e5184c96ba26d8a140adce97c8e316e6396a2f272d2

data/README.md

@@ -3,7 +3,7 @@
 Quaderno-ruby is a ruby wrapper for [Quaderno API] (https://github.com/quaderno/quaderno-api). 
 As the API, it's mostly CRUD.
 
-Current version is 1.5.2. See the changelog [here](https://github.com/quaderno/quaderno-ruby/blob/master/changelog.md)
+Current version is 1.5.3. See the changelog [here](https://github.com/quaderno/quaderno-ruby/blob/master/changelog.md)
 
 ## Installation & Configuration
 
@@ -50,10 +50,10 @@ This will return true if the service is up or false if it is not.
 ## Check the rate limit
 
 ```ruby
-  Quaderno::Base.rate_limit_info #=>  { :limit => 100, :remaining => 100 }
+  Quaderno::Base.rate_limit_info #=>  {:reset=>4, :remaining=>0} 
 ```
 
-This will return a hash with information about the rate limit and your remaining requestes
+This will return a hash with information about the seconds until the rate limit reset and your remaining requests per minute ([check the API documentation for more information](https://github.com/quaderno/quaderno-api#rate-limiting)).
 
 ## Reading the values
 
@@ -358,29 +358,6 @@ will update the specified webhook with the data of the hash passed as second par
 will delete the webhook with the id passed as parameter.
 
 
-## Managing transactions
-
-### Finding a transaction
-```ruby
- Quaderno::Transaction.find(id) #=> Quaderno::Transaction
-```
-
-will return the transaction with the id passed as parameter.
-
-### Creating a new transaction
-```ruby
- Quaderno::Transaction.create(params) #=> Quaderno::Transaction
-```
-
-will create a transaction using the information of the hash passed as parameter and return an instance of Quaderno::Transaction with the created transaction.
-
-
-### Deleting a transaction
-```ruby
-  Quaderno::Transaction.delete(id) #=> Boolean
-```
-will delete the transaction with the id passed as parameter.
-
 
 ## Taxes
 

data/VERSION

@@ -1 +1 @@
-1.5.2
+1.5.3

data/changelog.md

@@ -1,4 +1,9 @@
 #Changelog
+##1.5.3
+* Update `rate_limit_info` to fit the new rate limit
+* Remove transaction information from README (future resource name change)
+* Added new throttle limit exception (will be activated in future releases)
+
 ##1.5.1 and 1.5.2
 * Remove debugger
 * `Quaderno::Exceptions::RequiredFieldsEmpty` replaced with `Quaderno::Exceptions::RequiredFieldsEmptyOrInvalid`

data/lib/quaderno-ruby/base.rb

@@ -32,7 +32,7 @@ module Quaderno
     
     def self.configure
       yield self
-      @@base_url = @@environment == :sandbox && !@@subdomain.nil? ? "http://#{@@subdomain}.sandbox-quadernoapp.com" : "https://#{@@subdomain}.quadernoapp.com"
+      @@base_url = @@environment == :sandbox && !@@subdomain.nil? ? "http://#{@@subdomain}.lvh.me:3000" : "https://#{@@subdomain}.quadernoapp.com"
     end
      
     def self.environment=(mode)
@@ -62,6 +62,7 @@ module Quaderno
     def self.ping
       begin
         party_response = get("#{@@base_url}/api/v1/ping.json", basic_auth: { username: auth_token })
+        check_exception_for(party_response, { subdomain_or_token: true })
       rescue Errno::ECONNREFUSED
         return false
       end
@@ -71,9 +72,9 @@ module Quaderno
     #Returns the rate limit information: limit and remaining requests
     def self.rate_limit_info
       party_response = get("#{@@base_url}/api/v1/ping.json", basic_auth: { username: auth_token })
-      @@rate_limit_info = { limit: party_response.headers["x-ratelimit-limit"].to_i, remaining: party_response.headers["x-ratelimit-remaining"].to_i }
+      check_exception_for(party_response, { subdomain_or_token: true })
+      @@rate_limit_info = { reset: party_response.headers['x-ratelimit-reset'].to_i, remaining: party_response.headers["x-ratelimit-remaining"].to_i }
     end
-    
 
     # Instance methods
     def to_hash

data/lib/quaderno-ruby/exceptions/exceptions.rb

@@ -15,12 +15,18 @@ module Quaderno
     class RequiredFieldsEmptyOrInvalid < Exception
     end
 
+    class ThrottleLimitExceeded < Exception
+    end
+
     def self.included(receiver)
       receiver.send :extend, ClassMethods
     end  
 
     module ClassMethods
       def check_exception_for(party_response, params = {})
+        if params[:throttle_limit],nil == false
+         raise(Quaderno::Exceptions::ThrottleLimitExceeded, 'Throttle limit exceeded, please try again later') if party_response.response.class == Net::HTTPServiceUnavailable 
+        end
         if params[:rate_limit].nil? == false
           raise(Quaderno::Exceptions::RateLimitExceeded, 'Rate limit exceeded') if party_response.response.class == Net::HTTPForbidden
         end

data/quaderno.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: quaderno 1.5.2 ruby lib
+# stub: quaderno 1.5.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "quaderno"
-  s.version = "1.5.2"
+  s.version = "1.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Recrea"]
-  s.date = "2014-12-10"
+  s.date = "2014-12-16"
   s.description = " A ruby wrapper for Quaderno API "
   s.email = "carlos@recrea.es"
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quaderno
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Recrea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty