skydb 0.2.0 → 0.2.1

data/lib/skydb.rb

@@ -33,12 +33,12 @@ class SkyDB
   CLIENT_PASSTHROUGH = [
     :host, :host=, :port, :port=,
     :table, :table=,
-    :multi,
+    :multi, :ping,
     :add_event,
     :add_action, :get_action, :get_actions,
     :add_property, :get_property, :get_properties,
     :next_actions,
-    :map_reduce
+    :aggregate
   ]
   
   

data/lib/skydb/client.rb

@@ -121,15 +121,32 @@ class SkyDB
     end
 
 
+    ####################################
+    # Ping
+    ####################################
+
+    # Checks if the server is up and running.
+    #
+    # @returns [Boolean]  a flag stating if the server is running.
+    def ping(options={})
+      begin
+        send_message(SkyDB::Message::Ping.new(options))
+        return true
+      rescue
+        return false
+      end
+    end
+
+
     ####################################
     # Lua Messages
     ####################################
 
-    # Executes a Lua map/reduce job on the server and returns the results.
+    # Executes a Lua aggregation job on the server and returns the results.
     #
     # @param [String] source  the Lua source code to execute
-    def map_reduce(source, options={})
-      return send_message(SkyDB::Message::Lua::MapReduce.new(source, options))
+    def aggregate(source, options={})
+      return send_message(SkyDB::Message::Lua::Aggregate.new(source, options))
     end
 
 

data/lib/skydb/message.rb

@@ -60,10 +60,15 @@ class SkyDB
     # Validation
     ####################################
 
+    # A flag stating if the table is required for this type of message.
+    def require_table?
+      return true
+    end
+
     # Validates that the message is ready to be sent. If any validation issues
     # are found then an error is raised.
     def validate!
-      if table.nil? || table.empty?
+      if require_table? && (table.nil? || table.empty?)
         raise SkyDB::TableRequiredError.new('Table required')
       end
     end
@@ -129,6 +134,7 @@ require 'skydb/message/get_properties'
 require 'skydb/message/add_event'
 require 'skydb/message/next_actions'
 
-require 'skydb/message/lua/map_reduce'
+require 'skydb/message/lua/aggregate'
 
+require 'skydb/message/ping'
 require 'skydb/message/multi'

data/lib/skydb/message/lua/{map_reduce.rb → aggregate.rb}

@@ -1,18 +1,18 @@
 class SkyDB
   class Message
     class Lua
-      class MapReduce < SkyDB::Message
+      class Aggregate < SkyDB::Message
         ########################################################################
         #
         # Constructor
         #
         ########################################################################
 
-        # Initializes the 'lua::map_reduce' message.
+        # Initializes the 'lua::aggregate' message.
         #
         # @param [String] source  the Lua source to execute.
         def initialize(source=nil, options={})
-          super('lua::map_reduce')
+          super('lua::aggregate')
           self.source = source
         end
 

data/lib/skydb/message/ping.rb

@@ -0,0 +1,32 @@
+class SkyDB
+  class Message
+    class Ping < SkyDB::Message
+      ########################################################################
+      #
+      # Constructor
+      #
+      ########################################################################
+
+      # Initializes the 'ping' message.
+      def initialize(options={})
+        super('ping')
+      end
+
+
+      ########################################################################
+      #
+      # Methods
+      #
+      ########################################################################
+
+      ##################################
+      # Validation
+      ##################################
+
+      # A flag stating if the table is required for this type of message.
+      def require_table?
+        return false
+      end
+    end
+  end
+end

data/lib/skydb/version.rb

@@ -1,3 +1,3 @@
 class SkyDB
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/message/lua_aggregate_message_test.rb

@@ -0,0 +1,19 @@
+# encoding: binary
+require 'test_helper'
+
+class TestMessageLuaAggregate < MiniTest::Unit::TestCase
+  def setup
+    @message = SkyDB::Message::Lua::Aggregate.new()
+  end
+  
+  ######################################
+  # Encoding
+  ######################################
+
+  def test_encode
+    buffer = StringIO.new
+    @message.source = "function aggregate(cursor, data) return {} end"
+    @message.encode(buffer)
+    assert_bytes "\x93\x01\xaelua::aggregate\xa0\x81\xa6source\xda\x00\x2e" + "function aggregate(cursor, data) return {} end", buffer
+  end
+end

data/test/message/ping_message_test.rb

@@ -0,0 +1,18 @@
+# encoding: binary
+require 'test_helper'
+
+class TestMessagePing < MiniTest::Unit::TestCase
+  def setup
+    @message = SkyDB::Message::Ping.new()
+  end
+  
+  ######################################
+  # Encoding
+  ######################################
+
+  def test_encode
+    buffer = StringIO.new
+    @message.encode(buffer)
+    assert_bytes "\x93\x01\xa4ping\xa0", buffer
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skydb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -93,9 +93,10 @@ files:
 - lib/skydb/message/get_actions.rb
 - lib/skydb/message/get_properties.rb
 - lib/skydb/message/get_property.rb
-- lib/skydb/message/lua/map_reduce.rb
+- lib/skydb/message/lua/aggregate.rb
 - lib/skydb/message/multi.rb
 - lib/skydb/message/next_actions.rb
+- lib/skydb/message/ping.rb
 - lib/skydb/message.rb
 - lib/skydb/property/type.rb
 - lib/skydb/property.rb
@@ -112,9 +113,10 @@ files:
 - test/message/get_actions_message_test.rb
 - test/message/get_properties_message_test.rb
 - test/message/get_property_message_test.rb
-- test/message/lua_map_reduce_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/skydb_test.rb
 - test/test_helper.rb
@@ -130,18 +132,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 521903292973127112
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 521903292973127112
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -158,9 +154,10 @@ test_files:
 - test/message/get_actions_message_test.rb
 - test/message/get_properties_message_test.rb
 - test/message/get_property_message_test.rb
-- test/message/lua_map_reduce_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/skydb_test.rb
 - test/test_helper.rb

data/test/message/lua_map_reduce_message_test.rb

@@ -1,19 +0,0 @@
-# encoding: binary
-require 'test_helper'
-
-class TestMessageLuaMapReduce < MiniTest::Unit::TestCase
-  def setup
-    @message = SkyDB::Message::Lua::MapReduce.new()
-  end
-  
-  ######################################
-  # Encoding
-  ######################################
-
-  def test_encode
-    buffer = StringIO.new
-    @message.source = "function map(cursor) return {} end"
-    @message.encode(buffer)
-    assert_bytes "\x93\x01\xaflua::map_reduce\xa0\x81\xa6source\xda\x00\x22" + "function map(cursor) return {} end", buffer
-  end
-end