map_layers 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    map_layers (0.0.3)
+    map_layers (0.0.5)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -222,8 +222,8 @@ The MapLayers plugin for Rails is released under the MIT license.
 Development
 -----------
 
-* Source hosted at [GitHub](https://github.com/ldonnet/map_layers).
-* Report issues and feature requests to [GitHub Issues](https://github.com/ldonnet/map_layers/issues).
+* Source hosted at [GitHub](https://github.com/dryade/map_layers).
+* Report issues and feature requests to [GitHub Issues](https://github.com/dryade/map_layers/issues).
 
 Pull requests are very welcome! Make sure your patches are well tested. Please create a topic branch for every separate change you make. Please **do not change** the version in your pull-request.
 

data/install.rb

@@ -3,7 +3,8 @@
 Dir.chdir(Dir.getwd.sub(/vendor.*/, '')) do
 
 def copy_files(source_path, destination_path, plugin_root)
-  source, destination = File.join(File.expand_path(plugin_root), source_path), File.join(RAILS_ROOT, destination_path)
+  rails_root = ( defined?( RAILS_ROOT)) ? RAILS_ROOT : Rails.root 
+  source, destination = File.join(File.expand_path(plugin_root), source_path), File.join( rails_root, destination_path)
   FileUtils.mkdir(destination) unless File.exist?(destination)
   FileUtils.cp_r(source, destination)
 end

data/lib/map_layers/version.rb

@@ -1,3 +1,3 @@
 module MapLayers
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/map_layers/view_helpers.rb

@@ -27,7 +27,16 @@ module MapLayers
       if options.has_key?(:img_path)
         img_path = options[:img_path]
       end
-      if RAILS_ENV == "development" && File.exist?(File.join(RAILS_ROOT, 'public/javascripts/lib/OpenLayers.js'))
+      if defined?( RAILS_ROOT)
+        rails_env = RAILS_ENV
+        rails_root = RAILS_ROOT
+        rails_relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT']
+      else
+        rails_env = Rails.env
+        rails_root = Rails.root
+        rails_relative_url_root = controller.config.relative_url_root
+      end
+      if rails_env == "development" && File.exist?(File.join( rails_root, 'public/javascripts/lib/OpenLayers.js'))
         html << '<script src="/javascripts/lib/Firebug/firebug.js"></script>'
         html << '<script src="/javascripts/lib/OpenLayers.js"></script>'
       else
@@ -36,7 +45,7 @@ module MapLayers
 
 
       html << stylesheet_link_tag("map")
-      img_path=(Pathname(ActionController::Base.relative_url_root||"") +img_path).cleanpath.to_s
+      img_path=(Pathname(rails_relative_url_root||"") +img_path).cleanpath.to_s
       html << javascript_tag("OpenLayers.ImgPath='"+ img_path  + "/';")
       proxy = options.has_key?(:proxy) ? options[:proxy] : controller.controller_name
       html << javascript_tag("OpenLayers.ProxyHost='/#{proxy}/proxy?url=';")

data/map_layers.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Luc Donnet", "Alban Peignier", "Pirmin Kalberer"] 
   s.email       = ["luc.donnet@free.fr", "alban.peignier@free.fr", "pka@sourcepole.ch"]
-  s.homepage    = "http://github.com/ldonnet/map_layers"
+  s.homepage    = "http://github.com/dryade/map_layers"
   s.summary     = %q{library dedicated to generate OSM javascript}
   s.description = %q{library dedicated to generate OSM javascript}
 

data/tasks/map_layers_tasks.rake

@@ -7,15 +7,16 @@ namespace :map_layers do
   end
 
   def copy_files(source_path, destination_path, plugin_root)
-    source, destination = File.join(plugin_root, source_path), File.join(RAILS_ROOT, destination_path)
+    rails_root = ( defined?(RAILS_ROOT)) ? RAILS_ROOT : Rails.root
+    source, destination = File.join(plugin_root, source_path), File.join(rails_root, destination_path)
     FileUtils.mkdir(destination) unless File.exist?(destination)
     FileUtils.cp_r(source, destination)
   end
 
   desc "Remove development libraries"
   task :uninstall_dev_lib do
-    FileUtils.rm_r(File.join(RAILS_ROOT, "/public/javascripts/lib"))
+    FileUtils.rm_r(File.join(Rails.root, "/public/javascripts/lib"))
   end
 
 
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: map_layers
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Luc Donnet
@@ -17,13 +17,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-30 00:00:00 +02:00
-default_executable: 
+date: 2012-02-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -34,12 +31,12 @@ dependencies:
         - 3
         - 8
         version: 2.3.8
+  requirement: *id001
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rails
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -50,12 +47,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
+  requirement: *id002
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,12 +63,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
+  requirement: *id003
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
+  name: rspec-rails
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,12 +77,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id004
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: autotest-rails
+  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -94,12 +91,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id005
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: autotest-notification
+  name: autotest-rails
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -108,8 +105,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id006
   type: :development
-  version_requirements: *id006
+  name: autotest-notification
+  prerelease: false
 description: library dedicated to generate OSM javascript
 email: 
 - luc.donnet@free.fr
@@ -157,8 +156,7 @@ files:
 - spec/spec_helper.rb~
 - tasks/map_layers_tasks.rake
 - uninstall.rb
-has_rdoc: true
-homepage: http://github.com/ldonnet/map_layers
+homepage: http://github.com/dryade/map_layers
 licenses: []
 
 post_install_message: 
@@ -187,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: map_layers
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: library dedicated to generate OSM javascript