skydb 0.2.1 → 0.2.2

data/test/query_test.rb

@@ -0,0 +1,156 @@
+require 'test_helper'
+
+class TestQuery < MiniTest::Unit::TestCase
+  ##############################################################################
+  #
+  # Setup / Teardown
+  #
+  ##############################################################################
+
+  def setup
+    @query = SkyDB::Query.new()
+  end
+
+
+  ##############################################################################
+  #
+  # Tests
+  #
+  ##############################################################################
+
+  ######################################
+  # Select
+  ######################################
+
+  def test_select
+    @query.select('foo, bar')
+    assert_equal 'foo', @query.selection.fields[0].expression
+    assert_equal 'bar', @query.selection.fields[1].expression
+  end
+  
+  def test_select_array
+    @query.select('foo', 'bar')
+    assert_equal 'foo', @query.selection.fields[0].expression
+    assert_equal 'bar', @query.selection.fields[1].expression
+  end
+
+  def test_select_mixed
+    @query.select(:foo, :bar, 'baz, bat')
+    assert_equal 'foo', @query.selection.fields[0].expression
+    assert_equal 'bar', @query.selection.fields[1].expression
+    assert_equal 'baz', @query.selection.fields[2].expression
+    assert_equal 'bat', @query.selection.fields[3].expression
+  end
+  
+
+  ######################################
+  # Group by
+  ######################################
+
+  def test_group_by
+    @query.select(:foo, :bar).group_by('baz, bat', :xxx)
+    assert_equal 'foo', @query.selection.fields[0].expression
+    assert_equal 'bar', @query.selection.fields[1].expression
+    assert_equal 'baz', @query.selection.groups[0].expression
+    assert_equal 'bat', @query.selection.groups[1].expression
+    assert_equal 'xxx', @query.selection.groups[2].expression
+  end
+  
+  
+  ######################################
+  # After
+  ######################################
+
+  def test_after
+    @query.select('count()').after('foo')
+    assert_equal :count, @query.selection.fields[0].aggregation_type
+    assert_equal 'foo', @query.conditions[0].action.name
+  end
+
+  def test_after_with_hash
+    @query.select('count()').after(:action => 'foo')
+    assert_equal 'foo', @query.conditions[0].action.name
+  end
+
+
+  ######################################
+  # Codegen
+  ######################################
+
+  def test_codegen
+    @query.select('count()').after(10).after(20)
+    expected =
+      <<-BLOCK.unindent
+        function select(cursor, data)
+          target = data
+          target.count = (target.count or 0) + 1
+        end
+        
+        function __condition1(cursor, data)
+          repeat
+            if cursor.event.action_id == 10 then
+              cursor:next()
+              return true
+            end
+          until not cursor:next()
+          return false
+        end
+        
+        function __condition2(cursor, data)
+          repeat
+            if cursor.event.action_id == 20 then
+              cursor:next()
+              return true
+            end
+          until not cursor:next()
+          return false
+        end
+        
+        function aggregate(cursor, data)
+          while cursor:next_session() do
+            while cursor:next() do
+              if __condition1(cursor, data) and __condition2(cursor, data) then
+                select(cursor, data)
+              end
+            end
+          end
+        end
+
+        function merge(results, data)
+          a = results
+          b = data
+          a.count = (a.count or 0) + (b.count or 0)
+        end
+      BLOCK
+    assert_equal expected.chomp, @query.codegen().chomp
+  end
+
+  def test_codegen_with_session
+    @query.select('count()').session(7200)
+    expected =
+      <<-BLOCK.unindent
+        function select(cursor, data)
+          target = data
+          target.count = (target.count or 0) + 1
+        end
+        
+        function aggregate(cursor, data)
+          cursor:set_session_idle(7200)
+          while cursor:next_session() do
+            while cursor:next() do
+              if true then
+                select(cursor, data)
+              end
+            end
+          end
+        end
+
+        function merge(results, data)
+          a = results
+          b = data
+          a.count = (a.count or 0) + (b.count or 0)
+        end
+      BLOCK
+    assert_equal expected.chomp, @query.codegen().chomp
+  end
+end

data/test/test_helper.rb

@@ -1,6 +1,9 @@
+require 'bundler/setup'
 require 'minitest/autorun'
 require 'mocha'
+require 'unindentable'
 require 'skydb'
+require 'skydb/import'
 
 class MiniTest::Unit::TestCase
   def assert_bytes exp, act, msg = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skydb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -27,6 +27,70 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.7
+- !ruby/object:Gem::Dependency
+  name: commander
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.3
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: treetop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.12
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.12
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -75,24 +139,52 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.12.5
+- !ruby/object:Gem::Dependency
+  name: unindentable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: 
 email:
 - benbjohnson@yahoo.com
-executables: []
+executables:
+- sky
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/ext/hash.rb
 - lib/ext/string.rb
+- lib/ext/treetop.rb
 - lib/skydb/action.rb
 - lib/skydb/client.rb
 - lib/skydb/event.rb
+- lib/skydb/import/importer.rb
+- lib/skydb/import/transforms/sky.yml
+- lib/skydb/import/transforms/snowplow.yml
+- lib/skydb/import/translator.rb
+- lib/skydb/import.rb
 - lib/skydb/message/add_action.rb
 - lib/skydb/message/add_event.rb
 - lib/skydb/message/add_property.rb
+- lib/skydb/message/create_table.rb
+- lib/skydb/message/delete_table.rb
 - lib/skydb/message/get_action.rb
 - lib/skydb/message/get_actions.rb
 - lib/skydb/message/get_properties.rb
 - lib/skydb/message/get_property.rb
+- lib/skydb/message/get_table.rb
+- lib/skydb/message/lookup.rb
 - lib/skydb/message/lua/aggregate.rb
 - lib/skydb/message/multi.rb
 - lib/skydb/message/next_actions.rb
@@ -100,26 +192,51 @@ files:
 - lib/skydb/message.rb
 - lib/skydb/property/type.rb
 - lib/skydb/property.rb
+- lib/skydb/query/after.rb
+- lib/skydb/query/ast/selection_field_syntax_node.rb
+- lib/skydb/query/ast/selection_fields_syntax_node.rb
+- lib/skydb/query/ast/selection_group_syntax_node.rb
+- lib/skydb/query/ast/selection_groups_syntax_node.rb
+- lib/skydb/query/selection.rb
+- lib/skydb/query/selection_field.rb
+- lib/skydb/query/selection_fields_grammar.treetop
+- lib/skydb/query/selection_fields_parse_error.rb
+- lib/skydb/query/selection_group.rb
+- lib/skydb/query/selection_groups_grammar.treetop
+- lib/skydb/query/selection_groups_parse_error.rb
+- lib/skydb/query/validation_error.rb
+- lib/skydb/query.rb
+- lib/skydb/table.rb
 - lib/skydb/timestamp.rb
 - lib/skydb/version.rb
 - lib/skydb.rb
 - README.md
 - test/client_test.rb
 - test/event_test.rb
+- test/import/importer_test.rb
+- test/import/translator_test.rb
 - test/message/add_action_message_test.rb
 - test/message/add_event_message_test.rb
 - test/message/add_property_message_test.rb
+- test/message/create_table_message_test.rb
+- test/message/delete_table_message_test.rb
 - test/message/get_action_message_test.rb
 - test/message/get_actions_message_test.rb
 - test/message/get_properties_message_test.rb
 - test/message/get_property_message_test.rb
+- test/message/get_table_message_test.rb
+- test/message/lookup_message_test.rb
 - test/message/lua_aggregate_message_test.rb
 - test/message/multi_message_test.rb
 - test/message/next_action_message_test.rb
 - test/message/ping_message_test.rb
 - test/message_test.rb
+- test/query/after_test.rb
+- test/query/selection_test.rb
+- test/query_test.rb
 - test/skydb_test.rb
 - test/test_helper.rb
+- bin/sky
 homepage: http://github.com/skydb/sky.rb
 licenses: []
 post_install_message: 
@@ -147,17 +264,26 @@ summary: A Ruby client for the Sky database
 test_files:
 - test/client_test.rb
 - test/event_test.rb
+- test/import/importer_test.rb
+- test/import/translator_test.rb
 - test/message/add_action_message_test.rb
 - test/message/add_event_message_test.rb
 - test/message/add_property_message_test.rb
+- test/message/create_table_message_test.rb
+- test/message/delete_table_message_test.rb
 - test/message/get_action_message_test.rb
 - test/message/get_actions_message_test.rb
 - test/message/get_properties_message_test.rb
 - test/message/get_property_message_test.rb
+- test/message/get_table_message_test.rb
+- test/message/lookup_message_test.rb
 - test/message/lua_aggregate_message_test.rb
 - test/message/multi_message_test.rb
 - test/message/next_action_message_test.rb
 - test/message/ping_message_test.rb
 - test/message_test.rb
+- test/query/after_test.rb
+- test/query/selection_test.rb
+- test/query_test.rb
 - test/skydb_test.rb
 - test/test_helper.rb