torquebox-core 3.2.0-java → 4.0.0.alpha1-java

data/lib/torquebox/codecs/marshal_base64.rb

@@ -1,36 +1,37 @@
-# Copyright 2008-2013 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.
+# Copyright 2014 Red Hat, Inc, and individual contributors.
+#
+# 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 'base64'
 
+java_import org.projectodd.wunderboss.codecs.StringCodec
+
 module TorqueBox
   module Codecs
-    module MarshalBase64
-      class << self
+    class MarshalBase64 < StringCodec
 
-        def encode(data)
-          Base64.encode64(::Marshal.dump(data)) unless data.nil?
-        end
+      def initialize
+        super("marshal_base64", "application/ruby-marshal-base64")
+      end
 
-        def decode(data)
-          ::Marshal.restore(Base64.decode64(data)) unless data.nil?
-        end
-        
+      def encode(data)
+        Base64.encode64(::Marshal.dump(data)) unless data.nil?
       end
+
+      def decode(data)
+        ::Marshal.restore(Base64.decode64(data)) unless data.nil?
+      end
+
     end
   end
 end

data/lib/torquebox/codecs/marshal_smart.rb

@@ -1,49 +1,50 @@
-# Copyright 2008-2013 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.
+# Copyright 2014 Red Hat, Inc, and individual contributors.
+#
+# 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 'base64'
 
+java_import org.projectodd.wunderboss.codecs.StringCodec
+
 module TorqueBox
   module Codecs
-    module MarshalSmart
-      class << self
+    class MarshalSmart < StringCodec
+
+      def initialize
+        super("marshal_smart", "application/ruby-marshal-smart")
+      end
 
-        # @api private
-        MARSHAL_MARKER = "_|marshalled|_"
+      # @api private
+      MARSHAL_MARKER = "_|marshalled|_"
 
-        def encode(object)
-          case object
-          when String, Numeric, true, false, nil
+      def encode(object)
+        case object
+        when String, Numeric, true, false, nil
+          object
+        else
+          if object.respond_to?(:java_object)
             object
           else
-            if object.respond_to?(:java_object)
-              object
-            else
-              MARSHAL_MARKER + Base64.encode64(::Marshal.dump(object))
-            end
+            MARSHAL_MARKER + Base64.encode64(::Marshal.dump(object))
           end
         end
+      end
 
-        def decode(object)
-          if object.is_a?(String) && object.start_with?(MARSHAL_MARKER)
-            object = ::Marshal.load(Base64.decode64(object.sub(MARSHAL_MARKER, '')))
-          end
-          object
+      def decode(object)
+        if object.is_a?(String) && object.start_with?(MARSHAL_MARKER)
+          object = ::Marshal.load(Base64.decode64(object.sub(MARSHAL_MARKER, '')))
         end
+        object
       end
 
     end

data/lib/torquebox/codecs/text.rb

@@ -0,0 +1,35 @@
+# Copyright 2014 Red Hat, Inc, and individual contributors.
+#
+# 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.
+
+java_import org.projectodd.wunderboss.codecs.StringCodec
+
+module TorqueBox
+  module Codecs
+    class Text < StringCodec
+
+      def initialize
+        super("text", "text/plain")
+      end
+
+      def encode(data)
+        data.to_s
+      end
+
+      def decode(data)
+        data
+      end
+
+    end
+  end
+end

data/lib/torquebox/logger.rb

@@ -1,137 +1,27 @@
-# Copyright 2008-2013 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.
+# Copyright 2014 Red Hat, Inc, and individual contributors.
+#
+# 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 'logger'
 
 module TorqueBox
-
-  # @api private
-  class FallbackLogger < ::Logger
-
-    attr_accessor :formatter
-
-    def initialize name = nil
-      super(ENV['TORQUEBOX_FALLBACK_LOGFILE'] || $stderr)
-      @category = name || (TORQUEBOX_APP_NAME if defined? TORQUEBOX_APP_NAME) || "TorqueBox"
-      @formatter = ::Logger::Formatter.new
-    end
-
-    def add(severity, message, progname, &block)
-      if ( message.nil? && block.nil? )
-        message = progname
-        progname = @category
-      end
-      message = progname if message.nil?
-      super( severity, message, @category, &block )
-    end
-
-    # Allow our logger to be used for env['rack.errors']
-    def puts(message)
-      info message.to_s
-    end
-    def write(message)
-      info message.strip
-    end
-    def flush
-    end
-  end
-
-  begin
-    org.jboss.logging::Logger
-  rescue ::NameError
-    Logger = FallbackLogger
-  end
-
   class Logger
+    class << self
+      attr_reader :log_level
 
-    attr_accessor :formatter
-
-    def initialize name = nil
-      category = name || (TORQUEBOX_APP_NAME if defined? TORQUEBOX_APP_NAME) || "TorqueBox"
-      @logger = org.jboss.logging::Logger.getLogger( category.to_s.gsub('::','.') )
-      @formatter = ::Logger::Formatter.new
-    end
-
-    [:warn?, :error?, :fatal?].each do |method|
-      define_method(method) { true }
-    end
-
-    def info?
-      @logger.info_enabled?
-    end
-
-    def debug?
-      @logger.debug_enabled?
-    end
-
-    def trace?
-      @logger.trace_enabled?
-    end
-
-    # The minimum log level to actually log, with debug being the lowest
-    # and fatal the highest
-    attr_accessor :level
-
-    def add(severity, message, progname, &block)
-      severities = ['debug', 'info', 'warn', 'error', 'fatal']
-      # default to warn for unknown log level since jboss logger
-      # doesn't support unknown
-      delegate = severity > (severities.length - 1) ? 'warn' : severities[severity]
-      params = params_for_logger([message, progname], block)
-      @logger.send(delegate, *params)
-    end
-
-    # @!method debug(message)
-    #   @param [String] message The message to log
-    # @!method info(message)
-    #   @param [String] message The message to log
-    # @!method warn(message)
-    #   @param [String] message The message to log
-    # @!method error(message)
-    #   @param [String] message The message to log
-    # @!method fatal(message)
-    #   @param [String] message The message to log
-    def method_missing(method, *args, &block)
-      delegate = method
-      self.class.class_eval do
-        define_method(method) do |*a, &b|
-          params = params_for_logger(a, b)
-          params = [""] if params.empty?
-          @logger.send(delegate, *params)
-        end
+      def log_level=(level)
+        @log_level = level
+        org.projectodd.wunderboss.WunderBoss.log_level = level
       end
-      self.send(method, *args, &block)
     end
-
-    # Allow our logger to be used for env['rack.errors']
-    def puts(message)
-      info message.to_s
-    end
-    def write(message)
-      info message.strip
-    end
-    def flush
-    end
-
-    private
-
-    def params_for_logger(args, block)
-      [ args[0] || (block && block.call) ].compact
-    end
-
-  end unless defined?(TorqueBox::Logger)
+  end
 end

data/lib/torquebox/option_utils.rb

@@ -0,0 +1,72 @@
+# Copyright 2014 Red Hat, Inc, and individual contributors.
+#
+# 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 'set'
+
+module TorqueBox
+  module OptionUtils
+    protected
+
+    def validate_options(options, valid_keys)
+      options.keys.each do |key|
+        unless valid_keys.include?(key)
+          fail ArgumentError.new("#{key} is not a valid option")
+        end
+      end
+    end
+
+    def opts_to_hash(opts_class)
+      org.projectodd.wunderboss.Option.optsFor(opts_class).reduce({}) do |hash, entry|
+        hash[entry.name.to_sym] = entry
+        hash
+      end
+    end
+
+    def opts_to_set(opts_class)
+      Set.new(opts_to_hash(opts_class).keys)
+    end
+
+    def optset(*things)
+      set = Set.new
+      things.each do |thing|
+        if thing.is_a?(Symbol)
+          set << thing
+        elsif thing.is_a?(Enumerable)
+          set += thing
+        else
+          set += opts_to_set(thing)
+        end
+      end
+      set
+    end
+
+    def option_defaults(opts_class)
+      org.projectodd.wunderboss.Option.optsFor(opts_class).reduce({}) do |hash, entry|
+        hash[entry.name.to_sym] = entry.defaultValue
+        hash
+      end
+    end
+
+    def extract_options(options, opts_class)
+      opts_hash = opts_to_hash(opts_class)
+      extracted_options = {}
+      options.each_pair do |key, value|
+        if opts_hash.include?(key)
+          extracted_options[opts_hash[key]] = value.is_a?(Symbol) ? value.to_s : value
+        end
+      end
+      extracted_options
+    end
+  end
+end

data/lib/torquebox/spec_helpers.rb

@@ -0,0 +1,48 @@
+# Copyright 2014 Red Hat, Inc, and individual contributors.
+#
+# 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 'fileutils'
+require 'tempfile'
+
+module TorqueBox
+  # @api private
+  class SpecHelpers
+
+    def self.boot_marker_env_key
+      "TORQUEBOX_SPEC_BOOT_MARKER"
+    end
+
+    def self.set_boot_marker
+      boot_marker = Tempfile.new('tb_spec_boot_marker')
+      ENV[boot_marker_env_key] = boot_marker.path
+      boot_marker.close
+      boot_marker.unlink
+    end
+
+    def self.clear_boot_marker
+      if ENV[boot_marker_env_key]
+        FileUtils.rm_f(ENV[boot_marker_env_key])
+        ENV[boot_marker_env_key] = nil
+      end
+    end
+
+    def self.booted
+      File.open(ENV[boot_marker_env_key], "w") {} if ENV[boot_marker_env_key]
+    end
+
+    def self.booted?
+      File.exist?(ENV[boot_marker_env_key])
+    end
+  end
+end