als_typograf 0.0.4 → 0.0.5

data/Rakefile

@@ -23,7 +23,7 @@ end
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 
@@ -31,7 +31,7 @@ begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |test|
     test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
+    test.pattern = 'test/**/*_test.rb'
     test.verbose = true
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/als_typograf.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{als_typograf}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Semyonov"]
@@ -31,8 +31,8 @@ Gem::Specification.new do |s|
      "test/database.yml",
      "test/helper.rb",
      "test/schema.rb",
-     "test/test_als_typograf.rb",
-     "test/test_article.rb"
+     "test/unit/als_typograf_test.rb",
+     "test/unit/article_test.rb"
   ]
   s.homepage = %q{http://github.com/rotuka/als_typograf}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -41,9 +41,9 @@ Gem::Specification.new do |s|
   s.summary = %q{ArtLebedevStudio.RemoteTypograf}
   s.test_files = [
     "test/helper.rb",
-     "test/test_als_typograf.rb",
      "test/schema.rb",
-     "test/test_article.rb"
+     "test/unit/als_typograf_test.rb",
+     "test/unit/article_test.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/als_typograf.rb

@@ -2,11 +2,13 @@ $KCODE = 'u'
 
 require 'activesupport'
 require 'httparty'
-require 'als_typograf/request'
 
 # ruby-implementation of ArtLebedevStudio.RemoteTypograf class (web-service client)
 # @author Alexander Semyonov
 module AlsTypograf
+  autoload :Request, 'als_typograf/request'
+  autoload :ActiveRecord, 'als_typograf/active_record'
+
   HTML_ENTITIES = 1
   XML_ENTITIES = 2
   NO_ENTITIES = 3

data/lib/als_typograf/active_record.rb

@@ -6,7 +6,7 @@ module AlsTypograf
       self.class.typograf_fields.each do |column, options|
         send(:"#{column}=",
              AlsTypograf.process(send(column).to_s,
-                                 options))
+                                 options)) if send(:"#{column}?") && send(:"#{column}_changed?")
       end
     end
   end

data/test/database.yml

@@ -1,10 +1,10 @@
 sqlite:
   :adapter: sqlite
-  :database: vendor/plugins/als_typograf/test/als_typograf_plugin.sqlite.db
+  :database: test/als_typograf_plugin.sqlite.db
 
 sqlite3:
   :adapter: sqlite3
-  :database: vendor/plugins/als_typograf/test/als_typograf_plugin.sqlite3.db
+  :database: test/als_typograf_plugin.sqlite3.db
 
 postgresql:
   :adapter: postgresql

data/test/helper.rb

@@ -1,28 +1,21 @@
-ENV['RAILS_ENV'] = 'test'
-ENV['RAILS_ROOT'] ||= File.join(File.dirname(__FILE__), '../../../..')
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'rubygems'
-require 'test/unit'
+require 'activerecord'
 require 'shoulda'
 require 'redgreen' rescue nil
-require File.expand_path(File.join(ENV['RAILS_ROOT'], 'config/environment.rb'))
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'als_typograf'
+require 'active_support/test_case'
 
-class Test::Unit::TestCase
+class ActiveSupport::TestCase
   def self.process_assertions(assertions)
     assertions.each do |from, to|
       should "process '#{from}' to '#{to}'" do
-        assert_equal to, process(from)
+        assert_equal to, AlsTypograf.process(from)
       end
     end
   end
-
-  def process(text)
-    AlsTypograf.process(text)
-  end
 end
 
 def load_schema
@@ -34,7 +27,6 @@ def load_schema
   # no db passed, try one of these fine config-free DBs before bombing.
   db_adapter ||=
     begin
-      require 'rubygems'
       require 'sqlite'
         'sqlite'
     rescue MissingSourceFile

data/test/{test_als_typograf.rb → unit/als_typograf_test.rb}

@@ -1,10 +1,6 @@
 require 'helper'
 
-class TestAlsTypograf < Test::Unit::TestCase
-
-  class Article < ActiveRecord::Base
-  end
-
+class AlsTypografTest < ActiveSupport::TestCase
   # TODO: need more tests or not?
   context 'with default configuration' do
     setup { AlsTypograf.default_options! }

data/test/{test_article.rb → unit/article_test.rb}

@@ -1,6 +1,6 @@
 require 'helper'
-require 'als_typograf/active_record'
-require 'pp'
+require 'shoulda/active_record/matchers'
+require 'shoulda/active_record/macros'
 
 load_schema
 
@@ -10,11 +10,11 @@ class Article < ActiveRecord::Base
   typograf(:skills, :achievements, :description, :use_br => false)
 end
 
-class TestArticle < Test::Unit::TestCase
-  def self.described_type; Article end
+class ArticleTest < ActiveSupport::TestCase
+  extend Shoulda::ActiveRecord::Macros
 
   should_have_class_methods :typograf
-  should_have_instance_methods :typograf_fields
+  should_have_instance_methods :typograf_fields, :typograf_current_fields
 
   should 'load schema correctly' do
     assert_equal [], Article.all

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: als_typograf
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Alexander Semyonov
@@ -76,8 +76,8 @@ files:
 - test/database.yml
 - test/helper.rb
 - test/schema.rb
-- test/test_als_typograf.rb
-- test/test_article.rb
+- test/unit/als_typograf_test.rb
+- test/unit/article_test.rb
 has_rdoc: true
 homepage: http://github.com/rotuka/als_typograf
 licenses: []
@@ -108,6 +108,6 @@ specification_version: 3
 summary: ArtLebedevStudio.RemoteTypograf
 test_files: 
 - test/helper.rb
-- test/test_als_typograf.rb
 - test/schema.rb
-- test/test_article.rb
+- test/unit/als_typograf_test.rb
+- test/unit/article_test.rb