cs 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63eed43cc77b773bac24f95586ee557c5f190faa
-  data.tar.gz: 00bb1526dd327a88d7a84a6eae2a22c5917278ed
+  metadata.gz: 5d677266003749366fcffe2d64d691c4428769be
+  data.tar.gz: d2848fca4408702e7247db0cbf8cd6ee146fcb28
 SHA512:
-  metadata.gz: 0642bc7c0e29c0d90eb0b776710fa26e902de07c23675ed6e818ea245266373fcba3762d7f1958403ebbb7e3ebd08909dede27f1118e02741b64b61e758bd028
-  data.tar.gz: eb8f5b6c67d4d3582fcf5df831f677ea4e897edfb99417136753c15e052db63d40d6e93c4e220ace15a2362597d1fa7eb540d9178352afb119b772d20cccadc2
+  metadata.gz: d8f2304107d5a3d125a590c69ba370592b36723c9f336a75cc62774be62a11e8ae0f227242e2eb6b71d0b00d1db4995be422c9ffa2e9885170f501b61e7322a6
+  data.tar.gz: 7a9cdf5cd49cc9afb08b9ba6cca9882ba1ed85b32ed62ff1d59157e9a68a6fa6543f2c5041cb4c5a5e26563c59c1a4f76495eaa3a46fc4ddf58337c7735cb36c

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 2.1.2
   - 2.0.0
   - 1.9.3
   - jruby-19mode

data/lib/cs.rb

@@ -62,6 +62,10 @@ module CS
 
     def base_uri=(uri)
       @base_uri = uri
+      unless session
+        @session = Session.new()
+      end
+
       session.base_uri = uri
     end
 

data/lib/cs/auth/http.rb

@@ -6,11 +6,11 @@ module CS
     class HTTP
       include HTTParty
 
-      attr_accessor :response_body, :response_code, :response_headers, :errors
+      attr_accessor :request_body, :request_headers, :response_body, :response_code, :response_headers, :errors, :logger, :base_uri
       attr_reader :session_id, :api_key
 
       def initialize(base_uri = nil, api_key = nil)
-        self.base_uri = base_uri
+        @base_uri = base_uri
         @api_key = api_key
         @session_id = nil
         reset
@@ -35,45 +35,47 @@ module CS
         path
       end
 
+      def process_path(path)
+        return base_uri + path
+      end
+
       def get(path, query={}, headers = {})
         execute do
-          headers = default_headers.merge(headers)
-          options = {query: query, headers: headers}
-          path = process_api_key(path)
+          @request_headers = default_headers.merge(headers)
+          options = {query: query, headers: @request_headers}
+          path = process_api_key(process_path(path))
           self.class.get(path, options)
         end
       end
 
       def post(path, body = '', headers = {})
         execute do
-          headers = default_headers.merge(headers)
-          self.class.post(path, prepare(body, headers))
+          self.class.post(process_path(path), prepare(body, headers))
         end
       end
 
       def put(path, body = '', headers = {})
         execute do
-          headers = default_headers.merge(headers)
-          self.class.put(path, prepare(body, headers))
+          self.class.put(process_path(path), prepare(body, headers))
         end
       end
 
       def delete(path, query={}, headers = {})
         execute do
-          headers = default_headers.merge(headers)
-          options = {query: query, headers: headers}
-          self.class.delete(path, options)
+          @request_headers = default_headers.merge(headers)
+          options = {query: query, headers: @request_headers}
+          self.class.delete(process_path(path), options)
         end
       end
 
       def head(path, headers = {})
         execute do
-          self.class.head(path, prepare(nil, headers))
+          self.class.head(process_path(path), prepare(nil, headers))
         end
       end
 
       def base_uri=(uri = nil)
-        self.class.base_uri uri
+        @base_uri = uri
       end
 
       def default_headers
@@ -116,6 +118,8 @@ module CS
         @errors = nil
         @response_code = nil
         @response_body = nil
+        @request_body = nil
+        @request_headers = nil
       end
 
       def parse_response
@@ -128,8 +132,10 @@ module CS
       end
 
       def prepare(body=nil, headers={})
-        headers = default_headers.merge(headers)
-        {:body => body.to_json, :headers => headers}
+        @request_headers = default_headers.merge(headers)
+        @request_body = body.to_json
+
+        {:body => @request_body, :headers => @request_headers}
       end
     end
   end

data/lib/cs/auth/oauth.rb

@@ -4,8 +4,8 @@ module CS
   module Auth
     class OAuth
 
-      attr_accessor :response_body, :response_code, :response_headers, :errors, :consumer_key,
-        :consumer_secret, :access_token, :access_token_secret
+      attr_accessor :request_body, :request_headers, :response_body, :response_code, :response_headers, :errors, :consumer_key,
+        :consumer_secret, :access_token, :access_token_secret, :logger
 
       def initialize(consumer_key, consumer_secret, access_token, access_token_secret, uri=nil)
         @consumer_key = consumer_key
@@ -31,36 +31,38 @@ module CS
       def get(path, query={}, headers = {})
         execute do
           path += '?' + URI.encode_www_form(query) unless query.empty?
-          headers = default_headers.merge(headers)
+          @request_headers = default_headers.merge(headers)
           oauth.get(path, headers)
         end
       end
 
       def post(path, body = '', headers = {})
         execute do
-          headers = default_headers.merge(headers)
-          oauth.post(path, body.to_json, headers)
+          @request_headers = default_headers.merge(headers)
+          @request_body = body.to_json
+          oauth.post(path, @request_body, headers)
         end
       end
 
       def put(path, body = '', headers = {})
         execute do
-          headers = default_headers.merge(headers)
-          oauth.put(path, body.to_json, headers)
+          @request_headers = default_headers.merge(headers)
+          @request_body = body.to_json
+          oauth.put(path, @request_body, headers)
         end
       end
 
       def delete(path, query={}, headers = {})
         execute do
           path += '?' + URI.encode_www_form(query) unless query.empty?
-          headers = default_headers.merge(headers)
+          @request_headers = default_headers.merge(headers)
           oauth.delete(path, headers)
         end
       end
 
       def head(path, headers = {})
         execute do
-          headers = default_headers.merge(headers)
+          @request_headers = default_headers.merge(headers)
           oauth.head(path, headers)
         end
       end

data/lib/cs/session.rb

@@ -15,6 +15,7 @@ module CS
     # @return [String] session_id
     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)
     end
 
@@ -22,6 +23,8 @@ module CS
       @auth_proxy = CS::Auth::OAuth.new(consumer_key, consumer_secret,
                                                  access_token, access_token_secret,
                                                  @base_uri)
+      @auth_proxy.logger = self.logger if @auth_proxy
+      @auth_proxy
     end
 
     def session_id
@@ -60,14 +63,14 @@ module CS
       end
     end
 
-    def log_request(type, path, body, headers)
+    def log_request(type, path)
       logger.info("")
       logger.info("#{type} #{path}")
-      logger.debug("headers: #{headers.inspect}")
+      logger.debug("headers: #{@auth_proxy.request_headers.inspect}")
       if ["POST", "PUT"].include?(type)
-        logger.debug("request: #{body.inspect}")
+        logger.debug("request: #{@auth_proxy.request_body.inspect}")
       else
-        logger.info("request: #{body.inspect}")
+        logger.info("request: #{@auth_proxy.request_body.inspect}")
       end
     end
 
@@ -78,8 +81,11 @@ module CS
 
     def execute(type, path, body, headers, &block)
       start_time = Time.now
-      log_request(type, path, body, headers) if logger
-      response = retry_on_509 { yield }
+      response = retry_on_509 do
+        value = yield
+        log_request(type, path) if logger
+        value
+      end
 
       elapsed = (Time.now - start_time) * 1000.0
       log_response(elapsed) if logger
@@ -135,7 +141,7 @@ module CS
 
     def base_uri=(uri = nil)
       @base_uri = uri
-      auth_proxy.base_uri = uri
+      auth_proxy.base_uri = uri if @auth_proxy
     end
 
     def dump_to_text(path)

data/lib/cs/version.rb

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

data/spec/lib/cs/session_spec.rb

@@ -56,7 +56,7 @@ describe "session" do
         session.logger = logger
         logger.should_receive("info").with("").ordered
         logger.should_receive("info").with("GET /users/current.json").ordered
-        logger.should_receive("debug").with("headers: {}").ordered
+        logger.should_receive("debug").with("headers: {\"Content-Type\"=>\"application/json\"}").ordered
         session.get('/users/current.json', '',{})
       end
     end
@@ -79,7 +79,7 @@ describe "session" do
       client = create_client
       client.api_key = '123456'
       CS::Auth::HTTP.should_receive(:get).
-        with("/sensors.json?API_KEY=123456",
+        with("http://api.dev.sense-os.local/sensors.json?API_KEY=123456",
              {:query=>{:page=>0, :per_page=>1000},
               :headers=>{"Content-Type"=>"application/json"}}
             )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cs
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Ahmy Yulrizka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy