rewritten 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34a5c63d94e26e835807498f850cf45eecb6a846
-  data.tar.gz: dc27dfb93fd4a561fde220961a6d1d09c5019268
+  metadata.gz: f04c056a99d6a3acda82865046870011d45869e6
+  data.tar.gz: 2e1e1d2551c2303756f1ea6c4f6dc29dd0e74614
 SHA512:
-  metadata.gz: afe1017ab7ec13d289b1f2107f4f0931b878c356686aadad6018cf933a646c0b0a7d98696098600bfc2b7ee487a286b7a6906f057d58eead5428394e77163667
-  data.tar.gz: 84c441c885be0a95a9a5e00a5cbdaa068fd24264c8c16c8afe7348ae1f3cbb3d739286a066d7076f5c1d900c2b94a6d21f29c24832da8fe0717ff00b402db749
+  metadata.gz: 5d86aca2260d03f7855526b6a5bf8bcafab65739318900eb79dd7f2a6a0eabba67b5aca00b002914c69059d27d6bd15252ddff210f6cd47dbc3e9fe5b6a91ddf
+  data.tar.gz: 1b3f8c5c56a42fe6e62237bfd5abc96df833b61cf1054e10e1e987d11b5a1d8a780fc660632ad4619971d0b17880d0b71b8f5efa93f5ba3a9b59d93801985d7b

data/lib/rack/url.rb

@@ -29,6 +29,7 @@ module Rack
 
           current_path = ::Rewritten.get_current_translation(to)
           current_path = current_path.split(":").last
+          current_path = current_path.split('?')[0]
 
           if current_path == req.path_info or ::Rewritten.has_flag?(path, 'L')
             # if this is the current path, rewrite path and parameters

data/lib/rewritten.rb

@@ -187,9 +187,24 @@ module Rewritten
   end
 
   def get_current_translation(path)
+
+    uri = URI.parse(path)
+
     translation = Rewritten.z_range("to:#{path}", -1)
-    return translation if translation
-    return path
+
+    unless translation 
+      translation = Rewritten.z_range("to:#{uri.path}", -1)
+    end
+
+    translation = path unless translation
+
+
+    translated_uri = URI.parse(translation)
+
+    uri.path = translated_uri.path
+    uri.query = [translated_uri.query, uri.query].compact.join('&')
+    uri.query = nil if uri.query == ''
+    uri.to_s
   end
 
   def get_flag_string(from)

data/lib/rewritten/version.rb

@@ -1,4 +1,4 @@
 module Rewritten
-  VERSION = "0.12.1"
+  VERSION = "0.13.0"
 end
 

data/test/rewritten_test.rb

@@ -11,6 +11,27 @@ describe Rewritten do
     Rewritten.add_translation('/with/flags  [L12]', '/to3')
   }
 
+  describe 'Rewritten.get_current_translation' do
+
+    it "must give current_translation" do
+      Rewritten.get_current_translation('/to').must_equal '/from2'
+      Rewritten.get_current_translation('/to2').must_equal '/from3'
+      Rewritten.get_current_translation('/to3').must_equal '/with/flags'
+      Rewritten.get_current_translation('/n/a').must_equal '/n/a'
+    end
+
+    it "must find the translation if parameters are added" do
+      Rewritten.add_translation('/from_without_params', '/to_without_params')
+      Rewritten.get_current_translation('/to_without_params?some=param').must_equal '/from_without_params?some=param'
+    end
+
+    it "must translate if protocol and host are given" do
+      Rewritten.add_translation('/from_without_params', '/to_without_params')
+      Rewritten.get_current_translation('http://localhost:3000/to_without_params').must_equal 'http://localhost:3000/from_without_params'
+    end
+
+  end
+
   describe "basic interface" do
 
     it "must translate froms" do
@@ -20,13 +41,6 @@ describe Rewritten do
       Rewritten.translate('/with/flags').must_equal '/to3'
     end
 
-    it "must give current_translation" do
-      Rewritten.get_current_translation('/to').must_equal '/from2'
-      Rewritten.get_current_translation('/to2').must_equal '/from3'
-      Rewritten.get_current_translation('/to3').must_equal '/with/flags'
-      Rewritten.get_current_translation('/n/a').must_equal '/n/a'
-    end
-
     it "must return the  complete line with flags" do
       Rewritten.full_line('/from').must_equal '/from'
       Rewritten.full_line('/with/flags').must_equal '/with/flags [L12]'

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: rewritten
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Kai Rubarth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vegas
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -148,7 +148,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - HISTORY.rdoc
 - README.md
@@ -211,17 +211,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rewritten
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A redis-based URL rewriting engine