cs 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d677266003749366fcffe2d64d691c4428769be
-  data.tar.gz: d2848fca4408702e7247db0cbf8cd6ee146fcb28
+  metadata.gz: 65314f9bb5ad1ee8bb734e9a787ec6593b59c5ec
+  data.tar.gz: aa4f03d2c222473803addfe489038be17db58489
 SHA512:
-  metadata.gz: d8f2304107d5a3d125a590c69ba370592b36723c9f336a75cc62774be62a11e8ae0f227242e2eb6b71d0b00d1db4995be422c9ffa2e9885170f501b61e7322a6
-  data.tar.gz: 7a9cdf5cd49cc9afb08b9ba6cca9882ba1ed85b32ed62ff1d59157e9a68a6fa6543f2c5041cb4c5a5e26563c59c1a4f76495eaa3a46fc4ddf58337c7735cb36c
+  metadata.gz: 7eaf6550b00069705edb1c11dde22e3eda0ed839776881e1bb646a37817aa83c046adb163307bff80f7bf8f8699a08d27eb9071a60b0250114d0c2dc5c28e1ee
+  data.tar.gz: 139898e8a861b7ffe9b9659e6ed085105b3b6a9c1f9a9be54adc9c1f33bf10cc58e941037cca90f96edc3239edc56ed84bc6201424f21261e2df17a0b4836dc0

data/.travis.yml

@@ -1,9 +1,12 @@
 language: ruby
 rvm:
-  - 2.1.2
+  - 2.1.5
   - 2.0.0
   - 1.9.3
   - jruby-19mode
-  - rbx-2.2.1
-  - jruby-head
+  - rbx-2.2.10
+  - jruby
 script: bundle exec rspec spec
+addons:
+    code_climate:
+          repo_token: a4b19928b743eda49f7acaba02190126122bfa09bb2615395aa1820a7cce9fc0

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+## 0.2.0
+
+* forward http method and response inspection from client to session
+* fix logging

data/Gemfile

@@ -10,13 +10,14 @@ gem 'json'
 #
 
 platforms :rbx do
-  gem 'rubysl'
+#  gem 'rubysl'
 end
 
 group :test do
   gem "rake", "~> 10.1.0"
   gem "webmock", "~> 1.13.0"
   gem "rspec", "~> 2.14.1"
+  gem "codeclimate-test-reporter", require: nil
 end
 
 group :development do

data/README.md

@@ -4,6 +4,7 @@ Client library to communicate with CommonSense written in ruby
 [![Gem Version](https://badge.fury.io/rb/cs.svg)](http://badge.fury.io/rb/cs)
 [![Code Climate](https://codeclimate.com/github/senseobservationsystems/commonsense-ruby-lib.png)](https://codeclimate.com/github/senseobservationsystems/commonsense-ruby-lib)
 [![Build Status](https://travis-ci.org/senseobservationsystems/commonsense-ruby-lib.png?branch=master)](https://travis-ci.org/senseobservationsystems/commonsense-ruby-lib)
+[![Test Coverage](https://codeclimate.com/github/senseobservationsystems/commonsense-ruby-lib/badges/coverage.svg)](https://codeclimate.com/github/senseobservationsystems/commonsense-ruby-lib)
 
 RDoc [Documentation](http://rdoc.info/github/senseobservationsystems/commonsense-ruby-lib/frames)
 
@@ -108,9 +109,20 @@ data.save!
 sensor.data.build(date: Time.now, value: {"lux" => 1}).save!
 ```
 
+### Making manual API call
+
+With the client we could interact with CS API using the client object
+
+example
+
+```ruby
+client.get('/users/current.json')
+client.post('/sensors.json', {"params": "bar"})
+```
+
 ### Debuging
 
-To get information about the API response (body, code, headers) inspect the session
+To get information about the API response (body, code, headers) use this  method
 
 example
 
@@ -118,12 +130,9 @@ example
 # do some API call
 current_user = client.current_user
 
-# get the session
-session = client.session
-
-response_code = session.response_code
-response_body = session.resopnse_body
-header = session.response_headers
+response_code = client.response_code
+response_body = client.resopnse_body
+header = client.response_headers
 
 # dump the output to text file
 session.dump_to_text("/tmp/output.txt")

data/lib/cs.rb

@@ -50,8 +50,13 @@ module CS
   #     client.base_uri = 'https://api.dev.sense-os.nl'
   #
   class Client
+    extend Forwardable
+
     attr_accessor :session
-    attr_reader :logger
+
+    def_delegators :delegator, :get, :post, :put, :delete, :head,
+      :response_code, :response_body, :response_headers, :errors,
+      :dump_to_txt, :open_in_browser
 
     def initialize(opts={})
       options = {
@@ -74,6 +79,10 @@ module CS
       @session.logger = logger if @session
     end
 
+    def logger
+      @logger
+    end
+
     # Create a new session to CommonSense using username and plain text password
     # with `login!` it will throw exception if there is an error
     #
@@ -81,7 +90,7 @@ module CS
     #    client.login!('username', 'password')
     def login!(user, password, digest=true)
       @session = Session.new(base_uri: @base_uri)
-      @session.logger = logger
+      @session.logger = @logger
       @session.login(user, password, digest)
     end
 
@@ -100,7 +109,7 @@ module CS
     #    client.login('username', 'password')
     def oauth(consumer_key, consumer_secret, access_token, access_token_secret)
       @session = Session.new(base_uri: @base_uri)
-      @session.logger = logger
+      @session.logger = @logger
       @session.oauth(consumer_key, consumer_secret, access_token, access_token_secret)
     end
 
@@ -110,7 +119,7 @@ module CS
     #     client.session_id = '12345'
     def session_id=(session_id)
       @session = Session.new(base_uri: @base_uri)
-      @session.logger = logger
+      @session.logger = @logger
       @session.session_id = session_id
     end
 
@@ -176,10 +185,18 @@ module CS
     def errors
       return @session.errors if @session
     end
+
+    private
+    def delegator
+      raise Error::SessionEmptyError unless session
+      @session
+    end
   end
 
   def self.load_CLI
     require "cs/cli/cli"
   end
+
+
 end
 

data/lib/cs/auth/http.rb

@@ -101,6 +101,7 @@ module CS
         if digest
           password = Digest::MD5.hexdigest password
         end
+
         post('/login.json', {:username => username, :password => password})
 
         if @response_code == 200

data/lib/cs/session.rb

@@ -16,7 +16,14 @@ module CS
     def login(username, password, digest=true)
       @auth_proxy = CS::Auth::HTTP.new(@base_uri)
       @auth_proxy.logger = self.logger
-      @auth_proxy.login(username, password, digest)
+
+      start_time = Time.now
+      result = @auth_proxy.login(username, password, digest)
+      elapsed = (Time.now - start_time) * 1000.0
+      log_request("Logging in", "")
+      log_response(elapsed)
+
+      result
     end
 
     def oauth(consumer_key, consumer_secret, access_token, access_token_secret)
@@ -64,17 +71,20 @@ module CS
     end
 
     def log_request(type, path)
+      return if logger.nil?
+
       logger.info("")
-      logger.info("#{type} #{path}")
+      logger.info("#{type} #{base_uri}#{path}")
       logger.debug("headers: #{@auth_proxy.request_headers.inspect}")
       if ["POST", "PUT"].include?(type)
         logger.debug("request: #{@auth_proxy.request_body.inspect}")
       else
-        logger.info("request: #{@auth_proxy.request_body.inspect}")
+        logger.debug("request: #{@auth_proxy.request_body.inspect}")
       end
     end
 
     def log_response(elapsed)
+      return if logger.nil?
       logger.info("result: #{self.response_code} in #{elapsed}ms")
       logger.debug("response: #{self.response_body}")
     end
@@ -88,7 +98,7 @@ module CS
       end
 
       elapsed = (Time.now - start_time) * 1000.0
-      log_response(elapsed) if logger
+      log_response(elapsed)
 
       response
     end

data/lib/cs/version.rb

@@ -1,3 +1,3 @@
 module CS
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/spec/lib/cs/session_spec.rb

@@ -55,8 +55,10 @@ describe "session" do
         logger = double().as_null_object
         session.logger = logger
         logger.should_receive("info").with("").ordered
-        logger.should_receive("info").with("GET /users/current.json").ordered
+        logger.should_receive("info").with("GET http://api.dev.sense-os.local/users/current.json").ordered
         logger.should_receive("debug").with("headers: {\"Content-Type\"=>\"application/json\"}").ordered
+        logger.should_receive("debug").with("request: \"{\\\"username\\\":\\\"user1@tester.com\\\",\\\"password\\\":\\\"5f4dcc3b5aa765d61d8327deb882cf99\\\"}\""
+        ).ordered
         session.get('/users/current.json', '',{})
       end
     end

data/spec/lib/cs_spec.rb

@@ -80,6 +80,51 @@ module CS
         end
       end
 
+      describe "get" do
+        it 'shoudl delegate method to session' do
+        end
+      end
+
+      describe "post" do
+        it 'shoudl delegate method to session' do
+        end
+      end
+
+      describe "put" do
+        it 'shoudl delegate method to session' do
+        end
+      end
+
+      describe "delete" do
+        it 'shoudl delegate method to session' do
+        end
+      end
+
+      describe "head" do
+        it 'shoudl delegate method to session' do
+        end
+      end
+
+      describe "response_code" do
+        it 'shoudl delegate method to session' do
+        end
+      end
+
+      describe "response_body" do
+        it 'shoudl delegate method to session' do
+        end
+      end
+
+      describe "response_headers" do
+        it 'shoudl delegate method to session' do
+        end
+      end
+
+      describe "errors" do
+        it 'shoudl delegate method to session' do
+        end
+      end
+
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,24 @@
+#ENV['CODECLIMATE_REPO_TOKEN'] = "a4b19928b743eda49f7acaba02190126122bfa09bb2615395aa1820a7cce9fc0"
+# code climate
+if ENV['CODECLIMATE_REPO_TOKEN']
+  require "codeclimate-test-reporter"
+  CodeClimate::TestReporter.start
+end
+
 require 'bundler/setup'
 require 'rspec'
 require 'cs'
 require 'pry'
 
+
 Dir[File.join(File.dirname(__FILE__),("support/**/*.rb"))].each {|f| require f}
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
+
+  config.after(:suite) do
+      WebMock.disable_net_connect!(:allow => 'codeclimate.com')
+  end
 end
 
 def create_client

data/test.rb

@@ -0,0 +1,25 @@
+require 'logger'
+require 'pry'
+require 'cs'
+
+logger = Logger.new(STDOUT)
+logger.level = Logger::DEBUG
+cl1 = CS::Client.new
+cl1.logger = logger
+
+puts "loggin cl1"
+cl1.login!('ahmy+sf@sense-os.nl', 'sfpassword')
+puts "current_user cl1"
+cl1.current_user
+
+cl2 = CS::Client.new(base_uri: 'http://api.test.sense-os.nl')
+cl2.logger = logger
+puts "loggin cl2"
+cl2.login('a', 'a')
+puts "current_user cl2"
+cl2.current_user
+
+cl1.current_user
+puts "current_user cl1 again"
+
+binding.pry

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cs
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Ahmy Yulrizka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -78,6 +78,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -132,6 +133,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/spec_config.yml.sample
 - spec/support/vcr.rb
+- test.rb
 homepage: https://github.com/senseobservationsystems/commonsense-ruby-lib
 licenses: []
 metadata: {}