strikeroff-routing-filter 0.0.1 → 0.0.2

data/.gitignore

@@ -1 +1,2 @@
-vendor
+vendor
+gem_build.bat

data/README.markdown

@@ -117,6 +117,30 @@ So, even though the plugin itself is a blatant monkey-patch to one of the
 most complex area of Rails internals, this solution seems to be effectively
 less intrusive and pricey than others are.
 
+
+# Difference from origin
+
+1. Locale filter now has option :scip_locale_filter
+    In you routes rb you can 
+    map.change_locale "main/change_locale/:new_locale", :controller=>"main", :action=>"change_locale", :scip_locale_filter=>true
+    And locale filter wouldn't add locale to url while generate
+	
+2. extract_locale! and prepend_locale! methods become class methods aka static. So you can use them outside of gem
+	Usecase:
+	For example   to create  on page language changer without  requests to served. You need only change locale in url
+	
+	Example code:
+			Current locale - :ru,but you need to have a link  with locale = :en. 
+			
+			link_to("EN", url_with_locale(request.request_uri.dup, :en))
+			
+			def url_with_locale(url,locale)
+				RoutingFilter::Locale.extract_locale! url        
+				RoutingFilter::Locale.prepend_locale! url, locale
+			end
+
+ 
+
 ## Etc
 
 Authors: [Sven Fuchs](http://www.artweb-design.de) <svenfuchs at artweb-design dot de>  

data/lib/routing_filter/locale.rb

@@ -22,49 +22,61 @@ module RoutingFilter
       def locales_pattern
         @@locales_pattern ||= %r(^/(#{self.locales.map { |l| Regexp.escape(l.to_s) }.join('|')})(?=/|$))
       end
+
+      def extract_locale!(path)
+        path.sub! self.locales_pattern, ''
+        $1
+      end
+
+      def prepend_locale!(url, locale)
+        url.sub!(%r(^(http.?://[^/]*)?(.*))) { "#{$1}/#{locale}#{$2}" }
+      end
     end
 
     def around_recognize(path, env, &block)
-      locale = extract_locale!(path)                 # remove the locale from the beginning of the path
+      locale = self.class.extract_locale!(path)                 # remove the locale from the beginning of the path
       returning yield do |params|                    # invoke the given block (calls more filters and finally routing)
         params[:locale] = locale if locale           # set recognized locale to the resulting params hash
       end
     end
 
     def around_generate(*args, &block)
-      locale = args.extract_options!.delete(:locale) # extract the passed :locale option
-      locale = I18n.locale if locale.nil?            # default to I18n.locale when locale is nil (could also be false)
-      locale = nil unless valid_locale?(locale)      # reset to no locale when locale is not valid
-
-      returning yield do |result|
-        if locale && prepend_locale?(locale)
-          url = result.is_a?(Array) ? result.first : result
-          prepend_locale!(url, locale)
+      options = args.extract_options!
+
+      locale = options.delete(:locale)
+      unless  skip_prepend_locale? options
+        locale = I18n.locale if locale.nil?            # default to I18n.locale when locale is nil (could also be false)
+        locale = nil unless valid_locale?(locale)     # reset to no locale when locale is not valid
+        returning yield do |result|
+          if locale && prepend_locale?(locale)
+            url = result.is_a?(Array) ? result.first : result
+            self.class.prepend_locale!(url, locale)
+          end
         end
+      else
+        yield
       end
     end
 
     protected
 
-      def extract_locale!(path)
-        path.sub! self.class.locales_pattern, ''
-        $1
-      end
 
-      def prepend_locale?(locale)
-        self.class.include_default_locale? || !default_locale?(locale)
-      end
+    def prepend_locale?(locale)
+      self.class.include_default_locale? || !default_locale?(locale)
+    end
 
-      def valid_locale?(locale)
-        locale && self.class.locales.include?(locale.to_sym)
-      end
+    def skip_prepend_locale?(options)
+      !!options[:scip_locale_filter]
+    end
+
+    def valid_locale?(locale)
+      locale && self.class.locales.include?(locale.to_sym)
+    end
+
+    def default_locale?(locale)
+      locale && locale.to_sym == I18n.default_locale.to_sym
+    end
 
-      def default_locale?(locale)
-        locale && locale.to_sym == I18n.default_locale.to_sym
-      end
 
-      def prepend_locale!(url, locale)
-        url.sub!(%r(^(http.?://[^/]*)?(.*))) { "#{$1}/#{locale}#{$2}" }
-      end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: strikeroff-routing-filter
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -41,7 +41,6 @@ files:
 - spec/spec_helper.rb
 has_rdoc: false
 homepage: http://github.com/svenfuchs/routing-filter
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -62,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: routing-filter wraps around the complex beast that the Rails routing system is, allowing for unseen flexibility and power in Rails URL recognition and generation.