skydb 0.2.2 → 0.2.3

data/test/{query → unit/query}/selection_test.rb

@@ -141,12 +141,12 @@ class TestQuerySelection < MiniTest::Unit::TestCase
   end
 
   def test_max_codegen
-    @selection.fields = SkyDB::Query::Selection.parse_fields("min(foo) bar")
+    @selection.fields = SkyDB::Query::Selection.parse_fields("max(foo) bar")
     expected =
       <<-BLOCK.unindent
         function select(cursor, data)
           target = data
-          if(target.bar == nil or target.bar > cursor.event.foo()) then
+          if(target.bar == nil or target.bar < cursor.event.foo()) then
             target.bar = cursor.event.foo()
           end
         end

data/test/{query_test.rb → unit/query_test.rb}

@@ -64,12 +64,12 @@ class TestQuery < MiniTest::Unit::TestCase
   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
+    assert_equal 'foo', @query.selection.conditions[0].action.name
   end
 
   def test_after_with_hash
     @query.select('count()').after(:action => 'foo')
-    assert_equal 'foo', @query.conditions[0].action.name
+    assert_equal 'foo', @query.selection.conditions[0].action.name
   end
 
 
@@ -87,6 +87,7 @@ class TestQuery < MiniTest::Unit::TestCase
         end
         
         function __condition1(cursor, data)
+          if cursor:eos() or cursor:eof() then return false end
           repeat
             if cursor.event.action_id == 10 then
               cursor:next()
@@ -97,6 +98,7 @@ class TestQuery < MiniTest::Unit::TestCase
         end
         
         function __condition2(cursor, data)
+          if cursor:eos() or cursor:eof() then return false end
           repeat
             if cursor.event.action_id == 20 then
               cursor:next()
@@ -106,7 +108,7 @@ class TestQuery < MiniTest::Unit::TestCase
           return false
         end
         
-        function aggregate(cursor, data)
+        function select_all(cursor, data)
           while cursor:next_session() do
             while cursor:next() do
               if __condition1(cursor, data) and __condition2(cursor, data) then
@@ -121,12 +123,16 @@ class TestQuery < MiniTest::Unit::TestCase
           b = data
           a.count = (a.count or 0) + (b.count or 0)
         end
+
+        function aggregate(cursor, data)
+          select_all(cursor, data)
+        end
       BLOCK
     assert_equal expected.chomp, @query.codegen().chomp
   end
 
   def test_codegen_with_session
-    @query.select('count()').session(7200)
+    @query.session(7200).select('count()')
     expected =
       <<-BLOCK.unindent
         function select(cursor, data)
@@ -134,8 +140,8 @@ class TestQuery < MiniTest::Unit::TestCase
           target.count = (target.count or 0) + 1
         end
         
-        function aggregate(cursor, data)
-          cursor:set_session_idle(7200)
+
+        function select_all(cursor, data)
           while cursor:next_session() do
             while cursor:next() do
               if true then
@@ -150,7 +156,27 @@ class TestQuery < MiniTest::Unit::TestCase
           b = data
           a.count = (a.count or 0) + (b.count or 0)
         end
+
+        function aggregate(cursor, data)
+          cursor:set_session_idle(7200)
+          select_all(cursor, data)
+        end
       BLOCK
     assert_equal expected.chomp, @query.codegen().chomp
   end
+
+
+  ######################################
+  # Serialization
+  ######################################
+
+  def test_to_hash
+    @query.select('count()').group_by("action_id").on(:enter).after(:action => 10, :within => {:quantity => 1, :unit => 'step'}).after(20)
+    assert_equal IO.read("fixtures/unit/query/query.json"), JSON.pretty_generate(@query.to_hash)
+  end
+
+  def test_from_json
+    @query.from_hash(JSON.parse(IO.read("fixtures/unit/query/query.json")))
+    assert_equal IO.read("fixtures/unit/query/query.json"), JSON.pretty_generate(@query.to_hash)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skydb
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -91,6 +91,70 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.12
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: bzip2-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.7
+- !ruby/object:Gem::Dependency
+  name: apachelogregex
+  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
+- !ruby/object:Gem::Dependency
+  name: useragent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.16
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.16
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +211,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.0
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -155,6 +219,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: m
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 description: 
 email:
 - benbjohnson@yahoo.com
@@ -170,6 +266,7 @@ files:
 - lib/skydb/client.rb
 - lib/skydb/event.rb
 - lib/skydb/import/importer.rb
+- lib/skydb/import/transforms/apache.yml
 - lib/skydb/import/transforms/sky.yml
 - lib/skydb/import/transforms/snowplow.yml
 - lib/skydb/import/translator.rb
@@ -184,6 +281,7 @@ files:
 - lib/skydb/message/get_properties.rb
 - lib/skydb/message/get_property.rb
 - lib/skydb/message/get_table.rb
+- lib/skydb/message/get_tables.rb
 - lib/skydb/message/lookup.rb
 - lib/skydb/message/lua/aggregate.rb
 - lib/skydb/message/multi.rb
@@ -192,11 +290,13 @@ files:
 - lib/skydb/message.rb
 - lib/skydb/property/type.rb
 - lib/skydb/property.rb
-- lib/skydb/query/after.rb
+- lib/skydb/query/after_condition.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/condition.rb
+- lib/skydb/query/on_condition.rb
 - lib/skydb/query/selection.rb
 - lib/skydb/query/selection_field.rb
 - lib/skydb/query/selection_fields_grammar.treetop
@@ -211,31 +311,34 @@ files:
 - 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/integration/query_test.rb
 - test/test_helper.rb
+- test/unit/client_test.rb
+- test/unit/event_test.rb
+- test/unit/import/importer_test.rb
+- test/unit/import/translator_test.rb
+- test/unit/message/add_action_message_test.rb
+- test/unit/message/add_event_message_test.rb
+- test/unit/message/add_property_message_test.rb
+- test/unit/message/create_table_message_test.rb
+- test/unit/message/delete_table_message_test.rb
+- test/unit/message/get_action_message_test.rb
+- test/unit/message/get_actions_message_test.rb
+- test/unit/message/get_properties_message_test.rb
+- test/unit/message/get_property_message_test.rb
+- test/unit/message/get_table_message_test.rb
+- test/unit/message/get_tables_message_test.rb
+- test/unit/message/lookup_message_test.rb
+- test/unit/message/lua_aggregate_message_test.rb
+- test/unit/message/multi_message_test.rb
+- test/unit/message/next_action_message_test.rb
+- test/unit/message/ping_message_test.rb
+- test/unit/message_test.rb
+- test/unit/query/after_test.rb
+- test/unit/query/on_test.rb
+- test/unit/query/selection_test.rb
+- test/unit/query_test.rb
+- test/unit/skydb_test.rb
 - bin/sky
 homepage: http://github.com/skydb/sky.rb
 licenses: []
@@ -249,41 +352,50 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3253768369424236185
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3253768369424236185
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 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/integration/query_test.rb
 - test/test_helper.rb
+- test/unit/client_test.rb
+- test/unit/event_test.rb
+- test/unit/import/importer_test.rb
+- test/unit/import/translator_test.rb
+- test/unit/message/add_action_message_test.rb
+- test/unit/message/add_event_message_test.rb
+- test/unit/message/add_property_message_test.rb
+- test/unit/message/create_table_message_test.rb
+- test/unit/message/delete_table_message_test.rb
+- test/unit/message/get_action_message_test.rb
+- test/unit/message/get_actions_message_test.rb
+- test/unit/message/get_properties_message_test.rb
+- test/unit/message/get_property_message_test.rb
+- test/unit/message/get_table_message_test.rb
+- test/unit/message/get_tables_message_test.rb
+- test/unit/message/lookup_message_test.rb
+- test/unit/message/lua_aggregate_message_test.rb
+- test/unit/message/multi_message_test.rb
+- test/unit/message/next_action_message_test.rb
+- test/unit/message/ping_message_test.rb
+- test/unit/message_test.rb
+- test/unit/query/after_test.rb
+- test/unit/query/on_test.rb
+- test/unit/query/selection_test.rb
+- test/unit/query_test.rb
+- test/unit/skydb_test.rb

data/test/import/importer_test.rb

@@ -1,42 +0,0 @@
-require 'test_helper'
-
-class TestImporter < MiniTest::Unit::TestCase
-  def setup
-    @importer = SkyDB::Import::Importer.new()
-    @input  = {
-      'myString' => 'Hello',
-      'foo' => 100
-    }
-    @output = {}
-  end
-  
-
-  ######################################
-  # Transform File
-  ######################################
-
-  def test_load_simple_transform
-    @importer.load_transform(
-      <<-BLOCK.unindent
-      fields:
-        name: myString
-      BLOCK
-    )
-    
-    assert_equal "myString", @importer.translators.first.input_field
-    assert_equal "name", @importer.translators.first.output_field
-    assert_equal "string", @importer.translators.first.format
-  end
-
-  def test_load_simple_proc
-    @importer.load_transform(
-      <<-BLOCK.unindent
-      fields:
-        name: "{ output['foo'] * 10 }"
-      BLOCK
-    )
-    
-    assert_equal "name", @importer.translators.first.output_field
-    assert !@importer.translators.first.translate_function.nil?
-  end
-end