gemfire-jruby 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/gemfire-jruby-demo/cache.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE cache PUBLIC '-//GemStone Systems, Inc.//GemFire Declarative Cache 6.0//EN' 'http://www.gemstone.com/dtd/cache6_0.dtd'>
 <cache>
 	<region name='default'>
-		<region-attributes>
+		<region-attributes data-policy="replicate">
 		</region-attributes>
 	</region>
 </cache>

data/gemfire-jruby-demo/my.properties

@@ -0,0 +1,2 @@
+locators=
+mcast-port=10339

data/gemfire-jruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gemfire-jruby}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alan McKean"]
-  s.date = %q{2010-01-27}
+  s.date = %q{2010-01-28}
   s.description = %q{"Uses Memcached API"}
   s.email = %q{alan.mckean@gemstone.com}
   s.extra_rdoc_files = [
@@ -45,7 +45,6 @@ Gem::Specification.new do |s|
      "doc/fr_method_index.html",
      "doc/index.html",
      "doc/rdoc-style.css",
-     "gemfire-jruby-0.0.1.gem",
      "gemfire-jruby-demo/README",
      "gemfire-jruby-demo/Rakefile",
      "gemfire-jruby-demo/app/controllers/application_controller.rb",
@@ -66,10 +65,10 @@ Gem::Specification.new do |s|
      "gemfire-jruby-demo/config/routes.rb",
      "gemfire-jruby-demo/db/seeds.rb",
      "gemfire-jruby-demo/doc/README_FOR_APP",
-     "gemfire-jruby-demo/log/development.log",
      "gemfire-jruby-demo/log/production.log",
      "gemfire-jruby-demo/log/server.log",
      "gemfire-jruby-demo/log/test.log",
+     "gemfire-jruby-demo/my.properties",
      "gemfire-jruby-demo/public/404.html",
      "gemfire-jruby-demo/public/422.html",
      "gemfire-jruby-demo/public/500.html",

data/lib/gemfire-jruby.rb

@@ -1,4 +1,4 @@
-require 'activesupport'
+require 'active_support'
 
 import java.lang.System
 import java.util.Properties
@@ -23,8 +23,8 @@ module ActiveSupport
     	#   For example, GemFire.getInstance('locators' => 'localhost[10355]', 'mcast-port' => '0')
     	# Since it is a Singleton, successive calls to GemFire.getInstance() will return the single
     	# instance that was instantiated by the first call.
-    	def GemFire.getInstance(hashOfGemFireProperties)
-      	self.instance ||= new(hashOfGemFireProperties={})
+    	def GemFire.getInstance(hashOfGemFireProperties={})
+      	self.instance ||= new(hashOfGemFireProperties)
       end
 
       def initialize(hashOfGemFireProperties)
@@ -37,7 +37,6 @@ module ActiveSupport
       	@region = cache.getRegion(System.getProperty("cachingRegionName") || "default")
       rescue CacheException => e
           logger.error("GemfireCache Creation Error (#{e}): #{e.message}")
-          false
     	end
 
       # Read a value from the GemFire cache. _key_ can be any JRuby object. Returns the value stored at _key_.
@@ -46,17 +45,14 @@ module ActiveSupport
         @region.get(key)
       rescue CacheException => e
           logger.error("GemfireCache Error (#{e}): #{e.message}")
-          false
       end
 
       # Write a value to the GemFire cache. _key_ is used to read the value from the cache and can be any JRuby object. Returns the value that was stored at _key_.
       def write(key, value)
         super
         @region.put(key, value)
-        true
       rescue CacheException => e
         logger.error("GemfireCache Error (#{e}): #{e.message}")
-        false
       end
 
       # Delete the entry stored in the GemFire cache at _key_. _key_ can be any JRuby object. Returns the value that was deleted.
@@ -65,7 +61,6 @@ module ActiveSupport
         @region.destroy(key)
       rescue CacheException => e
         logger.error("GemfireCache Error (#{e}): #{e.message}")
-        false
       end
 
       # Fetch all of the keys currently in the GemFire cache. Returns a JRuby Array of JRuby objects.
@@ -75,18 +70,18 @@ module ActiveSupport
 
       # Check if there is an entry accessible by _key_ in the GemFire cache. Returns a boolean.
       def exist?(key)
-        super
-        @region.containsKeyOnServer(key)
+        if @region.getAttributes.getPoolName then
+          @region.containsKey(key)
+        else
+          @region.containsKeyOnServer(key)
+        end
       end
 
       # Delete all entries (key=>value pairs) from the GemFire cache. Returns a JRuby Hash.
       def clear
-        super
         @region.clear
-        true
       rescue CacheException => e
         logger.error("GemfireCache Error (#{e}): #{e.message}")
-        false
       end
 
       # Not implemented by GemFire. Raises an exception when called.
@@ -103,6 +98,32 @@ module ActiveSupport
       def delete_matched(matcher)
         raise "Not supported by Gemfire"
       end
+      
+      def toList(selectResults)
+      	results = []
+      	iterator = selectResults.iterator
+      	while(iterator.hasNext) {
+      		results << iterator.next
+      	end
+      	results	
+      end
+
+      def selectResults?(javaObject)
+        found = false
+        javaObject.getClass.getInterfaces.each { |i|
+          if (i.to_s == 'interface com.gemstone.gemfire.cache.query.SelectResults') then
+              found = true
+          end
+        }
+        found
+      end
+
+      def query(queryString)
+        queryService = @region.getAttributes.getPoolName ? pool.getQueryService : cache.getQueryService
+        query = queryService.newQuery(queryString)
+        result = query.execute
+        selectResults?(result) ? toList(result) : result
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gemfire-jruby
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Alan McKean
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-27 00:00:00 -08:00
+date: 2010-01-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,7 +60,6 @@ files:
 - doc/fr_method_index.html
 - doc/index.html
 - doc/rdoc-style.css
-- gemfire-jruby-0.0.1.gem
 - gemfire-jruby-demo/README
 - gemfire-jruby-demo/Rakefile
 - gemfire-jruby-demo/app/controllers/application_controller.rb
@@ -81,10 +80,10 @@ files:
 - gemfire-jruby-demo/config/routes.rb
 - gemfire-jruby-demo/db/seeds.rb
 - gemfire-jruby-demo/doc/README_FOR_APP
-- gemfire-jruby-demo/log/development.log
 - gemfire-jruby-demo/log/production.log
 - gemfire-jruby-demo/log/server.log
 - gemfire-jruby-demo/log/test.log
+- gemfire-jruby-demo/my.properties
 - gemfire-jruby-demo/public/404.html
 - gemfire-jruby-demo/public/422.html
 - gemfire-jruby-demo/public/500.html

data/gemfire-jruby-demo/log/development.log

@@ -1,24 +0,0 @@
-Cache write: 1
-Cache read: 1
-Cache write: 1
-Cache read: 1
-DEPRECATION WARNING: require "activesupport" is deprecated and will be removed in Rails 3. Use require "active_support" instead.. (called from /Developer/Applications/jruby-1.4.0/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/activesupport.rb:2)
-DEPRECATION WARNING: require "activesupport" is deprecated and will be removed in Rails 3. Use require "active_support" instead.. (called from /Developer/Applications/jruby-1.4.0/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/activesupport.rb:2)
-DEPRECATION WARNING: require "activesupport" is deprecated and will be removed in Rails 3. Use require "active_support" instead.. (called from /Developer/Applications/jruby-1.4.0/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/activesupport.rb:2)
-Cache write: 1
-Cache read: 1
-DEPRECATION WARNING: require "activesupport" is deprecated and will be removed in Rails 3. Use require "active_support" instead.. (called from /Developer/Applications/jruby-1.4.0/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/activesupport.rb:2)
-DEPRECATION WARNING: require "activesupport" is deprecated and will be removed in Rails 3. Use require "active_support" instead.. (called from /Developer/Applications/jruby-1.4.0/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/activesupport.rb:2)
-DEPRECATION WARNING: require "activesupport" is deprecated and will be removed in Rails 3. Use require "active_support" instead.. (called from /Developer/Applications/jruby-1.4.0/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/activesupport.rb:2)
-Cache write: 1
-Cache write: 1
-Cache delete: 1
-Cache exist?: 1
-Cache write: 1
-Cache exist?: 1
-Cache write: 1
-Cache incrementing: 1 (1)
-Cache read: 1
-DEPRECATION WARNING: require "activesupport" is deprecated and will be removed in Rails 3. Use require "active_support" instead.. (called from /Developer/Applications/jruby-1.4.0/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib/activesupport.rb:2)
-Cache write: 1
-Cache write: 1