kakaxi 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4b057764ba0dfdc5483338bbe4dee6bd858e1fb6
-  data.tar.gz: 1cd5734058abb795e992c1e54186244fd390fd09
+SHA256:
+  metadata.gz: 057a9bf5c0acb652d11d49e14f9427979b263bff2ea9c3a49c58a252f38b0d3e
+  data.tar.gz: 16b2e1e12a56e114987786401b6a7f6ed7bd6b2f089bb4315572bfb70477a8ee
 SHA512:
-  metadata.gz: 4dd29982e460d008a6aaaad81b5ea690f062d47e1684eeb808a57f780319b126c57481ec572f28ada86811143111fc45fb7924e92929e1196b509a706fabb3cd
-  data.tar.gz: ec080335be6505796f2b338f4117de5773db93970c6c5e3286347f6ba64d16a9b263c6d0e78a3a2334ff73c7f0fbe33762234305c2ccb23e1e656f374019c56e
+  metadata.gz: bf01338504fcd09f811ed8368c8a8455e16bcb1002d63bdf81f145541864b1b563f549be7d637a8bbb881e2911b8b04f176ffcd946f163c6b06eaed9a18ea95f
+  data.tar.gz: a36fb054b48d1587e2e29a99b696c7b02b4de2d89a9a95128ada2464293abd7fe91f0a65a5881550c16b966b74f61cb50848b76fef97c8b4f33df9c2e0c891c1

data/kakaxi.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name          = 'kakaxi'
-  s.version       = '0.0.2'
+  s.version       = '0.0.3'
   s.date          = '2017-09-10'
   s.summary       = 'Library for calling kakaxi api by ruby'
   s.description   = 'Make it easy to use Kakaxi API by ruby'

data/lib/exception/invalid_credentials.rb

@@ -1,4 +1,4 @@
-class InvalidCredentials < StandardError
+class InvalidCredentialsError < StandardError
   def initialize(email, password, msg='email: %s, or password: %s is invalid')
     super(msg % [email, password])
   end

data/lib/kakaxi/client.rb

@@ -6,7 +6,7 @@ require 'net/https'
 module Kakaxi
   class Client
     COMMON_HEADER = { 'Content-Type' => 'application/json' }
-    BASE_URL = 'https://kakaxi-data.me/api/v1/'
+    BASE_URL = 'http://localhost:8080/api/v1/'
     attr_reader :current_device, :temps, :temp_data, :token,
                 :farm, :devices, :humidities, :timelapses, :solar_radiations,
                 :rainfalls, :interval_photos, :interval_photo_data
@@ -14,10 +14,6 @@ module Kakaxi
     def initialize(email, password)
       @email = email
       @password = password
-      @token = get_token
-      @farm = get_farm
-      @devices = get_devices
-      @current_device = @devices[0]
     end
 
     def set_current_device(index: 0, id: nil, name: nil)
@@ -26,8 +22,21 @@ module Kakaxi
       @current_device = @devices.find { |device| device.name == name } unless name.nil?
     end
 
-    def load_temps(days: 5, unit: 'celsius')
-      uri = URI.parse(BASE_URL + "kakaxi_devices/#{current_device.id}/indicators/temperature?days=#{days}&unit=#{unit}")
+    def load_token
+      @token = get_token
+    end
+
+    def load_farm
+      @farm = get_farm
+    end
+
+    def load_devices
+      @devices = get_devices
+      @current_device = @devices[0]
+    end
+
+    def load_temps(days: 5, unit: 'celsius', start_date: Date.today - 7, end_date: Date.today)
+      uri = URI.parse(BASE_URL + "kakaxi_devices/#{@current_device.id}/indicators/temperature?start_date=#{start_date}&end_date=#{end_date}&unit=#{unit}")
       temps = get(uri)['data']
       Struct.new('TempMetaData', :size, :unit, :device_id)
       @temps = temps.map do |temp|
@@ -36,8 +45,8 @@ module Kakaxi
       @temp_data = Struct::TempMetaData.new(@temps.length, unit, @current_device.id)
     end
 
-    def load_humidities(days: 5)
-      uri = URI.parse(BASE_URL + "kakaxi_devices/#{current_device.id}/indicators/humidity?days=#{days}")
+    def load_humidities(days: 5, start_date: Date.today - 7, end_date: Date.today)
+      uri = URI.parse(BASE_URL + "kakaxi_devices/#{@current_device.id}/indicators/humidity?start_date=#{start_date}&end_date=#{end_date}")
       humidities = get(uri)['data']
       Struct.new('HumidityMetaData', :size, :device_id)
       @humidities = humidities.map do |humidity|
@@ -51,8 +60,8 @@ module Kakaxi
       @humidity_data = Struct::HumidityMetaData.new(@humidities.length, @current_device.id)
     end
 
-    def load_solar_radiations(days: 5, unit: 'watt')
-      uri = URI.parse(BASE_URL + "kakaxi_devices/#{@current_device.id}/indicators/solar_radiation?days=#{days}&unit=#{unit}")
+    def load_solar_radiations(start_date: Datetime.today - 5, end_date: Datetime.today)
+      uri = URI.parse(BASE_URL + "kakaxi_devices/#{@current_device.id}/indicators/solar_radiation?start_date=#{start_date}&end_date=#{end_date}&unit=watt")
       solar_radiations = get(uri)['data']
       Struct.new('SolarRadiationMetaData', :size, :unit, :device_id)
       @solar_radiations = solar_radiations.map do |solar_radiation|
@@ -62,21 +71,21 @@ module Kakaxi
           interpolation: solar_radiation['interpolation']
          )
       end
-      @solar_radiation_data = Struct::SolarRadiationMetaData.new(@solar_radiations.length, unit,  @current_device.id) 
+      @solar_radiation_data = Struct::SolarRadiationMetaData.new(@solar_radiations.length, 'watt',  @current_device.id) 
     end
 
-    def load_rainfalls(days: 5, unit: 'inch')
-      uri = URI.parse(BASE_URL + "kakaxi_devices/#{@current_device.id}/indicators/rainfall?days=#{days}&unit=#{unit}")
+    def load_rainfalls(days: 5, start_date: Date.today - 7, end_date: Date.today)
+      uri = URI.parse(BASE_URL + "kakaxi_devices/#{@current_device.id}/indicators/rainfall?start_date=#{start_date}&end_date=#{end_date}&unit=inch")
       rainfalls = get(uri)['data']
       Struct.new('RainfallMetaData', :size, :unit, :device_id)
       @rainfalls = rainfalls.map do |rainfall|
         Kakaxi::Data::Rainfall.new(value: rainfall['amount'], recorded_at: rainfall['recorded_at'], interpolation: rainfall['interpolation'])
       end
-      @rainfall_data = Struct::RainfallMetaData.new(@rainfalls.length, unit, @current_device.id)
+      @rainfall_data = Struct::RainfallMetaData.new(@rainfalls.length, 'inch', @current_device.id)
     end
 
-    def load_timelapses(days: 5)
-      uri = URI.parse(BASE_URL + "kakaxi_devices/#{@current_device.id}/indicators/timelapse?days=#{days}")
+    def load_timelapses(days: 5, start_date: Date.today - 7, end_date: Date.today)
+      uri = URI.parse(BASE_URL + "kakaxi_devices/#{@current_device.id}/indicators/timelapse?start_date=#{start_date}&end_date=#{end_date}")
       timelapses = get(uri)['data']
       Struct.new('TimelapseMetaData', :size, :device_id)
       @timelapses = timelapses.map do |timelapse|
@@ -113,7 +122,7 @@ module Kakaxi
       uri = URI.parse(BASE_URL + 'oauth/token')
       params = { username: @email, password: @password, grant_type: 'password', scope: 'all' }
       response = post(uri, params)
-      raise InvalidCredentials.new(@email, @password) if response.code == '404'
+      raise InvalidCredentialsError.new(@email, @password) if response.code == '404'
       JSON.parse(response.body)['access_token']
     end
 
@@ -148,12 +157,12 @@ module Kakaxi
 
     def https(uri)
       https = Net::HTTP.new(uri.host, uri.port)
-      https.use_ssl = true
+      # https.use_ssl = true
       https
     end
 
     def indicator_uri(device_id, indicator, days, unit)
-      URI.parse(BASE_URL + "kakaxi_devices/#{device_id}/indicators/#{indicator}?days=#{days}")
+      URI.parse(BASE_URL + "kakaxi_devices/#{device_id}/indicators/#{indicator}?start_date=#{start_date}&end_date=#{end_date}")
     end
   end
 end

data/lib/kakaxi/interval_photo.rb

@@ -1,5 +1,5 @@
 module Kakaxi
-  class Temperature
+  class IntervalPhoto
     attr_reader :id, :url, :taken_at
 
     def initialize(id: nil, url: nil, taken_at: nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kakaxi
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Naggi Goishi
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Library for calling kakaxi api by ruby