als_typograf 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/als_typograf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{als_typograf}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Semyonov"]
-  s.date = %q{2010-02-07}
+  s.date = %q{2010-09-13}
   s.description = %q{ruby-implementation of ArtLebedevStudio.RemoteTypograf class (web-service client)}
   s.email = %q{rotuka@rotuka.com}
   s.extra_rdoc_files = [
@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "als_typograf.gemspec",
+     "lib/active_model/typograf.rb",
      "lib/als_typograf.rb",
-     "lib/als_typograf/active_record.rb",
      "lib/als_typograf/request.rb",
      "rails/init.rb",
      "test/database.yml",
@@ -37,20 +37,20 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rotuka/als_typograf}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{ArtLebedevStudio.RemoteTypograf}
   s.test_files = [
-    "test/helper.rb",
-     "test/schema.rb",
-     "test/unit/als_typograf_test.rb",
-     "test/unit/article_test.rb"
+    "test/schema.rb",
+     "test/helper.rb",
+     "test/unit/article_test.rb",
+     "test/unit/als_typograf_test.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])

data/lib/active_model/typograf.rb

@@ -0,0 +1,57 @@
+module ActiveModel
+  module Typograf
+    module InstanceMethods
+      # Run AlsTypograf#process on configured columns.
+      # Used to run as before_validation filter (automaticaly added on ActiveRecord::Base.typograf)
+      def typograf_current_fields
+        self.class.typograf_fields.each do |column, options|
+          if send(:"#{column}?") && send(:"#{column}_changed?")
+            send(:"#{column}=", AlsTypograf.process(send(column).to_s, options))
+          end
+        end
+      end
+    end
+
+    # Specify columns to typograf
+    # @overload typograf(column_name, options)
+    #   Typograf only specified column with specified or default options
+    #   @example typograf column with default options
+    #     typograf :content # will typograf +content+ with default AlsTypograf options
+    #   @example typograf column with custom options
+    #     typograf :title, :use_br => false # will typograf +title+ without replacing +\n+ with <br />
+    #   @param [String, Symbol] column_name name of the column to typograf
+    #   @param [Hash] options custom options to AlsTypograf#process method
+    # @overload typograf(column1, column2, ..., options)
+    #   Typograf every specified columns with default options
+    #   @example typograf columns with common custom options
+    #     typograf :skills, :achievements, :description, :encoding => 'CP1251'
+    #   @param [String, Symbol] column1 first column name
+    #   @param [String, Symbol] column2 next column name
+    #   @param [String, Symbol] ... specify all columns, you need
+    #   @param [Hash] options options to AlsTypograf#process method for all specified fields
+    # @overload typograf(columns_with_options)
+    #   Typograf specified columns with specified options
+    #   @example typograf specified columns with specified options
+    #     typograf :foo => {:use_br => false}, :bar => {:use_p => false}
+    #   @param [Hash] columns_with_options column names with correspond options to AlsTypograf#process method
+    def typograf(*columns)
+      unless respond_to?(:typograf_fields)
+        cattr_accessor :typograf_fields
+        self.typograf_fields = {}
+        before_validation :typograf_current_fields
+        include InstanceMethods
+      end
+
+      common_options = columns.extract_options!
+      if columns == [] # There was an columns_with_options variant
+        common_options.each do |column, custom_options|
+          typograf_fields[column.to_sym] = custom_options
+        end
+      else
+        columns.each do |column|
+          typograf_fields[column.to_sym] = common_options
+        end
+      end
+    end
+  end
+end

data/lib/als_typograf.rb

@@ -105,6 +105,12 @@ module AlsTypograf
   end
 end
 
-if defined? ActiveRecord
-  require 'als_typograf/active_record'
+if defined? ActiveModel
+  require 'active_model/typograf'
+
+  if defined? ActiveRecord
+    class ActiveRecord::Base
+      extend ActiveModel::Typograf
+    end
+  end
 end

data/test/helper.rb

@@ -7,6 +7,7 @@ require 'shoulda'
 require 'redgreen' rescue nil
 require 'als_typograf'
 require 'active_support/test_case'
+require 'logger'
 
 class ActiveSupport::TestCase
   def self.process_assertions(assertions)

data/test/unit/article_test.rb

@@ -13,8 +13,14 @@ end
 class ArticleTest < ActiveSupport::TestCase
   extend Shoulda::ActiveRecord::Macros
 
-  should_have_class_methods :typograf
-  should_have_instance_methods :typograf_fields, :typograf_current_fields
+  should "have class method #typograf" do
+    assert Article.respond_to?(:typograf)
+  end
+  %w(typograf_fields typograf_current_fields).each do |field|
+    should "have instance method \##{field}" do
+      assert Article.instance_methods.include?(field)
+    end
+  end
 
   should 'load schema correctly' do
     assert_equal [], Article.all
@@ -32,7 +38,7 @@ class ArticleTest < ActiveSupport::TestCase
     end
 
     should 'typograf article’s title with custom options' do
-      assert_equal "— Does it “Article”?", @article.title
+      assert_equal "— Does it «Article»?", @article.title
     end
   end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: als_typograf
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  hash: 23
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Alexander Semyonov
@@ -9,39 +15,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-07 00:00:00 +03:00
+date: 2010-09-13 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 3
+        - 4
         version: 2.3.4
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: ruby-implementation of ArtLebedevStudio.RemoteTypograf class (web-service client)
 email: rotuka@rotuka.com
 executables: []
@@ -59,8 +79,8 @@ files:
 - Rakefile
 - VERSION
 - als_typograf.gemspec
+- lib/active_model/typograf.rb
 - lib/als_typograf.rb
-- lib/als_typograf/active_record.rb
 - lib/als_typograf/request.rb
 - rails/init.rb
 - test/database.yml
@@ -78,26 +98,32 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ArtLebedevStudio.RemoteTypograf
 test_files: 
-- test/helper.rb
 - test/schema.rb
-- test/unit/als_typograf_test.rb
+- test/helper.rb
 - test/unit/article_test.rb
+- test/unit/als_typograf_test.rb

data/lib/als_typograf/active_record.rb

@@ -1,57 +0,0 @@
-module AlsTypograf
-  module ActiveRecord
-    # Run AlsTypograf#process on configured columns.
-    # Used to run as before_validation filter (automaticaly added on ActiveRecord::Base.typograf)
-    def typograf_current_fields
-      self.class.typograf_fields.each do |column, options|
-        send(:"#{column}=",
-             AlsTypograf.process(send(column).to_s,
-                                 options)) if send(:"#{column}?") && send(:"#{column}_changed?")
-      end
-    end
-  end
-end
-
-class ActiveRecord::Base
-  # Specify columns to typograf
-  # @overload typograf(column_name, options)
-  #   Typograf only specified column with specified or default options
-  #   @example typograf column with default options
-  #     typograf :content # will typograf +content+ with default AlsTypograf options
-  #   @example typograf column with custom options
-  #     typograf :title, :use_br => false # will typograf +title+ without replacing +\n+ with <br />
-  #   @param [String, Symbol] column_name name of the column to typograf
-  #   @param [Hash] options custom options to AlsTypograf#process method
-  # @overload typograf(column1, column2, ..., options)
-  #   Typograf every specified columns with default options
-  #   @example typograf columns with common custom options
-  #     typograf :skills, :achievements, :description, :encoding => 'CP1251'
-  #   @param [String, Symbol] column1 first column name
-  #   @param [String, Symbol] column2 next column name
-  #   @param [String, Symbol] ... specify all columns, you need
-  #   @param [Hash] options options to AlsTypograf#process method for all specified fields
-  # @overload typograf(columns_with_options)
-  #   Typograf specified columns with specified options
-  #   @example typograf specified columns with specified options
-  #     typograf :foo => {:use_br => false}, :bar => {:use_p => false}
-  #   @param [Hash] columns_with_options column names with correspond options to AlsTypograf#process method
-  def self.typograf(*columns)
-    unless respond_to?(:typograf_fields)
-      cattr_accessor :typograf_fields
-      self.typograf_fields = {}
-      before_validation :typograf_current_fields
-      include AlsTypograf::ActiveRecord
-    end
-
-    common_options = columns.extract_options!
-    if columns == [] # There was an columns_with_options variant
-      common_options.each do |column, custom_options|
-        typograf_fields[column.to_sym] = custom_options
-      end
-    else
-      columns.each do |column|
-        typograf_fields[column.to_sym] = common_options
-      end
-    end
-  end
-end