evernote-thrift 1.23.1 → 1.23.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 598f16341c7628bd4915e77fad2e712494079c53
+  data.tar.gz: 68e45345cd031e0312f0fcd2b5f5fb19085cd326
+SHA512:
+  metadata.gz: 4fbef81c02d170fce5b333d3c115e4054eced59c0f0c8f0ff42e9739dab74f434c79b8bff2b30bb52be535b7492cd1cf65435da5cc2fa86aa0b29fd8fbf22d0b
+  data.tar.gz: 97f7ee06c86d49a6a35dd273a65fb74c0d4bd1479e5494f1f2f0e1d69b87bad4a5733a6cf33bd06512ca99130dcfbc1661a828e9a315eff114a672ad70da2434

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/evernote-thrift.png)](http://badge.fury.io/rb/evernote-thrift)
+
 Evernote SDK for Ruby
 =====================
 

data/evernote-thrift.gemspec

@@ -6,7 +6,7 @@ require 'evernote-thrift'
 
 majorv = Evernote::EDAM::UserStore::EDAM_VERSION_MAJOR
 minorv = Evernote::EDAM::UserStore::EDAM_VERSION_MINOR
-rev = 1
+rev = 2
 version = Gem::Version.new("#{majorv}.#{minorv}.#{rev}").version
 
 Gem::Specification.new do |s|
@@ -25,4 +25,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{evernote-sdk-ruby}
   s.rubygems_version = version
   s.summary = %q{This SDK contains wrapper code used to call the Evernote Cloud API from Ruby.}
+
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'fakeweb', '~> 1.3.0'
 end

data/lib/thrift/protocol/json_protocol.rb

@@ -18,21 +18,6 @@
 # under the License.
 # 
 
-@@kJSONObjectStart = '{'
-@@kJSONObjectEnd = '}'
-@@kJSONArrayStart = '['
-@@kJSONArrayEnd = ']'
-@@kJSONNewline = '\n'
-@@kJSONElemSeparator = ','
-@@kJSONPairSeparator = ':'
-@@kJSONBackslash = '\\'
-@@kJSONStringDelimiter = '"'
-
-@@kThriftVersion1 = 1
-
-@@kThriftNan = "NaN"
-@@kThriftInfinity = "Infinity"
-@@kThriftNegativeInfinity = "-Infinity"
 
 module Thrift
   class LookaheadReader
@@ -66,6 +51,7 @@ module Thrift
   # implementations
   #
   class JSONContext
+    @@kJSONElemSeparator = ','
     #
     # Write context data to the trans. Default is to do nothing.
     #
@@ -89,6 +75,8 @@ module Thrift
 
   # Context class for object member key-value pairs
   class JSONPairContext < JSONContext
+    @@kJSONPairSeparator = ':'
+
     def initialize
       @first = true
       @colon = true
@@ -146,6 +134,21 @@ module Thrift
   end
 
   class JsonProtocol < BaseProtocol
+
+    @@kJSONObjectStart = '{'
+    @@kJSONObjectEnd = '}'
+    @@kJSONArrayStart = '['
+    @@kJSONArrayEnd = ']'
+    @@kJSONNewline = '\n'
+    @@kJSONBackslash = '\\'
+    @@kJSONStringDelimiter = '"'
+
+    @@kThriftVersion1 = 1
+
+    @@kThriftNan = "NaN"
+    @@kThriftInfinity = "Infinity"
+    @@kThriftNegativeInfinity = "-Infinity"
+
     def initialize(trans)
       super(trans)
       @context = JSONContext.new

data/lib/thrift/transport/http_client_transport.rb

@@ -29,6 +29,7 @@ module Thrift
     def initialize(url, proxy_addr = nil, proxy_port = nil)
       @url = URI url
       @headers = default_headers
+      @ssl_attributes = default_ssl_attributes
       @outbuf = Bytes.empty_byte_buffer
       @proxy_addr = proxy_addr
       @proxy_port = proxy_port
@@ -42,9 +43,18 @@ module Thrift
       @headers = @headers.merge(headers)
     end
 
+    # Add ssl attributes for underlying Net::HTTP instance.
+    #
+    # attributes - Hash of Symbols to values where keys correspond to ssl
+    #              attributes of Net::HTTP like ca_file, verify_mode, etc.
+    def add_ssl_attributes(attributes)
+      @ssl_attributes = @ssl_attributes.merge(attributes)
+    end
+
     def flush
       http = Net::HTTP.new @url.host, @url.port, @proxy_addr, @proxy_port
-      http.use_ssl = @url.scheme == "https"
+      apply_ssl_attributes(http) if @url.scheme == "https"
+
       resp = http.post(@url.request_uri, @outbuf, @headers)
       data = resp.body
       data = Bytes.force_binary_encoding(data)
@@ -53,11 +63,22 @@ module Thrift
     end
 
     private
+
     def default_headers
       sdk_version = "#{Evernote::EDAM::UserStore::EDAM_VERSION_MAJOR}.#{Evernote::EDAM::UserStore::EDAM_VERSION_MINOR}" rescue 'NA'
       {'Content-Type' => 'application/x-thrift',
         'User-Agent' => "Evernote SDK Ruby / #{sdk_version}; Ruby / #{RUBY_VERSION};"}
     end
 
+    def default_ssl_attributes
+      {:use_ssl => true,
+        :verify_mode => OpenSSL::SSL::VERIFY_PEER}
+    end
+
+    def apply_ssl_attributes(http)
+      @ssl_attributes.each do |k, v|
+        http.__send__("#{k}=", v)
+      end
+    end
   end
 end

metadata

@@ -1,16 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: evernote-thrift
 version: !ruby/object:Gem::Version
-  version: 1.23.1
-  prerelease: 
+  version: 1.23.2
 platform: ruby
 authors:
 - Evernote
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
-dependencies: []
+date: 2013-03-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: This SDK contains wrapper code used to call the Evernote Cloud API from
   Ruby.
 email: api@evernote.com
@@ -74,6 +101,7 @@ files:
 - lib/thrift.rb
 homepage: http://github.com/evernote/evernote-sdk-ruby
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --inline-source
@@ -81,21 +109,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: evernote-sdk-ruby
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This SDK contains wrapper code used to call the Evernote Cloud API from Ruby.
 test_files: []