eeml 0.0.13 → 0.0.14

data/.gitignore

@@ -0,0 +1,5 @@
+pkg
+doc
+eeml.gemspec
+client_config.yml
+

data/Rakefile

@@ -1,25 +1,33 @@
-require 'echoe'
+begin
+  require 'jeweler'
 
-$:.unshift(File.join(File.dirname(__FILE__), "lib"))
+  $:.unshift(File.join(File.dirname(__FILE__), "lib"))
 
-require 'eeml'
+  require 'eeml'
 
-Echoe.new("eeml") do |p|
-  p.author = "Neill Bogie, Sam Mulube"
-  p.email = "sam.mulube@gmail.com"
-  p.description = "Simple little library for programmatically manipulating EEML documents, in particular this library is designed to work with the Pachube web service."
-  p.summary = "Simple little library for programmatically manipulating EEML documents."
-  p.version = Eeml::VERSION
-  p.runtime_dependencies = [
-    "libxml-ruby >= 1.1.3",
-    "json >= 1.2.0"
-  ]
-  p.development_dependencies = [
-    "rake >= 0.8.4",
-    "mocha >= 0.9.6"
-  ] 
-  p.ignore_pattern = [ 
-  "test/data/real_xmls/v005/oks/*",
-  "test/data/real_xmls/v005/*"
-  ]
+  Jeweler::Tasks.new do |gem|
+    gem.name = "eeml"
+    gem.summary = "Simple little library for programmatically manipulating EEML documents."
+    gem.description = "Simple little library for programmatically manipulating EEML documents, in particular this library is designed to work with the Pachube web service."
+    gem.email = "sam.mulube@gmail.com"
+    gem.authors = ["Neill Bogie", "Sam Mulube"]
+    gem.version = Eeml::VERSION
+    gem.add_dependency("libxml-ruby", ">=1.1.3")
+    gem.add_dependency("json", ">=1.4.3")
+    gem.files.exclude("test/data/real_xmls/*")
+  end
+rescue LoadError
+  puts "Jeweler not available. Install with: gem install jeweler"
+end
+
+require 'rake/clean'
+require 'rake/testtask'
+
+CLEAN.include("pkg")
+CLOBBER.include("doc")
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/test*.rb']
+  t.verbose = true
 end

data/lib/eeml/environment.rb

@@ -100,6 +100,7 @@ module Eeml
     attr_accessor :title, :description, :feed_url, :website, :email, :icon, :status
     attr_accessor :location
     attr_accessor :datastreams
+    attr_writer :private
 
     # Create a new Environment object by passing parameters in a hash (just like creating an ActiveRecord object)
     def initialize(options = {})
@@ -113,6 +114,7 @@ module Eeml
       @website = options[:website]
       @email = options[:email]
       @icon = options[:icon]
+      @private = options[:private]
     end
 
     def add_datastream(datastream)
@@ -171,6 +173,14 @@ module Eeml
       outputter = OutputRegistry.get_json_output_for
       outputter.to_json(self)
     end
+
+    def private
+      if @private
+        return true
+      else
+        return false
+      end
+    end
     
   end
 

data/lib/eeml/json_environment_parser_v005.rb

@@ -11,7 +11,8 @@ module Eeml
                             :email => env_hash["email"],
                             :icon => env_hash["icon"],
                             :status => env_hash["status"],
-                            :identifier => env_hash["id"])
+                            :identifier => env_hash["id"],
+                            :private => env_hash["private"])
 
       env.updated = Time.gm(*ParseDate.parsedate(env_hash['updated'])) unless env_hash['updated'].nil?
 

data/lib/eeml/json_environment_parser_v006.rb

@@ -11,7 +11,8 @@ module Eeml
                             :email => env_hash["email"],
                             :icon => env_hash["icon"],
                             :status => env_hash["status"],
-                            :identifier => env_hash["id"])
+                            :identifier => env_hash["id"],
+                            :private => env_hash["private"])
 
       env.updated = Time.gm(*ParseDate.parsedate(env_hash['updated'])) unless env_hash['updated'].nil?
 

data/lib/eeml/libxml_eeml_parser_v005.rb

@@ -78,6 +78,7 @@ module Eeml
       env.status      = optional_content(env_node, 'x:status', 'status', "x:#{Constants::EEML5_HREF}")
       env.email       = optional_content(env_node, 'x:email', 'email', "x:#{Constants::EEML5_HREF}")
       env.icon        = optional_content(env_node, 'x:icon', 'icon', "x:#{Constants::EEML5_HREF}")
+      env.private     = optional_content(env_node, 'x:private', 'private', "x:#{Constants::EEML5_HREF}")
 
       #find_first_node_or_fail(env_node, 'x:location', 'location')
       loc_node = env_node.find_first('x:location', "x:#{Constants::EEML5_HREF}")

data/lib/eeml.rb

@@ -15,7 +15,7 @@ require 'time'
 module Eeml
 
   # library version number
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 
   # TODO: put in some configuration file, not here
   LOCAL_EEML_SCHEMA_LOCATION = 'schemas/eeml/005.xsd'

data/test/data/.gitignore

@@ -0,0 +1 @@
+real_xmls

data/test/data/doc_1_private.json

@@ -0,0 +1,31 @@
+{"datastreams":[
+  {"tags":["tagD0"],
+  "value":{"current_value":"0","min_value":"-9999.0","max_value":"1022.0"},
+  "unit":{"type":"basicSI","label":"Celsius","symbol":"C"},
+  "id":"0"},
+  {"value":{"current_value":"33","min_value":"0.0","max_value":"1023.0"},
+  "id":"1"},
+  {"tags":["tagD2a","tagD2b","tagD2c"],
+  "value":{"current_value":"42.1","min_value":"23.4","max_value":"1021.0"},
+  "id":"2"}
+],
+"description":"description here",
+"updated":"2009-02-11T10:56:56Z",
+"status":"frozen",
+"website":"http:\/\/example.com\/studio\/",
+"email":"someone@example.com",
+"feed":"http:\/\/example.com\/api\/1247.xml",
+"private":true,
+"location":{
+  "lat":"50.1",
+  "lon":"48.7",
+  "ele":"1.34",
+  "name":"Up on the roof (somewhere)",
+  "domain":"physical",
+  "exposure":"outdoor",
+  "disposition":"mobile"
+},
+"icon":"http:\/\/example.com\/some\/icon.gif",
+"id":"1247",
+"title":"title here",
+"version":"5"}

data/test/data/doc_1_private.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eeml xmlns="http://www.eeml.org/xsd/005" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5" xsi:schemaLocation="http://www.eeml.org/xsd/005 http://www.eeml.org/xsd/005/005.xsd">
+  <environment updated="2009-02-11T10:56:56Z" id="1247" creator="http://example.com/creator/">
+    <title>title here</title>
+    <feed>http://example.com/api/1247.xml</feed>
+    <status>frozen</status>
+    <description>description here</description>
+    <icon>http://example.com/some/icon.gif</icon>
+    <website>http://example.com/studio/</website>
+    <email>someone@example.com</email>
+    <private>true</private>
+    <location domain="physical" exposure="outdoor" disposition="mobile">
+      <name>Up on the roof (somewhere)</name>
+      <lat>50.1</lat>
+      <lon>48.7</lon>
+      <ele>1.34</ele>
+    </location>
+    <data id="0">
+      <tag>tagD0</tag>
+      <value minValue="-9999.0" maxValue="1022.0">0</value>
+      <unit type="basicSI" symbol="C">Celsius</unit>
+    </data>
+    <data id="1">
+      <value minValue="0.0" maxValue="1023.0">33</value>
+    </data>
+    <data id="2">
+      <tag>tagD2a</tag>
+      <tag>tagD2b</tag>
+      <tag>tagD2c</tag>
+      <value minValue="23.4" maxValue="1021.0">42.1</value>
+    </data>
+  </environment>
+</eeml>

data/test/data/doc_1_v6_private.json

@@ -0,0 +1,31 @@
+{"datastreams":[
+  {"tags":["tagD0"],
+  "values":[{"value":"0","min_value":"-9999.0","max_value":"1022.0","recorded_at":"2009-02-11T10:56:56Z"}],
+  "unit":{"type":"basicSI","label":"Celsius","symbol":"C"},
+  "id":"0"},
+  {"values":[{"value":"33","min_value":"0.0","max_value":"1023.0","recorded_at":"2009-02-11T10:56:55Z"}],
+  "id":"1"},
+  {"tags":["tagD2a","tagD2b","tagD2c"],
+  "values":[{"value":"42.1","min_value":"23.4","max_value":"1021.0","recorded_at":"2009-02-11T10:55:10Z"}],
+  "id":"2"}
+],
+"description":"description here",
+"updated":"2009-02-11T10:56:56Z",
+"status":"frozen",
+"website":"http:\/\/example.com\/studio\/",
+"email":"someone@example.com",
+"feed":"http:\/\/example.com\/api\/1247.xml",
+"private":true,
+"location":{
+  "lat":"50.1",
+  "lon":"48.7",
+  "ele":"1.34",
+  "name":"Up on the roof (somewhere)",
+  "domain":"physical",
+  "exposure":"outdoor",
+  "disposition":"mobile"
+},
+"icon":"http:\/\/example.com\/some\/icon.gif",
+"id":"1247",
+"title":"title here",
+"version":"0.6"}

data/test/test_environment.rb

@@ -175,6 +175,11 @@ class TestEnvironment < Test::Unit::TestCase
     assert_raise(MissingNamespace) {env = create_env_from_xml_file('no_namespace.xml')}
   end
 
+  test "captures the `private` attribute if present" do
+    env = create_env_from_xml_file("doc_1_private.xml")
+    assert_equal true, env.private
+  end
+
   test "ok parsing oddly tagged eeml file" do
     env = create_env_from_xml_file('difficult_tag.xml')
     assert_equal 2, env.datastreams.size
@@ -422,6 +427,18 @@ class TestEnvironment < Test::Unit::TestCase
     end
   end
 
+  test "captures `private` attribute when parsing old json" do
+    env = create_env_from_json_file("test/data/doc_1_private.json")
+    assert_not_nil env
+    assert_equal true, env.private
+  end
+
+  test "captures `private` attribute when parsing v6 json" do
+    env = create_env_from_json_file("test/data/doc_1_v6_private.json")
+    assert_not_nil env
+    assert_equal true, env.private
+  end
+
   # ---                 -------------------------------------------------------
   # --- csv input stuff -------------------------------------------------------
   # ---                 -------------------------------------------------------

metadata

@@ -1,90 +1,51 @@
 --- !ruby/object:Gem::Specification 
 name: eeml
 version: !ruby/object:Gem::Version 
-  version: 0.0.13
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
-- Neill Bogie, Sam Mulube
+- Neill Bogie
+- Sam Mulube
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMRMwEQYDVQQDDApzYW0u
-  bXVsdWJlMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZFgNj
-  b20wHhcNMDkwNDA5MDA0MTM0WhcNMTAwNDA5MDA0MTM0WjBBMRMwEQYDVQQDDApz
-  YW0ubXVsdWJlMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZ
-  FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7qguBvno2p114
-  XMkUimGvPqtxGW81Sopxc5IoJ5c5ViZW89kS3FedJPI9pjv9YbocJdI+A17cvLuU
-  IbUar078HEjN9/AverLva5h5+f9KyfDZWMXPer8IrGeY06TShrLQ6LRWYnYZmeZT
-  0+d0Ya0REPbZjUyF2lQeFiItrGjIKUgcC8XnBHEwleMBf0T/hEybZ+2vPvVZ8/r4
-  pxTRFEjHE1g88OvB5QYMl9s8BRC1IXCkxn+uyeSVcdPKl645pXex+3Nb5GPPwui+
-  emhIFir+B+9ksGWCR4KbeJXhQPDAV7/kY6uZU6skvX28A/PuORuD3oeXPqmJTov4
-  6ot4ISgFAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
-  BBTVpDuRBcyQlJXavgQUTw5t2EEoRzANBgkqhkiG9w0BAQUFAAOCAQEAAZWZw4wJ
-  URCduxVR7QOfJtILhEFf6lH/tGcIvszxQCBU3kq9xN6MSoWOsgDoYzPqLlnmGSci
-  JRZpjzDG7n6e9GlIxDnFaoDmNdSBJF4GPC4W9o18KLGxXCO7eA0Zva7AEZ5GggUA
-  VeQR8SPZ6szVtObb+oQB28+SPjtx/bbmWuKnOJoPVR0eivQxhOYxT0S1kNmKX8vA
-  IoGdiXT3hCwdqB9Het8z4rhhwDBww5eJXGTsA2ByRYpF6ywu1TO5lveUFonLasTx
-  AjeaOWNZqGH14rCvSOTC9/iVbn+dj1lwINrIHDI60NYOtijBDvNcw7YIigXcoTRp
-  yyRwZdVyDdsafg==
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2009-12-16 00:00:00 +00:00
+date: 2010-06-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    - - "="
-      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 3
         version: 1.1.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: json
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.2.0
-    version: 
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.8.4
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: json
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.6
-    version: 
+        segments: 
+        - 1
+        - 4
+        - 3
+        version: 1.4.3
+  type: :runtime
+  version_requirements: *id002
 description: Simple little library for programmatically manipulating EEML documents, in particular this library is designed to work with the Pachube web service.
 email: sam.mulube@gmail.com
 executables: []
@@ -92,23 +53,10 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- CHANGELOG
 - LICENSE
 - README
-- lib/blank.rb
-- lib/eeml.rb
-- lib/eeml/constants.rb
-- lib/eeml/csv_parser.rb
-- lib/eeml/environment.rb
-- lib/eeml/environment_builder.rb
-- lib/eeml/exceptions.rb
-- lib/eeml/json_environment_parser_v005.rb
-- lib/eeml/json_environment_parser_v006.rb
-- lib/eeml/json_output.rb
-- lib/eeml/libxml_eeml_output_v005.rb
-- lib/eeml/libxml_eeml_parser_v005.rb
-- lib/eeml/output_registry.rb
 files: 
+- .gitignore
 - CHANGELOG
 - LICENSE
 - Manifest
@@ -129,11 +77,15 @@ files:
 - lib/eeml/libxml_eeml_parser_v005.rb
 - lib/eeml/output_registry.rb
 - schemas/eeml/005.xsd
+- test/data/.gitignore
 - test/data/complete_namespaced.xml
 - test/data/difficult_tag.xml
 - test/data/doc_1.json
 - test/data/doc_1.xml
+- test/data/doc_1_private.json
+- test/data/doc_1_private.xml
 - test/data/doc_1_v6.json
+- test/data/doc_1_v6_private.json
 - test/data/doc_2.xml
 - test/data/doc_2_expected.json
 - test/data/list.xml
@@ -145,42 +97,39 @@ files:
 - test/test_helper.rb
 - test/test_libxml_eeml_parser_v005.rb
 - test/test_libxml_test_helper.rb
-- eeml.gemspec
 has_rdoc: true
-homepage: ""
+homepage: 
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Eeml
-- --main
-- README
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
-  version: 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
-rubyforge_project: eeml
-rubygems_version: 1.3.5
+rubyforge_project: 
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simple little library for programmatically manipulating EEML documents.
 test_files: 
 - test/test_environment.rb
 - test/test_libxml_test_helper.rb
+- test/libxml_test_helper.rb
 - test/test_libxml_eeml_parser_v005.rb
 - test/test_helper.rb

data/eeml.gemspec

@@ -1,45 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{eeml}
-  s.version = "0.0.13"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Neill Bogie, Sam Mulube"]
-  s.cert_chain = ["/home/sam/.gem/gem-public_cert.pem"]
-  s.date = %q{2009-12-16}
-  s.description = %q{Simple little library for programmatically manipulating EEML documents, in particular this library is designed to work with the Pachube web service.}
-  s.email = %q{sam.mulube@gmail.com}
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/blank.rb", "lib/eeml.rb", "lib/eeml/constants.rb", "lib/eeml/csv_parser.rb", "lib/eeml/environment.rb", "lib/eeml/environment_builder.rb", "lib/eeml/exceptions.rb", "lib/eeml/json_environment_parser_v005.rb", "lib/eeml/json_environment_parser_v006.rb", "lib/eeml/json_output.rb", "lib/eeml/libxml_eeml_output_v005.rb", "lib/eeml/libxml_eeml_parser_v005.rb", "lib/eeml/output_registry.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "example.rb", "lib/blank.rb", "lib/eeml.rb", "lib/eeml/constants.rb", "lib/eeml/csv_parser.rb", "lib/eeml/environment.rb", "lib/eeml/environment_builder.rb", "lib/eeml/exceptions.rb", "lib/eeml/json_environment_parser_v005.rb", "lib/eeml/json_environment_parser_v006.rb", "lib/eeml/json_output.rb", "lib/eeml/libxml_eeml_output_v005.rb", "lib/eeml/libxml_eeml_parser_v005.rb", "lib/eeml/output_registry.rb", "schemas/eeml/005.xsd", "test/data/complete_namespaced.xml", "test/data/difficult_tag.xml", "test/data/doc_1.json", "test/data/doc_1.xml", "test/data/doc_1_v6.json", "test/data/doc_2.xml", "test/data/doc_2_expected.json", "test/data/list.xml", "test/data/minimal.xml", "test/data/no_namespace.xml", "test/data/out_empty.xml", "test/libxml_test_helper.rb", "test/test_environment.rb", "test/test_helper.rb", "test/test_libxml_eeml_parser_v005.rb", "test/test_libxml_test_helper.rb", "eeml.gemspec"]
-  s.homepage = %q{}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Eeml", "--main", "README"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{eeml}
-  s.rubygems_version = %q{1.3.5}
-  s.signing_key = %q{/home/sam/.gem/gem-private_key.pem}
-  s.summary = %q{Simple little library for programmatically manipulating EEML documents.}
-  s.test_files = ["test/test_environment.rb", "test/test_libxml_test_helper.rb", "test/test_libxml_eeml_parser_v005.rb", "test/test_helper.rb"]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<libxml-ruby>, [">= 0", "= 1.1.3"])
-      s.add_runtime_dependency(%q<json>, [">= 0", "= 1.2.0"])
-      s.add_development_dependency(%q<rake>, [">= 0", "= 0.8.4"])
-      s.add_development_dependency(%q<mocha>, [">= 0", "= 0.9.6"])
-    else
-      s.add_dependency(%q<libxml-ruby>, [">= 0", "= 1.1.3"])
-      s.add_dependency(%q<json>, [">= 0", "= 1.2.0"])
-      s.add_dependency(%q<rake>, [">= 0", "= 0.8.4"])
-      s.add_dependency(%q<mocha>, [">= 0", "= 0.9.6"])
-    end
-  else
-    s.add_dependency(%q<libxml-ruby>, [">= 0", "= 1.1.3"])
-    s.add_dependency(%q<json>, [">= 0", "= 1.2.0"])
-    s.add_dependency(%q<rake>, [">= 0", "= 0.8.4"])
-    s.add_dependency(%q<mocha>, [">= 0", "= 0.9.6"])
-  end
-end

data.tar.gz.sig

@@ -1,3 +0,0 @@
-9���..RK�y��8�{M_�%i��~9E.\�u����C$�����WϨ����9���d0��H��&�t�?6�w\Һ%�n=�X�P�����0�%e�5;���C����X_@��jf��nӭz#��+�u��JL�Ԯ(�YJ=��2���w��g�=d\֑׃�Q�!'|��*ƪ9��C��g���lc�o�E�BX9)!m;B�:3
-�.d�S7�ƸB�Y
-�S�:y��G�.��2�:��e��أg'6��#�