rubyhaze 0.0.6-jruby → 0.0.7-jruby

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/rubyhaze/map.rb

@@ -34,19 +34,23 @@ class RubyHaze::Map
   end
 
   def keys(predicate = nil)
-    proxy_object.key_set(prepare_predicate(predicate)).map
+    predicate = prepare_predicate(predicate) unless predicate.is_a?(SqlPredicate)
+    proxy_object.key_set(predicate).map
   rescue NativeException => x
     rescue_native_exception x
   end
 
   def values(predicate = nil)
-    proxy_object.values(prepare_predicate(predicate)).map
+    predicate = prepare_predicate(predicate) unless predicate.is_a?(SqlPredicate)
+    proxy_object.values(predicate).map
   rescue NativeException => x
     rescue_native_exception x
   end
+  alias :find :values
 
   def local_keys(predicate = nil)
-    proxy_object.local_key_set(prepare_predicate(predicate)).map
+    predicate = prepare_predicate(predicate) unless predicate.is_a?(SqlPredicate)
+    proxy_object.local_key_set(predicate).map
   rescue NativeException => x
     rescue_native_exception x
   end
@@ -57,21 +61,26 @@ class RubyHaze::Map
       :created => lsm.creation_time, :last_accessed => lsm.last_access_time,  }
   end
 
-  private
-  
   def prepare_predicate(predicate)
     return if predicate.nil?
     case predicate
       when String
         SqlPredicate.new predicate
       when Hash
-        SqlPredicate.new predicate.map{|k,v| "#{k} = #{v}"}.join(' AND ')
-      when SqlPredicate
-        predicate
+        query = predicate.map do |field, value|
+          cmp = '='
+          if value.is_a?(String)
+            value = "'" + value + "'"
+            cmp = 'LIKE' if value.index('%')
+          end
+          "#{field} #{cmp} #{value}"
+        end.join(' AND ')
+        SqlPredicate.new query
       else
         raise "Unknown predicate type"
     end
   end
+
 end
 
 RubyHaze::Hash = RubyHaze::Map unless defined? RubyHaze::Hash

data/lib/rubyhaze/mixins/native_exception.rb

@@ -5,7 +5,7 @@ module RubyHaze
       def rescue_native_exception(exception)
         exception = exception.cause while exception.cause
         exception.print_stack_trace
-        raise RubyHaze::HazelcastException(exception)
+        raise RubyHaze::HazelcastException.new(exception)
       end
 
     end

data/test/helper.rb

@@ -1,4 +1,4 @@
-unless HELPER_LOADED
+unless defined?(HELPER_LOADED)
 
   require File.expand_path(File.dirname(__FILE__) + '/../lib/rubyhaze')
   require 'test/unit'
@@ -29,6 +29,10 @@ unless HELPER_LOADED
     end
   end
 
+  # Loading the Employee Java class
+  $CLASSPATH << File.expand_path(File.dirname(__FILE__)) + '/'
+  java_import 'Employee'
+
   # Finished loading helpers
   HELPER_LOADED = true
 

data/test/test_map.rb

@@ -0,0 +1,96 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+class TestRubyHazeHash < Test::Unit::TestCase
+
+  java_import 'com.hazelcast.query.SqlPredicate'
+
+  def test_same_object
+    hash = RubyHaze::Hash[:test_same_object]
+    map = RubyHaze::Map[:test_same_object]
+    assert_equal hash.name, map.name
+    hash[:a] = 1
+    assert_equal hash[:a], map[:a]
+  end
+
+  def test_string_keys
+    hash = RubyHaze::Map[:test_string_keys]
+
+    hash[:a] = 1
+    assert_equal hash['a'], 1
+    assert_equal hash[:a], 1
+
+    hash['b'] = 2
+    assert_equal hash[:b], 2
+
+    hash[Date.new(2010, 3, 18)] = 3
+    assert_equal hash['2010-03-18'], 3
+
+    hash[4] = 4
+    assert_equal hash['4'], 4
+    assert_equal hash[4], 4
+  end
+
+  def test_predicates
+    map = RubyHaze::Map[:test_predicates]
+
+    predicate = map.prepare_predicate "active = false AND (age = 45 OR name = 'Joe Mategna')"
+    assert_kind_of SqlPredicate, predicate
+    assert_equal "(active=false AND (age=45 OR name=Joe Mategna))", predicate.to_s
+
+    predicate = map.prepare_predicate :quantity => 3
+    assert_kind_of SqlPredicate, predicate
+    assert_equal 'quantity=3', predicate.to_s
+
+    predicate = map.prepare_predicate :country => "Unites States of America"
+    assert_kind_of SqlPredicate, predicate
+    assert_equal "country=Unites States of America", predicate.to_s
+  end
+
+  def test_search
+    map = RubyHaze::Map[:test_search]
+    map.clear
+
+    @a = Employee.new "Leonardo", 65, true, 1547.5
+    @b = Employee.new "Michelangelo", 45, false, 2835.75
+    @c = Employee.new "Marcos", 32, false, 0.0
+
+    map[:a] = @a
+    map[:b] = @b
+    map[:c] = @c
+
+    res = map.find :age => @b.age
+    assert_equal res.size, 1
+    assert_equal res.first.name, @b.name
+
+    res = map.find :name => @b.name
+    assert_equal res.size, 1
+    assert_equal res.first.name, @b.name
+
+    res = map.find 'salary > 2000.0'
+    assert_equal res.size, 1
+    assert_equal res.first.name, @b.name
+
+    res = map.find 'age BETWEEN 40 AND 50'
+    assert_equal res.size, 1
+    assert_equal res.first.name, @b.name
+
+    res = map.find "name LIKE 'Leo%'"
+    assert_equal res.size, 1
+    assert_equal res.first.name, @a.name
+
+    # Throws an internal exception
+#    res = map.find "age IN (32, 65)"
+#    assert_equal res.size, 2
+#    names = res.map{|x| x.name }.sort
+#    assert_equal names.first, @a.name
+#    assert_equal names.last, @b.name
+
+    res = map.find "age < 60 AND name LIKE 'M%'"
+    assert_equal res.size, 2
+    names = res.map{|x| x.name }.sort
+    assert_equal names.first, @c.name
+    assert_equal names.last, @b.name
+
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 6
-  version: 0.0.6
+    - 7
+  version: 0.0.7
 platform: jruby
 authors: 
   - Adrian Madrid
@@ -56,7 +56,7 @@ files:
   - lib/rubyhaze/set.rb
   - lib/rubyhaze/topic.rb
   - test/helper.rb
-  - test/test_hash.rb
+  - test/test_map.rb
   - test/test_queue.rb
   - test/test_topic.rb
 has_rdoc: true
@@ -90,6 +90,6 @@ signing_key:
 specification_version: 3
 summary: Hazelcast distributed objects in my JRuby
 test_files: 
-  - test/test_hash.rb
+  - test/test_map.rb
   - test/test_queue.rb
   - test/test_topic.rb

data/test/test_hash.rb

@@ -1,31 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
-
-class TestRubyHazeHash < Test::Unit::TestCase
-
-  def test_same_object
-    hash = RubyHaze::Hash[:test_same_object]
-    map = RubyHaze::Map[:test_same_object]
-    assert_equal hash.name, map.name
-    hash[:a] = 1
-    assert_equal hash[:a], map[:a]
-  end
-
-  def test_string_keys
-    hash = RubyHaze::Hash[:test_string_keys]
-
-    hash[:a] = 1
-    assert_equal hash['a'], 1
-    assert_equal hash[:a], 1
-
-    hash['b'] = 2
-    assert_equal hash[:b], 2
-
-    hash[Date.new(2010, 3, 18)] = 3
-    assert_equal hash['2010-03-18'], 3
-
-    hash[4] = 4
-    assert_equal hash['4'], 4
-    assert_equal hash[4], 4
-  end
-
-end