eeml 0.0.41 → 0.0.42

data/lib/eeml.rb

@@ -16,6 +16,6 @@ require 'time'
 module Eeml
 
   # library version number
-  VERSION = '0.0.41'
+  VERSION = '0.0.42'
 
 end #module

data/lib/eeml/csv_parser_v2.rb

@@ -6,7 +6,7 @@ module Eeml
     def self.make_environment_from_csv(csv_content)
       csv = LightCsv.parse(strip_content(csv_content))
       environment = Environment.new(:csv_version => 'v2')
-
+      environment.private = nil
       csv = strip_content(csv)
 
       datastreams = csv.collect do |datastream|

data/lib/eeml/environment.rb

@@ -105,7 +105,7 @@ module Eeml
     attr_accessor :csv_version
     attr_accessor :datastreams
     attr_accessor :tags, :has_tag_element
-    attr_writer :private
+    attr_accessor :private
 
     # Create a new Environment object by passing parameters in a hash (just
     # like creating an ActiveRecord object)
@@ -186,14 +186,6 @@ module Eeml
       end
     end
 
-    def private
-      if @private
-        return true
-      else
-        return false
-      end
-    end
-
     private
 
     def self.detect_csv_version(version, csv)

data/lib/eeml/json_environment_parser_v100.rb

@@ -12,7 +12,7 @@ module Eeml
                             :icon => env_hash["icon"],
                             :status => env_hash["status"],
                             :identifier => env_hash["id"],
-                            :private => env_hash["private"].to_s == "true",
+                            :private => (env_hash["private"].nil? ? nil : env_hash["private"].to_s == "true"),
                             :publisher => env_hash["publisher"],
                             :creator => env_hash["creator"])
 

data/lib/eeml/libxml_eeml_parser_v051.rb

@@ -79,7 +79,8 @@ module Eeml
       env.status      = optional_content(env_node, 'x:status', 'status', "x:#{@@eeml_version[:href]}")
       env.email       = optional_content(env_node, 'x:email', 'email', "x:#{@@eeml_version[:href]}")
       env.icon        = optional_content(env_node, 'x:icon', 'icon', "x:#{@@eeml_version[:href]}")
-      env.private     = (optional_content(env_node, 'x:private', 'private', "x:#{@@eeml_version[:href]}") == "true")
+      private_elem = optional_content(env_node, 'x:private', 'private', "x:#{@@eeml_version[:href]}")
+      env.private     = (private_elem.nil? ? nil : private_elem == "true")
 
       #find_first_node_or_fail(env_node, 'x:location', 'location')
       loc_node = env_node.find_first('x:location', "x:#{@@eeml_version[:href]}")

data/test/data/doc_1_no_private_element.json

@@ -0,0 +1,30 @@
+{"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",
+"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":"1.0.0"}

data/test/data/doc_1_no_private_element.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eeml xmlns="http://www.eeml.org/xsd/0.5.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="0.5.1" xsi:schemaLocation="http://www.eeml.org/xsd/0.5.1 http://www.eeml.org/xsd/0.5.1/0.5.1.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>
+    <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/test_environment.rb

@@ -184,6 +184,21 @@ class TestEnvironment < Test::Unit::TestCase
     assert_equal false, env.private
   end
 
+  test "captures the `private` attribute as nil if the element is missing for xml" do
+    env = create_env_from_xml_file("doc_1_no_private_element.xml")
+    assert_equal nil, env.private
+  end
+
+  test "captures the `private` attribute as nil if the element is missing for json" do
+    env = create_env_from_json_file("doc_1_no_private_element.json")
+    assert_equal nil, env.private
+  end
+
+  test "captures the `private` attribute as nil if the element is missing for csv" do
+    env = Environment.new_from_csv("one,1\r\ntwo,2", :v2)
+    assert_equal nil, 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
@@ -487,7 +502,7 @@ class TestEnvironment < Test::Unit::TestCase
   end
 
   test "parses environment level tags from v1.0.0 json" do
-    env = create_env_from_json_file('test/data/environment_tags.json')
+    env = create_env_from_json_file('environment_tags.json')
     assert_equal 3, env.datastreams.size
 
     assert_equal 2, env.tags.size
@@ -527,7 +542,7 @@ class TestEnvironment < Test::Unit::TestCase
 
 
   test "sets has_tag_element to false if there are no tag elements" do
-    env = create_env_from_json_file('test/data/environment_no_tags.json')
+    env = create_env_from_json_file('environment_no_tags.json')
     assert_equal 3, env.datastreams.size
 
     assert_equal false, env.has_tag_element
@@ -537,7 +552,7 @@ class TestEnvironment < Test::Unit::TestCase
   end
 
   test "sets has_tag_element to true if there are empty tag elements" do
-    env = create_env_from_json_file('test/data/environment_empty_tags.json')
+    env = create_env_from_json_file('environment_empty_tags.json')
     assert_equal 3, env.datastreams.size
 
     assert_equal true, env.has_tag_element
@@ -622,30 +637,30 @@ class TestEnvironment < Test::Unit::TestCase
   end
 
   test "captures `private` attribute when parsing old json" do
-    env = create_env_from_json_file("test/data/doc_1_private.json")
+    env = create_env_from_json_file("doc_1_private.json")
     assert_not_nil env
     assert_equal true, env.private
   end
 
   test "captures the `private` attribute as false if present and false when parsing old json" do
-    env = create_env_from_json_file("test/data/doc_1_non_private.json")
+    env = create_env_from_json_file("doc_1_non_private.json")
     assert_equal false, 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")
+    env = create_env_from_json_file("doc_1_v6_private.json")
     assert_not_nil env
     assert_equal true, env.private
   end
 
   test "captures `private` attribute when parsing 1.0.0 json" do
-    env = create_env_from_json_file("test/data/doc_1_v1-0-0.json")
+    env = create_env_from_json_file("doc_1_v1-0-0.json")
     assert_not_nil env
     assert_equal false, env.private
   end
 
   test "captures the `private` attribute as false if present and false when parsing v6 json" do
-    env = create_env_from_json_file("test/data/doc_1_v6_non_private.json")
+    env = create_env_from_json_file("doc_1_v6_non_private.json")
     assert_not_nil env
     assert_equal false, env.private
   end
@@ -809,18 +824,19 @@ CSV
   end
 
   def create_env_from_json_file_one
-    return create_env_from_json_file('test/data/doc_1.json')
+    return create_env_from_json_file('doc_1.json')
   end
 
   def create_env_from_json_v6_file_one
-    return create_env_from_json_file('test/data/doc_1_v6.json')
+    return create_env_from_json_file('doc_1_v6.json')
   end
 
   def create_env_from_json_v100_file_one
-    return create_env_from_json_file('test/data/doc_1_v1-0-0.json')
+    return create_env_from_json_file('doc_1_v1-0-0.json')
   end
 
-  def create_env_from_json_file(filename)
+  def create_env_from_json_file(test_file)
+    filename = 'test/data/' + test_file
     json = File.read(filename)
     return Environment.new_from_json(json)
   end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: eeml
 version: !ruby/object:Gem::Version 
-  hash: 77
   prerelease: false
   segments: 
   - 0
   - 0
-  - 41
-  version: 0.0.41
+  - 42
+  version: 0.0.42
 platform: ruby
 authors: 
 - Neill Bogie
@@ -18,18 +17,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 +00:00
+date: 2011-06-01 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 1
         - 1
@@ -41,11 +38,9 @@ dependencies:
   name: yajl-ruby
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 61
         segments: 
         - 0
         - 8
@@ -57,11 +52,9 @@ dependencies:
   name: lightcsv
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
         - 2
@@ -79,7 +72,6 @@ extra_rdoc_files:
 - LICENSE
 - README
 files: 
-- .gitignore
 - CHANGELOG
 - LICENSE
 - Manifest
@@ -108,6 +100,8 @@ files:
 - test/data/difficult_tag.xml
 - test/data/doc_1.json
 - test/data/doc_1.xml
+- test/data/doc_1_no_private_element.json
+- test/data/doc_1_no_private_element.xml
 - test/data/doc_1_non_private.json
 - test/data/doc_1_non_private.xml
 - test/data/doc_1_private.json
@@ -143,40 +137,36 @@ homepage:
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simple little library for programmatically manipulating EEML documents.
 test_files: 
 - test/libxml_test_helper.rb
-- test/test_libxml_test_helper.rb
-- test/test_libxml_eeml_parser_v005.rb
-- test/test_csv_parser_v2.rb
-- test/test_helper.rb
 - test/test_csv_parser_v1.rb
+- test/test_csv_parser_v2.rb
 - test/test_environment.rb
+- test/test_helper.rb
+- test/test_libxml_eeml_parser_v005.rb
+- test/test_libxml_test_helper.rb

data/.gitignore

@@ -1,9 +0,0 @@
-.rvmrc
-pkg
-coverage/
-doc
-eeml.gemspec
-client_config.yml
-coverage/
-.*.swp
-gem_deps_manual/