cradlepoint 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b22d2f2d6acac43af74052aa2196bd1ddd32c19
-  data.tar.gz: e94608b410b016ac61ea0ea5aeb0868d2c86f049
+  metadata.gz: fc0607e7966ce67469b3016b970518cb4f083fa1
+  data.tar.gz: 89d811424d1b64f56a4e93e542e5abed215199a6
 SHA512:
-  metadata.gz: da2b87096d7035ac878390ae23601276141bc928b25e9dd51b18896fc3720105c0a357f481f8df56eb9de7c1535d52bfa4e78bac4eb6050aada77a0640a3659d
-  data.tar.gz: 72f5bd64be30d269b9bcdb7ff448dff63b09257cc1310f134c01ef766c696a3b3ab01858e8708b95feaf3c5db503b265f83fa5c2d44cc0b0655035cd9df8cd82
+  metadata.gz: b8bd523c938895c2e7d2c4f29fc1cc517e2da04a48251f18d651597246d9851c4aea5b10dc672c1d1159275bf30f7a38c82386cb825a6b5897fce4c398face2a
+  data.tar.gz: ea2bdcdbf822b8dfd2a9448f122e5b6e301a6950dba010e7d12835280b47357e66f279525aed34084bd8fbbb99df846cdb9ff1c3d99302796ffeaf3401377907

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  
+notifications:
+  email:
+    - john@uceem.com
+    - doug@uceem.com

data/lib/cradlepoint.rb

@@ -3,7 +3,7 @@ require 'rest-client'
 
 require 'cradlepoint/version'
 
-require 'cradlepoint/hash_helpers'
+require 'utils/hash_helpers'
 
 require 'cradlepoint/cradlepoint_object'
 require 'cradlepoint/account'
@@ -62,7 +62,7 @@ module Cradlepoint
     end
     
     parsed_response['success'] ? 
-      Cradlepoint::HashHelpers.symbolize_keys(parsed_response['data']) : 
-      raise("Unsuccessful response received.")  # TODO: Handle more elegantly.
+      Utils::HashHelpers.symbolize_keys(parsed_response['data']) : 
+      raise("Unsuccessful response received: #{ parsed_response.inspect }")  # TODO: Handle more elegantly.
   end
 end

data/lib/cradlepoint/cradlepoint_object.rb

@@ -20,5 +20,25 @@ module Cradlepoint
     def params
       { params: { format: :json } }
     end
+
+    def self.successful_response?(response)
+      return false unless response
+      return false if response.is_a?(Hash) and !response[:success]
+      true
+    end
+
+    def successful_response?(response)
+      Cradlepoint::CradlepointObject.successful_response?(response)
+    end
+
+    def self.ecm_object_blob?(object_blob)
+      return false unless object_blob
+      return false unless object_blob.is_a?(Hash) and object_blob[:id]
+      true
+    end
+
+    def ecm_object_blob?(object_blob)
+      Cradlepoint::CradlepointObject.ecm_object_blob?(object_blob)
+    end
   end
 end

data/lib/cradlepoint/net_device.rb

@@ -1,6 +1,5 @@
 module Cradlepoint
   class NetDevice < CradlepointObject
-    include Cradlepoint::HashHelpers
 
     attr_accessor :id, :router, :data, :bytes_in, :bytes_out, :carrier, :esn, :imei, :info, 
                   :ip_address, :mac, :mode, :name, :type, :uptime, :netmask, :dns0, :dns1,
@@ -41,6 +40,10 @@ module Cradlepoint
       assign_attributes_from_data(group: true)
     end
 
+    def get_all_from_router_as_hash
+      Cradlepoint.make_request(:get, build_url(rel_url_from_router))
+    end
+
     def assign_attributes_from_data(options = {})
       return unless self.data and self.data.any?
       raw_data = self.data
@@ -64,6 +67,7 @@ module Cradlepoint
     def assign_attributes_from_blob(blob = {})
       return unless blob and blob.any?
 
+      self.data = blob
       self.connection_state = blob[:connection_state]
       self.bytes_in = blob[:bytes_in]
       self.bytes_out = blob[:bytes_out]

data/lib/cradlepoint/net_flow.rb

@@ -18,11 +18,13 @@ module Cradlepoint
 
     def get
       raise 'You must provide a mac' unless self.mac
+      return self.data if self.data
       self.data = Cradlepoint.make_request(:get, build_new_url(rel_url), params)
     end
 
     def get_status
       raise 'You must provide a mac' unless self.mac
+      return self.status_data if self.status_data
       self.status_data = Cradlepoint.make_request(:get, build_new_url("#{ rel_url }/status"), params)
     end
 

data/lib/cradlepoint/router.rb

@@ -1,6 +1,5 @@
 module Cradlepoint
   class Router < CradlepointObject
-    include Cradlepoint::HashHelpers
 
     attr_accessor :id, :data, :ecm_firmware_uri, :ecm_configuration_uri, 
                   :ecm_configuration_manager_uri, :ecm_configuration_manager_data,
@@ -62,7 +61,7 @@ module Cradlepoint
 
     def firmware_data
       check_for_id_or_raise_error
-      Cradlepoint.make_request(:get, build_url(firmware_uri.split('/api/v1').last))
+      Cradlepoint.make_request(:get, build_url(firmware_uri.split('/api/v1').last)) if firmware_uri
     end
 
     def firmware_uri
@@ -112,12 +111,12 @@ module Cradlepoint
     private
 
       def self.build_array_of_routers_from_response(response)
-        return unless response and response.any?
+        return false unless successful_response?(response)
         response.map { |r| create_and_assign_attributes_from_data(r) }
       end
 
       def self.create_and_assign_attributes_from_data(data)
-        return unless data and data.any? and data[:id]
+        return unless ecm_object_blob?(data)
         router = Cradlepoint::Router.new(data[:id], data: data)
         router.assign_attributes_from_data
         router

data/lib/cradlepoint/version.rb

@@ -1,3 +1,3 @@
 module Cradlepoint
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/{cradlepoint → utils}/hash_helpers.rb

@@ -1,4 +1,4 @@
-module Cradlepoint
+module Utils
   module HashHelpers
     # From 
     # http://devblog.avdi.org/2009/07/14/recursively-symbolize-keys/

data/spec/cradlepoint_object_spec.rb

@@ -19,5 +19,19 @@ describe Cradlepoint::CradlepointObject do
     it 'should return the correct url' do
       cradlepoint_object.build_url('/blah').should == url
     end
+
+    describe '.successful_response?' do
+
+      let(:successful_response) { [] }
+      let(:unsuccessful_responses) { [nil, { success: false }] }
+
+      it 'should think a successful response is successful' do
+        cradlepoint_object.successful_response?(successful_response).should be_true
+      end
+
+      it 'should think unsuccessful responses are unsuccessful' do
+        unsuccessful_responses.each { |r| cradlepoint_object.successful_response?(r).should be_false }
+      end
+    end
   end
 end

data/spec/net_device_spec.rb

@@ -16,11 +16,25 @@ describe Cradlepoint::NetDevice do
 
   context 'when authenticated' do
 
+    let(:router) { Cradlepoint::Router.new(ROUTER_ID) }
+
     before { login }
 
+    describe '.get_all_from_router_as_hash' do
+
+      let(:response) { net_device.new(nil, router).get_all_from_router_as_hash }
+
+      subject { response }
+      it { should be }
+
+      it 'should return a an array of hashes' do
+        response.is_a?(Array).should be_true
+        response.each { |h| h.is_a?(Hash).should be_true }
+      end
+    end
+
     describe '.get_all_from_router' do
 
-      let(:router)  { Cradlepoint::Router.new(ROUTER_ID) }
       let(:device)  { net_device.new(nil, router) }
       let(:devices) { device.get_all_from_router }
 

data/spec/router_spec.rb

@@ -69,14 +69,10 @@ describe Cradlepoint::Router do
 
       let(:the_router) { router.new(ROUTER_ID) }
 
-      it 'should have gotten the firmware data' do
-        pending 'Waiting for updates to the firmware on the API side.'
-        the_router.firmware_data['success'].should be_true
+      it 'should return nil when no firmware_uri exists' do
+        the_router.ecm_firmware_uri = nil
+        the_router.firmware_data.should be_nil
       end
     end
-
-    describe '.apply_new_config' do
-
-    end
   end
 end

data/spec/spec_helper.rb

@@ -32,4 +32,4 @@ def logout
   Cradlepoint.password = nil
 end
 
-include Cradlepoint::HashHelpers
+include Utils::HashHelpers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cradlepoint
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - uceem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -97,12 +98,12 @@ files:
 - lib/cradlepoint/account.rb
 - lib/cradlepoint/config.rb
 - lib/cradlepoint/cradlepoint_object.rb
-- lib/cradlepoint/hash_helpers.rb
 - lib/cradlepoint/net_device.rb
 - lib/cradlepoint/net_flow.rb
 - lib/cradlepoint/router.rb
 - lib/cradlepoint/version.rb
 - lib/cradlepoint/wlan_survey.rb
+- lib/utils/hash_helpers.rb
 - script/.gitkeep
 - spec/account_spec.rb
 - spec/config_spec.rb
@@ -132,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Cradlepoint ECM API gem