gnip_api 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0ae4c94718a2de90323b7511592b9d1320ef80e
-  data.tar.gz: f5b6ea9aee615af882e27555b4705774d7bbc206
+  metadata.gz: 81c81bf3548344605b9739f2cc6afb83e43d7b4f
+  data.tar.gz: 380d6266db0e255f64d75c3e6c667f9ff8b88ba5
 SHA512:
-  metadata.gz: 22b94334a96c94518ca52ae883ef98e04c98489ecbf5e6da4b70f6a70fb6017e982a97a395a32621e094f46dc3dfd017d5a00f8e4dc12bda3e8cc92ee3a814c1
-  data.tar.gz: 65205a747d6622d441960996fb597ebf79fb53adff213147ad4e225c1a948cd503d4cc865ccf1018d8cdcebf8f8c458a287beb602396ab376697a77646e7c967
+  metadata.gz: 106047db8629174c72855dc7062fc87ac98918f63c47116cb9379062ce0a45e1b4c679993f23b8f84e18d4cc2df149e3c1f1d861dff79db67ac10f34dea16a44
+  data.tar.gz: 4fe5240c6a90257b8950182285d33c8b4c65cd2f9c927a25070f4697548e7e27d98c1d575361a3e9a6389a7b99c5a4b472ccc17411900aff75949f612bb1a908

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    gnip_api (0.0.7)
+    gnip_api (0.0.8)
       activesupport
       addressable
       httparty
-      json
+      yajl-ruby
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.0)
+    activesupport (5.0.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -20,13 +20,11 @@ GEM
     coderay (1.1.0)
     concurrent-ruby (1.0.2)
     diff-lcs (1.2.5)
-    httparty (0.13.7)
-      json (~> 1.8)
+    httparty (0.14.0)
       multi_xml (>= 0.5.2)
     i18n (0.7.0)
-    json (1.8.3)
     method_source (0.8.2)
-    minitest (5.9.0)
+    minitest (5.9.1)
     multi_xml (0.5.5)
     pry (0.10.1)
       coderay (~> 1.1.0)
@@ -50,6 +48,7 @@ GEM
     timecop (0.7.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    yajl-ruby (1.2.1)
 
 PLATFORMS
   ruby
@@ -64,4 +63,4 @@ DEPENDENCIES
   timecop
 
 BUNDLED WITH
-   1.12.5
+   1.13.1

data/gnip_api.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop"
 
   spec.add_dependency "httparty"
-  spec.add_dependency "json"
+  spec.add_dependency "yajl-ruby"
   spec.add_dependency "activesupport"
   spec.add_dependency "addressable"
 end

data/lib/gnip_api.rb

@@ -1,3 +1,10 @@
+# External
+require 'httparty'
+require 'yajl'
+require 'logger'
+require 'addressable/uri'
+require 'uri'
+
 require "gnip_api/version"
 require "gnip_api/errors"
 require "gnip_api/configuration"
@@ -18,13 +25,8 @@ require "gnip_api/adapters/base_adapter"
 require "gnip_api/adapters/httparty_adapter"
 require "gnip_api/response"
 require "gnip_api/request"
+require "gnip_api/json_parser"
 
-# External
-require 'httparty'
-require 'json'
-require 'logger'
-require 'addressable/uri'
-require 'uri'
 
 module GnipApi
   class << self

data/lib/gnip_api/apis/power_track/rules.rb

@@ -51,7 +51,7 @@ module GnipApi
         end
 
         def parse_rules data
-          parsed_data = JSON.parse(data)
+          parsed_data = GnipApi::JsonParser.parse(data)
           parsed_data['rules'].map{|rule| GnipApi::Apis::PowerTrack::Rule.new(:value => rule['value'], :tag => rule['tag'])}
         end
 

data/lib/gnip_api/apis/power_track/stream.rb

@@ -48,8 +48,8 @@ module GnipApi
 
         def parse_json json
           begin 
-            JSON.parse json
-          rescue JSON::ParserError
+            GnipApi::JsonParser.parse json
+          rescue GnipApi::Errors::JsonParser::ParseError
             nil
           end
         end

data/lib/gnip_api/apis/search.rb

@@ -52,7 +52,7 @@ module GnipApi
       end
 
       def parse_counts_response data
-        parsed_data = JSON.parse(data)
+        parsed_data = GnipApi::JsonParser.parse(data)
         result_set = parsed_data['results']
         params = parsed_data['requestParameters']
         result = {:results => [], :total_count => parsed_data['totalCount'], :next => parsed_data['next'], :request_parameters => {}}
@@ -66,7 +66,7 @@ module GnipApi
       end
 
       def parse_activities_response data
-        parsed_data = JSON.parse(data)
+        parsed_data = GnipApi::JsonParser.parse(data)
         result_set = parsed_data['results']
         params = parsed_data['requestParameters']
         result = {:results => [], :next => parsed_data['next'], :request_parameters => {}}

data/lib/gnip_api/errors.rb

@@ -1,5 +1,10 @@
 module GnipApi
   module Errors
+    module JsonParser
+      class ParseError < StandardError
+      end
+    end
+
     module Adapter
       class RequestError < StandardError
         def initialize msg='Request failed'

data/lib/gnip_api/gnip/message.rb

@@ -29,7 +29,7 @@ module Gnip
     end
     
     def generate_json data
-      JSON.generate(data)
+      GnipApi::JsonParser.encode(data)
     end
 
     private

data/lib/gnip_api/gnip/system_message.rb

@@ -24,7 +24,7 @@ module Gnip
     end
     
     def to_json
-      parse_json(original_attributes)
+      generate_json(original_attributes)
     end
   end
 end

data/lib/gnip_api/json_parser.rb

@@ -0,0 +1,24 @@
+module GnipApi
+  class JsonParser
+    def self.parse data
+      begin
+        return parser.parse(data)
+      rescue Yajl::ParseError => error
+        raise GnipApi::Errors::JsonParser::ParseError.new("Yajl failed to parse: #{error.class} -- #{error.message}")
+      end
+    end
+
+    def self.encode data
+      return encoder.encode(data)
+    end
+    
+    private
+    def self.parser
+      Yajl::Parser.new
+    end
+
+    def self.encoder
+      Yajl::Encoder.new
+    end
+  end
+end

data/lib/gnip_api/response.rb

@@ -26,7 +26,7 @@ module GnipApi
 
     def error_message
       if @body && !@body.empty?
-        parsed = JSON.parse(@body)
+        parsed = GnipApi::JsonParser.parse(@body)
         return parsed['error']['message'] if parsed['error']
       end
       return nil

data/lib/gnip_api/version.rb

@@ -1,3 +1,3 @@
 module GnipApi
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/gnip_api/json_parser_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe GnipApi::JsonParser do
+  describe ".parse" do
+    it 'parses a JSON object' do
+      output = GnipApi::JsonParser.parse('{"key":"value","key2":"value2"}')
+      expect(output).to eq({'key' => 'value', 'key2' => 'value2'})
+    end
+  end
+
+  describe ".encode" do
+    it 'generates a JSON object' do
+      output = GnipApi::JsonParser.encode({:key => 'value', :key2 => 'value2'})
+      expect(output).to eq('{"key":"value","key2":"value2"}')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gnip_api
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Rayko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -185,6 +185,7 @@ files:
 - lib/gnip_api/gnip/message.rb
 - lib/gnip_api/gnip/system_message.rb
 - lib/gnip_api/gnip/url.rb
+- lib/gnip_api/json_parser.rb
 - lib/gnip_api/request.rb
 - lib/gnip_api/response.rb
 - lib/gnip_api/version.rb
@@ -226,6 +227,7 @@ files:
 - spec/gnip_api/gnip/activity_spec.rb
 - spec/gnip_api/gnip/gnip_data_spec.rb
 - spec/gnip_api/gnip/message_spec.rb
+- spec/gnip_api/json_parser_spec.rb
 - spec/gnip_api/request_spec.rb
 - spec/gnip_api/response_spec.rb
 - spec/lib/test_adapter.rb
@@ -294,6 +296,7 @@ test_files:
 - spec/gnip_api/gnip/activity_spec.rb
 - spec/gnip_api/gnip/gnip_data_spec.rb
 - spec/gnip_api/gnip/message_spec.rb
+- spec/gnip_api/json_parser_spec.rb
 - spec/gnip_api/request_spec.rb
 - spec/gnip_api/response_spec.rb
 - spec/lib/test_adapter.rb