xively-rb 0.2.09 → 0.2.10

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p392

data/README.md

@@ -1,6 +1,4 @@
-[![Build Status](https://secure.travis-ci.org/xively/xively-rb.png)](http://travis-ci.org/xively/xively-rb)
-
-## Xively gem
+## xively-rb [![Gem Version](https://badge.fury.io/rb/xively-rb.png)](http://badge.fury.io/rb/xively-rb) [![Build Status](https://secure.travis-ci.org/xively/xively-rb.png)](http://travis-ci.org/xively/xively-rb) [![Code Climate](https://codeclimate.com/github/xively/xively-rb.png)](https://codeclimate.com/github/xively/xively-rb) [![Dependency Status](https://gemnasium.com/xively/xively-rb.png)](https://gemnasium.com/xively/xively-rb)
 
 Use this gem if you would like to convert between Xively data formats or represent Xively objects in Ruby.
 You can also interact with the Xively REST API using this gem.

data/lib/xively-rb.rb

@@ -25,6 +25,7 @@ require 'xively-rb/trigger'
 require 'xively-rb/key'
 require 'xively-rb/permission'
 require 'xively-rb/resource'
+require 'xively-rb/version'
 
 require 'xively-rb/client'
 

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

@@ -29,7 +29,8 @@ module Xively
           hash["created"] = hash["created"]
           hash["status"] = hash["status"]
           hash["tags"] = join_tags(hash["tags"])
-          hash["datastreams"] = hash["datastreams"].collect do |datastream|
+          raise InvalidJSONError, "\"datastreams\" must be an array" unless hash["datastreams"].nil? || hash["datastreams"].is_a?(Array)
+          hash["datastreams"] = [*hash["datastreams"]].collect do |datastream|
             unit_hash = {}
             if unit = datastream.delete('unit')
               unit_hash['unit_type'] = unit['type']

data/lib/xively-rb/version.rb

@@ -1,3 +1,3 @@
 module Xively #:nodoc:
-  VERSION = '0.2.09'
+  VERSION = '0.2.10'
 end

data/spec/xively-rb/parsers/json/feed_defaults_spec.rb

@@ -40,6 +40,13 @@ describe "default feed json parser" do
       feed.datastreams[0].unit_symbol.should == ""
       feed.datastreams[0].tags.should == ""
     end
+
+    it "should throw an error if datastreams is not an array" do
+      json = "{\"version\":\"1.0.0\",\"datastreams\":\"foobar\"}"
+      expect {
+        Xively::Feed.new(json)
+      }.should raise_error(Xively::Parsers::JSON::InvalidJSONError, "\"datastreams\" must be an array")
+    end
   end
 end
 

data/xively-rb.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/xively/xively-rb"
   s.summary     = "A library for communicating with the Xively REST API, parsing and rendering Xively feed formats"
   s.description = "A library for communicating with the Xively REST API, parsing and rendering Xively feed formats"
+  s.license     = "BSD 3-Clause License"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xively-rb
 version: !ruby/object:Gem::Version
-  version: 0.2.09
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -124,8 +124,8 @@ extra_rdoc_files:
 - CONTRIBUTING.md
 files:
 - .gitignore
-- .rbenv-version
 - .rspec
+- .ruby-version
 - .rvmrc
 - .travis.yml
 - CHANGELOG.md
@@ -247,7 +247,8 @@ files:
 - spec/xively-rb/trigger_spec.rb
 - xively-rb.gemspec
 homepage: http://github.com/xively/xively-rb
-licenses: []
+licenses:
+- BSD 3-Clause License
 post_install_message: 
 rdoc_options:
 - --main
@@ -260,12 +261,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4127591570389426511
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4127591570389426511
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -273,61 +280,4 @@ signing_key:
 specification_version: 3
 summary: A library for communicating with the Xively REST API, parsing and rendering
   Xively feed formats
-test_files:
-- spec/fixtures/models.rb
-- spec/spec_helper.rb
-- spec/support/contain_datapoint_eeml_matcher.rb
-- spec/support/contain_datastream_eeml_matcher.rb
-- spec/support/contain_feed_eeml_matcher.rb
-- spec/support/datapoint_helper.rb
-- spec/support/datastream_helper.rb
-- spec/support/describe_eeml_matcher.rb
-- spec/support/feed_helper.rb
-- spec/support/fully_represent_datapoint_matcher.rb
-- spec/support/fully_represent_datastream_matcher.rb
-- spec/support/fully_represent_feed_matcher.rb
-- spec/support/fully_represent_key_matcher.rb
-- spec/support/fully_represent_search_result_matcher.rb
-- spec/support/fully_represent_trigger_matcher.rb
-- spec/support/key_helper.rb
-- spec/support/search_result_helper.rb
-- spec/support/trigger_helper.rb
-- spec/xively-rb/array_extensions_spec.rb
-- spec/xively-rb/base/instance_methods_spec.rb
-- spec/xively-rb/base_spec.rb
-- spec/xively-rb/client_spec.rb
-- spec/xively-rb/datapoint_spec.rb
-- spec/xively-rb/datastream_spec.rb
-- spec/xively-rb/feed_spec.rb
-- spec/xively-rb/hash_extensions_spec.rb
-- spec/xively-rb/helpers_spec.rb
-- spec/xively-rb/key_spec.rb
-- spec/xively-rb/parsers/csv/datastream_defaults_spec.rb
-- spec/xively-rb/parsers/csv/feed_defaults_spec.rb
-- spec/xively-rb/parsers/json/datapoint_defaults_spec.rb
-- spec/xively-rb/parsers/json/datastream_defaults_spec.rb
-- spec/xively-rb/parsers/json/feed_defaults_spec.rb
-- spec/xively-rb/parsers/json/key_defaults_spec.rb
-- spec/xively-rb/parsers/json/search_result_defaults_spec.rb
-- spec/xively-rb/parsers/json/trigger_defaults_spec.rb
-- spec/xively-rb/parsers/xml/datapoint_defaults_spec.rb
-- spec/xively-rb/parsers/xml/datastream_defaults_spec.rb
-- spec/xively-rb/parsers/xml/feed_defaults_spec.rb
-- spec/xively-rb/parsers/xml/key_defaults_spec.rb
-- spec/xively-rb/parsers/xml/trigger_defaults_spec.rb
-- spec/xively-rb/search_result_spec.rb
-- spec/xively-rb/string_extensions_spec.rb
-- spec/xively-rb/templates/csv/datapoint_defaults_spec.rb
-- spec/xively-rb/templates/csv/datastream_defaults_spec.rb
-- spec/xively-rb/templates/csv/feed_defaults_spec.rb
-- spec/xively-rb/templates/json/datapoint_defaults_spec.rb
-- spec/xively-rb/templates/json/datastream_defaults_spec.rb
-- spec/xively-rb/templates/json/feed_defaults_spec.rb
-- spec/xively-rb/templates/json/key_defaults_spec.rb
-- spec/xively-rb/templates/json/search_result_defaults_spec.rb
-- spec/xively-rb/templates/json/trigger_defaults_spec.rb
-- spec/xively-rb/templates/xml/datapoint_defaults_spec.rb
-- spec/xively-rb/templates/xml/datastream_defaults_spec.rb
-- spec/xively-rb/templates/xml/feed_defaults_spec.rb
-- spec/xively-rb/templates/xml/search_result_defaults_spec.rb
-- spec/xively-rb/trigger_spec.rb
+test_files: []

data/.rbenv-version

@@ -1 +0,0 @@
-ruby-1.9.3-p392