foaas-client 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 77d8ac1e17d5ff1344373bf4baf233db3d4365a3
-  data.tar.gz: 6b7b6003f300a494b728083484bd100404407c7e
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MzhlNzE3NDczZDY4Yzc3OWNlNjc1MWQxZmUzMTFjY2Y1YjIwYTg2Yw==
+  data.tar.gz: !binary |-
+    MTE3MmJiNjUzMjM2MGFlZDVlZmM1YTEzOWNjYTMyMWZiYTRkZDNhNQ==
 SHA512:
-  metadata.gz: d92c5e52eb9cbd346c2bbc3d1722a3db7df7ac851a5c60346490a87289df1fdccc736f739b3029591940fa6d285f3892d7bf7809523609bb23089b99fb8aa98a
-  data.tar.gz: 0bedf1e04724ad903ecc05762e446ed4f343ae995b0b2a9cd624b6e0ce7e16af124c5f01428f88e7d3ff6f3245a1f93cd2008abd0e060d68681ec2efa3c2cecb
+  metadata.gz: !binary |-
+    YTI0YTI4OWUyOTllZTNhYjRlMWRhZTI2MjcwMzU1Zjg1ZTJkYWY1ZjhjODg2
+    OTUwNWRhYTNiOTBkNWVhMDcwNTM0OTBiOWZlMTk4MGFlYmI5ZjZlOWZkODM4
+    OTdlODhkYzExZjIzMzc2NGZlZmVhNDQ3ZWMyZWViNWVkMjA2NzM=
+  data.tar.gz: !binary |-
+    MmRkMWRhOGY1ZGFhNWNjN2E3N2YxMzI0YTRiOWQ4ZTAzMTc2ODAxZjBjYWZm
+    MTQ3OGIxNDZlZGVhNjkxZmI4NjJlZjdhZjZkMGMyOWIxM2E0MGNkYTliYzhj
+    NDJhZTI4N2I1MmZkOWQ0MmM4MWY0YzRmNjRlYWNhOGZlYjRlZGY=

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v1.2.0
+
+* Implement the following FOAAS methods:
+  * Dalton
+* Refactor the way the JSONP callback parameter is added to the FOAAS url
+* Add support for i18n parameter
+* Add support for shoutcloud parameter
+
 ## v1.1.0
 
 * Fix example for JSONP response type (typo: `\` instead of `"`)

data/README.md

@@ -7,7 +7,7 @@ A client for [FOAAS](http://foaas.com).
 
 ## API Version
 
-Version `0.1.2` of the FOAAS API is supported.
+Version `0.1.4` of the FOAAS API is supported.
 
 ## Usage
 
@@ -20,6 +20,13 @@ fuck = Foaas::Client.new
 fuck.off('Bob', 'Alice')
 ```
 
+### i18n
+
+```ruby
+fuck.off('Bob', 'Alice', i18n: :es)
+#=> { 'message': 'Vete a la mierda, Bob.', 'subtitle': '-Alice' }
+```
+
 ### Response Types
 
 ```ruby
@@ -39,6 +46,13 @@ fuck.off('Bob', 'Alice', :xml)
 #=> '<?xml version="1.0" encoding="utf-8"?>...'
 ```
 
+### Shoutcloud
+
+```ruby
+fuck.off('Bob', 'Alice', shoutcloud: true)
+#=> { 'message': 'FUCK OFF, BOB', 'subtitle': '- ALICE' }
+```
+
 ### Methods
 
 ### Awesome
@@ -97,6 +111,13 @@ fuck.cool('Alice')
 #=> { 'message' => 'Cool story, Bro', '- Alice' }
 ```
 
+### Dalton
+
+```ruby
+fuck.dalton('Bob', 'Alice')
+#=> { 'msessage' => 'Bob: A fucking problem solving super-hero', 'subtitle' => '- Alice' }
+```
+
 #### Diabetes
 
 ```ruby

data/lib/foaas-client/client.rb

@@ -8,18 +8,20 @@ module Foaas
   	URL = Addressable::Template.new("http://foaas.com/{method}{/name}/{from}{/other}")
 
     METHODS_ONE_PARAM = [:awesome, :because, :bye, :cool, :diabetes, :everyone, :everything, :fascinating, :flying, :life, :pink, :thanks, :this, :what]
-    METHODS_TWO_PARAMS = [:bus, :donut, :caniuse, :chainsaw, :king, :linus, :madison, :nugget, :off, :outside, :shakespeare, :you, :xmas, :yoda]
+    METHODS_TWO_PARAMS = [:bus, :donut, :caniuse, :chainsaw, :dalton, :king, :linus, :madison, :nugget, :off, :outside, :shakespeare, :you, :xmas, :yoda]
     METHODS_THREE_PARAMS = [:ballmer, :field]
 
     def method_missing(sym, *args, &block)
+        kwargs = {}
+        kwargs = args[-1] if args[-1].class == Hash
         if METHODS_TWO_PARAMS.include? sym
-          make_request(URL.expand(method: sym, name: args[0], from: args[1]), args[2])
+          make_request(URL.expand(method: sym, name: args[0], from: args[1]), args[2], i18n=kwargs[:i18n], shoutcloud=kwargs[:shoutcloud])
         elsif  METHODS_ONE_PARAM.include? sym
-          make_request(URL.expand(method: sym, from: args[0]), args[1])
+          make_request(URL.expand(method: sym, from: args[0]), args[1], i18n=kwargs[:i18n], shoutcloud=kwargs[:shoutcloud])
         elsif METHODS_THREE_PARAMS.include? sym
-          make_request(URL.expand(method: sym, name: args[0], from: args[1], other: args[2]), args[3])
+          make_request(URL.expand(method: sym, name: args[0], from: args[1], other: args[2]), args[3], i18n=kwargs[:i18n], shoutcloud=kwargs[:shoutcloud])
         elsif sym == :thing
-          make_request(URL.expand(method: args[0], from: args[1]), args[2])
+          make_request(URL.expand(method: args[0], from: args[1]), args[2], i18n=kwargs[:i18n], shoutcloud=kwargs[:shoutcloud])
         else
           super(sym, *args, &block)
         end
@@ -39,7 +41,8 @@ module Foaas
 
   	private
 
-  	def make_request(url, type)
+  	def make_request(url, type, i18n=nil, shoutcloud=false)
+      query_params = {}
       url = url.to_s
       accept_type = case type
         when nil
@@ -47,11 +50,30 @@ module Foaas
         when :text
           'text/plain'
         when :jsonp
-          url += '?callback=fuck'
+          query_params['callback'] = 'fuck' 
           :json
         else
           type
       end
+
+      if i18n
+        query_params['i18n'] = i18n
+      end
+
+      if shoutcloud
+        query_params['shoutcloud'] = nil
+      end
+
+      if not query_params.empty?
+        url += '?' + query_params.map do |k,v|
+          if v
+            "#{k}=#{v}"
+          else
+            k.to_s
+          end
+        end.join('&')
+      end
+
       response = RestClient.get url, { accept: accept_type }
       response = JSON.parse(response) if type.nil?
       response

data/lib/foaas-client/version.rb

@@ -1,3 +1,3 @@
 module Foaas
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/foaas-client/client_spec.rb

@@ -24,6 +24,28 @@ describe Foaas::Client do
 
       let(:url) { "http://foaas.com/#{method}/#{name}/#{from}/#{other}" }
 
+      context 'i18n specified' do
+        let(:accept) { :json }
+        let(:i18n) { 'es' }
+
+        let(:url) { "http://foaas.com/#{method}/#{name}/#{from}/#{other}?i18n=es" }
+
+        it 'sets the i18n parameter on the url' do
+          client.send(method, name, from, other, type, i18n: i18n)
+        end
+      end
+
+      context 'shoutcloud specified' do
+        let(:accept) { :json }
+        let(:shoutcloud) { true }
+
+        let(:url) { "http://foaas.com/#{method}/#{name}/#{from}/#{other}?shoutcloud" }
+
+        it 'sets the shoutcloud parameter on the url' do
+          client.send(method, name, from, other, type, shoutcloud: true)
+        end
+      end
+
       context 'type is' do
 
         context 'not specified' do
@@ -117,6 +139,28 @@ describe Foaas::Client do
 
       let(:url) { "http://foaas.com/#{method}/#{name}/#{from}" }
 
+      context 'i18n specified' do
+        let(:accept) { :json }
+        let(:i18n) { 'es' }
+
+        let(:url) { "http://foaas.com/#{method}/#{name}/#{from}?i18n=es" }
+
+        it 'sets the i18n parameter on the url' do
+          client.send(method, name, from, type, i18n: i18n)
+        end
+      end
+
+      context 'shoutcloud specified' do
+        let(:accept) { :json }
+        let(:shoutcloud) { true }
+
+        let(:url) { "http://foaas.com/#{method}/#{name}/#{from}?shoutcloud" }
+
+        it 'sets the shoutcloud parameter on the url' do
+          client.send(method, name, from, type, shoutcloud: true)
+        end
+      end
+
       context 'type is' do
 
         context 'not specified' do
@@ -207,6 +251,28 @@ describe Foaas::Client do
       let(:from) { 'from' }
       let(:type) { nil }
 
+      context 'i18n specified' do
+        let(:accept) { :json }
+        let(:i18n) { 'es' }
+
+        let(:url) { "http://foaas.com/#{method}/#{from}?i18n=es" }
+
+        it 'sets the i18n parameter on the url' do
+          client.send(method, from, type, i18n: i18n)
+        end
+      end
+
+      context 'shoutcloud specified' do
+        let(:accept) { :json }
+        let(:shoutcloud) { true }
+
+        let(:url) { "http://foaas.com/#{method}/#{from}?shoutcloud" }
+
+        it 'sets the shoutcloud parameter on the url' do
+          client.send(method, from, type, shoutcloud: true)
+        end
+      end
+
       context 'type is' do
 
         context 'not specified' do
@@ -294,6 +360,29 @@ describe Foaas::Client do
     let(:from) { 'from' }
     let(:type) { nil }
 
+    context 'i18n specified' do
+        let(:accept) { :json }
+        let(:i18n) { 'es' }
+
+        let(:url) { "http://foaas.com/#{thing}/#{from}?i18n=es" }
+
+        it 'sets the i18n parameter on the url' do
+          client.thing(thing, from, type, i18n: i18n)
+        end
+      end
+
+
+    context 'shoutcloud specified' do
+        let(:accept) { :json }
+        let(:shoutcloud) { true }
+
+        let(:url) { "http://foaas.com/#{thing}/#{from}?shoutcloud" }
+
+        it 'sets the shoutcloud parameter on the url' do
+          client.thing(thing, from, type, shoutcloud: true)
+        end
+    end
+
     context 'type is' do
 
       context 'not specified' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foaas-client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Peter Marsh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -110,17 +110,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A client for FOAAS