adafruit-io 1.0.4 → 2.0.0.beta.1

data/lib/adafruit/io/client/groups.rb

@@ -0,0 +1,63 @@
+module Adafruit
+  module IO
+    class Client
+      module Groups
+
+        # Get all groups.
+        def groups(*args)
+          username, _ = extract_username(args)
+
+          get api_url(username, 'groups')
+        end
+
+        # Get a group specified by key
+        def group(*args)
+          username, arguments = extract_username(args)
+          group_key = get_key_from_arguments(arguments)
+
+          get api_url(username, 'groups', group_key)
+        end
+
+        def group_add_feed(*args)
+          username, arguments = extract_username(args)
+          group_key = get_key_from_arguments(arguments)
+          feed_key = get_key_from_arguments(arguments)
+
+          post api_url(username, 'groups', group_key, 'add'), feed_key: feed_key
+        end
+
+        def group_remove_feed(*args)
+          username, arguments = extract_username(args)
+          group_key = get_key_from_arguments(arguments)
+          feed_key = get_key_from_arguments(arguments)
+
+          post api_url(username, 'groups', group_key, 'remove'), feed_key: feed_key
+        end
+
+        def create_group(*args)
+          username, arguments = extract_username(args)
+          group_attrs = arguments.shift
+
+          post api_url(username, 'groups'), group_attrs
+        end
+
+        def delete_group(*args)
+          username, arguments = extract_username(args)
+          group_key = get_key_from_arguments(arguments)
+
+          delete api_url(username, 'groups', group_key)
+        end
+
+        def update_group(*args)
+          username, arguments = extract_username(args)
+          group_key = get_key_from_arguments(arguments)
+          query = get_query_from_arguments(arguments, %w(name key))
+
+          put api_url(username, 'groups', group_key), query
+        end
+
+      end
+    end
+  end
+end
+

data/lib/adafruit/io/client/tokens.rb

@@ -0,0 +1,48 @@
+module Adafruit
+  module IO
+    class Client
+      module Tokens
+
+        # Get all tokens.
+        def tokens(*args)
+          username, _ = extract_username(args)
+
+          get api_url(username, 'tokens')
+        end
+
+        # Get a token specified by key
+        def token(*args)
+          username, arguments = extract_username(args)
+          token_key = get_key_from_arguments(arguments)
+
+          get api_url(username, 'tokens', token_key)
+        end
+
+        # Get a token along with additional details about the token. This method
+        # has more to lookup and so is slower than `token`
+        def token_details(*args)
+          username, arguments = extract_username(args)
+          token_key = get_id_from_arguments(arguments)
+
+          get api_url(username, 'tokens', token_key, 'details')
+        end
+
+        def create_token(*args)
+          username, arguments = extract_username(args)
+          token_attrs = arguments.shift
+
+          post api_url(username, 'tokens'), token_attrs
+        end
+
+        def delete_token(*args)
+          username, arguments = extract_username(args)
+          token_key = get_id_from_arguments(arguments)
+
+          delete api_url(username, 'tokens', token_key)
+        end
+
+      end
+    end
+  end
+end
+

data/lib/adafruit/io/configurable.rb

@@ -0,0 +1,22 @@
+module Adafruit
+  module IO
+    module Configurable
+
+      # Client configuration variables
+      attr_accessor :key, :username
+
+      # Client configuration variables with defaults
+      attr_writer :api_endpoint
+
+      def api_endpoint
+        if @api_endpoint.nil?
+          'https://io.adafruit.com'
+        else
+          @api_endpoint
+        end
+      end
+
+    end
+  end
+end
+

data/lib/adafruit/io/request_handler.rb

@@ -0,0 +1,126 @@
+require 'open-uri'
+
+module Adafruit
+  module IO
+    module RequestHandler
+
+      attr_reader :last_response, :pagination
+
+      def request(method, url, data = nil, options = nil)
+        @last_response = send(method, url, data)
+      end
+
+      def get(url, options = {})
+        request(:handle_get, url, options)
+      end
+
+      def post(url, data, options = {})
+        request :handle_post, url, data, options
+      end
+
+      def put(url, data, options = {})
+        request :handle_put, url, data, options
+      end
+
+      def delete(url, options = {})
+        request :handle_delete, url
+      end
+
+      def last_page?
+        pagination.nil? || (pagination['limit'] != pagination['count'])
+      end
+
+      private
+
+      def update_pagination(response)
+        @pagination = nil
+
+        if pagination_keys = response.headers.keys.grep(/x-pagination-/i)
+          @pagination = {}
+          pagination_keys.each do |k|
+            @pagination[k.gsub(/x-pagination-/i, '')] = response.headers[k]
+          end
+        end
+      end
+
+      def parsed_response(response)
+        if response.respond_to?(:data)
+          response.data
+        else
+          begin
+            json = JSON.parse(response.body)
+          rescue => ex
+            if @debug
+              puts "ERROR PARSING JSON: #{ex.message}"
+              puts ex.backtrace[0..5].join("\n")
+            end
+            response.body
+          end
+        end
+      end
+
+      def handle_get(url, options = {})
+        response = conn.get do |req|
+          req.url URI::encode(url)
+          options.each do |k,v|
+            req.params[k] = v
+          end
+        end
+
+        update_pagination(response)
+
+        if response.status < 200 || response.status > 299
+          if response.status === 404
+            nil
+          else
+            raise "GET error: #{ response.body }"
+          end
+        else
+          parsed_response response
+        end
+      end
+
+      def handle_post(url, data, options = {})
+        response = conn.post do |req|
+          req.url URI::encode(url)
+          req.body = data
+        end
+
+        if response.status < 200 || response.status > 299
+          raise "POST error: #{ response.body }"
+        else
+          parsed_response response
+        end
+      end
+
+      def handle_put(url, data, options = {})
+        response = conn.put do |req|
+          req.url URI::encode(url)
+          req.body = data
+        end
+
+        if response.status < 200 || response.status > 299
+          raise "PUT error: #{ response.body }"
+        else
+          parsed_response response
+        end
+      end
+
+      def handle_delete(url, options = {})
+        response = conn.delete do |req|
+          req.url URI::encode(url)
+        end
+
+        if response.status < 200 || response.status > 299
+          if response.status === 404
+            nil
+          else
+            raise "DELETE error: #{ response.body }"
+          end
+        else
+          parsed_response response
+        end
+      end
+    end
+  end
+end

data/lib/adafruit/io/version.rb

@@ -1,5 +1,5 @@
 module Adafruit
   module IO
-    VERSION = "1.0.4"
+    VERSION = "2.0.0.beta.1"
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: adafruit-io
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.0.beta.1
 platform: ruby
 authors:
 - Justin Cooper
+- Adam Bachman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,48 +39,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: multi_xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -120,12 +79,14 @@ files:
 - Rakefile
 - adafruit-io.gemspec
 - lib/adafruit/io.rb
+- lib/adafruit/io/arguments.rb
 - lib/adafruit/io/client.rb
 - lib/adafruit/io/client/data.rb
-- lib/adafruit/io/client/feed.rb
-- lib/adafruit/io/client/group.rb
-- lib/adafruit/io/client/io_object.rb
-- lib/adafruit/io/client/request_handler.rb
+- lib/adafruit/io/client/feeds.rb
+- lib/adafruit/io/client/groups.rb
+- lib/adafruit/io/client/tokens.rb
+- lib/adafruit/io/configurable.rb
+- lib/adafruit/io/request_handler.rb
 - lib/adafruit/io/version.rb
 homepage: https://github.com/adafruit/io-client-ruby
 licenses:
@@ -142,13 +103,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Adafruit IO API Client Library
 test_files: []
+has_rdoc: 

data/lib/adafruit/io/client/feed.rb

@@ -1,55 +0,0 @@
-require 'adafruit/io/client/io_object'
-require 'adafruit/io/client/data'
-
-module Adafruit
-  module IO
-
-    class Feed < IOObject
-      def initialize(client = nil, id_or_key = nil)
-        super(client, id_or_key)
-      end
-
-      def create(options = {})
-        response = @client.post 'feeds', options
-        return process_response(response)
-      end
-
-      def retrieve(id_or_key = nil, options = {})
-        if id_or_key
-          @id_or_key = id_or_key
-          response = @client.get "feeds/#{id_or_key}", options
-        else
-          response = @client.get 'feeds', options
-        end
-
-        return process_response(response)
-      end
-
-      def delete
-        response = @client.delete "feeds/#{self.id}"
-        if response == 200
-          {"delete" => true, "id" => self.id}
-        else
-          {"delete" => false, "id" => self.id}
-        end
-      end
-
-      def save
-        response = @client.put "feeds/#{self.id}", serialize_params(self)
-        @unsaved_values.clear
-
-        return process_response(response)
-      end
-
-      def data(id_or_key = nil)
-        Adafruit::IO::Data.new(@client, self, id_or_key)
-      end
-
-      def to_s
-        %[#<Adafruit::IO::Feed id=#{self.id} name=#{self.name} key=#{self.key}>]
-      end
-
-    end
-
-  end
-end

data/lib/adafruit/io/client/group.rb

@@ -1,87 +0,0 @@
-require 'adafruit/io/client/io_object'
-
-module Adafruit
-  module IO
-    class Group < IOObject
-      def initialize(client = nil, id_or_key = nil)
-        super(client, id_or_key)
-      end
-
-      def create(options = {})
-        response = @client.post 'groups', options
-        return process_response(response)
-      end
-
-      def retrieve(id_or_key = nil, options = {})
-        if id_or_key
-          @id_or_key = id_or_key
-          response = @client.get "groups/#{id_or_key}", options
-        else
-          response = @client.get 'groups', options
-        end
-
-        return process_response(response)
-      end
-
-      def delete
-        response = @client.delete "groups/#{self.id}"
-        if response == 200
-          {"delete" => true, "id" => self.id}
-        else
-          {"delete" => false, "id" => self.id}
-        end
-      end
-
-      def save
-        response = @client.put "groups/#{self.id}", serialize_params(self)
-        @unsaved_values.clear
-
-        return process_response(response)
-      end
-
-      def send_group(group_name, data)
-        if group_name
-          group_name = URI::escape(group_name)
-          response = @client.post "groups/#{group_name}/send", {:value => data}
-
-          return process_response(response)
-        else
-          # no-op
-        end
-      end
-
-      def receive_group(group_name)
-        if group_name
-          group_name = URI::escape(group_name)
-          response = @client.get "groups/#{group_name}/last"
-
-          return process_response(response)
-        else
-          # no-op
-        end
-      end
-
-      def receive_next_group(group_name)
-        if group_name
-          group_name = URI::escape(group_name)
-          response = @client.get "groups/#{group_name}/next"
-
-          return process_response(response)
-        else
-          # no-op
-        end
-      end
-
-      def create_group(feed_id_or_key, options = {})
-        response = @client.post "groups/#{feed_id_or_key}", options
-
-        return process_response(response)
-      end
-
-      # Deprecated: this method was not present in the io.adafruit.com API.
-      # This method will be removed in v2.0.0
-      def groups(*args)
-      end
-    end
-  end
-end