rails-ext 0.2.5 → 0.2.6

data/.git/COMMIT_EDITMSG

@@ -1 +1 @@
-minor fix
+update i18n & mongomapper

data/.git/logs/HEAD

@@ -15,3 +15,4 @@ f63ad03a8daa1602df63aab3838947c18fa63797 0fd3ac42b07c2d3102263bd939704f5633db304
 00cc0fab85c28c827b7489c092c7fdfacaab2c15 ddad36d883dd04cb1b68f0f81d5b3fa98b8551e3 Alex <alex@alex.local> 1262611311 +0300	commit: small fixes
 ddad36d883dd04cb1b68f0f81d5b3fa98b8551e3 8203c2c6cdd29e1e20e88fbb81e63b7ea1ec2899 Alex <alex@alex.local> 1262615007 +0300	commit: minor fix
 8203c2c6cdd29e1e20e88fbb81e63b7ea1ec2899 4966cd792ea3e03d5091aa7a332f2a082e479a76 Alex <alex@alex.local> 1262615022 +0300	commit: minor fix
+4966cd792ea3e03d5091aa7a332f2a082e479a76 c1424cadd8817a7e927742e52945f303b38e7222 alex <alex@amac.local> 1264099114 +0300	commit: update i18n & mongomapper

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

@@ -15,3 +15,4 @@ f63ad03a8daa1602df63aab3838947c18fa63797 0fd3ac42b07c2d3102263bd939704f5633db304
 00cc0fab85c28c827b7489c092c7fdfacaab2c15 ddad36d883dd04cb1b68f0f81d5b3fa98b8551e3 Alex <alex@alex.local> 1262611311 +0300	commit: small fixes
 ddad36d883dd04cb1b68f0f81d5b3fa98b8551e3 8203c2c6cdd29e1e20e88fbb81e63b7ea1ec2899 Alex <alex@alex.local> 1262615007 +0300	commit: minor fix
 8203c2c6cdd29e1e20e88fbb81e63b7ea1ec2899 4966cd792ea3e03d5091aa7a332f2a082e479a76 Alex <alex@alex.local> 1262615022 +0300	commit: minor fix
+4966cd792ea3e03d5091aa7a332f2a082e479a76 c1424cadd8817a7e927742e52945f303b38e7222 alex <alex@amac.local> 1264099114 +0300	commit: update i18n & mongomapper

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

@@ -14,3 +14,4 @@ f63ad03a8daa1602df63aab3838947c18fa63797 0fd3ac42b07c2d3102263bd939704f5633db304
 00cc0fab85c28c827b7489c092c7fdfacaab2c15 ddad36d883dd04cb1b68f0f81d5b3fa98b8551e3 Alex <alex@alex.local> 1262611317 +0300	update by push
 ddad36d883dd04cb1b68f0f81d5b3fa98b8551e3 8203c2c6cdd29e1e20e88fbb81e63b7ea1ec2899 Alex <alex@alex.local> 1262615013 +0300	update by push
 8203c2c6cdd29e1e20e88fbb81e63b7ea1ec2899 4966cd792ea3e03d5091aa7a332f2a082e479a76 Alex <alex@alex.local> 1262615027 +0300	update by push
+4966cd792ea3e03d5091aa7a332f2a082e479a76 c1424cadd8817a7e927742e52945f303b38e7222 alex <alex@amac.local> 1264099121 +0300	update by push

data/.git/refs/heads/master

@@ -1 +1 @@
-4966cd792ea3e03d5091aa7a332f2a082e479a76
+c1424cadd8817a7e927742e52945f303b38e7222

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

@@ -1 +1 @@
-4966cd792ea3e03d5091aa7a332f2a082e479a76
+c1424cadd8817a7e927742e52945f303b38e7222

data/Rakefile

@@ -18,7 +18,7 @@ require 'fileutils'
 
 spec = Gem::Specification.new do |s|
 	s.name = "rails-ext"
-	s.version = "0.2.5"
+	s.version = "0.2.6"
 	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/i18n_helper.rb

@@ -25,46 +25,64 @@ begin
   # t() and t_scope()
   list = [Object, ActionController::Base, ActionView::Base, ActionMailer::Base]
   list << ActiveRecord::Base if defined?(ActiveRecord)
-  list.each do |_class|
-    _class.class_eval do
+  list.each do |aclass|
+    aclass.class_eval do
       
       # def self.t_scope_value; end # hack, becouse of rails method_missing magic it causes error
       # def t_scope_value; end # hack, becouse of rails method_missing magic it causes error
-      
-      def self.t_scope *scopes
-        class_inheritable_accessor :t_scope_value unless respond_to? :t_scope_value
-        self.t_scope_value = scopes.collect{|scope| scope + "_scope"}
-      end
+      # 
+      # def self.t_scope *scopes
+      #   class_inheritable_accessor :t_scope_value unless respond_to? :t_scope_value
+      #   self.t_scope_value = scopes.collect{|scope| scope + "_scope"}
+      # end
   
       # finding translation in all class hierarchy
-      def t message, params = {}
-        result = nil
-        
-        aclass = self.is_a?(Class) ? self : self.class
-        list = aclass.ancestors
-        list.unshift self unless self.is_a?(Class) # hack for ActionView and ActionMailer
-        
-        list.each do |c|
-          begin
-            next unless t_scope = c.respond_to(:t_scope_value)
-          rescue NameError # hack for rails method_missing magic
-            next 
-          end
-          
-          t_scope.each do |ts|
-            begin
-              result = I18n.t "#{ts}.#{message}", params.merge(:raise => true)
-            rescue I18n::MissingTranslationData
-            end
-            break if result
-          end
-          
-          break if result
-        end
-        
-        result ||= I18n.t message, params
-        result.to_s # Globalize2 uses Translation::Static instead of String
+      # def t message, params = {}
+      #   # begin
+      #   #   p([message, respond_to(:t_scope_value)])
+      #   # rescue
+      #   #   p([self.t_scope_value])
+      #   # end
+      #   
+      #   result = nil
+      #   
+      #   aclass = self.is_a?(Class) ? self : self.class
+      #   list = aclass.ancestors
+      #   list.unshift self unless self.is_a?(Class) # hack for ActionView and ActionMailer
+      #   
+      #   catch :found do 
+      #     list.each do |c|
+      #       t_scope = begin
+      #         c.respond_to(:t_scope_value)
+      #       rescue NameError # hack for rails method_missing magic
+      #         begin 
+      #           c.t_scope_value
+      #         rescue NoMethodError
+      #           nil
+      #         end
+      #       end
+      #             
+      #       next unless t_scope
+      #     
+      #       t_scope.each do |ts|
+      #         begin
+      #           result = I18n.t "#{ts}.#{message}", params.merge(:raise => true)
+      #         rescue I18n::MissingTranslationData
+      #         end
+      #         throw :found if result
+      #       end
+      #     end
+      #   end
+      #   
+      #   result ||= I18n.t message, params
+      #   result.to_s # Globalize2 uses Translation::Static instead of String
+      # end
+      
+      def t *args
+        # Globalize2 uses Translation::Static instead of String
+        I18n.t(*args).to_s
       end
+    
     end
   end
     
@@ -79,15 +97,15 @@ begin
   # end
   
   ActionView::Base.class_eval do
-    def t_scope_value
-      controller.class.t_scope_value if controller.class.respond_to? :t_scope_value
-    end
+    # def t_scope_value
+    #   controller.class.t_scope_value if controller.class.respond_to? :t_scope_value
+    # end
   end
   
   ActionMailer::Base.class_eval do
-    def t_scope_value
-      controller.class.t_scope_value if controller.class.respond_to? :t_scope_value
-    end
+    # def t_scope_value
+    #   controller.class.t_scope_value if controller.class.respond_to? :t_scope_value
+    # end
     # def t_scope scope
     #   raise 'stub! use the same'
     #   @t_scope = scope

data/lib/rails_ext/mongo_mapper.rb

@@ -1,7 +1,34 @@
-if defined?(MongoMapper::Document)
-  MongoMapper::Document.class_eval do
-    def dom_id
-      new_record? ? "new_#{self.class.name.underscore}" : "#{self.class.name.underscore}_#{id}"
-    end
+# require 'mm-paginate'
+
+# 
+# dom_id
+# 
+MongoMapper::Document.class_eval do
+  def dom_id
+    new_record? ? "new_#{self.class.name.underscore}" : "#{self.class.name.underscore}_#{id}"
+  end
+end
+
+# 
+# attributes_cache
+#
+MongoMapper::Document::InstanceMethods.class_eval do
+  def attributes_cache
+    @attributes_cache ||= {}
+  end
+  
+  def reload_with_cache
+    @attributes_cache.clear if @attributes_cache
+    reload_without_cache
+  end
+  alias_method_chain :reload, :cache
+end
+
+# 
+# ObjectID serialization
+# 
+Mongo::ObjectID.class_eval do 
+  def to_yaml *args
+    to_s.to_yaml *args
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails-ext
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Alexey Petrushin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-04 00:00:00 +03:00
+date: 2010-01-21 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,6 +65,7 @@ files:
 - .git/objects/10/1f52d83027dfe5798f87aec1118f02d19e5cf8
 - .git/objects/10/bfe1230b9d96e23600091cc8b4b9d378068101
 - .git/objects/13/882df4f2ef911454bf3b69a85742b372723366
+- .git/objects/13/d5e53963c37e20ff517035b00f6b404c0e8056
 - .git/objects/15/351f2f81548a7a0d9c4a6690894a42262fb7f5
 - .git/objects/15/3f845625a0f605a2a35487a32038d0349bc386
 - .git/objects/18/17673317d63a90369c9f7abdc6f0113f42050f
@@ -88,6 +89,7 @@ files:
 - .git/objects/36/9902ca51d5820a02ccccbf1cac6ed09051941d
 - .git/objects/3a/03b9d44de43472689300120ffb2a0a9a74f27f
 - .git/objects/3a/797683953be7e6d0ffa0e34514f3e8e9c3ceb0
+- .git/objects/3a/ff2a7bfdf3a677812899ede62d084369c7c5f4
 - .git/objects/3f/3db6bb5a5204ae58e303959c4c0da3a70d8b35
 - .git/objects/40/215c0554202fc46dc2fca94ed21e2920ce1e84
 - .git/objects/40/7adfb7f6188b0bb0b88cf9391943e1aaa32374
@@ -101,6 +103,7 @@ files:
 - .git/objects/55/d1f1efc344266d472094b1fd2f247b97de1c8b
 - .git/objects/57/8a722fd66124331e07123e3a0de2b6b50a581b
 - .git/objects/59/0ef6ba9931d75fbddc7a940044dbaaa50efc76
+- .git/objects/59/7b19d2ba6f1d46f75f702cbacf8828b7b506f9
 - .git/objects/5a/35fa85474278f3c817aa59d07b725428c41a28
 - .git/objects/60/a681e873ca0ae0b7da3f37dbc5701f6e42b970
 - .git/objects/61/32f3f8005ce5b88165162ac5542e54d0472a82
@@ -114,6 +117,7 @@ files:
 - .git/objects/71/e6b43e9d41f9903992fd86d483b7d3e4dd28cd
 - .git/objects/74/d8411c7276b4e1c1f614606af7f69ab4526d30
 - .git/objects/75/d0b250bcdf241d981313b1d6eb153b96e4b05f
+- .git/objects/76/d3cd0f31cfb174c2411be5636a8257e7af613a
 - .git/objects/77/6e03ab9139aab1e0e8d551a75c3c0145fd9322
 - .git/objects/7d/978ee312ca2119dc84e40431182b8f68e42f53
 - .git/objects/7e/ca6f113845c2dcdf536daa084349445d608879
@@ -141,6 +145,7 @@ files:
 - .git/objects/b4/0345153922bfcdbbc4785cc3146e9e7c60dbbd
 - .git/objects/b4/228251babf3a84ac181d462fdd383816bd23b8
 - .git/objects/b4/eb909dd819bf870d2445bddc0d7f00678b11b6
+- .git/objects/b5/15828bb32356501aa81bb4e808ea5d7d77f068
 - .git/objects/b5/edd343ceb8e87d1a73922612aec210b393f839
 - .git/objects/b7/88e3ac322b164a2a223f80f8a6da0836d9d1dd
 - .git/objects/bb/23236d2e8340087cc495c66310e6eb90d6fe0a
@@ -149,6 +154,7 @@ files:
 - .git/objects/c0/22e88f31b91cecfc45b1bae611c27f5b12ca15
 - .git/objects/c0/724bc45e241d336d6376f14d9b258c2e4744d4
 - .git/objects/c1/3cf3c2ea85ec40544fe31702b2cfe6091aed6e
+- .git/objects/c1/424cadd8817a7e927742e52945f303b38e7222
 - .git/objects/c5/64ac68ebc8e0db7a6355a45f3299829ef2a825
 - .git/objects/c7/a9ce2f4c2230143a30c77952c14ddf6507f511
 - .git/objects/ca/c13b06411cdb70ac35d51ecf9efb0907645bd1
@@ -157,6 +163,7 @@ files:
 - .git/objects/d1/38a420782e818f3f87c6c8c0a0a135639a30d9
 - .git/objects/d1/7ff61278b2c669eaab5f6d7f741c39f39e18f9
 - .git/objects/d2/85be6e2891e063625d4904c9bcca42bf6f0b83
+- .git/objects/d3/090290f6f317ca51efd4d2913bc079ba115078
 - .git/objects/d4/1e2336bcd3ce3d09a9fa6c3af3270c29bd8457
 - .git/objects/d5/86dc7698c6ec37db86e9f36a16bd671e0005ab
 - .git/objects/d5/a2b441718a88aa08fa937352a6d80319bc91c0