mdwan-rsolr 0.8.2 → 0.9.0

data/lib/core_ext/array.rb

@@ -0,0 +1,7 @@
+unless Array.respond_to?(:extract_options!)
+  class Array
+    def extract_options!
+      last.is_a?(::Hash) ? pop : {}
+    end
+  end
+end

data/lib/core_ext/hash.rb

@@ -0,0 +1,42 @@
+# TODO: test this 
+class Hash
+  # This is straight from ActiveSupport
+  unless Hash.respond_to?(:symbolize_keys) || Hash.respond_to?(:symbolize_keys)
+    # Return a new hash with all keys converted to symbols.
+    def symbolize_keys
+      inject({}) do |options, (key, value)|
+        options[(key.to_sym rescue key) || key] = value
+        options
+      end
+    end
+
+    # Destructively convert all keys to symbols.
+    def symbolize_keys!
+      self.replace(self.symbolize_keys)
+    end
+  end 
+
+  # This is absent for some reason in Rails, at least for now. Merb has it and will probably make its way in with Rails 3.0
+  unless Hash.respond_to?(:recursive_symbolize_keys) || Hash.respond_to?(:recursive_symbolize_keys!)
+    def recursive_symbolize_keys
+      Hash.recursive_symbolize_keys(self.deep_clone)
+    end
+
+    def recursive_symbolize_keys!
+      Hash.recursive_symbolize_keys(self)
+    end
+
+    private
+      def self.recursive_symbolize_keys(hash)
+        hash = hash.symbolize_keys!
+        hash.each do |key, value|
+          if value.is_a?(Hash)
+             Hash.recursive_symbolize_keys(value)
+          elsif value.is_a?(Array)
+            value.each { |v| Hash.recursive_symbolize_keys(v) if v.is_a?(Hash)}
+          end
+        end
+        hash
+      end
+  end
+end

data/lib/core_ext/object.rb

@@ -0,0 +1,9 @@
+# Need to perform destructive operations on a clone without affecting referenced objects? BAM!
+# This REALLY should be in Ruby. Perhaps Ruby 1.9 will have it...
+unless Object.respond_to?(:deep_clone)
+  class Object
+    def deep_clone
+      Marshal::load(Marshal.dump(self))
+    end
+  end
+end

data/lib/core_ext.rb

@@ -1,25 +1 @@
-#class Symbol
-  
-  # allow symbol chaining: :one.two.three
-  # This breaks Rails, probably lots of other things too :(
-  #def method_missing(m)
-  #  [self.to_s, m.to_s].join('.').to_sym
-  #end
-  
-#end
-
-class Hash
-  
-  def to_mash
-    self.is_a?(Mash) ? self : Mash.new(self)
-  end
-  
-end
-
-unless Array.respond_to?(:extract_options!)
-  class Array
-    def extract_options!
-      last.is_a?(::Hash) ? pop : {}
-    end
-  end
-end
+Dir[File.dirname(__FILE__) + '/core_ext/*.rb'].each { |file| require file }

data/lib/rsolr/connection.rb

@@ -97,7 +97,7 @@ class RSolr::Connection
   # 
   def adapt_response(adapter_response)
     if adapter_response[:params][:wt] == :ruby
-      data = Kernel.eval(adapter_response[:body]).to_mash
+      data = Kernel.eval(adapter_response[:body]).recursive_symbolize_keys
     else
       data = adapter_response[:body]
     end

data/lib/rsolr.rb

@@ -3,7 +3,7 @@
 proc {|base, files|
   $: << base unless $:.include?(base) || $:.include?(File.expand_path(base))
   files.each {|f| require f}
-}.call(File.dirname(__FILE__), ['core_ext', 'mash'])
+}.call(File.dirname(__FILE__), ['core_ext'])
 
 module RSolr
   

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: mdwan-rsolr
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors: 
+- Michael Dwan
 - Matt Mitchell
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-03-24 00:00:00 -07:00
+date: 2009-04-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +24,7 @@ dependencies:
         version: 2.1.2
     version: 
 description: RSolr is a Ruby gem for working with Apache Solr!
-email: goodieboy@gmail.com
+email: mpdwan@gmail.com
 executables: []
 
 extensions: []
@@ -37,7 +38,9 @@ files:
 - examples/http.rb
 - examples/direct.rb
 - lib/core_ext.rb
-- lib/mash.rb
+- lib/core_ext/hash.rb
+- lib/core_ext/array.rb
+- lib/core_ext/object.rb
 - lib/rsolr.rb
 - lib/rsolr/adapter/common_methods.rb
 - lib/rsolr/adapter/direct.rb
@@ -55,7 +58,7 @@ files:
 - rsolr-ruby.gemspec
 - CHANGES.txt
 has_rdoc: true
-homepage: http://github.com/mwmitchell/rsolr
+homepage: http://github.com/mdwan/rsolr
 post_install_message: 
 rdoc_options: []
 

data/lib/mash.rb

@@ -1,148 +0,0 @@
-# This class has dubious semantics and we only have it so that people can write
-# params[:key] instead of params['key'].
-class Mash < Hash
-
-  # @param constructor<Object>
-  #   The default value for the mash. Defaults to an empty hash.
-  #
-  # @details [Alternatives]
-  #   If constructor is a Hash, a new mash will be created based on the keys of
-  #   the hash and no default value will be set.
-  def initialize(constructor = {})
-    if constructor.is_a?(Hash)
-      super()
-      update(constructor)
-    else
-      super(constructor)
-    end
-  end
-
-  # @param key<Object> The default value for the mash. Defaults to nil.
-  #
-  # @details [Alternatives]
-  #   If key is a Symbol and it is a key in the mash, then the default value will
-  #   be set to the value matching the key.
-  def default(key = nil)
-    if key.is_a?(Symbol) && include?(key = key.to_s)
-      self[key]
-    else
-      super
-    end
-  end
-
-  alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
-  alias_method :regular_update, :update unless method_defined?(:regular_update)
-
-  # @param key<Object> The key to set.
-  # @param value<Object>
-  #   The value to set the key to.
-  #
-  # @see Mash#convert_key
-  # @see Mash#convert_value
-  def []=(key, value)
-    regular_writer(convert_key(key), convert_value(value))
-  end
-
-  # @param other_hash<Hash>
-  #   A hash to update values in the mash with. The keys and the values will be
-  #   converted to Mash format.
-  #
-  # @return <Mash> The updated mash.
-  def update(other_hash)
-    other_hash.each_pair { |key, value| regular_writer(convert_key(key), convert_value(value)) }
-    self
-  end
-
-  alias_method :merge!, :update
-
-  # @param key<Object> The key to check for. This will be run through convert_key.
-  #
-  # @return <TrueClass, FalseClass> True if the key exists in the mash.
-  def key?(key)
-    super(convert_key(key))
-  end
-
-  # def include? def has_key? def member?
-  alias_method :include?, :key?
-  alias_method :has_key?, :key?
-  alias_method :member?, :key?
-
-  # @param key<Object> The key to fetch. This will be run through convert_key.
-  # @param *extras<Array> Default value.
-  #
-  # @return <Object> The value at key or the default value.
-  def fetch(key, *extras)
-    super(convert_key(key), *extras)
-  end
-
-  # @param *indices<Array>
-  #   The keys to retrieve values for. These will be run through +convert_key+.
-  #
-  # @return <Array> The values at each of the provided keys
-  def values_at(*indices)
-    indices.collect {|key| self[convert_key(key)]}
-  end
-
-  # @param hash<Hash> The hash to merge with the mash.
-  #
-  # @return <Mash> A new mash with the hash values merged in.
-  def merge(hash)
-    self.dup.update(hash)
-  end
-
-  # @param key<Object>
-  #   The key to delete from the mash.\
-  def delete(key)
-    super(convert_key(key))
-  end
-
-  # @param *rejected<Array[(String, Symbol)] The mash keys to exclude.
-  #
-  # @return <Mash> A new mash without the selected keys.
-  #
-  # @example
-  #   { :one => 1, :two => 2, :three => 3 }.except(:one)
-  #     #=> { "two" => 2, "three" => 3 }
-  def except(*keys)
-    super(*keys.map {|k| convert_key(k)})
-  end
-
-  # Used to provide the same interface as Hash.
-  #
-  # @return <Mash> This mash unchanged.
-  def stringify_keys!; self end
-
-  # @return <Hash> The mash as a Hash with string keys.
-  def to_hash
-    Hash.new(default).merge(self)
-  end
-
-  protected
-  # @param key<Object> The key to convert.
-  #
-  # @param <Object>
-  #   The converted key. If the key was a symbol, it will be converted to a
-  #   string.
-  #
-  # @api private
-  def convert_key(key)
-    key.kind_of?(Symbol) ? key.to_s : key
-  end
-
-  # @param value<Object> The value to convert.
-  #
-  # @return <Object>
-  #   The converted value. A Hash or an Array of hashes, will be converted to
-  #   their Mash equivalents.
-  #
-  # @api private
-  def convert_value(value)
-    if value.class == Hash
-      value.to_mash
-    elsif value.is_a?(Array)
-      value.collect { |e| convert_value(e) }
-    else
-      value
-    end
-  end
-end