ninja_blocks 0.0.7 → 0.0.8

data/lib/ninja_blocks/base.rb

@@ -1,7 +1,7 @@
 module NinjaBlocks 
   class Base
-    def get(url)
-      execute(:get,url)
+    def get(url,options={})
+      execute(:get,url,options)
     end
     def put(url)
       execute(:put,url)
@@ -15,8 +15,8 @@ module NinjaBlocks
     end
 
     def connection
-      @connection = Faraday.new(:url => 'https://a.ninja.is')
-      @connection.headers['accepts'] = 'application/json'
+      @connection = Faraday.new(:url => 'https://api.ninja.is')
+      @connection.headers['accept'] = 'application/json'
       @connection.headers['Content-Type'] = 'application/json'
       @connection
     end
@@ -25,8 +25,13 @@ module NinjaBlocks
       @token || NinjaBlocks.token
     end
     
-    def execute(method,url)
-      response = connection.send(method,"#{url}?user_access_token=#{self.token}")
+    def execute(method,url,options={})
+
+      unless options.empty?
+        response = connection.send(method,"#{url}?#{options}&user_access_token=#{self.token}")
+      else
+        response = connection.send(method,"#{url}?user_access_token=#{self.token}")
+      end
       JSON.parse(response.body)
     end
     

data/lib/ninja_blocks/device.rb

@@ -85,9 +85,11 @@ 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}")
+      
+      from = (Chronic.parse(from).utc.to_i) *1000
+      to = (Chronic.parse(to).utc.to_i) *1000 
+      
+      get("https://api.ninja.is/rest/v0/device/#{guid}/data", "from=#{from}&to=#{to}")
     end
 
     def last_heartbeat(guid)

data/lib/ninja_blocks/version.rb

@@ -1,3 +1,3 @@
 module NinjaBlocks
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/ninja_blocks.rb

@@ -5,6 +5,7 @@ require 'faraday'
 require 'rest-client'
 require 'json'
 require 'chronic'
+require 'active_support/time_with_zone'
 
 require "ninja_blocks/version"
 module NinjaBlocks

data/ninja_blocks.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'faraday'
   gem.add_dependency 'rest-client'
   gem.add_dependency 'json'
+  gem.add_dependency 'active_support'
   gem.add_dependency 'chronic'
   
    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ninja_blocks
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: active_support
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -116,4 +132,3 @@ signing_key:
 specification_version: 3
 summary: Ninja Blocks!
 test_files: []
-has_rdoc: