padrino-contrib 0.1.4 → 0.1.5

data/Rakefile

@@ -10,7 +10,7 @@ end
 
 desc "Bump version on github"
 task :bump do
-  if `git status -s`.chomp!
+  if `git status -s`.chomp != ""
     version  = Bundler.load_gemspec(Dir[File.expand_path('../*.gemspec', __FILE__)].first).version
     sh "git add .; git commit -a -m \"Bump to version #{version}\""
   else

data/lib/padrino-contrib/orm/active_record/permalink.rb

@@ -17,10 +17,13 @@ module Padrino
           module ClassMethods
             def has_permalink(field)
               include InstanceMethods
-              class_inheritable_accessor  :permalink_field
-              write_inheritable_attribute :permalink_field, field
+              @_permalink_field = field
               before_save :generate_permalink
             end
+
+            def permalink_field
+              @_permalink_field
+            end
           end # ClassMethods
 
           module InstanceMethods
@@ -30,11 +33,8 @@ module Padrino
 
             protected
               def generate_permalink
-                self.permalink = read_attribute(permalink_field).downcase.
-                                                                 gsub(/\W/, '-').
-                                                                 gsub(/-+/, '-').
-                                                                 gsub(/-$/, '').
-                                                                 gsub(/^-/, '')
+                self.permalink = read_attribute(self.class.permalink_field).downcase.
+                  gsub(/\W/, '-').gsub(/-+/, '-').gsub(/-$/, '').gsub(/^-/, '')
               end
           end # InstanceMethods
         end # Permalink
@@ -42,4 +42,4 @@ module Padrino
     end # Orm
   end # Contrib
 end # Padrino
-::ActiveRecord::Base.extend(Padrino::Contrib::Orm::ActiveRecord::Permalink::ClassMethods)
+::ActiveRecord::Base.extend(Padrino::Contrib::Orm::ActiveRecord::Permalink::ClassMethods)

data/lib/padrino-contrib/orm/active_record/permalink_i18n.rb

@@ -17,9 +17,8 @@ module Padrino
           module ClassMethods
             def has_permalink(field, options={})
               include InstanceMethods
-              class_inheritable_accessor  :permalink_field, :permalink_langs
-              write_inheritable_attribute :permalink_field, field
-              write_inheritable_attribute :permalink_langs, options.delete(:langs)
+              @_permalink_field = field
+              @_permalink_langs = options.delete(:langs)
               before_save :generate_permalinks
               permalink_langs.each do |lang|
                 validates_uniqueness_of :"#{field}_#{lang}", options
@@ -34,6 +33,14 @@ module Padrino
               name.gsub!(/\s+/, '-') # all spaces to dashes
               name
             end
+
+            def permalink_field
+              @_permalink_field
+            end
+
+            def permalink_langs
+              @_permalink_langs
+            end
           end
 
           module InstanceMethods
@@ -43,8 +50,8 @@ module Padrino
 
             protected
               def generate_permalinks
-                permalink_langs.each do |lang|
-                  self.send(:"permalink_#{lang}=", self.class.permalink_for(read_attribute(:"#{permalink_field}_#{lang}")))
+                self.class.permalink_langs.each do |lang|
+                  self.send(:"permalink_#{lang}=", self.class.permalink_for(read_attribute(:"#{self.class.permalink_field}_#{lang}")))
                 end
               end
           end # InstanceMethods
@@ -53,4 +60,4 @@ module Padrino
     end # Orm
   end # Contrib
 end # Padrino
-::ActiveRecord::Base.extend(Padrino::Contrib::Orm::ActiveRecord::PermalinkI18n::ClassMethods)
+::ActiveRecord::Base.extend(Padrino::Contrib::Orm::ActiveRecord::PermalinkI18n::ClassMethods)

data/lib/padrino-contrib/orm/active_record/textile.rb

@@ -21,24 +21,31 @@ module Padrino
               include InstanceMethods
               options = fields.extract_options!
               options.reverse_merge!(:internal_links => :blog)
-              class_inheritable_accessor  :textile_fields, :textile_options
-              write_inheritable_attribute :textile_fields, fields
-              write_inheritable_attribute :textile_options, options
+              @_textile_fields  = fields
+              @_textile_options = options
               before_save :generate_textile
             end
+
+            def textile_fields
+              @_textile_fields
+            end
+
+            def textile_options
+              @_textile_options
+            end
           end
 
           module InstanceMethods
             protected
               def generate_textile
-                textile_fields.each do |textile_field|
+                self.class.textile_fields.each do |textile_field|
                   next if read_attribute(textile_field).blank?
                   html = RedCloth.new(read_attribute(textile_field)).to_html
                   # Parse internal links
                   html.gsub!(/\[\[([^\]]+)\]\]/) do
                     page, name = *$1.split("|") # this allow to rename link ex: [[Page Name|link me]]
                     name ||= page
-                    "<a href=\"/#{textile_options[:internal_links]}/#{Post.permalink_for(page.strip)}\">#{name.strip}</a>"
+                    "<a href=\"/#{@_textile_options[:internal_links]}/#{Post.permalink_for(page.strip)}\">#{name.strip}</a>"
                   end
                   # Write content
                   self.send("#{textile_field}_html=", html)
@@ -50,4 +57,4 @@ module Padrino
     end # Orm
   end # Contrib
 end # Padrino
-::ActiveRecord::Base.extend(Padrino::Contrib::Orm::ActiveRecord::Textile::ClassMethods)
+::ActiveRecord::Base.extend(Padrino::Contrib::Orm::ActiveRecord::Textile::ClassMethods)

data/lib/padrino-contrib/orm/mongo_mapper/permalink.rb

@@ -18,8 +18,7 @@ module Padrino
 
           module ClassMethods
             def has_permalink(field)
-              class_inheritable_accessor  :permalink_field
-              write_inheritable_attribute :permalink_field, field
+              @_permalink_field = field
               before_save :generate_permalink
               validates_uniqueness_of field
               key :permalink, String
@@ -31,6 +30,10 @@ module Padrino
                             gsub(/-$/, '').
                             gsub(/^-/, '')
             end
+
+            def permalink_field
+              @_permalink_field
+            end
           end
 
           module InstanceMethods
@@ -40,7 +43,7 @@ module Padrino
 
             protected
               def generate_permalink
-                self.permalink = self.class.permalink_for(self[permalink_field])
+                self.permalink = self.class.permalink_for(self[self.class.permalink_field])
               end
           end # InstanceMethods
         end # Permalink
@@ -48,4 +51,4 @@ module Padrino
     end # Orm
   end # Contrib
 end # Padrino
-::MongoMapper::Document.send(:include, Padrino::Contrib::Orm::MongoMapper::Permalink)
+::MongoMapper::Document.send(:include, Padrino::Contrib::Orm::MongoMapper::Permalink)

data/lib/padrino-contrib/orm/mongo_mapper/search.rb

@@ -19,14 +19,13 @@ module Padrino
 
           module ClassMethods
             def has_search(*fields)
-              class_inheritable_accessor  :search_fields
-              write_inheritable_attribute :search_fields, fields
+              @_search_fields = fields
             end
 
             def search(text, options={})
               if text
                 re    = Regexp.new(Regexp.escape(text), 'i')
-                where = search_fields.map { |field| "this.#{field}.match(#{re.inspect})" }.join(" || ")
+                where = @_search_fields.map { |field| "this.#{field}.match(#{re.inspect})" }.join(" || ")
                 options.merge!("$where" => where)
               end
               options.delete(:paginate) ? paginate(options) : all(options)
@@ -37,4 +36,4 @@ module Padrino
     end # Orm
   end # Contrib
 end # Padrino
-::MongoMapper::Document.send(:include, Padrino::Contrib::Orm::MongoMapper::Search)
+::MongoMapper::Document.send(:include, Padrino::Contrib::Orm::MongoMapper::Search)

data/lib/padrino-contrib/version.rb

@@ -1,5 +1,5 @@
 module Padrino
   module Contrib
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-contrib
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Davide D'Agostino
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-30 00:00:00 +02:00
+date: 2011-08-31 00:00:00 +02:00
 default_executable: 
 dependencies: []