omf_oml 0.9.8 → 0.9.9

data/LICENSE.txt

@@ -0,0 +1,23 @@
+The MIT License (MIT)
+Copyright (c) 2013 National ICT Australia (NICTA)
+
+Permission is hereby granted, free of charge, to any person 
+obtaining a copy of this software and associated documentation 
+files (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge, 
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be 
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 
+OTHER DEALINGS IN THE SOFTWARE.
+

data/lib/omf_oml/csv_table.rb

@@ -1,4 +1,9 @@
-
+#-------------------------------------------------------------------------------
+# Copyright (c) 2013 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+#-------------------------------------------------------------------------------
 require 'csv'
 require 'omf_oml'
 require 'omf_oml/table'

data/lib/omf_oml/endpoint.rb

@@ -1,4 +1,9 @@
-
+#-------------------------------------------------------------------------------
+# Copyright (c) 2013 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+#-------------------------------------------------------------------------------
 require 'omf_base/lobject'
 require 'omf_oml'
 

data/lib/omf_oml/indexed_table.rb

@@ -1,4 +1,9 @@
-
+#-------------------------------------------------------------------------------
+# Copyright (c) 2013 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+#-------------------------------------------------------------------------------
 require 'monitor'
 
 require 'omf_oml'

data/lib/omf_oml/network.rb

@@ -1,3 +1,9 @@
+#-------------------------------------------------------------------------------
+# Copyright (c) 2013 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+#-------------------------------------------------------------------------------
 require 'monitor'
 require 'json'
 require 'set'

data/lib/omf_oml/oml_tuple.rb

@@ -1,4 +1,9 @@
-
+#-------------------------------------------------------------------------------
+# Copyright (c) 2013 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+#-------------------------------------------------------------------------------
 require 'omf_oml'
 require 'omf_oml/schema'
 require 'omf_oml/tuple'

data/lib/omf_oml/schema.rb

@@ -1,4 +1,9 @@
-
+#-------------------------------------------------------------------------------
+# Copyright (c) 2013 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+#-------------------------------------------------------------------------------
 require 'omf_base/lobject'
 require 'omf_oml'
 

data/lib/omf_oml/sequel/sequel_server.rb

@@ -1,3 +1,9 @@
+#-------------------------------------------------------------------------------
+# Copyright (c) 2013 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+#-------------------------------------------------------------------------------
 require 'rubygems'
 require 'rexml/document'
 require 'time'

data/lib/omf_oml/sql_row.rb

@@ -1,4 +1,9 @@
-
+#-------------------------------------------------------------------------------
+# Copyright (c) 2013 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+#-------------------------------------------------------------------------------
 require 'omf_oml/oml_tuple'
 require 'omf_oml/table'
 
@@ -154,9 +159,6 @@ module OMF::OML
       t
     end
 
-
-    protected
-
     def run(in_thread = true)
       return if @running
       if in_thread
@@ -232,29 +234,12 @@ if $0 == __FILE__
 
   require 'omf_oml/sql_source'
   db_file = File.join(File.dirname(__FILE__), '../../test/data/brooklynDemo.sq3')
-  ss = OMF::OML::OmlSqlSource.new('sqlite://' + File.absolute_path(db_file))
+  ss = OMF::OML::OmlSqlSource.new('sqlite://' + File.expand_path(db_file))
 
   r = ss.create_stream('wimaxmonitor_wimaxstatus')
-  puts r
-
-  exit
-
-  require 'omf_oml/table'
-  ep = OMF::OML::OmlSqlSource.new(File.join(File.dirname(__FILE__), '../../test/data/brooklynDemo.sq3'))
-  ep.on_new_stream() do |s|
-    puts ">>>>>>>>>>>> New stream #{s.stream_name}: #{s.names.join(', ')}"
-    case s.stream_name
-    when 'wimaxmonitor_wimaxstatus'
-      select = [:oml_ts_server, :sender_hostname, :frequency, :signal, :rssi, :cinr, :avg_tx_pw]
-    when 'GPSlogger_gps_data'
-      select = [:oml_ts_server, :oml_sender_id, :lat, :lon]
-    end
-
-    s.on_new_vector() do |v|
-      puts "New vector(#{s.stream_name}): #{v.select(*select).join('|')}"
-    end
-  end
-  ep.run()
+  r.run(false)
+  puts '=============='
+  puts r.row.inspect
 
 end
 

data/lib/omf_oml/sql_source.rb

@@ -1,4 +1,9 @@
-
+#-------------------------------------------------------------------------------
+# Copyright (c) 2013 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+#-------------------------------------------------------------------------------
 require 'sequel'
 
 require 'omf_base/lobject'
@@ -189,7 +194,7 @@ module OMF::OML
           unless type = cd[:type] || FALLBACK_MAPPING[cd[:db_type]]
             warn "Can't find ruby type for database type '#{cd[:db_type]}'"
           end
-          {name: col_name, type: type}
+          {:name => col_name, :type => type}
         end
         #puts "SCHEMA_DESCR>>>> #{schema_descr}"
         schema = OmlSchema.new(schema_descr)
@@ -199,9 +204,11 @@ module OMF::OML
     end
 
     def _def_query_for_table(table_name)
-      t = table_name
+      t = table_name.to_sym
       @db["SELECT _senders.name as oml_sender, a.* FROM #{t} AS a INNER JOIN _senders ON (_senders.id = a.oml_sender_id);"]
-    end
+      @db[t].select(:_senders__name___oml_sender).select_all(t).select_append(:_senders__name___oml_sender) \
+          .join('_senders'.to_sym, :id => :oml_sender_id)
+      end
   end
 
 
@@ -213,7 +220,7 @@ if $0 == __FILE__
 
   require 'omf_oml/table'
   db_file = File.join(File.dirname(__FILE__), '../../test/data/brooklynDemo.sq3')
-  ep = OMF::OML::OmlSqlSource.new('sqlite://' + File.absolute_path(db_file), limit: 10)
+  ep = OMF::OML::OmlSqlSource.new('sqlite://' + File.expand_path(db_file), :limit => 10)
 
   def on_new_stream(ep)
     ep.on_new_stream() do |s|
@@ -244,7 +251,7 @@ if $0 == __FILE__
   puts t.schema
 
   # Raw query on database
-  puts ep.dataset('GPSlogger_gps_data').select(:lat, :lon).limit(2).all
+  puts ep.dataset('GPSlogger_gps_data').select(:lat, :lon).limit(2).all.inspect
 
 end
 

data/lib/omf_oml/table.rb

@@ -1,4 +1,9 @@
-
+#-------------------------------------------------------------------------------
+# Copyright (c) 2013 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+#-------------------------------------------------------------------------------
 require 'monitor'
 
 require 'omf_base/lobject'

data/lib/omf_oml/tuple.rb

@@ -1,4 +1,9 @@
-
+#-------------------------------------------------------------------------------
+# Copyright (c) 2013 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+#-------------------------------------------------------------------------------
 require 'omf_base/lobject'
 require 'omf_oml'
 require 'omf_oml/schema'

data/lib/omf_oml/version.rb

@@ -1,6 +1,11 @@
-
+#-------------------------------------------------------------------------------
+# Copyright (c) 2013 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+#-------------------------------------------------------------------------------
 module OMF
   module OML
-    VERSION = '0.9.8'
+    VERSION = '0.9.9'
   end
-end
+end

data/lib/omf_oml.rb

@@ -1,4 +1,9 @@
-
+#-------------------------------------------------------------------------------
+# Copyright (c) 2013 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+#-------------------------------------------------------------------------------
 module OMF
   module OML; end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_oml
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_base
@@ -53,6 +53,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENSE.txt
 - Rakefile
 - lib/omf_oml.rb
 - lib/omf_oml/csv_table.rb