gemfire-jruby 0.0.4 → 0.0.5

data/README

@@ -0,0 +1,29 @@
+Role must be specified as either 'client' or 'server'
+ActiveSupport::Cache::GemFire.getInstance('server', {...})
+
+Universal Required Options
+These options are required for both clients and servers. The 'locators' is used by servers to join its peers. It is used by a client's pool to connect to the server tier.
+
+	'region-name' == nameString
+	'locators' == addressOrHostname:portNumber
+
+Example:
+ActiveSupport::Cache::GemFire.getInstance('server', {'region-name'=>'data, 'locators=>localhost:10355, , ...})
+
+Client Options
+	'caching-enabled' => 'true' || 'false' ... default is 'false'
+
+Server Options
+	'cacheserver-port'=> 40404 					# required			
+	'data-policy' => 'partition' || 'replicate' # default is replicate
+	'redundancy-level' => '0..3' 				# applicable only if 'data-policy' is 'partition'
+
+Example of Creating a Server
+require 'rubygems'
+require 'lib/gemfire-jruby'
+gfe = ActiveSupport::Cache::GemFire.getInstance('server', {'locators'=>'localhost:10355', 'region-name'=>'data', 'cacheserver-port'=>40405})
+
+require 'rubygems'
+require 'lib/gemfire-jruby'
+gfe = ActiveSupport::Cache::GemFire.getInstance('client', {'locators'=>'localhost:10355', 'region-name'=>'data'})
+

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/doc/classes/ActiveSupport/Cache/GemFire.html

@@ -103,6 +103,7 @@ href="GemFire.html">GemFire</a> cache.
       <a href="#M000009">increment</a>&nbsp;&nbsp;
       <a href="#M000006">keys</a>&nbsp;&nbsp;
       <a href="#M000002">new</a>&nbsp;&nbsp;
+      <a href="#M000012">query</a>&nbsp;&nbsp;
       <a href="#M000003">read</a>&nbsp;&nbsp;
       <a href="#M000004">write</a>&nbsp;&nbsp;
       </div>
@@ -151,7 +152,7 @@ href="GemFire.html">GemFire</a> cache.
         <div class="method-heading">
           <a href="GemFire.src/M000001.html" target="Code" class="method-signature"
             onclick="popupCode('GemFire.src/M000001.html');return false;">
-          <span class="method-name">getInstance</span><span class="method-args">(hashOfGemFireProperties)</span>
+          <span class="method-name">getInstance</span><span class="method-args">(role, options={})</span>
           </a>
         </div>
       
@@ -164,8 +165,8 @@ href="GemFire.html">GemFire</a> instance and to launch <a
 href="GemFire.html">GemFire</a>.
 </p>
 <pre>
-  There is an optional Hash that you can use to override any GemFire properties'.
-  For example, GemFire.getInstance('locators' =&gt; 'localhost[10355]', 'mcast-port' =&gt; '0')
+  The required Hash is used to configure clients and servers.
+  For example, GemFire.getInstance('server', {'region-name'=&gt; 'data', 'locators' =&gt; 'localhost:10355'})
 </pre>
 <p>
 Since it is a Singleton, successive calls to <a
@@ -181,7 +182,7 @@ single instance that was instantiated by the first call.
         <div class="method-heading">
           <a href="GemFire.src/M000002.html" target="Code" class="method-signature"
             onclick="popupCode('GemFire.src/M000002.html');return false;">
-          <span class="method-name">new</span><span class="method-args">(hashOfGemFireProperties)</span>
+          <span class="method-name">new</span><span class="method-args">(role, options)</span>
           </a>
         </div>
       
@@ -319,6 +320,20 @@ objects.
         </div>
       </div>
 
+      <div id="method-M000012" class="method-detail">
+        <a name="M000012"></a>
+
+        <div class="method-heading">
+          <a href="GemFire.src/M000012.html" target="Code" class="method-signature"
+            onclick="popupCode('GemFire.src/M000012.html');return false;">
+          <span class="method-name">query</span><span class="method-args">(queryString)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+        </div>
+      </div>
+
       <div id="method-M000003" class="method-detail">
         <a name="M000003"></a>
 

data/doc/classes/ActiveSupport/Cache/GemFire.src/M000001.html

@@ -10,9 +10,9 @@
   <link rel="stylesheet" href="../../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 26</span>
-        <span class="ruby-keyword kw">def</span> <span class="ruby-constant">GemFire</span>.<span class="ruby-identifier">getInstance</span>(<span class="ruby-identifier">hashOfGemFireProperties</span>)
-        <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">instance</span> <span class="ruby-operator">||=</span> <span class="ruby-identifier">new</span>(<span class="ruby-identifier">hashOfGemFireProperties</span>={})
+  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 29</span>
+      <span class="ruby-keyword kw">def</span> <span class="ruby-constant">GemFire</span>.<span class="ruby-identifier">getInstance</span>(<span class="ruby-identifier">role</span>, <span class="ruby-identifier">options</span>={})
+        <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">instance</span> <span class="ruby-operator">||=</span> <span class="ruby-identifier">new</span>(<span class="ruby-identifier">role</span>, <span class="ruby-identifier">options</span>)
       <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/classes/ActiveSupport/Cache/GemFire.src/M000002.html

@@ -10,18 +10,30 @@
   <link rel="stylesheet" href="../../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 30</span>
-      <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">hashOfGemFireProperties</span>)
-        <span class="ruby-identifier">properties</span> = <span class="ruby-constant">Properties</span>.<span class="ruby-identifier">new</span>
-        <span class="ruby-identifier">hashOfGemFireProperties</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">key</span>, <span class="ruby-identifier">value</span><span class="ruby-operator">|</span>
-          <span class="ruby-identifier">properties</span>.<span class="ruby-identifier">setProperty</span>(<span class="ruby-identifier">key</span>, <span class="ruby-identifier">value</span>)
-        <span class="ruby-keyword kw">end</span>
+  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 101</span>
+      <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">role</span>, <span class="ruby-identifier">options</span>)      
+        <span class="ruby-comment cmt"># fill the GemFire properties from the options</span>
+        <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">check_required_options</span>(<span class="ruby-identifier">role</span>, <span class="ruby-identifier">options</span>)
+        <span class="ruby-comment cmt"># join the distributed system</span>
+        <span class="ruby-identifier">properties</span> = <span class="ruby-identifier">get_gemfire_properties</span>(<span class="ruby-identifier">role</span>, <span class="ruby-identifier">options</span>)
         <span class="ruby-identifier">system</span> = <span class="ruby-constant">DistributedSystem</span>.<span class="ruby-identifier">connect</span>(<span class="ruby-identifier">properties</span>)
-        <span class="ruby-identifier">cache</span> = <span class="ruby-constant">CacheFactory</span>.<span class="ruby-identifier">create</span>(<span class="ruby-identifier">system</span>)
-        <span class="ruby-ivar">@region</span> = <span class="ruby-identifier">cache</span>.<span class="ruby-identifier">getRegion</span>(<span class="ruby-constant">System</span>.<span class="ruby-identifier">getProperty</span>(<span class="ruby-value str">&quot;cachingRegionName&quot;</span>) <span class="ruby-operator">||</span> <span class="ruby-value str">&quot;default&quot;</span>)
+        <span class="ruby-comment cmt"># create the cache ... this will read a cache.xml</span>
+        <span class="ruby-ivar">@cache</span> = <span class="ruby-constant">CacheFactory</span>.<span class="ruby-identifier">create</span>(<span class="ruby-identifier">system</span>)
+        <span class="ruby-comment cmt"># there is only one region</span>
+        <span class="ruby-identifier">regionAttributes</span> = <span class="ruby-keyword kw">nil</span>
+        <span class="ruby-keyword kw">if</span>(<span class="ruby-identifier">role</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'client'</span>) <span class="ruby-keyword kw">then</span>
+          <span class="ruby-comment cmt"># it's a client</span>
+          <span class="ruby-identifier">regionAttributes</span> = <span class="ruby-identifier">get_client_attributes</span>(<span class="ruby-identifier">options</span>)
+        <span class="ruby-keyword kw">else</span>
+          <span class="ruby-comment cmt"># it's a server</span>
+          <span class="ruby-identifier">cacheServer</span> = <span class="ruby-ivar">@cache</span>.<span class="ruby-identifier">addCacheServer</span>
+          <span class="ruby-identifier">cacheServer</span>.<span class="ruby-identifier">setPort</span>(<span class="ruby-identifier">options</span>[<span class="ruby-value str">'cacheserver-port'</span>])
+          <span class="ruby-identifier">cacheServer</span>.<span class="ruby-identifier">start</span>
+          <span class="ruby-identifier">regionAttributes</span> = <span class="ruby-identifier">get_server_attributes</span>(<span class="ruby-identifier">options</span>)
+        <span class="ruby-keyword kw">end</span> 
+        <span class="ruby-ivar">@region</span> = <span class="ruby-ivar">@cache</span>.<span class="ruby-identifier">createRegion</span>(<span class="ruby-identifier">options</span>[<span class="ruby-value str">'region-name'</span>], <span class="ruby-identifier">regionAttributes</span>)
       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">CacheException</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
           <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">error</span>(<span class="ruby-node">&quot;GemfireCache Creation Error (#{e}): #{e.message}&quot;</span>)
-          <span class="ruby-keyword kw">false</span>
         <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/classes/ActiveSupport/Cache/GemFire.src/M000003.html

@@ -10,13 +10,12 @@
   <link rel="stylesheet" href="../../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 44</span>
+  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 127</span>
       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">read</span>(<span class="ruby-identifier">key</span>)
         <span class="ruby-keyword kw">super</span>
         <span class="ruby-ivar">@region</span>.<span class="ruby-identifier">get</span>(<span class="ruby-identifier">key</span>)
       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">CacheException</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
           <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">error</span>(<span class="ruby-node">&quot;GemfireCache Error (#{e}): #{e.message}&quot;</span>)
-          <span class="ruby-keyword kw">false</span>
       <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/classes/ActiveSupport/Cache/GemFire.src/M000004.html

@@ -10,14 +10,12 @@
   <link rel="stylesheet" href="../../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 53</span>
+  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 135</span>
       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">write</span>(<span class="ruby-identifier">key</span>, <span class="ruby-identifier">value</span>)
         <span class="ruby-keyword kw">super</span>
         <span class="ruby-ivar">@region</span>.<span class="ruby-identifier">put</span>(<span class="ruby-identifier">key</span>, <span class="ruby-identifier">value</span>)
-        <span class="ruby-keyword kw">true</span>
       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">CacheException</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
         <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">error</span>(<span class="ruby-node">&quot;GemfireCache Error (#{e}): #{e.message}&quot;</span>)
-        <span class="ruby-keyword kw">false</span>
       <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/classes/ActiveSupport/Cache/GemFire.src/M000005.html

@@ -10,13 +10,12 @@
   <link rel="stylesheet" href="../../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 63</span>
+  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 143</span>
       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">delete</span>(<span class="ruby-identifier">key</span>)
         <span class="ruby-keyword kw">super</span>
         <span class="ruby-ivar">@region</span>.<span class="ruby-identifier">destroy</span>(<span class="ruby-identifier">key</span>)
       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">CacheException</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
         <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">error</span>(<span class="ruby-node">&quot;GemfireCache Error (#{e}): #{e.message}&quot;</span>)
-        <span class="ruby-keyword kw">false</span>
       <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/classes/ActiveSupport/Cache/GemFire.src/M000006.html

@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="../../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 72</span>
+  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 151</span>
       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">keys</span>
         <span class="ruby-ivar">@region</span>.<span class="ruby-identifier">keys</span>.<span class="ruby-identifier">to_a</span>
       <span class="ruby-keyword kw">end</span></pre>

data/doc/classes/ActiveSupport/Cache/GemFire.src/M000007.html

@@ -10,10 +10,13 @@
   <link rel="stylesheet" href="../../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 77</span>
+  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 156</span>
       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">exist?</span>(<span class="ruby-identifier">key</span>)
-        <span class="ruby-keyword kw">super</span>
-        <span class="ruby-ivar">@region</span>.<span class="ruby-identifier">containsKeyOnServer</span>(<span class="ruby-identifier">key</span>)
+        <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@region</span>.<span class="ruby-identifier">getAttributes</span>.<span class="ruby-identifier">getPoolName</span> <span class="ruby-keyword kw">then</span>
+          <span class="ruby-ivar">@region</span>.<span class="ruby-identifier">containsKey</span>(<span class="ruby-identifier">key</span>)
+        <span class="ruby-keyword kw">else</span>
+          <span class="ruby-ivar">@region</span>.<span class="ruby-identifier">containsKeyOnServer</span>(<span class="ruby-identifier">key</span>)
+        <span class="ruby-keyword kw">end</span>
       <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/classes/ActiveSupport/Cache/GemFire.src/M000008.html

@@ -10,14 +10,11 @@
   <link rel="stylesheet" href="../../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 83</span>
+  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 165</span>
       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">clear</span>
-        <span class="ruby-keyword kw">super</span>
         <span class="ruby-ivar">@region</span>.<span class="ruby-identifier">clear</span>
-        <span class="ruby-keyword kw">true</span>
       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">CacheException</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
         <span class="ruby-identifier">logger</span>.<span class="ruby-identifier">error</span>(<span class="ruby-node">&quot;GemfireCache Error (#{e}): #{e.message}&quot;</span>)
-        <span class="ruby-keyword kw">false</span>
       <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/classes/ActiveSupport/Cache/GemFire.src/M000009.html

@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="../../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 93</span>
+  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 172</span>
       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">increment</span>(<span class="ruby-identifier">key</span>)
         <span class="ruby-identifier">raise</span> <span class="ruby-value str">&quot;Not supported by Gemfire&quot;</span>
       <span class="ruby-keyword kw">end</span></pre>

data/doc/classes/ActiveSupport/Cache/GemFire.src/M000010.html

@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="../../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 98</span>
+  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 177</span>
       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">decrement</span>(<span class="ruby-identifier">key</span>)
         <span class="ruby-identifier">raise</span> <span class="ruby-value str">&quot;Not supported by Gemfire&quot;</span>
       <span class="ruby-keyword kw">end</span></pre>

data/doc/classes/ActiveSupport/Cache/GemFire.src/M000011.html

@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="../../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 103</span>
+  <pre><span class="ruby-comment cmt"># File lib/gemfire-jruby.rb, line 182</span>
       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">delete_matched</span>(<span class="ruby-identifier">matcher</span>)
         <span class="ruby-identifier">raise</span> <span class="ruby-value str">&quot;Not supported by Gemfire&quot;</span>
       <span class="ruby-keyword kw">end</span></pre>

data/doc/created.rid

@@ -1 +1 @@
-Wed, 27 Jan 2010 11:29:26 -0800
+Fri, 29 Jan 2010 10:49:13 -0800

data/doc/files/lib/gemfire-jruby_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Jan 27 11:29:25 -0800 2010</td>
+      <td>Fri Jan 29 10:45:01 -0800 2010</td>
     </tr>
     </table>
   </div>
@@ -73,7 +73,7 @@
       <h3 class="section-bar">Required files</h3>
 
       <div class="name-list">
-      activesupport&nbsp;&nbsp;
+      active_support&nbsp;&nbsp;
       </div>
     </div>
 

data/doc/fr_method_index.html

@@ -29,6 +29,7 @@
     <a href="classes/ActiveSupport/Cache/GemFire.html#M000009">increment (ActiveSupport::Cache::GemFire)</a><br />
     <a href="classes/ActiveSupport/Cache/GemFire.html#M000006">keys (ActiveSupport::Cache::GemFire)</a><br />
     <a href="classes/ActiveSupport/Cache/GemFire.html#M000002">new (ActiveSupport::Cache::GemFire)</a><br />
+    <a href="classes/ActiveSupport/Cache/GemFire.html#M000012">query (ActiveSupport::Cache::GemFire)</a><br />
     <a href="classes/ActiveSupport/Cache/GemFire.html#M000003">read (ActiveSupport::Cache::GemFire)</a><br />
     <a href="classes/ActiveSupport/Cache/GemFire.html#M000004">write (ActiveSupport::Cache::GemFire)</a><br />
   </div>

data/gemfire-jruby.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gemfire-jruby}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alan McKean"]
@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.email = %q{alan.mckean@gemstone.com}
   s.extra_rdoc_files = [
     "LICENSE",
+     "README",
      "README.rdoc"
   ]
   s.files = [

data/lib/gemfire-jruby.rb

@@ -30,77 +30,9 @@ module ActiveSupport
       	self.instance ||= new(role, options)
       end
 
-      def check_required_options(role, options)
-        # role must be client or server
-        if(role != 'client' && role != 'server') then
-          raise "The member role must be either client or server"
-        end
-        # ensure that we are using locators ... no multicast distribution is allowed
-        if (!options.include?('locators')) then
-          raise "Locators must be specified in the options"
-        end
-        if (role == 'server' && !options.include?('cacheserver-port')) then
-            raise "The server must have a cacheserver-port specified in the options"
-          end          
-        if (!options.include?('region-name')) then
-          raise "The region name must be specified in the options"
-        end
-      end
-      
-      def get_gemfire_properties(role, options)
-        properties = Properties.new
-        properties.setProperty('mcast-port', '0')
-        options.each do |key, value|
-          properties.setProperty(key, value) unless ((key == 'cacheserver-port') || (key == 'region-name') || (key == 'locators' && role == 'client'))
-        end
-        properties
-      end
-      
-      def get_client_attributes(options)
-        # configure the region attributes for client usage
-        attributesFactory = AttributesFactory.new
-        # clients have a Pool
-        poolFactory = PoolManager.createFactory
-        ipAndPort = options['locators'].split(':')
-        puts ipAndPort[0]
-        puts ipAndPort[1]
-        poolFactory.addLocator(ipAndPort[0], ipAndPort[1].to_i)
-        poolFactory.create("clientPool")
-        # clients do no peer-to-peer distribution
-        attributesFactory.setScope(Scope::LOCAL)
-        # clients either cache data locally (DataPolicy::NORMAL) or not (DataPolicy::EMPTY)
-        if (options['caching-enabled'] == 'true') then
-          attributesFactory.setDataPolicy(DataPolicy::NORMAL)
-        else
-          attributesFactory.setDataPolicy(DataPolicy::EMPTY)
-        end
-        attributesFactory.setPoolName("clientPool")
-  	    regionAttributes = attributesFactory.create
-      end
-      
-      def get_server_attributes(options)
-        attributesFactory = AttributesFactory.new
-    	  if (options['data-policy'] == 'partition') then
-	        # it's a partitioned region
-	        attributesFactory.setDataPolicy(DataPolicy::PARTITION)
-    	    if (options['redundant-copies']) then
-      	    partitionAttributesFactory = PartitionAttributesFactory.new
-  	        partitionattributesFactory.setRedundantCopies(options['redundant-copies'].to_s)
-  	        partitionAttributes = partitionAttributesFactory.create
-  	        attributesFactory.setPartitionAttributes(partitionAttributes)
-	        end
-    	  elsif (!options['data-policy'] || (options['data-policy'] == 'replicate'))
-	        # it's a replicate region
-    	    attributesFactory.setDataPolicy(DataPolicy::REPLICATE)
-    	  else
-    	    raise "Data policy must be either 'replicate', 'partition', or unset (the default is replicate)"
-  	    end
-  	    regionAttributes = attributesFactory.create
-      end
-      
       def initialize(role, options)      
         # fill the GemFire properties from the options
-        self.check_required_options(role, options)
+        check_required_options(role, options)
         # join the distributed system
         properties = get_gemfire_properties(role, options)
         system = DistributedSystem.connect(properties)
@@ -126,7 +58,7 @@ module ActiveSupport
       # Read a value from the GemFire cache. _key_ can be any JRuby object. Returns the value stored at _key_.
       def read(key)
         super
-        @region.get(key)
+        Marshal.load(@region.get(Marshal.dump(key)))
       rescue CacheException => e
           logger.error("GemfireCache Error (#{e}): #{e.message}")
       end
@@ -134,7 +66,7 @@ module ActiveSupport
       # 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)
+        @region.put(Marshal.dump(key), Marshal.dump(value))
       rescue CacheException => e
         logger.error("GemfireCache Error (#{e}): #{e.message}")
       end
@@ -183,6 +115,76 @@ module ActiveSupport
         raise "Not supported by Gemfire"
       end
       
+      private
+      def check_required_options(role, options)
+        # role must be client or server
+        if(role != 'client' && role != 'server') then
+          raise "The member role must be either client or server"
+        end
+        # ensure that we are using locators ... no multicast distribution is allowed
+        if (!options.include?('locators')) then
+          raise "Locators must be specified in the options"
+        end
+        if (role == 'server' && !options.include?('cacheserver-port')) then
+            raise "The server must have a cacheserver-port specified in the options"
+          end          
+        if (!options.include?('region-name')) then
+          raise "The region name must be specified in the options"
+        end
+      end
+      
+      def get_gemfire_properties(role, options)
+        properties = Properties.new
+        properties.setProperty('mcast-port', '0')
+        options.each do |key, value|
+          properties.setProperty(key, value) unless ((key == 'cacheserver-port') || (key == 'region-name') || (key == 'locators' && role == 'client'))
+        end
+        properties
+      end
+      
+      def get_client_attributes(options)
+        # configure the region attributes for client usage
+        attributesFactory = AttributesFactory.new
+        # clients have a Pool
+        poolFactory = PoolManager.createFactory
+        ipAndPort = options['locators'].split(':')
+        puts ipAndPort[0]
+        puts ipAndPort[1]
+        poolFactory.addLocator(ipAndPort[0], ipAndPort[1].to_i)
+        poolFactory.create("clientPool")
+        # clients do no peer-to-peer distribution
+        attributesFactory.setScope(Scope::LOCAL)
+        # clients either cache data locally (DataPolicy::NORMAL) or not (DataPolicy::EMPTY)
+        if (options['caching-enabled'] == 'true') then
+          attributesFactory.setDataPolicy(DataPolicy::NORMAL)
+        else
+          attributesFactory.setDataPolicy(DataPolicy::EMPTY)
+        end
+        attributesFactory.setPoolName("clientPool")
+  	    regionAttributes = attributesFactory.create
+      end
+      
+      def get_server_attributes(options)
+        attributesFactory = AttributesFactory.new
+    	  if (options['data-policy'] == 'partition') then
+	        # it's a partitioned region
+	        attributesFactory.setDataPolicy(DataPolicy::PARTITION)
+    	    if (options['redundant-copies']) then
+      	    partitionAttributesFactory = PartitionAttributesFactory.new
+  	        partitionattributesFactory.setRedundantCopies(options['redundant-copies'].to_s)
+  	        partitionAttributes = partitionAttributesFactory.create
+  	        attributesFactory.setPartitionAttributes(partitionAttributes)
+	        end
+    	  elsif (!options['data-policy'] || (options['data-policy'] == 'replicate'))
+	        # it's a replicate region
+    	    attributesFactory.setDataPolicy(DataPolicy::REPLICATE)
+    	  else
+    	    raise "Data policy must be either 'replicate', 'partition', or unset (the default is replicate)"
+  	    end
+  	    regionAttributes = attributesFactory.create
+      end
+      
+      public
       def toList(selectResults)
       	results = []
       	iterator = selectResults.iterator
@@ -202,14 +204,14 @@ module ActiveSupport
         found
       end
 
-      def query(queryString)
-        queryService = @region.getAttributes.getPoolName ? PoolManager.find(@region).getQueryService : @cache.getQueryService
+      public
+      # Query the cache. Optional serverData arg allows querying local client cache
+      def query(queryString, serverData=true)
+        queryService = @region.getAttributes.getPoolName && serverData ? PoolManager.find(@region).getQueryService : @cache.getQueryService
         query = queryService.newQuery(queryString)
         result = query.execute
         selectResults?(result) ? toList(result) : result
       end
-      
-      private :check_required_options, :get_gemfire_properties, :get_server_attributes, :get_client_attributes,:toList, :selectResults?
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gemfire-jruby
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Alan McKean
@@ -30,6 +30,7 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
+- README
 - README.rdoc
 files: 
 - .document
@@ -64,6 +65,7 @@ files:
 - lib/gemfire-jruby.rb
 - test/helper.rb
 - test/test_gemfire-jruby.rb
+- README
 has_rdoc: true
 homepage: http://github.com/amckean/gemfire-jruby
 licenses: []