texter 0.3.0 → 1.0.0

data/app/assets/javascripts/texter/texts.js

@@ -1,33 +1,33 @@
 $(function(){
-	$('body').on('click', '.js-edit', function(){
-		EditText($(this));
-	});
+    $('body').on('click', '.js-edit', function(){
+        EditText($(this));
+    });
 
-	function EditText(elem){
+    function EditText(elem){
 
-		function removePopup(){
-			popup.fadeOut('fast', function(){
-				popup.remove();
-			});
-			$(window).off('keyup');
-		}
+        function removePopup(){
+            popup.fadeOut('fast', function(){
+                popup.remove();
+            });
+            $(window).off('keyup');
+        }
 
-		$('body').append('<div id="popup"><span class="close"></span><div id="form"></div></div>');
-		var popup = $('#popup');
-		$(window).on('keyup', function(e){
-			if(e.keyCode == 27){
-				removePopup();
-			}
-		});
+        $('body').append('<div id="popup"><span class="close"></span><div id="form"></div></div>');
+        var popup = $('#popup');
+        $(window).on('keyup', function(e){
+            if(e.keyCode == 27){
+                removePopup();
+            }
+        });
 
-		popup.on('click', '.close', function(){
-			removePopup();
-		});
+        popup.on('click', '.close', function(){
+            removePopup();
+        });
 
-		$.get(elem.data('url'), function(){
-			popup.fadeIn('fast', function(){
-				popup.find('textarea:first').focus();
-			});
-		});
-	}
+        $.get(elem.data('url'), function(){
+            popup.fadeIn('fast', function(){
+                popup.find('textarea:first').focus();
+            });
+        });
+    }
 });

data/app/controllers/texter/texts_controller.rb

@@ -2,8 +2,6 @@ require_dependency "texter/application_controller"
 
 module Texter
   class TextsController < ApplicationController
-    Texter.controller_setup.call(self)
-
     respond_to :js
     before_filter :load_text
 
@@ -11,10 +9,9 @@ module Texter
     end
 
     def update
-      Texter::CleanBody.new(@text).clean(Texter.bodies & @text.changed)
+      RunPreprocessorsOnText.call(@text)
 
-      if @text.valid? && Texter::Typograph.new(@text).process(Texter.bodies & @text.changed)
-        @text = TextDecorator.new(@text)
+      if @text.save
         render :update
       else
         render :edit

data/app/helpers/texter/texts_helper.rb

@@ -1,44 +1,17 @@
 module Texter
   module TextsHelper
-    def inline(path)
-      display_text(path, :inline)
+    def inline(path, options = {})
+      display_text(path, :inline, options)
     end
 
-    def block(path)
-      display_text(path, :block)
+    def block(path, options = {})
+      display_text(path, :block, options)
     end
 
-    def display_text(path, tag_type)
-      text = Texter::TextFactory.new(path, tag_type, @virtual_path).build
-      text.body
-    end
-
-    def text_can_be_edited?(text)
-      moderator_signed_in?
-    end
-
-    def textile(string, *rules)
-      return nil if string.blank?
-
-      textilize = ::RedCloth.new(string, rules)
-      textilize.to_html(:block_textile_prefix, :block_textile_lists, :inline_textile_link).html_safe
-
-      # refs_textile::          Textile references (i.e. [hobix]http://hobix.com/)
-      # block_textile_table::   Textile table block structures
-      # block_textile_lists::   Textile list structures
-      # block_textile_prefix::  Textile blocks with prefixes (i.e. bq., h2., etc.)
-      # inline_textile_image::  Textile inline images
-      # inline_textile_link::   Textile inline links
-      # inline_textile_span::   Textile inline spans
-      # inline_textile_glyphs:: Textile entities (such as em-dashes and smart quotes)
-    end
-
-    def textile_block(string)
-      textile(string)
-    end
-
-    def textile_inline(string)
-      textile(string, :lite_mode)
+    def display_text(path, tag_type, options = {})
+      text = Texter::BuildText.call(path, tag_type, @virtual_path)
+      presenter = Texter::TextPresenter.new(text, self, options)
+      presenter.body
     end
   end
 end

data/app/lib/texter/art_typograph_preprocessor.rb

@@ -0,0 +1,13 @@
+require 'art_typograph'
+
+module Texter
+  class ArtTypographPreprocessor < Preprocessor
+    def call
+      processed = ArtTypograph.process(body)
+      processed.gsub! %r{</p>}m, "\n"
+      processed.gsub! %r{<p.*?>}, ''
+      processed.gsub! %r{</?(nobr|span).*?>}, ''
+      processed.strip
+    end
+  end
+end

data/app/lib/texter/build_text.rb

@@ -0,0 +1,38 @@
+module Texter
+  class BuildText
+    include CallableClass
+
+    attr_reader :path, :tag_type, :virtual_path
+
+    # @param [String] path
+    # @param [Symbol] tag_type (:block, :inline)
+    # @param [String, NilClass] virtual_path
+    def initialize(path, tag_type, virtual_path)
+      @path         = path
+      @tag_type     = tag_type
+      @virtual_path = virtual_path
+    end
+
+    def call
+      text = Texter::Text.find_or_initialize_by_path(full_path)
+      text.tag_type = tag_type
+      text
+    end
+
+    private
+
+    def full_path
+      return path unless relative_path?
+
+      if virtual_path
+        virtual_path.gsub(%r{/_?}, ".") + path.to_s
+      else
+        raise "Cannot use #{path.inspect} shortcut because path is not available"
+      end
+    end
+
+    def relative_path?
+      path.starts_with?(".")
+    end
+  end
+end

data/app/lib/texter/callable_class.rb

@@ -0,0 +1,11 @@
+module Texter
+  module CallableClass
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def call(*args)
+        new(*args).call
+      end
+    end
+  end
+end

data/app/lib/texter/clean_preprocessor.rb

@@ -0,0 +1,7 @@
+module Texter
+  class CleanPreprocessor < Preprocessor
+    def call
+      body.to_s.gsub(/\r/, '').strip
+    end
+  end
+end

data/app/lib/texter/formatter.rb

@@ -0,0 +1,26 @@
+module Texter
+  class Formatter
+    attr_reader :body, :options
+
+    def initialize(body, options = {})
+      @body = body
+      @options = options.dup
+      reverse_merge_defaults
+    end
+
+    # @return [String, NilClass]
+    def inline
+      raise NotImplementedError
+    end
+
+    # @return [String, NilClass]
+    def block
+      raise NotImplementedError
+    end
+
+    protected
+
+    def reverse_merge_defaults
+    end
+  end
+end

data/app/lib/texter/markdown_formatter.rb

@@ -0,0 +1,41 @@
+require 'rdiscount'
+
+module Texter
+  class MarkdownFormatter < Formatter
+    # :smart - Enable SmartyPants processing.
+    # :filter_styles - Do not output <style> tags.
+    # :filter_html - Do not output any raw HTML tags included in the source text.
+    # :fold_lines - RedCloth compatible line folding (not used).
+    # :footnotes - PHP markdown extra-style footnotes.
+    # :generate_toc - Enable Table Of Contents generation
+    # :no_image - Do not output any <img> tags.
+    # :no_links - Do not output any <a> tags.
+    # :no_tables - Do not output any tables.
+    # :strict - Disable superscript and relaxed emphasis processing.
+    # :autolink - Greedily urlify links.
+    # :safelink - Do not make links for unknown URL types.
+    # :no_pseudo_protocols - Do not process pseudo-protocols.
+    cattr_accessor :extensions
+    self.extensions = []
+
+    # extracts html from the first paragraph or header
+    def inline
+      block.match(%r{<[hp]\d?>(.*?)</[hp]\d?>}).try(:[], 1)
+    end
+
+    def block
+      return nil if body.blank?
+
+      markdown = ::RDiscount.new(body, *options[:extensions])
+      markdown.to_html
+    end
+
+    protected
+
+    def reverse_merge_defaults
+      options.assert_valid_keys(:extensions)
+      options.reverse_merge!(:extensions => extensions)
+    end
+  end
+end
+

data/app/lib/texter/preprocessor.rb

@@ -0,0 +1,17 @@
+module Texter
+  class Preprocessor
+    include CallableClass
+
+    attr_reader :body
+
+    # @param [String] body
+    def initialize(body)
+      @body = body
+    end
+
+    # @return [String, NilClass]
+    def call
+      raise NotImplementedError
+    end
+  end
+end

data/app/lib/texter/run_preprocessors_on_text.rb

@@ -0,0 +1,29 @@
+module Texter
+  class RunPreprocessorsOnText
+    include CallableClass
+
+    attr_reader :text, :options
+
+    # @param [Texter::Text] text
+    # @param [Hash] options (:force => true to force processing)
+    def initialize(text, options = {})
+      @text = text
+      @options = options
+    end
+
+    def call
+      attributes.each do |attr|
+        body = text.send(attr)
+        processed = Texter.preprocessors.inject(body) { |memo, preprocessor| Texter.find_preprocessor(preprocessor).call(memo) }
+        text.send "#{attr}=", processed
+      end
+    end
+
+    private
+
+    def attributes
+      return Texter.bodies if options[:force]
+      Texter.bodies & text.changed
+    end
+  end
+end

data/app/lib/texter/simple_formatter.rb

@@ -0,0 +1,11 @@
+module Texter
+  class SimpleFormatter < Formatter
+    def inline
+      body
+    end
+
+    def block
+      ApplicationController.helpers.simple_format(body)
+    end
+  end
+end

data/app/lib/texter/textile_formatter.rb

@@ -0,0 +1,42 @@
+require 'RedCloth'
+
+module Texter
+  class TextileFormatter < Formatter
+    cattr_accessor :rules, :restrictions
+
+    self.rules = []
+
+    # :filter_html
+    # :sanitize_html
+    # :filter_styles
+    # :filter_classes
+    # :filter_ids
+    # :lite_mode
+    # :no_span_caps
+    self.restrictions = [:no_span_caps]
+
+    def inline
+      restrictions_with_lite_mode = (options[:restrictions] + [:lite_mode]).uniq
+      textile :restrictions => restrictions_with_lite_mode
+    end
+
+    def block
+      textile
+    end
+
+    protected
+
+    def textile(redefine_options = {})
+      return nil if body.blank?
+
+      redefined_options = options.merge(redefine_options)
+      textile = ::RedCloth.new(body, redefined_options[:restrictions])
+      textile.to_html(*redefined_options[:rules]).html_safe
+    end
+
+    def reverse_merge_defaults
+      options.assert_valid_keys(:rules, :restrictions)
+      options.reverse_merge!(:rules => rules, :restrictions => restrictions)
+    end
+  end
+end

data/app/models/texter/text.rb

@@ -1,12 +1,12 @@
 module Texter
   class Text < ActiveRecord::Base
-    TAG_TYPES = %w{block inline}
+    BLOCK = 'block'
+    TAG_TYPES = [BLOCK, 'inline']
+
     attr_writer :tag_type
 
     attr_accessible *Texter.bodies, :tag_type
-
     validates_uniqueness_of :path, :allow_blank => false
-    validates_presence_of *Texter.bodies
 
     def self.find_or_create_from_translations_by_path(path)
       text = find_or_initialize_by_path(path)
@@ -19,15 +19,15 @@ module Texter
     end
 
     def get_body(options = {})
-      persisted? ? body : I18n.t(path, {:scope => 'texts'}.merge(options)).strip
+      persisted? ? body : Texter.translate(path, options)
     end
 
     def tag_type
-      TAG_TYPES.include?(@tag_type.to_s) ? @tag_type : TAG_TYPES.first
+      TAG_TYPES.include?(@tag_type.to_s) ? @tag_type : BLOCK
     end
 
     def default_attributes
-      {:body => get_body}
+      { :body => get_body }
     end
   end
 end

data/app/presenters/texter/text_presenter.rb

@@ -0,0 +1,60 @@
+# encoding: UTF-8
+module Texter
+  class TextPresenter
+    attr_reader :text, :h, :options
+
+    delegate :tag_type, :get_body, :path, :to => :text
+
+    def initialize(text, h, options = {})
+      @text    = text
+      @h       = h
+      @options = options
+
+      options.assert_valid_keys(:locale, :formatter, :formatter_options)
+    end
+
+    def body
+      return formatted unless can_be_edited?
+
+      h.content_tag(content_tag_name, formatted, {
+        :data => {
+          :url => h.texter.edit_text_path(path, :js, :text => {
+            :tag_type => tag_type
+          })
+        },
+        :class => "js-edit #{path_for_class}"
+      })
+    end
+
+    def path_for_class
+      path.gsub(/\./, '-')
+    end
+
+    private
+
+    def formatter
+      Texter.find_formatter(options[:formatter] || Texter.formatter)
+    end
+
+    def content_tag_name
+      {
+        :block => :div,
+        :inline => :span
+      }.fetch(tag_type.to_sym)
+    end
+
+    def formatted
+      body = get_body(locale_options)
+      body = Texter.translate("edit", locale_options.merge(:default => 'Редактировать')) if can_be_edited? && body.blank?
+      formatter.new(body, options[:formatter_options] || {}).send(tag_type)
+    end
+
+    def can_be_edited?
+      true
+    end
+
+    def locale_options
+      options.slice(:locale)
+    end
+  end
+end

data/app/views/texter/texts/_edit.html.erb

@@ -3,5 +3,5 @@
   <% Texter.bodies.each do |body| %>
     <%= f.input body %>
   <% end %>
-  <%= f.submit "Сохранить", :disable_with => '✔ Сохраняется...' %>
+  <%= f.submit Texter.translate('submit', :default => 'Сохранить'), :disable_with => Texter.translate('disable_with', :default => '✔ Сохраняется...') %>
 <% end %>

data/app/views/texter/texts/update.js.erb

@@ -1,4 +1,5 @@
+<% presenter = Texter::TextPresenter.new(@text, self) %>
 $("#popup").remove();
-$(".<%= @text.path_for_class %>").each(function(){
-  $(this).replaceWith($("<%= j(@text.body) %>"));
+$(".<%= presenter.path_for_class %>").each(function(){
+  $(this).replaceWith($("<%= j(presenter.body) %>"));
 });

data/config/locales/texter.ru.yml

@@ -0,0 +1,10 @@
+ru:
+  texter:
+    edit: Редактировать
+    submit: Сохранить
+    disable_with: '✔ Сохраняется...'
+
+  simple_form:
+    labels:
+      text:
+        body: Текст

data/db/migrate/20121231021051_create_texter_texts.rb

@@ -1,9 +1,8 @@
 class CreateTexterTexts < ActiveRecord::Migration
   def change
     create_table :texter_texts do |t|
-      t.string :path, :null => false, :default => ''
+      t.string :path, :null => false
       t.text :body
-      t.timestamps
     end
     add_index :texter_texts, :path, :unique => true
   end

data/lib/texter.rb

@@ -1,11 +1,33 @@
-require "texter/engine"
+require 'texter/engine'
+require 'simple_form'
 
 module Texter
-  # body attributes for text, array of strings
-  # it can be %w{body_ru body_en} for instance, if you use multiple languages
+  # [Array<String>] body attributes for text
+  # it can be %w{body_ru body_en} for instance if you use multiple languages
   mattr_accessor :bodies
   self.bodies = %w{body}
 
-  mattr_accessor :controller_setup
-  self.controller_setup = proc{|controller| controller.before_filter(:require_moderator!)}
+  # [Array<Symbol>]
+  mattr_accessor :preprocessors
+  self.preprocessors = [:clean]
+
+  # [Symbol]
+  mattr_accessor :formatter
+  self.formatter = :simple
+
+  class <<self
+    # @param [Symbol, String] name
+    def find_formatter(name)
+      "Texter::#{name.to_s.classify}Formatter".constantize
+    end
+
+    # @param [Symbol, String] name
+    def find_preprocessor(name)
+      "Texter::#{name.to_s.classify}Preprocessor".constantize
+    end
+
+    def translate(path, options = {})
+      I18n.t(path, { :scope => 'texter' }.merge(options))
+    end
+  end
 end

data/lib/texter/engine.rb

@@ -1,11 +1,3 @@
-require 'draper'
-require 'simple_form'
-require 'RedCloth'
-require 'art_typograph'
-require 'texter/typograph'
-require 'texter/clean_body'
-require 'texter/text_factory'
-
 module Texter
   class Engine < ::Rails::Engine
     isolate_namespace Texter

data/lib/texter/version.rb

@@ -1,3 +1,3 @@
 module Texter
-  VERSION = "0.3.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: texter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.9
   type: :runtime
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.9
 - !ruby/object:Gem::Dependency
@@ -32,7 +32,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.3
   type: :runtime
@@ -40,66 +40,66 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.3
 - !ruby/object:Gem::Dependency
-  name: draper
+  name: simple_form
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: RedCloth
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.9
-  type: :runtime
+        version: '2.12'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.9
+        version: '2.12'
 - !ruby/object:Gem::Dependency
-  name: simple_form
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 2.0.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
-  name: art_typograph
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -108,76 +108,77 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: RedCloth
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.9
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: art_typograph
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
 description: ! '* Лёгкий вывод блочных и инлайновых текстов, отформатированных с помощью
-  Textile
+  Textile, Markdown или simple_format
 
   * Дефолтные тексты в I18n
 
-  * После редактирования тексты хранятся в базе, перед сохранением обрабатываются
-  Типографом Лебедева
+  * При редактировании тексты сохраняются в базе
+
+  * Подключаемые обработчики (препроцессоры) — можно легко подключить «Типограф Лебедева»
 
   * Удобный, встроенный в сайт интерфейс редактирования'
 email:
@@ -193,26 +194,35 @@ files:
 - app/assets/stylesheets/texter/application.css
 - app/controllers/texter/application_controller.rb
 - app/controllers/texter/texts_controller.rb
-- app/decorators/texter/text_decorator.rb
 - app/helpers/texter/application_helper.rb
 - app/helpers/texter/texts_helper.rb
+- app/lib/texter/art_typograph_preprocessor.rb
+- app/lib/texter/build_text.rb
+- app/lib/texter/callable_class.rb
+- app/lib/texter/clean_preprocessor.rb
+- app/lib/texter/formatter.rb
+- app/lib/texter/markdown_formatter.rb
+- app/lib/texter/preprocessor.rb
+- app/lib/texter/run_preprocessors_on_text.rb
+- app/lib/texter/simple_formatter.rb
+- app/lib/texter/textile_formatter.rb
 - app/models/texter/text.rb
+- app/presenters/texter/text_presenter.rb
 - app/views/texter/texts/_edit.html.erb
 - app/views/texter/texts/edit.js.erb
 - app/views/texter/texts/update.js.erb
+- config/locales/texter.ru.yml
 - config/routes.rb
 - db/migrate/20121231021051_create_texter_texts.rb
 - lib/tasks/texter_tasks.rake
-- lib/texter/clean_body.rb
 - lib/texter/engine.rb
-- lib/texter/text_factory.rb
-- lib/texter/typograph.rb
 - lib/texter/version.rb
 - lib/texter.rb
 - Rakefile
 homepage: http://github.com/macovsky/texter
 licenses: []
-post_install_message: 
+post_install_message: Texter 1.0.0 is backwards incompatible, please take a look at
+  the changelog.
 rdoc_options: []
 require_paths:
 - lib

data/app/decorators/texter/text_decorator.rb

@@ -1,42 +0,0 @@
-# encoding: UTF-8
-require 'draper'
-
-module Texter
-  class TextDecorator < Draper::Decorator
-    decorates 'Texter::Text'
-    delegate_all
-
-    def body
-      return textile unless can_edit?
-
-      h.content_tag(content_tag, textile, {
-        :data => {
-          :url => h.texter.edit_text_path(path, :js, :text => {
-            :tag_type => tag_type
-          })
-        },
-        :class => "js-edit #{path_for_class}"
-      })
-    end
-
-    def path_for_class
-      path.gsub(/\./, '-')
-    end
-
-    private
-
-    def content_tag
-      {:block => :div, :inline => :span}[tag_type.to_sym]
-    end
-
-    def textile
-      body = get_body
-      body = "Редактировать" if can_edit? && body.blank?
-      h.send("textile_#{tag_type}", body)
-    end
-
-    def can_edit?
-      h.text_can_be_edited?(model)
-    end
-  end
-end

data/lib/texter/clean_body.rb

@@ -1,11 +0,0 @@
-module Texter
-  class CleanBody < Struct.new(:text)
-    def clean(*attrs)
-      attrs.flatten.each do |attr|
-        if (value = text.send(attr)).present?
-          text.send("#{attr}=", value.gsub(/\r/, ''))
-        end
-      end
-    end
-  end
-end

data/lib/texter/text_factory.rb

@@ -1,23 +0,0 @@
-module Texter
-  class TextFactory < Struct.new(:path, :tag_type, :virtual_path)
-    def build
-      text = Texter::Text.find_or_initialize_by_path(full_path)
-      text.tag_type = tag_type
-      Texter::TextDecorator.new(text)
-    end
-
-    private
-
-    def full_path
-      if path.to_s.first == "."
-        if virtual_path
-          virtual_path.gsub(%r{/_?}, ".") + path.to_s
-        else
-          raise "Cannot use #{path.inspect} shortcut because path is not available"
-        end
-      else
-        path
-      end
-    end
-  end
-end

data/lib/texter/typograph.rb

@@ -1,21 +0,0 @@
-module Texter
-  class Typograph < Struct.new(:text)
-    def process(*attrs)
-      return true if attrs.blank?
-
-      options = attrs.flatten.inject({}){|memo, attr|
-        memo.merge! attr => self.class.process(text.send(attr))
-      }
-
-      text.update_attributes options
-    end
-
-    def self.process(text)
-      s = ArtTypograph.process(text)
-      s.gsub! %r{</p>}m, "\n"
-      s.gsub! %r{<p.*?>}, ''
-      s.gsub! %r{</?(nobr|span).*?>}, ''
-      s.strip
-    end
-  end
-end