dumb_quotes 1.2 → 2.0

data/README.rdoc

@@ -32,19 +32,14 @@ the following changes to your model attributes before validation:
 
 === Installation
 
-1. On rails 2.3
+Option 1. Load the plugin as a gem
 
-  * gem install strip_control_chars
-  * add the following to your environment.rb
+  gem install dumb_quotes
+  add "config.gem 'dumb_quotes'" to your environment.rb
 
-    config.gem 'dumb_quotes', version => < 2.0"
+Option 2. Use the standard Rails plugin install (assuming Rails 2.1).
 
-2. On rails 3
-
-  * gem install strip_control_chars
-  * add the following to your Gemfile
-
-    gem 'dumb_quotes', ">=2.0"
+  ./script/plugin install git://github.com/yob/dumb_quotes.git
 
 === Caveats
 

data/lib/dumb_quotes.rb

@@ -1,43 +1,2 @@
-# coding: utf-8
-
-module DumbQuotes
-  # Strips whitespace from model fields and converts blank values to nil.
-  def dumb_quotes!(options = nil)
-    before_validation do |record|
-      attributes = DumbQuotes.narrow(record.attributes, options)
-      attributes.each do |attr, value|
-        if value.respond_to?(:gsub)
-          # single quotes
-          value = value.gsub("\xE2\x80\x98","'") # U+2018
-          value = value.gsub("\xE2\x80\x99","'") # U+2019
-          value = value.gsub("\xCA\xBC","'")     # U+02BC
-
-          #  double quotes
-          value = value.gsub("\xE2\x80\x9C",'"') # U+201C
-          value = value.gsub("\xE2\x80\x9D",'"') # U+201D
-          value = value.gsub("\xCB\xAE",'"')     # U+02EE
-
-          record[attr] = value
-        end
-      end
-    end
-  end
-
-  # Necessary because Rails has removed the narrowing of attributes using :only
-  # and :except on Base#attributes
-  def self.narrow(attributes, options)
-    if options.nil?
-      attributes
-    else
-      if except = options[:except]
-        except = Array(except).collect { |attribute| attribute.to_s }
-        attributes.except(*except)
-      elsif only = options[:only]
-        only = Array(only).collect { |attribute| attribute.to_s }
-        attributes.slice(*only)
-      else
-        raise ArgumentError, "Options does not specify :except or :only (#{options.keys.inspect})"
-      end
-    end
-  end
-end
+require 'dumb_quotes/ar_extend'
+require 'dumb_quotes/railtie'

data/lib/dumb_quotes/ar_extend.rb

@@ -0,0 +1,45 @@
+# coding: utf-8
+
+module DumbQuotes
+  module ArExtend
+    # Strips whitespace from model fields and converts blank values to nil.
+    def dumb_quotes!(options = nil)
+      before_validation do |record|
+        attributes = DumbQuotes::ArExtend.narrow(record.attributes, options)
+        attributes.each do |attr, value|
+          if value.respond_to?(:gsub)
+            # single quotes
+            value = value.gsub("\xE2\x80\x98","'") # U+2018
+            value = value.gsub("\xE2\x80\x99","'") # U+2019
+            value = value.gsub("\xCA\xBC","'")     # U+02BC
+
+            #  double quotes
+            value = value.gsub("\xE2\x80\x9C",'"') # U+201C
+            value = value.gsub("\xE2\x80\x9D",'"') # U+201D
+            value = value.gsub("\xCB\xAE",'"')     # U+02EE
+
+            record[attr] = value
+          end
+        end
+      end
+    end
+
+    # Necessary because Rails has removed the narrowing of attributes using :only
+    # and :except on Base#attributes
+    def self.narrow(attributes, options)
+      if options.nil?
+        attributes
+      else
+        if except = options[:except]
+          except = Array(except).collect { |attribute| attribute.to_s }
+          attributes.except(*except)
+        elsif only = options[:only]
+          only = Array(only).collect { |attribute| attribute.to_s }
+          attributes.slice(*only)
+        else
+          raise ArgumentError, "Options does not specify :except or :only (#{options.keys.inspect})"
+        end
+      end
+    end
+  end
+end

data/lib/dumb_quotes/railtie.rb

@@ -0,0 +1,15 @@
+require 'dumb_quotes'
+require 'rails'
+
+module DumbQuotes
+  class Railtie < Rails::Railtie
+
+    initializer "dumb_quotes.active_record" do |app|
+      if defined?(::ActiveRecord)
+        ::ActiveRecord::Base.extend(DumbQuotes::ArExtend)
+
+      end
+    end
+
+  end
+end

data/test/test_helper.rb

@@ -5,9 +5,11 @@ require 'active_record'
 PLUGIN_ROOT = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 
 $LOAD_PATH.unshift "#{PLUGIN_ROOT}/lib"
-require "#{PLUGIN_ROOT}/init"
+require 'dumb_quotes'
 
 class ActiveRecord::Base
+  extend DumbQuotes::ArExtend
+
   alias_method :save, :valid?
   def self.columns()
     @columns ||= []

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dumb_quotes
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 3
   prerelease: false
   segments: 
-  - 1
   - 2
-  version: "1.2"
+  - 0
+  version: "2.0"
 platform: ruby
 authors: 
 - James Healy
@@ -23,13 +23,15 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <=
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 197
+        hash: 7712042
         segments: 
-        - 2
-        - 99
-        version: "2.99"
+        - 3
+        - 0
+        - 0
+        - rc
+        version: 3.0.0.rc
   type: :runtime
   version_requirements: *id001
 description: a small ActiveRecord plugin that converts 'smart quotes' to their ASCII equivalents
@@ -41,16 +43,16 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- init.rb
-- rails/init.rb
 - lib/dumb_quotes.rb
+- lib/dumb_quotes/ar_extend.rb
+- lib/dumb_quotes/railtie.rb
 - Rakefile
 - MIT-LICENSE
 - README.rdoc
 - test/dumb_quotes_test.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://github.com/yob/dumb_quotes/tree/master
+homepage: http://github.com/yob/dumb_quotes
 licenses: []
 
 post_install_message: 
@@ -80,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: yob-projects
+rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3

data/init.rb

@@ -1,2 +0,0 @@
-require 'dumb_quotes'
-ActiveRecord::Base.extend(DumbQuotes)

data/rails/init.rb

@@ -1,2 +0,0 @@
-require 'dumb_quotes'
-ActiveRecord::Base.extend(DumbQuotes)