lib/couchbase/bucket.rb in couchbase-jruby-client-0.1.1 vs lib/couchbase/bucket.rb in couchbase-jruby-client-0.1.2

- old
+ new

@@ -1,5 +1,22 @@ +# Author:: Mike Evans <mike@urlgonomics.com> +# Copyright:: 2013 Urlgonomics LLC. +# License:: Apache License, Version 2.0 +# +# 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. +# + module Couchbase class Bucket java_import java.io.IOException @@ -157,9 +174,11 @@ elsif url.nil? {} else url end + + options = Hash[ options.map { |k, v| [k.to_sym, v] } ] connection_options = default_options.merge(options).merge(url_options) connection_options.each_pair do |key, value| instance_variable_set("@#{key}", value)