rails-ext 0.3.22 → 0.3.23

data/.git/COMMIT_EDITMSG

@@ -1 +1 @@
-upd
+fix

data/.git/logs/HEAD

@@ -76,3 +76,4 @@ a5fe3c8ef2b84dbebb2181ceaebec710f5b163d4 0573ef490a937cd853c8d8d6affb63851451e0a
 f3f41f5c38825fcae9dd63fc9f18ce66b9ce08b7 e68bedbf8dd4dacaa7f0a681fe083d4b754cb1f7 alex <alex@amac.local> 1272806420 +0400	commit: fix
 e68bedbf8dd4dacaa7f0a681fe083d4b754cb1f7 83e57169d9640366e3a95806fc2c73c98d686033 alex <alex@amac.local> 1272814712 +0400	commit: fix
 83e57169d9640366e3a95806fc2c73c98d686033 120612cf1c0a44c1433355a4155c1aede0bbceef alex <alex@amac.local> 1272820652 +0400	commit: upd
+120612cf1c0a44c1433355a4155c1aede0bbceef 911c11ff0ad81999f73c5dee56c8f6241d3ac346 alex <alex@amac.local> 1272821766 +0400	commit: fix

data/.git/logs/refs/heads/master

@@ -76,3 +76,4 @@ a5fe3c8ef2b84dbebb2181ceaebec710f5b163d4 0573ef490a937cd853c8d8d6affb63851451e0a
 f3f41f5c38825fcae9dd63fc9f18ce66b9ce08b7 e68bedbf8dd4dacaa7f0a681fe083d4b754cb1f7 alex <alex@amac.local> 1272806420 +0400	commit: fix
 e68bedbf8dd4dacaa7f0a681fe083d4b754cb1f7 83e57169d9640366e3a95806fc2c73c98d686033 alex <alex@amac.local> 1272814712 +0400	commit: fix
 83e57169d9640366e3a95806fc2c73c98d686033 120612cf1c0a44c1433355a4155c1aede0bbceef alex <alex@amac.local> 1272820652 +0400	commit: upd
+120612cf1c0a44c1433355a4155c1aede0bbceef 911c11ff0ad81999f73c5dee56c8f6241d3ac346 alex <alex@amac.local> 1272821766 +0400	commit: fix

data/.git/logs/refs/remotes/origin/master

@@ -61,3 +61,4 @@ cda2dd4b5ecbc69fa1b1ebf09c580ba17bf69656 268fe011dd9d01aa6e05c2004280b78e149ea29
 f3f41f5c38825fcae9dd63fc9f18ce66b9ce08b7 e68bedbf8dd4dacaa7f0a681fe083d4b754cb1f7 alex <alex@amac.local> 1272806434 +0400	update by push
 e68bedbf8dd4dacaa7f0a681fe083d4b754cb1f7 83e57169d9640366e3a95806fc2c73c98d686033 alex <alex@amac.local> 1272814722 +0400	update by push
 83e57169d9640366e3a95806fc2c73c98d686033 120612cf1c0a44c1433355a4155c1aede0bbceef alex <alex@amac.local> 1272820661 +0400	update by push
+120612cf1c0a44c1433355a4155c1aede0bbceef 911c11ff0ad81999f73c5dee56c8f6241d3ac346 alex <alex@amac.local> 1272821772 +0400	update by push

data/.git/refs/heads/master

@@ -1 +1 @@
-120612cf1c0a44c1433355a4155c1aede0bbceef
+911c11ff0ad81999f73c5dee56c8f6241d3ac346

data/.git/refs/remotes/origin/master

@@ -1 +1 @@
-120612cf1c0a44c1433355a4155c1aede0bbceef
+911c11ff0ad81999f73c5dee56c8f6241d3ac346

data/Rakefile

@@ -18,7 +18,7 @@ require 'fileutils'
 
 spec = Gem::Specification.new do |s|
 	s.name = "rails-ext"
-	s.version = "0.3.22"
+	s.version = "0.3.23"
 	s.summary = "Set of common Ruby on Rails extensions"
 	s.description = "Set of common Ruby on Rails extensions"
 	s.author = "Alexey Petrushin"

data/lib/rails_ext/action_controller/persistent_params.rb

@@ -8,21 +8,22 @@ ActionController::Base.send :class_eval do
     
     if options
       options = options.stringify_keys if options
+      global_persistent_params = ActionController::Base.global_persistent_params
     
       if Thread.current[:persist_params] or options.delete(:persist)
         params.each do |key, value|
           persist = (
             (key =~ /^_/) and
             !(options.include?(key) or DO_NOT_PERSIST.include?(key))
-          )
+          ) or global_persistent_params.include?(key)
 
           persistent_params[key] = value if persist
         end
       end
         
-      global_persistent_params.each do |key, value|
-        persistent_params[key] = value unless options.include?(key)
-      end
+      # global_persistent_params.each do |key, value|
+      #   persistent_params[key] = value unless options.include?(key)
+      # end
     end
     
     return persistent_params
@@ -50,20 +51,20 @@ ActionController::Base.send :class_eval do
   end 
   helper_method :do_not_persist_params
   
-  def prepare_global_persistent_params
-    persistent_params = ActionController::Base.global_persistent_params
-    prefix_params = ActionController::Base.global_path_prefix
-    params = self.params.stringify_keys
-    params.each do |key, value|
-      if persistent_params.include?(key) and !prefix_params.include?(key)
-        global_persistent_params[key] = value
-      end
-    end
-  end
-  def global_persistent_params
-    @global_persistent_params ||= {}
-  end
-  before_filter :prepare_global_persistent_params
+  # def prepare_global_persistent_params
+  #   persistent_params = ActionController::Base.global_persistent_params
+  #   prefix_params = ActionController::Base.global_path_prefix
+  #   params = self.params.stringify_keys
+  #   params.each do |key, value|
+  #     if persistent_params.include?(key) and !prefix_params.include?(key)
+  #       global_persistent_params[key] = value
+  #     end
+  #   end
+  # end
+  # def global_persistent_params
+  #   @global_persistent_params ||= {}
+  # end
+  # before_filter :prepare_global_persistent_params
   
   class << self
     def global_persistent_params= params

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 22
-  version: 0.3.22
+  - 23
+  version: 0.3.23
 platform: ruby
 authors: 
 - Alexey Petrushin
@@ -91,6 +91,7 @@ files:
 - .git/objects/0b/b62f25b6636b2ce32ebd4551120f5765b787e1
 - .git/objects/0b/e101a0586410212b4ee5905881ad726b7b4907
 - .git/objects/0c/4df6bee8ffbfd79927b23a070a4c9a41991152
+- .git/objects/0c/d63588836394586cf3aec62339dba672e3fba1
 - .git/objects/0d/aa3468e187093eff222b8094a6e702dea9ba4e
 - .git/objects/0d/b63ec7380f5132ca02be93c82f5295e33c10a9
 - .git/objects/0d/f02169bc94825e3629924eb44a662f07dc4dd8
@@ -109,6 +110,7 @@ files:
 - .git/objects/13/a8efff96c74f758b770a3d6825e8ede1163130
 - .git/objects/13/d5e53963c37e20ff517035b00f6b404c0e8056
 - .git/objects/13/e384c8fc700987e1d3ad07936a93c55481bd9d
+- .git/objects/13/e52335ce37dcd3ef032f5187b5971114a21cfb
 - .git/objects/13/fd1506658a8432e3048715a654024162ee654f
 - .git/objects/14/ff5ae72cfafe3787a600e2292edf2822c4e48e
 - .git/objects/15/351f2f81548a7a0d9c4a6690894a42262fb7f5
@@ -160,6 +162,7 @@ files:
 - .git/objects/26/8fe011dd9d01aa6e05c2004280b78e149ea29e
 - .git/objects/27/37bd94ff477fad57bb86f0a3e37110f6a75cb5
 - .git/objects/27/c51d8db9f25b7b6596dceb626252c90fd26b57
+- .git/objects/27/f64dfbca8c6e228425b7e63b48eed190d29780
 - .git/objects/27/f8a63386b8acf5edba3ed9334644455045acd8
 - .git/objects/28/0d2d83eb4aa5fb48fefa1a8ceab6761cd9288d
 - .git/objects/28/8e20f19c6662b1425e0a0797ae443f7eddcc4a
@@ -263,6 +266,7 @@ files:
 - .git/objects/53/b8187421c09e55e44b8d6fb3c4cd7feb0a51b2
 - .git/objects/54/713b018cb71a95e3f10510ea96b9f103ef0255
 - .git/objects/55/0dd68cd7e6918dd1473d609e8cafcde8f89009
+- .git/objects/55/3b8cd5bc6a69c81af2f957445c7a381fdf7220
 - .git/objects/55/45d0d521bb723db8feae0223fa838a183e38b7
 - .git/objects/55/4e8e5d25f1c00fb3743766532d9324e623b0a3
 - .git/objects/55/6c13b26b6cecd286427a7f16c60c86c7df7885
@@ -349,6 +353,7 @@ files:
 - .git/objects/78/dfe98fd2685e6fd0b937d866e5dfb1c83ae589
 - .git/objects/79/0a80b72f6f6f214ece6a3e71e818effc5c9e6e
 - .git/objects/79/4750e930e297c9616e902898f684967c2760c7
+- .git/objects/79/b917ac5d56e3bffb0f63a9e3119ed32d638d42
 - .git/objects/79/f570c126c66576fc1a5eaa52f003cf1b24e0d2
 - .git/objects/7a/1d5b342eabedd35bb3c388eafcb6a42266e740
 - .git/objects/7a/d62f1e2a8e4af39d293ce70c5dca999263ab4e
@@ -407,6 +412,7 @@ files:
 - .git/objects/90/a3187c0cfd6ae0de236633da361820a4cf1b19
 - .git/objects/90/ad7b150bde29d3a30f4a8ddd2463249e6c4418
 - .git/objects/90/ca84ea326afab5fcc92a50469c2052ebc46f11
+- .git/objects/91/1c11ff0ad81999f73c5dee56c8f6241d3ac346
 - .git/objects/92/dc044f4d69a5cb3a6a3109c2ce6b7f90bac2ab
 - .git/objects/92/debcedcd81c328806dc7506b3cd91990bb9775
 - .git/objects/92/e1c250edfca72ed0932934257ef3cfc7122ec5
@@ -590,6 +596,7 @@ files:
 - .git/objects/e0/d8e7ab5a565d95d44f2a9a6246be6003a3de7b
 - .git/objects/e1/0c4f3ec5729fd4d2580d74e96a0489644a041a
 - .git/objects/e1/323977dc6cda25967e6ec6166430c2c0f08e32
+- .git/objects/e2/30f8b3acd20695be0a13fdd42aefa364ad1a4d
 - .git/objects/e2/bc2615d3aa154bba2897c562a15ed19136d518
 - .git/objects/e2/c37248908c561be703c405e237fbf0c743977a
 - .git/objects/e2/df18fc21e446588205694aef1de7d63ca31b4f