quaderno 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bca4eb12a813d217d7bfdb17a51adae185c35aa5
-  data.tar.gz: b31d19f51e8459874f9396e58dd9211a73f5d45e
+  metadata.gz: 09c7db7390357eaea573c6ee995f7ba5148cc342
+  data.tar.gz: 88a81c8324e9e194fd3cb8553098cf22f96d934b
 SHA512:
-  metadata.gz: a57d5344bb40962831c8cc559a42b380f63729103aa2bc9a3f9afc5ce42fdbc74c195b9c3a419c193b763cfd741da3f282c16807f58a03064a8171605976feb9
-  data.tar.gz: cbb1a82722e9951ebec35812e58d16b7be184b893d7848b9d6a3bce4d6a72a67316ab0330c1f09bf0310376fe1e87cd974fcaeebf0e246b5179e4207eaaa2c91
+  metadata.gz: 35e837e86943777b0ea4db2ddec5e7c8340c113b432a3ce2e899dcbb557cb520aed52d377f832bbdb2c95f5132c0228901b32e60e993ba4960eb7b20a923ce52
+  data.tar.gz: 7917889a1196b38ea36362128eacf6a3c781286707383dc9389cbab436f2eaa706824894f4d10ca5c288fb2661e90935f821f72469cc0563fb985487cb0e5988

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.7.0 See the changelog [here](https://github.com/quaderno/quaderno-ruby/blob/master/changelog.md)
+Current version is 1.7.1 See the changelog [here](https://github.com/quaderno/quaderno-ruby/blob/master/changelog.md)
 
 ## Installation & Configuration
 
@@ -18,12 +18,11 @@ To configure just add this to your initializers
 ```ruby
   Quaderno::Base.configure do |config|
     config.auth_token = 'my_authenticate_token'
-    config.subdomain = 'my_subdomain'
-    config.environment = :production
+    config.url = 'https://my_subdomain.quadernoapp.com/api/v1/'
   end
 ```
 
-The `environment` attribute is optional and set to `:production` by default. Optionally, you can set it to `:sandbox` in order to test your application before deploying it to production.
+**1.7.1 Breaking changes:** If you are using a configuration based on versions `< '1.7.1'`, you will notice that the old configuration no longer works, so please update your configuration or specify the `1.7.0` version.
 
 ## Get authorization data
 

data/VERSION

@@ -1 +1 @@
-1.7.0
+1.7.1

data/changelog.md

@@ -1,4 +1,7 @@
 #Changelog
+##1.7.1
+ * Breaking change: change configuration options
+
 ##1.7.0
  * Added recurring documents
  * Raise existent exception

data/lib/quaderno-ruby/base.rb

@@ -7,14 +7,12 @@ module Quaderno
     include Quaderno::Exceptions
     include Quaderno::Behavior::Crud
 
-    PRODUCTION_URL = 'https://quadernoapp.com'
-    SANDBOX_URL = 'http://sandbox-quadernoapp.com'
+    PRODUCTION_URL = 'https://quadernoapp.com/api/v1/'
+    SANDBOX_URL = 'http://sandbox-quadernoapp.com/api/v1/'
 
     @@auth_token = nil
-    @@subdomain = 'subdomain'
     @@rate_limit_info = nil
-    @@base_url = PRODUCTION_URL
-    @@environment = :production
+    @@url = PRODUCTION_URL
 
     # Class methods
     def self.api_model(klass)
@@ -32,26 +30,21 @@ module Quaderno
 
     def self.configure
       yield self
-      @@base_url = @@environment == :sandbox && !@@subdomain.nil? ? "http://#{@@subdomain}.sandbox-quadernoapp.com" : "https://#{@@subdomain}.quadernoapp.com"
-    end
-
-    def self.environment=(mode)
-      @@environment = mode
     end
 
     def self.auth_token=(auth_token)
       @@auth_token = auth_token
     end
 
-    def self.subdomain=(subdomain)
-      @@subdomain = subdomain
+    def self.url=(url)
+      @@url = url
     end
 
     def self.authorization(auth_token, mode = nil)
       begin
-        mode ||= @@environment
-        base_url = mode == :sandbox ? SANDBOX_URL : PRODUCTION_URL
-        party_response = get("#{base_url}/api/v1/authorization.json", basic_auth: { username: auth_token })
+        mode ||= :production
+        url = mode == :sandbox ? SANDBOX_URL : PRODUCTION_URL
+        party_response = get("#{url}authorization.json", basic_auth: { username: auth_token })
         return  JSON::parse party_response.body
       rescue Exception
         return false
@@ -61,7 +54,7 @@ module Quaderno
     #Check the connection
     def self.ping
       begin
-        party_response = get("#{@@base_url}/api/v1/ping.json", basic_auth: { username: auth_token })
+        party_response = get("#{@@url}ping.json", basic_auth: { username: auth_token })
         check_exception_for(party_response, { subdomain_or_token: true })
       rescue Errno::ECONNREFUSED
         return false
@@ -71,7 +64,7 @@ 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 })
+      party_response = get("#{@@url}ping.json", basic_auth: { username: auth_token })
       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
@@ -86,8 +79,8 @@ module Quaderno
       @@auth_token
     end
 
-    def self.base_url
-      @@base_url
+    def self.url
+      @@url
     end
 
     def self.subdomain

data/lib/quaderno-ruby/behavior/crud.rb

@@ -29,7 +29,7 @@ module Quaderno
         end
 
         def all(filter = nil)
-          party_response = get("#{api_model.base_url}/api/v1/#{ api_model.api_path }.json", body: filter, basic_auth: { username: api_model.auth_token })
+          party_response = get("#{api_model.url}#{ api_model.api_path }.json", body: filter, basic_auth: { username: api_model.auth_token })
           check_exception_for(party_response,  { rate_limit: true, subdomain_or_token: true })
           array = party_response.parsed_response
           collection = []
@@ -47,7 +47,7 @@ module Quaderno
         end
 
         def find(id)
-          party_response = get "#{api_model.base_url}/api/v1/#{ api_model.api_path }/#{ id }.json", basic_auth: { username: api_model.auth_token }
+          party_response = get "#{api_model.url}#{ api_model.api_path }/#{ id }.json", basic_auth: { username: api_model.auth_token }
           check_exception_for(party_response,  { rate_limit: true, subdomain_or_token: true, id: true })
           hash = party_response.parsed_response
 
@@ -57,7 +57,7 @@ module Quaderno
         end
 
         def create(params)
-          party_response = post "#{api_model.base_url}/api/v1/#{ api_model.api_path }.json", body: params, basic_auth: { username: api_model.auth_token }
+          party_response = post "#{api_model.url}#{ api_model.api_path }.json", body: params, basic_auth: { username: api_model.auth_token }
           check_exception_for(party_response,  { rate_limit: true, subdomain_or_token: true, required_fields: true })
           hash = party_response.parsed_response
 
@@ -67,7 +67,7 @@ module Quaderno
         end
 
         def update(id, params)
-          party_response = put "#{api_model.base_url}/api/v1/#{ api_model.api_path }/#{ id }.json", body: params, basic_auth: { username: api_model.auth_token }
+          party_response = put "#{api_model.url}#{ api_model.api_path }/#{ id }.json", body: params, basic_auth: { username: api_model.auth_token }
           check_exception_for(party_response, { rate_limit: true, subdomain_or_token: true, id: true })
           hash = party_response.parsed_response
 
@@ -77,7 +77,7 @@ module Quaderno
         end
 
         def delete(id)
-          party_response = HTTParty.delete "#{api_model.base_url}/api/v1/#{ api_model.api_path }/#{ id }.json", basic_auth: { username: api_model.auth_token }
+          party_response = HTTParty.delete "#{api_model.url}#{ api_model.api_path }/#{ id }.json", basic_auth: { username: api_model.auth_token }
           check_exception_for(party_response,  { rate_limit: true, subdomain_or_token: true, id: true, has_documents: true })
           true
         end

data/lib/quaderno-ruby/behavior/deliver.rb

@@ -8,7 +8,7 @@ module Quaderno
 
       module InstanceMethods
         def deliver
-          party_response = api_model.get("#{api_model.base_url}/api/v1/#{ api_model.api_path }/#{ id }/deliver.json", basic_auth: { username: api_model.auth_token })
+          party_response = api_model.get("#{api_model.url}#{ api_model.api_path }/#{ id }/deliver.json", basic_auth: { username: api_model.auth_token })
           api_model.check_exception_for(party_response, { rate_limit: true, subdomain_or_token: true, id: true, required_fields: true })
           { limit: party_response.headers["x-ratelimit-limit"].to_i, remaining: party_response.headers["x-ratelimit-remaining"].to_i }
         end

data/lib/quaderno-ruby/behavior/payment.rb

@@ -11,7 +11,7 @@ module Quaderno
         end
 
         def add_payment(params)
-          party_response = api_model.post "#{api_model.base_url}/api/v1/#{ api_model.api_path }/#{ id }/payments.json", body: params, basic_auth: { username: api_model.auth_token }
+          party_response = api_model.post "#{api_model.url}#{ api_model.api_path }/#{ id }/payments.json", body: params, basic_auth: { username: api_model.auth_token }
           api_model.check_exception_for(party_response, { rate_limit: true, subdomain_or_token: true, required_fields: true })
           parsed = JSON::parse party_response.body
           instance = to_instance(Quaderno::Payment, parsed)
@@ -20,7 +20,7 @@ module Quaderno
         end
 
         def remove_payment(payment_id)
-          party_response = HTTParty.delete "#{api_model.base_url}/api/v1/#{ api_model.api_path }/#{ id }/payments/#{ payment_id }.json", basic_auth: { username: api_model.auth_token }
+          party_response = HTTParty.delete "#{api_model.url}#{ api_model.api_path }/#{ id }/payments/#{ payment_id }.json", basic_auth: { username: api_model.auth_token }
           to_delete = nil
           payments.each do |payment|
             if payment.id == payment_id

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.7.0 ruby lib
+# stub: quaderno 1.7.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "quaderno"
-  s.version = "1.7.0"
+  s.version = "1.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Recrea"]
-  s.date = "2015-05-13"
+  s.date = "2015-06-02"
   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.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Recrea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty