freebox_api 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWU0Zjg4MjY4Yjk3ZTFkNGZkMjY1MmJmOTM2NzNhNTIwNTU1ZTI0Mg==
+  data.tar.gz: !binary |-
+    MzM3ODk1MWMwZjg0NzZiYmUzMWRiY2JjNDZlYmEyMGZlZTc4NDk1YQ==
+SHA512:
+  metadata.gz: !binary |-
+    ZWE3ZTk4ODZhYjMxNGEyOTMyOTM3ZjVlY2ZjZGZmMTAwMzUyMThlNTUzOGQz
+    M2QwYTdhMzQwZmNhZTUwNTcyZGJjNjlmZmMzNjg2OGVlZTExMTU3YzU1NWZj
+    OTFmOTY1NjU1OWU1NWZmOGI3ZGJhNDY1OTY5MTQxODY3M2ViZTg=
+  data.tar.gz: !binary |-
+    MGI5ZGViOGViYmYxMTZhZTIxYjk3NmExODZhYjQ4NGYyNTZjNjMyYWZkZTY2
+    MTQyMWZkZjRlM2E3NTdmMjgyOGRjZThmY2Y0NjY1OTc0MTA5NTgyYjBhZDYz
+    YzE4MjIyMzJhODY1ZGQ1NzlmZDBlMzc4ODA3ZTM2NTRjY2EwNDE=

data/lib/freebox_api/config.rb

@@ -3,6 +3,7 @@ module FreeboxApi
   class Config
 
     def initialize(session)
+      @session = session
     end
 
     def url(service)
@@ -21,11 +22,11 @@ module FreeboxApi
     end
 
     def show(service)
-      @session.http_call('get', url)
+      @session.http_call('get', url(service))
     end
 
     def update(service, params = {})
-      @session.http_call('put', url, params)
+      @session.http_call('put', url(service), params)
     end
 
   end

data/lib/freebox_api/freebox.rb

@@ -1,10 +1,13 @@
 require 'rest_client'
 require 'json'
+require 'logger'
 
 module FreeboxApi
 
   class Freebox < Hash
 
+    attr_reader :logger
+
     def initialize(hash = {})
       self[:freebox_ip] = hash[:freebox_ip] ? hash[:freebox_ip] : 'mafreebox.free.fr'
       self[:freebox_port] = hash[:freebox_port] ? hash[:freebox_port] : '80'
@@ -14,8 +17,17 @@ module FreeboxApi
       self[:api_version] = discover['api_version']
       self[:api_base_url] = discover['api_base_url']
       self[:device_type] = discover['device_type']
+      self.logger = nil
     end
 
+    def logger=(logger)
+      if logger.nil?
+        logger = Logger.new(STDOUT)
+        logger.level = Logger::WARN
+      end
+        @logger = logger
+      end
+
     def discover
       args = ['get']
       @discover ||= JSON.parse(@client['/api_version'].send(*args))
@@ -37,7 +49,7 @@ module FreeboxApi
       http_call('get', '/login/')['challenge']
     end
 
-    def http_call(http_method, path, params = {}, session = nil)
+    def http_call(http_method, path, params = nil, session = nil)
       headers = {}
 
       args = [http_method]
@@ -47,8 +59,22 @@ module FreeboxApi
         headers[:params] = params if params
       end
       headers[:'X_Fbx_App_Auth'] = session.session_token if session
+
+      logger.info "#{http_method.upcase} #{path}"
+      logger.debug "Params: #{params.inspect}"
+      logger.debug "Headers: #{headers.inspect}"
       args << headers if headers
-      JSON.parse(@client[build_url(path)].send(*args))['result']
+      process_data(@client[build_url(path)].send(*args))['result']
+    end
+
+    def process_data(response)
+      data = begin
+        JSON.parse(response.body)
+      rescue JSON::ParserError
+        response.body
+      end
+      logger.debug "Returned data: #{data.inspect}"
+      return data
     end
 
   end

data/lib/freebox_api/resources/static_lease.rb

@@ -9,7 +9,7 @@ module FreeboxApi
       end
 
       def index
-        @session.http_call('get', '/dhcp/static_lease/')
+        @session.http_call('get', '/dhcp/static_lease/') || []
       end
 
       def show(id)

data/lib/freebox_api/version.rb

@@ -1,3 +1,3 @@
 module FreeboxApi
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,61 +1,49 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: freebox_api
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.1.2
 platform: ruby
-authors: 
-- "Micka\xC3\xABl Can\xC3\xA9vet"
+authors:
+- Mickaël Canévet
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-09-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-09-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
 description: Helps you to use Freebox OS's API calls from your app
 email: mickael.canevet@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - LICENSE
 - README.md
@@ -74,37 +62,27 @@ files:
 - lib/freebox_api/session.rb
 - lib/freebox_api/version.rb
 homepage: http://github.com/mcanevet/freebox_api
-licenses: 
+licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby bindings for Freebox OS's rest API
 test_files: []
-