eeml 0.0.35 → 0.0.36

data/lib/eeml/attr_alias.rb

@@ -0,0 +1,8 @@
+class Module
+  def attr_alias(new_attr, original)
+    alias_method(new_attr, original) if method_defined?(original)
+    new_writer = "#{new_attr}="
+    original_writer = "#{original}="
+    alias_method(new_writer, original_writer) if method_defined?(original_writer)
+  end
+end

data/lib/eeml/constants.rb

@@ -1,19 +1,7 @@
 module Eeml
   module Constants
-#    LOCAL_EEML5_SCHEMA_LOCATION = "schemas/eeml/005.xsd" # :nodoc:
-#    EEML5_HREF = "http://www.eeml.org/xsd/005"
-#    EEML5_VERSION = "5"
-#    EEML5_SCHEMA_LOCATION = "http://www.eeml.org/xsd/005 http://www.eeml.org/xsd/005/005.xsd"
-
-#    EEML5_NAMESPACE = ":#{EEML5_HREF}"
     XSI_NAMESPACE = "http://www.w3.org/2001/XMLSchema-instance"
 
-    # EEML6_VERSION = "0.6-alpha1"
-
-    # Not calling this EEML as json is not part of the eeml spec
-    # JSON_1_0_0_VERSION = "1.0.0"
-    
-    # EEML6_RC1_VERSION = "0.6-rc1"
     JSON_API = {}
     EEML = {}
 

data/lib/eeml/environment.rb

@@ -93,20 +93,11 @@ module Eeml
     end
   end
 
-  class Owner
-    attr_accessor :login, :url
-
-    def initialize(options = {})
-      @login = options[:login]
-      @url = options[:url]
-    end
-  end
-
   # This class represents the main point of entry to this library. In general we will be creating instances of this class, either
   # by manually specifying the parameters, or probably more commonly, by passing in either an EEML or JSON formatted string which
   # will be parsed to initialize the object.
   class Environment
-    attr_accessor :identifier, :updated, :creator
+    attr_accessor :identifier, :updated, :publisher
     attr_accessor :title, :description, :feed_url, :website, :email, :icon, :status
     attr_accessor :owner
     attr_accessor :location
@@ -114,12 +105,15 @@ module Eeml
     attr_accessor :datastreams
     attr_accessor :tags
     attr_writer :private
+    attr_accessor :owner
+
+    attr_alias :creator, :publisher
 
     # Create a new Environment object by passing parameters in a hash (just like creating an ActiveRecord object)
     def initialize(options = {})
       @datastreams = []
       @identifier = options[:identifier]
-      @creator = options[:creator]
+      @publisher = options[:publisher] || options[:creator]
       @title = options[:title]
       @status = options[:status]
       @feed_url = options[:feed_url]
@@ -129,6 +123,7 @@ module Eeml
       @icon = options[:icon]
       @private = options[:private]
       @csv_version = options[:csv_version]
+      @owner = options[:owner]
       @tags = []
     end
 

data/lib/eeml/json_environment_parser_v100.rb

@@ -12,14 +12,14 @@ 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"].to_s == "true",
+                            :publisher => env_hash["publisher"],
+                            :owner => env_hash["owner"])
 
       env.updated = Time.gm(*ParseDate.parsedate(env_hash['updated'])) unless env_hash['updated'].nil?
 
       env.tags = env_hash['tags'] unless env_hash['tags'].nil?
 
-      env.owner = buildOwner(env_hash)
-
       env.location = buildLocation(env_hash)
 
       env.add_datastreams(buildDatastreams(env_hash))
@@ -34,13 +34,6 @@ module Eeml
 
     private
 
-    def buildOwner(env_hash)
-      owner_hash = env_hash["owner"]
-      return if owner_hash.nil?
-      Owner.new(:login => owner_hash["login"],
-                :url => owner_hash["url"])
-    end
-
     def buildLocation(env_hash)
       location_hash = env_hash["location"]
       return if location_hash.nil?
@@ -89,5 +82,3 @@ module Eeml
     end
   end
 end
-
-

data/lib/eeml/libxml_eeml_parser_v005.rb

@@ -47,7 +47,6 @@ module Eeml
       #validation?
       # seems we have to recreate our XML::Schema object on each invocation
       # else libxml segfaults very quickly
-      #doc.validate_schema(XML::Schema.from_string(IO.read(LOCAL_EEML5_SCHEMA_LOCATION)))
       return doc
     end
 

data/lib/eeml/libxml_eeml_parser_v051.rb

@@ -47,7 +47,6 @@ module Eeml
       #validation?
       # seems we have to recreate our XML::Schema object on each invocation
       # else libxml segfaults very quickly
-      #doc.validate_schema(XML::Schema.from_string(IO.read(LOCAL_EEML5_SCHEMA_LOCATION)))
       return doc
     end
 

data/lib/eeml/libxml_eeml_parser_v052.rb

@@ -47,7 +47,6 @@ module Eeml
       #validation?
       # seems we have to recreate our XML::Schema object on each invocation
       # else libxml segfaults very quickly
-      #doc.validate_schema(XML::Schema.from_string(IO.read(LOCAL_EEML5_SCHEMA_LOCATION)))
       return doc
     end
 
@@ -69,7 +68,7 @@ module Eeml
       env.identifier = env_node['id']
       env.updated = Time.parse(env_node['updated']) if !env_node['updated'].nil?
       
-      env.creator = env_node['creator']
+      env.publisher = env_node['publisher']
 
       env.title       = optional_content(env_node, 'x:title', 'title', "x:#{@@eeml_version[:href]}")
       env.feed_url    = optional_content(env_node, 'x:feed', 'feed', "x:#{@@eeml_version[:href]}")
@@ -79,9 +78,7 @@ module Eeml
       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")
-
-      owner_node = env_node.find_first('x:owner', "x:#{@@eeml_version[:href]}")
-      env.owner = extractOwner(owner_node) if owner_node
+      env.owner       = optional_content(env_node, 'x:owner', 'owner', "x:#{@@eeml_version[:href]}") 
 
       #find_first_node_or_fail(env_node, 'x:location', 'location')
       loc_node = env_node.find_first('x:location', "x:#{@@eeml_version[:href]}")
@@ -98,18 +95,6 @@ module Eeml
       return env
     end
 
-    def extractOwner(node)
-      #<owner>
-      #  <login>bob</login>
-      #  <url>http://pachube.com/users/bob</url>
-      #</owner>
-      raise "given nil node" if node.nil?
-      owner = Owner.new
-      owner.login = optional_content(node, 'x:login', 'login', "x:#{@eeml_version[:href]}")
-      owner.url = optional_content(node, 'x:url', 'url', "x:#{@eeml_version[:href]}")
-      return owner
-    end
-
     def extractLocation(node)
       #<location domain="physical" exposure="outdoor" disposition="mobile">
       #  <lat>50.1</lat>

data/lib/eeml.rb

@@ -6,6 +6,7 @@ require 'blank'
 require 'libxml'
 require 'yajl/json_gem'
 require 'lightcsv'
+require 'eeml/attr_alias'
 require 'eeml/constants'
 require 'eeml/exceptions'
 require 'eeml/helpers'
@@ -16,9 +17,6 @@ require 'time'
 module Eeml
 
   # library version number
-  VERSION = '0.0.35'
-
-  # TODO: put in some configuration file, not here
-  LOCAL_EEML_SCHEMA_LOCATION = 'schemas/eeml/005.xsd'
+  VERSION = '0.0.36'
 
 end #module

data/test/data/doc_1_v1-0-0.json

@@ -38,4 +38,6 @@
 "id":"1247",
 "title":"title here",
 "private":"false",
+"publisher":"http://www.pachube.com",
+"owner":"http://www.pachube.com/users/joe",
 "version":"1.0.0"}

data/test/data/eeml_datastream_052.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eeml xmlns="http://www.eeml.org/xsd/0.5.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="0.5.2" xsi:schemaLocation="http://www.eeml.org/xsd/0.5.2 http://www.eeml.org/xsd/0.5.2/0.5.2.xsd">
+  <environment updated="2010-09-23T09:54:57.873029Z" publisher="http://www.pachube.com">
+    <title>title here</title>
+    <feed>http://appdev.loc:3000/api/feeds/.xml</feed>
+    <status>live</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>false</private>
+    <owner>http://www.pachube.com/users/joe</owner>
+    <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>
+      <current_value at="2010-09-23T09:54:57.873029Z">0</current_value>
+      <max_value>1022.0</max_value>
+      <min_value>-9999.0</min_value>
+      <unit type="basicSI" symbol="C">Celsius</unit>
+    </data>
+    <data id="1">
+      <current_value at="2010-09-23T09:54:57.873029Z">33</current_value>
+      <max_value>1023.0</max_value>
+      <min_value>0.0</min_value>
+    </data>
+    <data id="2">
+      <tag>tagD2a</tag>
+      <tag>tagD2b</tag>
+      <tag>tagD2c</tag>
+      <current_value at="2010-09-23T09:54:57.873029Z">42.1</current_value>
+      <max_value>1021.0</max_value>
+      <min_value>23.4</min_value>
+    </data>
+  </environment>
+</eeml>

data/test/data/environment_tags.json

@@ -38,4 +38,6 @@
 "id":"1247",
 "title":"title here",
 "version":"1.0.0",
+"owner":"http:\/\/www.pachube.com\/users\/joe",
+"publisher":"http:\/\/www.pachube.com",
 "tags":["tagE0", "tagE1"]}

data/test/test_environment.rb

@@ -36,13 +36,24 @@ class TestEnvironment < Test::Unit::TestCase
     assert_equal('http://example.com/creator/', env.creator)
   end
 
-  test "creating Env object from some 0.5.2 eeml" do
+  test "creating minimal Env object from some 0.5.2 eeml" do
     env = create_env_from_eeml_052
 
     # simple text nodes available
     assert_equal("Pachube Office environment", env.title)
   end
 
+  test "creating complete Env object from some 0.5.2 eeml" do
+    env = create_complete_env_from_eeml_052
+
+    # simple text nodes available
+    assert_equal("title here", env.title)
+
+    # new attributes
+    assert_equal("http://www.pachube.com", env.publisher)
+    assert_equal("http://www.pachube.com/users/joe", env.owner)
+  end
+
   test 'location parses ok' do
     env = create_env_from_xml_file_one
 
@@ -344,6 +355,7 @@ class TestEnvironment < Test::Unit::TestCase
     #env attrs
     assert_equal('1247', env.identifier)
     assert_equal('2009-02-11T10:56:56Z', env.updated.utc.iso8601)
+
   end
 
   test "location parses ok from json" do
@@ -427,6 +439,10 @@ class TestEnvironment < Test::Unit::TestCase
     #env attrs
     assert_equal('1247', env.identifier)
     assert_equal('2010-02-11T10:56:56Z', env.updated.utc.iso8601)
+
+    # new stuff
+    assert_equal("http://www.pachube.com", env.publisher)
+    assert_equal("http://www.pachube.com/users/joe", env.owner)
   end
 
   test "location parses ok from json when parsing a v1.0.0 file" do
@@ -775,4 +791,8 @@ CSV
   def create_env_from_eeml_052
     return create_env_from_xml_file("environment_minimal_052.xml")
   end
+
+  def create_complete_env_from_eeml_052
+    return create_env_from_xml_file("eeml_datastream_052.xml")
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eeml
 version: !ruby/object:Gem::Version 
-  hash: 89
+  hash: 87
   prerelease: false
   segments: 
   - 0
   - 0
-  - 35
-  version: 0.0.35
+  - 36
+  version: 0.0.36
 platform: ruby
 authors: 
 - Neill Bogie
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 +00:00
+date: 2011-02-28 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,6 +89,7 @@ files:
 - example.rb
 - lib/blank.rb
 - lib/eeml.rb
+- lib/eeml/attr_alias.rb
 - lib/eeml/constants.rb
 - lib/eeml/csv_parser_v1.rb
 - lib/eeml/csv_parser_v2.rb
@@ -121,6 +122,7 @@ files:
 - test/data/doc_2.xml
 - test/data/doc_2_expected.json
 - test/data/eeml_datastream_051.xml
+- test/data/eeml_datastream_052.xml
 - test/data/environment_minimal_051.xml
 - test/data/environment_minimal_052.xml
 - test/data/environment_tags.json