solr_mapper 0.1.5 → 0.1.6

data/README.rdoc

@@ -30,7 +30,14 @@ gem install solr_mapper
 
   class Thing
     include SolrDocument
-    @base_url = 'http://localhost:8080/solr/thing'
+
+    # base urls can also be defined by rails environments
+    @base_url = {
+      :development => 'http://somehost/solr_thing',
+      :test => 'http://localhost:8080/solr_thing',
+      :production => 'http://somehost/solr_thing'
+    }
+
     @per_page = 10
 
     has_many :stuffs
@@ -89,7 +96,6 @@ gem install solr_mapper
   # deletes reference and destroys stuff from index
   Thing.find(2).stuffs.destroy(stuff)
 
-
 == Copyright
 
 Copyright 2010 The Skunkworx.

data/Rakefile

@@ -16,7 +16,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('solr_mapper', '0.1.5') do |p|
+Echoe.new('solr_mapper', '0.1.6') do |p|
   p.description    = "Object Document Mapper for the Apache Foundation's Solr search platform"
   p.url            = "http://github.com/skunkworx/solr_mapper"
   p.author         = "Chris Umbel"

data/lib/solr_mapper.rb

@@ -20,6 +20,7 @@ require 'rest_client'
 require 'builder'
 require 'will_paginate'
 require 'active_support/inflector'
+require 'active_support/hash_with_indifferent_access'
 
 include ActiveSupport::Inflector
 

data/lib/solr_mapper/solr_document.rb

@@ -47,7 +47,14 @@ module SolrMapper
         qs = build_qs(opts)
         qs = '?' + qs unless qs.empty?
 
-        URI::escape("#{base_url}/#{path}#{qs}")
+        if self.base_url.kind_of?(Hash) && ENV['RAILS_ENV']
+          self.base_url = ActiveSupport::HashWithIndifferentAccess.new(self.base_url) unless self.base_url.kind_of?(ActiveSupport::HashWithIndifferentAccess)
+          base = self.base_url[ENV['RAILS_ENV']]
+        else
+          base = base_url
+        end
+
+        URI::escape("#{base}/#{path}#{qs}")
       end
 
       # create a querystring from a hash

data/solr_mapper.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{solr_mapper}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Umbel"]

data/spec/url_spec.rb

@@ -32,5 +32,34 @@ describe SolrDocument do
     Thing.build_url("update").should == "#{Thing.base_url}/update"
   end
 
+  it "should build URLs accepting hashes for the environment" do
+    ENV['RAILS_ENV'] = 'test'
+
+    class AnotherThing
+      include SolrDocument
+      @base_url = {
+              :development => 'http://somehost/solr_thing',
+              :test => 'http://localhost:8080/solr_thing',
+              :production => 'http://somehost/solr_thing'
+      }
+    end
+
+    AnotherThing.build_url('select').should == 'http://localhost:8080/solr_thing/select'
+  end
+
+  it "should build URLs accepting hashes for the environment via string keys" do
+    ENV['RAILS_ENV'] = 'test'
+
+    class AnotherThing
+      include SolrDocument
+      @base_url = {
+              'development' => 'http://somehost/solr_thing',
+              'test' => 'http://localhost:8080/solr_thing',
+              'production' => 'http://somehost/solr_thing'
+      }
+    end
+
+    AnotherThing.build_url('select').should == 'http://localhost:8080/solr_thing/select'
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solr_mapper
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Chris Umbel