ninja_blocks 0.0.4 → 0.0.5

data/lib/ninja_blocks.rb

@@ -8,11 +8,11 @@ require 'chronic'
 
 require "ninja_blocks/version"
 module NinjaBlocks
-  require 'ninja_blocks/abstruct'
+  require 'ninja_blocks/base'
   require 'ninja_blocks/device'
   require 'ninja_blocks/user'
   require 'ninja_blocks/rule'
-  
+
   def self.token
     @token
   end

data/lib/ninja_blocks/{abstruct.rb → base.rb}

@@ -1,5 +1,5 @@
 module NinjaBlocks 
-  class Abstruct
+  class Base
     def get(url)
       execute(:get,url)
     end
@@ -29,6 +29,7 @@ module NinjaBlocks
       response = connection.send(method,"#{url}?user_access_token=#{self.token}")
       JSON.parse(response.body)
     end
+    
   end
 end
 

data/lib/ninja_blocks/device.rb

@@ -1,20 +1,71 @@
 module NinjaBlocks
-  class Device <Abstruct
+  class Device < Base
 
-    def list
+    def list(*filter_by)
+      
       hash_of_response = get("https://api.ninja.is/rest/v0/devices")
 
       devices = []
+      
+      unless filter_by.nil?
 
+        hash_of_response["data"].each do |d|
+          device_hash = {}
+          device_hash["guid"] = d[0]
+          device_hash = device_hash.merge(d[1]) 
+          devices << device_hash
+          devices = devices.reject { |d| d['device_type'] != filter_by[:device_type] }
+        end
+      
+      else
+        hash_of_response["data"].each do |d|
+          device_hash = {}
+          device_hash["guid"] = d[0]
+          device_hash = device_hash.merge(d[1]) 
+          devices << device_hash
+          devices = devices.sort_by { |k| k["device_type"] }
+        end
+        
+      end
+        
+      devices
+    end
+
+    def available_types
+      hash_of_response = get("https://api.ninja.is/rest/v0/devices")
+
+      devices_types = []
+      
       hash_of_response["data"].each do |d|
         device_hash = {}
         device_hash["guid"] = d[0]
         device_hash = device_hash.merge(d[1]) 
-        devices << device_hash
+        devices_types << device_hash['device_type'] unless device_hash['device_type'].nil?
+        devices_types = devices_types.uniq
+      end
+      
+      devices_types.each do |t|
+        puts t
       end
-
-      devices
     end
+    
+    def available_devices
+      hash_of_response = get("https://api.ninja.is/rest/v0/devices")
+
+      devices_types = []
+      
+      hash_of_response["data"].each do |d|
+        device_hash = {}
+        device_hash["guid"] = d[0]
+        device_hash = device_hash.merge(d[1]) 
+        devices_types << device_hash['device_type'] unless device_hash['device_type'].nil?
+        devices_types = devices_types.uniq
+      end
+      
+      devices_types.each do |t|
+        puts t
+      end
+    end   
 
     def actuate(guid, da)
       json = JSON.dump('DA'=> dsa)
@@ -31,6 +82,8 @@ module NinjaBlocks
     end
 
     def data(guid, from, to)
+      from = Chronic.parse(from).to_i
+      to = Chronic.parse(to).to_i
       get("https://api.ninja.is/rest/v0/device/#{guid}/data?from=#{from}&to=#{to}")
     end
 

data/lib/ninja_blocks/rule.rb

@@ -1,5 +1,5 @@
 module NinjaBlocks
-  class Rule < Abstruct
+  class Rule < Base
     
     def list
       get('https://api.ninja.is/rest/v0/rule')

data/lib/ninja_blocks/user.rb

@@ -1,5 +1,5 @@
 module NinjaBlocks
-  class User < Abstruct
+  class User < Base
     def info
       get('https://api.ninja.is/rest/v0/user')
     end

data/lib/ninja_blocks/version.rb

@@ -1,3 +1,3 @@
 module NinjaBlocks
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ninja_blocks
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -85,7 +85,7 @@ files:
 - README.md
 - example/app.rb
 - lib/ninja_blocks.rb
-- lib/ninja_blocks/abstruct.rb
+- lib/ninja_blocks/base.rb
 - lib/ninja_blocks/device.rb
 - lib/ninja_blocks/rule.rb
 - lib/ninja_blocks/user.rb