torquebox-cache 2.0.3-java → 2.1.0-java

data/spec/gem_hook_spec.rb

@@ -0,0 +1,31 @@
+#
+# Copyright 2012 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require File.dirname(__FILE__) + '/spec_helper'
+require 'gem_hook'
+
+describe 'torquebox-cache gem_hook.rb with ' do
+  it "should not load torque_box_store.rb if ActiveSupport is unavailable" do
+    lambda { ActiveSupport::Cache::TorqueBoxStore.should raise_error(NameError) }
+  end
+
+  it "should load torque_box_store.rb if ActiveSupport is available" do
+    module ActiveSupport ; end
+    load 'gem_hook.rb'
+    lambda { ActiveSupport::Cache::TorqueBoxStore.should_not raise_error(NameError) }
+  end
+end
+

data/spec/spec_helper.rb

@@ -14,15 +14,8 @@
 # limitations under the License.
 #
 
-require 'dm-core/spec/shared/adapter_spec'
-require 'dm-core/spec/lib/pending_helpers'
-require 'datamapper/dm-infinispan-adapter'
 require 'cache'
 
-RSpec::Runner.configure do |config|
-  config.include(DataMapper::Spec::PendingHelpers)
-end
-
 def random_string( length = 20 )
   chars = ('a'..'z').to_a + ('A'..'Z').to_a
   dir_string = (0...length).collect { chars[Kernel.rand(chars.length)] }.join

data/spec/torque_box_store_spec.rb

@@ -9,6 +9,10 @@ TORQUEBOX_APP_NAME = 'active-support-unit-test'
 describe ActiveSupport::Cache::TorqueBoxStore do
 
   before(:each) do
+    manager = org.infinispan.manager.DefaultCacheManager.new 
+    service = org.projectodd.polyglot.cache.as.CacheService.new
+    service.stub!(:cache_container).and_return( manager )
+    TorqueBox::ServiceRegistry.stub!(:[]).with(org.projectodd.polyglot.cache.as.CacheService::CACHE).and_return( service )
     TorqueBox::ServiceRegistry.service_registry = nil
     @cache = ActiveSupport::Cache::TorqueBoxStore.new()
   end
@@ -169,6 +173,10 @@ describe ActiveSupport::Cache::TorqueBoxStore do
       @cache.read_multi("john", "paul").should == {"john" => "guitar", "paul" => "bass"}
     end
 
+    it "should default to local mode" do
+      @cache.clustering_mode.should == CacheMode::LOCAL
+    end
+
   end
 
   describe "advanced" do
@@ -189,32 +197,14 @@ describe ActiveSupport::Cache::TorqueBoxStore do
 
   end
 
-  describe "clustering" do
-    
-    it "should default to invalidation mode" do
-      @cache.clustering_mode.should == CacheMode::INVALIDATION_SYNC
-      TorqueBoxStore.new(:mode => :unknown).clustering_mode.should == CacheMode::INVALIDATION_SYNC
-    end
-
-    [:repl, :dist, :invalidation].each do |mode|
-      it "should be configurable in #{mode} mode" do
-        TorqueBoxStore.new(:mode => mode).clustering_mode.to_s.should == "#{mode.to_s.upcase}_SYNC"
-        TorqueBoxStore.new(:name => 'async', :mode => mode, :sync => false).clustering_mode.to_s.should == "#{mode.to_s.upcase}_ASYNC"
-      end
+  describe "options when not clustered" do
+    it "should default to :local mode" do
+      TorqueBoxStore.new.clustering_mode.to_s.should == "LOCAL"
     end
-
-    it "should support replicated mode" do
-      [:r, :repl, :replicated, :replication].each do |mode|
-        TorqueBoxStore.new(:mode => mode).clustering_mode.should be_replicated
-      end
-    end
-
-    it "should support distributed mode" do
-      [:d, :dist, :distributed, :distribution].each do |mode|
-        TorqueBoxStore.new(:mode => mode).clustering_mode.should be_distributed
-      end
+    
+    it "should not fail if set to a clustered mode" do
+      TorqueBoxStore.new( :mode => :repl ).clustering_mode.to_s.should == "LOCAL"
     end
-
   end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: torquebox-cache
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.3
+  version: 2.1.0
 platform: java
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-04 00:00:00 Z
+date: 2012-07-26 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: activesupport
@@ -42,7 +42,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.3
+            version: 2.1.0
     type: :runtime
     version_requirements: *id003
   - !ruby/object:Gem::Dependency 
@@ -53,53 +53,31 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.3
+            version: 2.1.0
     type: :runtime
     version_requirements: *id004
-  - !ruby/object:Gem::Dependency 
-    name: dm-serializer
-    prerelease: false
-    requirement: &id005 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 1.1.0
-    type: :development
-    version_requirements: *id005
-  - !ruby/object:Gem::Dependency 
-    name: dm-core
-    prerelease: false
-    requirement: &id006 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 1.1.0
-    type: :development
-    version_requirements: *id006
   - !ruby/object:Gem::Dependency 
     name: json
     prerelease: false
-    requirement: &id007 !ruby/object:Gem::Requirement 
+    requirement: &id005 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
             version: 1.4.6
     type: :development
-    version_requirements: *id007
+    version_requirements: *id005
   - !ruby/object:Gem::Dependency 
     name: rspec
     prerelease: false
-    requirement: &id008 !ruby/object:Gem::Requirement 
+    requirement: &id006 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
             version: 2.7.0
     type: :development
-    version_requirements: *id008
+    version_requirements: *id006
 description: ""
 email: 
   - torquebox-dev@torquebox.org
@@ -113,20 +91,19 @@ files:
   - licenses/lgpl-2.1.txt
   - lib/torquebox-cache.jar
   - lib/torquebox-cache.rb
-  - lib/cache.rb
+  - lib/polyglot-cache-1.7.1.jar
+  - lib/polyglot-core-1.7.1.jar
   - lib/gem_hook.rb
-  - lib/dm-infinispan-adapter.rb
+  - lib/cache.rb
   - lib/cache_listener.rb
-  - lib/datamapper/model.rb
-  - lib/datamapper/dm-infinispan-adapter.rb
-  - lib/datamapper/search.rb
+  - lib/sequence.rb
   - lib/active_support/cache/torque_box_store.rb
+  - spec/cache_listener_spec.rb
   - spec/spec_helper.rb
+  - spec/cache_spec.rb
+  - spec/gem_hook_spec.rb
   - spec/spec.opts
-  - spec/cache_listener_spec.rb
   - spec/torque_box_store_spec.rb
-  - spec/dm-infinispan-adapter_spec.rb
-  - spec/cache_spec.rb
 homepage: http://torquebox.org/
 licenses: 
   - lgpl
@@ -156,6 +133,6 @@ specification_version: 3
 summary: TorqueBox Cache Gem
 test_files: 
   - spec/cache_listener_spec.rb
-  - spec/torque_box_store_spec.rb
-  - spec/dm-infinispan-adapter_spec.rb
   - spec/cache_spec.rb
+  - spec/gem_hook_spec.rb
+  - spec/torque_box_store_spec.rb

data/lib/datamapper/dm-infinispan-adapter.rb

@@ -1,129 +0,0 @@
-# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
-require "digest/sha1"
-require 'dm-core'
-require 'cache'
-require 'json'
-require 'torquebox-cache' # is this needed?
-require 'datamapper/model'
-require 'datamapper/search'
-
-
-module DataMapper::Adapters
-
-  class InfinispanAdapter < AbstractAdapter
-
-    include TorqueBox::Infinispan
-
-    DataMapper::Model.append_inclusions( Infinispan::Model )
-
-    def initialize( name, options )
-      super
-      @options            = options.dup
-      @metadata           = @options.dup
-      @options[:name]     = name.to_s
-      @options[:index]    = true
-      @metadata[:name]    = name.to_s + "/metadata"
-      @cache              = Cache.new( @options )
-      @metadata_cache     = Cache.new( @metadata )
-      @search             = Infinispan::Search.new(cache, lambda{ |v| self.deserialize(v) })
-    end
-
-
-    def create( resources )
-      cache.transaction do
-        resources.each do |resource|
-          initialize_serial( resource, @metadata_cache.increment( index_for( resource ) ) )
-          cache.put( key( resource ), serialize( resource ) ) 
-        end
-      end
-    end
-
-    def read( query )
-      query.filter_records(@search.search( query ))
-    end
-
-    def update( attributes, collection )
-      attributes = attributes_as_fields(attributes)
-      cache.transaction do
-        collection.each do |resource|
-          resource.attributes(:field).merge(attributes)
-          cache.put( key(resource), serialize(resource) )
-        end
-      end
-    end
-
-    def delete( collection )
-      cache.transaction do
-        collection.each do |resource|
-          cache.remove( key(resource) )
-        end
-      end
-    end
-
-    def stop
-      cache.stop
-    end
-
-    def serialize(resource)
-      resource.is_a?(DataMapper::Resource) ? resource : resource.to_json
-    end
-
-    def deserialize(value)
-      value.is_a?(String) ? JSON.parse(value) : value
-    end
-
-    def search_manager
-      @search.search_manager
-    end
-
-    private
-    def cache
-      @cache
-    end
-
-    def metadata_cache
-      @metadata_cache
-    end
-
-    def next_id(resource)
-      Digest::SHA1.hexdigest(Time.now.to_i + rand(1000000000).to_s)[1..length].to_i
-    end
-
-    def key( resource )
-      model = resource.model
-      key = resource.key.nil? ? '' : resource.key.join('/')
-      "#{model}/#{key}/#{resource.id}"
-    end      
-    
-    def index_for( resource )
-      resource.model.name + ".index"
-    end
-
-    def all_records
-      records = []
-      cache.keys.each do |key|
-        value = cache.get(key)
-        records << deserialize(value) if value
-      end
-      records
-    end
-
-  end
-end
-

data/lib/datamapper/model.rb

@@ -1,187 +0,0 @@
-# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
-require 'dm-serializer'
-require 'jruby/core_ext'
-require 'json'
-
-
-module Infinispan
-  JVoid   = java.lang.Void::TYPE
-  
-  module Model
-
-    # TODO enhance TYPEs list
-    TYPES = {
-      ::String                         => java.lang.String,
-      ::Integer                        => java.lang.Integer,
-      ::Float                          => java.lang.Double,
-      ::BigDecimal                     => java.math.BigDecimal,
-      ::Date                           => java.util.Date,
-      ::DateTime                       => java.util.Date,
-      ::Time                           => java.util.Date,
-      ::TrueClass                      => java.lang.Boolean
-    }
-
-    def self.included(model)
-      model.extend(ClassMethods)
-      include java.io.Serializable
-
-      unless model.mapped? model.name
-        [:auto_migrate!, :auto_upgrade!, :create, :all, :copy, :first, :first_or_create, :first_or_new, :get, :last, :load].each do |method|
-          model.before_class_method(method, :configure_index)
-        end
-
-        [:save, :update, :destroy, :update_attributes].each do |method|
-          model.before(method) { model.configure_index }
-        end
-      end
-    end
-
-    def deserialize_to
-      self.class.name
-    end
-
-    def is_a_with_hack?( thing )
-      thing == java.lang.Object || is_a_without_hack?( thing )
-    end
-
-    alias_method :is_a_without_hack?, :is_a?
-    alias_method :is_a?, :is_a_with_hack?
-
-    module ClassMethods
-
-      @@mapped = {}
-
-      def auto_upgrade!
-        configure_index
-      end
-
-      def auto_migrate!
-        destroy
-        configure_index
-      end
-
-      def to_java_type(type)
-        TYPES[type] || self.to_java_type(type.primitive)
-      end
-
-      def mapped?( type )
-        @@mapped[type]
-      end
-
-      def configure_index
-        unless mapped?( name )
-          configure_index!
-        end
-      end
-
-      def configure_index!
-        TorqueBox::Infinispan::Cache.log( "Configuring dm-infinispan-adapter model #{name}" )
-        properties().each do |prop|
-          TorqueBox::Infinispan::Cache.log( "Adding property #{prop.inspect}" )
-          add_java_property(prop) 
-          TorqueBox::Infinispan::Cache.log( "Added property #{prop.inspect}" )
-        end
-
-        annotation = {
-          org.hibernate.search.annotations.Indexed => {},
-          org.hibernate.search.annotations.ProvidedId => {},
-          org.infinispan.marshall.SerializeWith => { "value" => org.torquebox.cache.marshalling.JsonExternalizer.java_class }
-        }
-
-        add_class_annotation( annotation )
-
-        # Wonder twin powers... ACTIVATE!
-        java_class = become_java!(false)
-
-        @@mapped[name] = true
-      end
-
-      def add_java_property(prop)
-        name = prop.name
-        type = prop.class
-
-        column_name = prop.field
-        annotation = {}
-
-        annotation[org.hibernate.search.annotations.Field] = {}
-
-        get_name = "get#{name.to_s.capitalize}"
-        set_name = "set#{name.to_s.capitalize}"
-
-        # TODO Time, Discriminator, EmbededValue
-        # to consider: in mu opinion those methods should set from/get to java objects...
-        if (type == DataMapper::Property::Date)
-          class_eval <<-EOT
-            def  #{set_name.intern} (d)
-              attribute_set(:#{name} , d.nil? ? nil : Date.civil(d.year + 1900, d.month + 1, d.date))
-            end
-          EOT
-          class_eval <<-EOT
-            def  #{get_name.intern}
-              d = attribute_get(:#{name} )
-              java.util.Date.new( (Time.mktime(d.year, d.month, d.day).to_i * 1000) ) if d
-            end
-          EOT
-        elsif (type == DataMapper::Property::DateTime)
-          class_eval <<-EOT
-            def  #{set_name.intern} (d)
-              attribute_set(:#{name} , d.nil? ? nil : DateTime.civil(d.year + 1900, d.month + 1, d.date, d.hours, d.minutes, d.seconds))
-            end
-          EOT
-          class_eval <<-EOT
-            def  #{get_name.intern}
-              d = attribute_get(:#{name} )
-              java.util.Date.new( (Time.mktime(d.year, d.month, d.day, d.hour, d.min, d.sec, 0).to_i * 1000) ) if d
-            end
-          EOT
-        elsif (type.to_s == BigDecimal || type == DataMapper::Property::Decimal)
-          class_eval <<-EOT
-            def  #{set_name.intern} (d)
-              attribute_set(:#{name} , d.nil? ? nil :#{type}.new(d.to_s))
-            end
-          EOT
-          class_eval <<-EOT
-            def  #{get_name.intern}
-              d = attribute_get(:#{name} )
-              java.math.BigDecimal.new(d.to_i) if d
-            end
-          EOT
-        else
-          class_eval <<-EOT
-            def  #{set_name.intern} (d)
-              attribute_set(:#{name} , d)
-            end
-          EOT
-          class_eval <<-EOT
-            def  #{get_name.intern}
-              d = attribute_get(:#{name} )
-              d
-            end
-          EOT
-        end
-
-        mapped_type = to_java_type(type)
-        add_method_signature get_name, [mapped_type]
-        add_method_annotation get_name, annotation
-        add_method_signature set_name, [JVoid, mapped_type]
-      end
-    end
-
-  end
-end