wiscale 0.0.2 → 0.0.3

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Jon
+Copyright (c) 2010 Jon Gaudette
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.description = %Q{Ruby Wrapper for Withings Wifi Scale API}
     gem.email = "jon@digital-drip.com"
     gem.homepage = "http://github.com/jgaudette/wiscale"
-    gem.authors = ["Jon"]
+    gem.authors = ["Jon Gaudette"]
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
@@ -47,7 +47,7 @@ Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "wiscale-ruby #{version}"
+  rdoc.title = "wiscale #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/wiscale.rb

@@ -22,26 +22,24 @@ class WiScale
   end
 
   def get_meas(*params)
-    if params.length == 1
-      #TODO pass params to api for things like limie
-      ret_val = JSON.parse(HTTParty.get(api_url + '/measure', :query => {:action => 'getmeas', :userid => userid, :publickey => publickey}))
-    else
-      ret_val = JSON.parse(HTTParty.get(api_url + '/measure', :query => {:action => 'getmeas', :userid => userid, :publickey => publickey}))
-    end
+    params = Array.new unless params
+    params[0] = Hash.new unless params[0]
 
+    params[0][:action] = 'getmeas'
+    params[0][:userid] = userid
+    params[0][:publickey] = publickey
+
+    ret_val = JSON.parse(HTTParty.get(api_url + '/measure', :query => params[0]))
 
     if ret_val['status'] == 0
       OpenStruct.new(ret_val['body'])
+    else
+      ret_val['status']
     end
   end
 
-  #TODO this should call get_meas(:limit=>1) once first todo is done
   def get_last_meas
-  ret_val = JSON.parse(HTTParty.get(api_url + '/measure', :query => {:action => 'getmeas', :userid => userid, :publickey => publickey, :limit => 1}))
-
-    if ret_val['status'] == 0
-      return OpenStruct.new(ret_val['body'])
-    end
+    get_meas(:limit => 1)
   end
 
   def api_url

data/test/helper.rb

@@ -4,7 +4,7 @@ require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'wiscale-ruby'
+require 'wiscale'
 
 class Test::Unit::TestCase
 end

data/test/test_wiscale.rb

@@ -1,7 +1,17 @@
 require 'helper'
 
 class TestWiscaleRuby < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+  context "no login required" do
+    should "return 0 for connected" do
+      client = WiScale.new
+      assert(client.get_status == 0)
+    end
+  end
+
+  context "invalid login" do
+    should "fail to get last measurement" do
+      client = WiScale.new(:userid => '2384', :publickey => 'asdf')
+      assert_equal 2555, client.get_last_meas
+    end
   end
 end

metadata

@@ -5,11 +5,11 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
-- Jon
+- Jon Gaudette
 autorequire: 
 bindir: bin
 cert_chain: []