moxify 0.1.7.2 → 0.1.7.3

data/config/routes.rb

@@ -1,5 +1,7 @@
-::Refinery::Application.routes.draw do
-  match '/refinery(/*path)', :to => redirect {|params, request|
-    "/admin#{"/#{params[:path]}" unless params[:path].blank?}"
-  }
+if RefinerySetting.find_or_set(:rewrite_refinery_paths, true)
+  ::Refinery::Application.routes.draw do
+    match '/refinery(/*path)', :to => redirect {|params, request|
+      "/#{RefinerySetting.find_or_set(:rewrite_refinery_paths_to, "admin")}#{"/#{params[:path]}" unless params[:path].blank?}"
+    }
+  end
 end

data/lib/moxify.rb

@@ -32,16 +32,18 @@ module Moxify
       Rails.application.routes.routes.each do |route|
         match = false
         
-        if  route.path =~ /refinery/ and
+        if  RefinerySetting.find_or_set(:rewrite_refinery_paths, true) and
+            route.path =~ /refinery/ and
             not route.path =~ /^\/refinery\(\/\*path\)/ # this is our catch all route
           
-          route.instance_variable_set "@path", route.path.gsub(/refinery/, "admin")
+          route.instance_variable_set "@path", route.path.gsub(/refinery/, RefinerySetting.find_or_set(:rewrite_refinery_paths_to, "admin"))
           match = true
           
-        elsif route.path =~ /^\/users/ and
+        elsif RefinerySetting.find_or_set(:rewrite_user_paths, true) and
+              route.path =~ /^\/users/ and
               route.name =~ /user\_/
           
-          route.instance_variable_set "@path", route.path.gsub(/users/, "admin")
+          route.instance_variable_set "@path", route.path.gsub(/users/, RefinerySetting.find_or_set(:rewrite_user_paths_to, "admin"))
           match = true
           
         end
@@ -76,4 +78,4 @@ module Moxify
     
   end
   
-end
+end

data/lib/moxify/url_tempfile.rb

@@ -1,19 +1,48 @@
 module Moxify
+  require 'mime/types'
+  require 'openssl'
+  require 'open-uri'
+
   class URLTempfile < Tempfile
+    attr :content_type
 
     def initialize(url)
       @url = URI.parse(url)
 
+      # see if we can get a filename
+      raise "Unable to determine filename for URL uploaded file." unless original_filename
+
       begin
-        super('url', Dir.tmpdir, :encoding => 'ascii-8bit')
+        # HACK to get around inability to set VERIFY_NONE with open-uri
+        old_verify_peer_value = OpenSSL::SSL::VERIFY_PEER
+        openssl_verify_peer = OpenSSL::SSL::VERIFY_NONE
 
-        Net::HTTP.start(@url.host) do |http|
-          resp = http.get(@url.path)
-          self.write resp.body
+        super('urlupload', Dir.tmpdir, :encoding => 'ascii-8bit')
+        Kernel.open(url) do |file|
+          @content_type = file.content_type
+          raise "Unable to determine MIME type for URL uploaded file." unless content_type
+
+          self.write file.read
+          self.flush
         end
       ensure
+        openssl_verify_peer = old_verify_peer_value
       end
     end
 
+    def original_filename
+      # Take the URI path and strip off everything after last slash, assume this
+      # to be filename (URI path already removes any query string)
+      match = @url.path.match(/^.*\/(.+)$/)
+      return (match ? match[1] : nil)
+    end
+
+    protected
+
+    def openssl_verify_peer=(value)
+      silence_warnings do
+        OpenSSL::SSL.const_set("VERIFY_PEER", value)
+      end
+    end
   end
 end

data/lib/moxify/version.rb

@@ -1,3 +1,3 @@
 module Moxify
-  VERSION = "0.1.7.2"
+  VERSION = "0.1.7.3"
 end

metadata

@@ -2,7 +2,7 @@
 name: moxify
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.7.2
+  version: 0.1.7.3
 platform: ruby
 authors: 
 - Marian Andre
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 +02:00
+date: 2011-05-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency