cosm-rb 0.1.00 → 0.1.01

data/cosm-rb.gemspec

@@ -17,11 +17,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  if defined?(JRUBY_VERSION)
-    s.add_dependency("json_pure")
-  else
-    s.add_dependency("yajl-ruby", ">=0.8.1")
-  end
+  s.add_dependency("multi_json", ">=1.3.6")
+  s.add_dependency("yajl-ruby", ">=1.1.0")
   s.add_dependency("nokogiri", ">=1.4.4")
   s.add_dependency("httparty", ">=0.8.3")
 

data/lib/cosm-rb.rb

@@ -1,9 +1,5 @@
 require 'nokogiri'
-if defined?(JRUBY_VERSION)
-  require 'json/pure'
-else
-  require 'yajl/json_gem'
-end
+require 'multi_json'
 
 $:.unshift(File.dirname(File.expand_path(__FILE__)))
 

data/lib/cosm-rb/datapoint.rb

@@ -57,7 +57,7 @@ module Cosm
     end
 
     def to_json(options = {})
-      ::JSON.generate as_json(options)
+      MultiJson.dump as_json(options)
     end
 
     def to_xml(options = {})

data/lib/cosm-rb/datastream.rb

@@ -110,7 +110,7 @@ module Cosm
     end
 
     def to_json(options = {})
-      ::JSON.generate as_json(options)
+      MultiJson.dump as_json(options)
     end
 
     def to_xml(options = {})

data/lib/cosm-rb/feed.rb

@@ -90,7 +90,7 @@ module Cosm
     end
 
     def to_json(options = {})
-      ::JSON.generate as_json(options)
+      MultiJson.dump as_json(options)
     end
 
     def to_xml(options = {})

data/lib/cosm-rb/key.rb

@@ -68,7 +68,7 @@ module Cosm
     end
 
     def to_json(options = nil)
-      ::JSON.generate as_json(options)
+      MultiJson.dump(as_json(options))
     end
 
     def permissions

data/lib/cosm-rb/parsers/json/datapoint_defaults.rb

@@ -4,8 +4,8 @@ module Cosm
       module DatapointDefaults
         def from_json(json)
           begin
-            ::JSON.parse(json)
-          rescue ::JSON::ParserError => e
+            MultiJson.load(json)
+          rescue MultiJson::DecodeError => e
             raise InvalidJSONError, e.message
           end
         end

data/lib/cosm-rb/parsers/json/datastream_defaults.rb

@@ -4,8 +4,8 @@ module Cosm
       module DatastreamDefaults
         def from_json(json)
           begin
-            hash = ::JSON.parse(json)
-          rescue ::JSON::ParserError => e
+            hash = MultiJson.load(json)
+          rescue MultiJson::DecodeError => e
             raise InvalidJSONError, e.message
           end
           raise InvalidJSONError, "JSON doesn't appear to be a hash" unless hash.is_a?(Hash)

data/lib/cosm-rb/parsers/json/feed_defaults.rb

@@ -8,8 +8,8 @@ module Cosm
 
         def from_json(json)
           begin
-            hash = ::JSON.parse(json)
-          rescue ::JSON::ParserError => e
+            hash = MultiJson.load(json)
+          rescue MultiJson::DecodeError => e
             raise InvalidJSONError, e.message
           end
           raise InvalidJSONError, "JSON doesn't appear to be a hash" unless hash.is_a?(Hash)

data/lib/cosm-rb/parsers/json/key_defaults.rb

@@ -4,8 +4,8 @@ module Cosm
       module KeyDefaults
         def from_json(json)
           begin
-            hash = ::JSON.parse(json)["key"]
-          rescue ::JSON::ParserError => e
+            hash = MultiJson.load(json)["key"]
+          rescue MultiJson::DecodeError => e
             raise InvalidJSONError, e.message
           end
           raise InvalidJSONError, "JSON doesn't appear to be a hash" unless hash.is_a?(Hash)

data/lib/cosm-rb/parsers/json/search_result_defaults.rb

@@ -6,8 +6,8 @@ module Cosm
 
         def from_json(json)
           begin
-            hash = ::JSON.parse(json)
-          rescue ::JSON::ParserError => e
+            hash = MultiJson.load(json)
+          rescue MultiJson::DecodeError => e
             raise InvalidJSONError, e.message
           end
           raise InvalidJSONError, "JSON doesn't appear to be a hash" unless hash.is_a?(Hash)

data/lib/cosm-rb/parsers/json/trigger_defaults.rb

@@ -4,8 +4,8 @@ module Cosm
       module TriggerDefaults
         def from_json(json)
           begin
-            ::JSON.parse(json)
-          rescue ::JSON::ParserError => e
+            MultiJson.load(json)
+          rescue MultiJson::DecodeError => e
             raise InvalidJSONError, e.message
           end
         end

data/lib/cosm-rb/search_result.rb

@@ -55,7 +55,7 @@ module Cosm
     end
 
     def to_json(options = {})
-      ::JSON.generate as_json(options)
+      MultiJson.dump as_json(options)
     end
 
     def to_xml(options = {})

data/lib/cosm-rb/trigger.rb

@@ -56,7 +56,7 @@ module Cosm
     end
 
     def to_json(options = {})
-      ::JSON.generate as_json(options)
+      MultiJson.dump as_json(options)
     end
 
 

data/lib/cosm-rb/version.rb

@@ -1,3 +1,3 @@
 module Cosm #:nodoc:
-  VERSION = '0.1.00'
+  VERSION = '0.1.01'
 end

data/spec/cosm-rb/datapoint_spec.rb

@@ -179,7 +179,7 @@ describe Cosm::Datapoint do
       datapoint_hash = {"id" => "env001", "value" => "2344"}
       datapoint = Cosm::Datapoint.new(datapoint_hash)
       datapoint.should_receive(:as_json).and_return({:awesome => "hash"})
-      ::JSON.should_receive(:generate).with({:awesome => "hash"})
+      MultiJson.should_receive(:dump).with({:awesome => "hash"})
       datapoint.to_json
     end
   end

data/spec/cosm-rb/datastream_spec.rb

@@ -336,7 +336,7 @@ describe Cosm::Datastream do
       datastream_hash = {"id" => "env001", "value" => "2344"}
       datastream = Cosm::Datastream.new(datastream_hash)
       datastream.should_receive(:as_json).and_return({:awesome => "hash"})
-      ::JSON.should_receive(:generate).with({:awesome => "hash"})
+      MultiJson.should_receive(:dump).with({:awesome => "hash"})
       datastream.to_json
     end
   end

data/spec/cosm-rb/feed_spec.rb

@@ -326,14 +326,14 @@ describe Cosm::Feed do
     it "should generate datastreams" do
       feed = Cosm::Feed.new(feed_as_('hash'))
       feed.datastreams = datastream_as_(:hash)
-      JSON.parse(feed.to_json)["datastreams"].should_not be_nil
+      MultiJson.load(feed.to_json)["datastreams"].should_not be_nil
     end
 
     it "should pass the output of #as_json to yajl" do
       feed_hash = {"title" => "Environment"}
       feed = Cosm::Feed.new(feed_hash)
       feed.should_receive(:as_json).and_return({:awesome => "hash"})
-      ::JSON.should_receive(:generate).with({:awesome => "hash"})
+      MultiJson.should_receive(:dump).with({:awesome => "hash"})
       feed.to_json
     end
   end

data/spec/cosm-rb/key_spec.rb

@@ -190,7 +190,7 @@ describe Cosm::Key do
     it "should pass the output of #as_json to yajl" do
       key = Cosm::Key.new(@key_hash)
       key.should_receive(:as_json).and_return({:awesome => "hash"})
-      ::JSON.should_receive(:generate).with({:awesome => "hash"})
+      MultiJson.should_receive(:dump).with({:awesome => "hash"})
       key.to_json
     end
   end

data/spec/cosm-rb/parsers/json/datapoint_defaults_spec.rb

@@ -8,7 +8,7 @@ describe "default datapoint json parser" do
   it "should convert into attributes hash" do
     @json = datapoint_as_(:json)
     attributes = @datapoint.from_json(@json)
-    json = JSON.parse(@json)
+    json = MultiJson.load(@json)
     attributes["at"].should == json["at"]
     attributes["value"].should == json["value"]
   end

data/spec/cosm-rb/parsers/json/datastream_defaults_spec.rb

@@ -10,7 +10,7 @@ describe "default datastream json parser" do
   it "should default to v2 if no version is present" do
     @json = datastream_as_(:json, :version => "1.0.0", :except => [:version])
     attributes = @datastream.from_json(@json)
-    json = JSON.parse(@json)
+    json = MultiJson.load(@json)
     attributes["id"].should == json["id"]
     attributes["updated"].should == json["at"]
     attributes["current_value"].should == json["current_value"]
@@ -40,7 +40,7 @@ describe "default datastream json parser" do
     it "should convert into attributes hash" do
       @json = datastream_as_(:json)
       attributes = @datastream.from_json(@json)
-      json = JSON.parse(@json)
+      json = MultiJson.load(@json)
       attributes["id"].should == json["id"]
       attributes["updated"].should == json["at"]
       attributes["current_value"].should == json["current_value"]
@@ -68,7 +68,7 @@ describe "default datastream json parser" do
     it "should capture timestamp" do
       @json = datastream_as_(:json, :version => "1.0.0-minimal_timestamp")
       attributes = @datastream.from_json(@json)
-      json = JSON.parse(@json)
+      json = MultiJson.load(@json)
       attributes["updated"].should_not be_nil
       attributes["updated"].should == json["at"]
     end
@@ -79,7 +79,7 @@ describe "default datastream json parser" do
     it "should convert into attributes hash" do
       @json = datastream_as_(:json, :version => "0.6-alpha")
       attributes = @datastream.from_json(@json)
-      json = JSON.parse(@json)
+      json = MultiJson.load(@json)
       attributes["id"].should == json["id"]
       attributes["updated"].should == json["values"].first["recorded_at"]
       attributes["current_value"].should == json["values"].first["value"]

data/spec/cosm-rb/parsers/json/trigger_defaults_spec.rb

@@ -8,7 +8,7 @@ describe "default trigger json parser" do
   it "should convert into attributes hash" do
     @json = trigger_as_(:json)
     attributes = @trigger.from_json(@json)
-    json = JSON.parse(@json)
+    json = MultiJson.load(@json)
     Cosm::Trigger::ALLOWED_KEYS.each do |key|
       attributes[key].should == json[key]
     end

data/spec/cosm-rb/search_result_spec.rb

@@ -240,14 +240,14 @@ describe Cosm::SearchResult do
     it "should generate feeds" do
       search_result = Cosm::SearchResult.new("results" => [feed_as_('hash')])
       search_result.results = feed_as_(:hash)
-      JSON.parse(search_result.to_json)["results"].should_not be_nil
+      MultiJson.load(search_result.to_json)["results"].should_not be_nil
     end
 
     it "should pass the output of #as_json to yajl" do
       search_result_hash = {"totalResults" => 100}
       search_result = Cosm::SearchResult.new(search_result_hash)
       search_result.should_receive(:as_json).and_return({:awesome => "hash"})
-      ::JSON.should_receive(:generate).with({:awesome => "hash"})
+      MultiJson.should_receive(:dump).with({:awesome => "hash"})
       search_result.to_json
     end
   end

data/spec/cosm-rb/trigger_spec.rb

@@ -148,7 +148,7 @@ describe Cosm::Trigger do
       trigger_hash = {"title" => "Environment"}
       trigger = Cosm::Trigger.new(trigger_hash)
       trigger.should_receive(:as_json).and_return({:awesome => "hash"})
-      ::JSON.should_receive(:generate).with({:awesome => "hash"})
+      MultiJson.should_receive(:dump).with({:awesome => "hash"})
       trigger.to_json
     end
   end

data/spec/support/datapoint_helper.rb

@@ -44,7 +44,7 @@ XML
   when 'hash'
     data
   when 'json'
-    data.to_json
+    MultiJson.dump(data)
   when 'xml'
     data
   else

data/spec/support/datastream_helper.rb

@@ -53,7 +53,7 @@ def datastream_as_(format, options = {})
   when 'hash'
     data
   when 'json'
-    data.to_json
+    MultiJson.dump(data)
   when 'xml'
     data
   when 'csv'

data/spec/support/feed_helper.rb

@@ -136,7 +136,7 @@ def feed_as_(format, options = {})
   when 'hash'
     data
   when 'json'
-    data.to_json
+    MultiJson.dump(data)
   when 'xml'
     data
   when 'csv'

data/spec/support/fully_represent_datastream_matcher.rb

@@ -75,7 +75,7 @@ RSpec::Matchers.define :fully_represent_datastream do |format, formatted_datastr
   end
 
   def match_json_datastream(datastream, formatted_datastream)
-    json = JSON.parse(formatted_datastream)
+    json = MultiJson.load(formatted_datastream)
     case json['version']
     when '1.0.0'
       raise "Not implemented"

data/spec/support/fully_represent_feed_matcher.rb

@@ -149,7 +149,7 @@ RSpec::Matchers.define :fully_represent_feed do |format, formatted_feed|
   end
 
   def match_json_feed(feed, formatted_feed)
-    json = JSON.parse(formatted_feed)
+    json = MultiJson.load(formatted_feed)
     case json['version']
     when '1.0.0'
       feed.title.should == json["title"]

data/spec/support/fully_represent_key_matcher.rb

@@ -47,7 +47,7 @@ RSpec::Matchers.define :fully_represent_key do |format, formatted_key|
   end
 
   def match_json_key(key, formatted_key)
-    json = JSON.parse(formatted_key)["key"]
+    json = MultiJson.load(formatted_key)["key"]
     key.id.should == json["id"]
     key.expires_at.should == json["expires_at"]
     key.key.should == json["api_key"]

data/spec/support/fully_represent_search_result_matcher.rb

@@ -12,7 +12,7 @@ RSpec::Matchers.define :fully_represent_search_result do |format, formatted_sear
   end
 
   def match_json_search_result(search_result, formatted_search_result)
-    json = JSON.parse(formatted_search_result)
+    json = MultiJson.load(formatted_search_result)
     search_result.totalResults.should == json['totalResults']
     search_result.startIndex.should == json['startIndex']
     search_result.itemsPerPage.should == json['itemsPerPage']

data/spec/support/key_helper.rb

@@ -64,7 +64,7 @@ XML
   when 'hash'
     data
   when 'json'
-    { "key" => data }.to_json
+    MultiJson.dump({ "key" => data })
   when 'xml'
     data
   else

data/spec/support/search_result_helper.rb

@@ -136,7 +136,7 @@ def search_result_as_(format, options = {})
   when 'hash'
     data
   when 'json'
-    data.to_json
+    MultiJson.dump(data)
   when 'xml'
     data
   else

data/spec/support/trigger_helper.rb

@@ -41,7 +41,7 @@ XML
   when 'hash'
     data
   when 'json'
-    data.to_json
+    MultiJson.dump(data)
   when 'xml'
     data
   else

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cosm-rb
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.00
+  - 1
+  version: 0.1.01
 platform: ruby
 authors: 
 - Paul Bellamy
@@ -17,29 +17,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-01 00:00:00 +00:00
+date: 2012-09-06 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  name: multi_json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 23
         segments: 
-        - 0
-        - 8
         - 1
-        version: 0.8.1
+        - 3
+        - 6
+        version: 1.3.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: yajl-ruby
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -51,11 +67,11 @@ dependencies:
         - 4
         version: 1.4.4
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: httparty
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -67,11 +83,11 @@ dependencies:
         - 3
         version: 0.8.3
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: fastercsv
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -83,11 +99,11 @@ dependencies:
         - x
         version: 1.5.x
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,11 +113,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,11 +129,11 @@ dependencies:
         - 9
         version: 0.9.9
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -129,11 +145,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -145,7 +161,7 @@ dependencies:
         - 0
         version: 2.6.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 description: A library for communicating with the Cosm REST API, parsing and rendering Cosm feed formats
 email: 
 - paul.a.bellamy@gmail.com