html_slicer 0.1.8 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4c4fcc74a0356630d72498be76a169062014b80
-  data.tar.gz: e4f4b2585a0f4408e93b85f6c442119fa90b5264
+  metadata.gz: 8db09b48ca101d1442befb97c3f6d9f898061fb4
+  data.tar.gz: 2c93428bd3ec22b662e589203c9b044d0fb40df7
 SHA512:
-  metadata.gz: a7f979442c8dba55d1c5cc2547420aa1dbd18fdad635542d4b02be01636d5769079d3d872c8881a6547064cd7d4fc85e917d1d9fb568ed2fa6df5535b3b099f5
-  data.tar.gz: 305e3c4bd510566c9c39e8f37d00cffa2a2bd94e8c53de945b491611a4a9a4b2c1d1562723986ee035aafe609a061499b09768b72201b3b2115ca70ed4c68dcc
+  metadata.gz: 78f8c07ec1c60824e6e4213ce67c655c03a1c6a5e088698d0b3902f9020005ed7735c197712bc16f8c1c6f63e595a3b2e6b0a5141909d834773bc0822961fcec
+  data.tar.gz: 911c0aef4eb8fe0916088404ebfd672a716b4515f8e9719696816ffd8d3a39aff1d05f84f4d014f752d7eda722352a0796cf1529dfa3174e4fcc29a03c90cf6c

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.2.0
+
+* html-scanner has been a part of Rails for a long time up to version 4.1. Now it's been deprecated and used as a stand-alone dependency.
+
 == 0.1.6
 
 * Dependency bugfixes.

data/Gemfile

@@ -1,4 +1,5 @@
 source "http://rubygems.org"
 
 # Specify your gem's dependencies in html_slicer.gemspec
-gemspec
+gemspec
+gem 'html-scanner', :github => 'addagger/html-scanner'

data/README.rdoc

@@ -1,14 +1,14 @@
-= html_slicer
+= HTML-slicer
 
-A little gem for Rails 3 helps you implement a smart way to split textual content. This is a quick approach to create ‘pageable’ views for ActiveRecord Model’s attributes, just independent strings, or any other Ruby classes. Or course it can split HTML content. More over, it can ‘resize’ HTML tags through <tt>width=</tt> attribute*.
+A little gem for Rails 3+ helps you implement a smart way to split text/HTML content into pages. This is a short way to create ‘pageable’ views for models' string attributes or raw String objects. Optionally it can ‘resize’ on a fly any HTML elements having <tt>width=</tt> or <tt>style='width: *px;'</tt> attribute*.
 
-  * Imagine you want to resize <iframe> embeddings from YouTube saved in static content.
+  * for example <iframe> embeddings from YouTube or images or any other objects.
 
 
 == Features
 
 === Clean
-Does not globally pollute +Array+, +Hash+, +Object+ or <tt>AR::Base</tt>.
+Inspired by Kaminari. Does not globally pollute +Array+, +Hash+, +Object+ or <tt>AR::Base</tt>.
 
 === Easy to use
 Bundle the gem, then your models are ready to implement slicing.
@@ -20,7 +20,7 @@ Besides global configuration (default), you can create stylized app-level config
 You can split your text with any Regexp clause: set up which node from your HTML content you want to split, or which you don’t want to. You can also use processor(s) to transform the content before it has to be sliced. Param name, used as a slice number key accessor, can be nested in another param key (nested params). Resizing HTML tags having <tt>width=</tt> attribute is a helpful feature too.
 
 === ORM & template engine agnostic
-Supports Rails 3 and multiple template engines (ERB, Haml).
+Supports Rails 3+ and multiple template engines (ERB, Haml).
 
 === Modern
 The slicer helper outputs the HTML5 <nav> tag by default. In addition, the helper supports Rails 3 unobtrusive Ajax.
@@ -28,9 +28,9 @@ The slicer helper outputs the HTML5 <nav> tag by default. In addition, the helpe
 
 == Supported versions
 
-* Ruby 1.9.2, 1.9.3
+* Ruby 1.9.2+
 
-* Rails 3.0.x, 3.1, 3.2
+* Rails 3+
 
 * Haml 3+
 
@@ -39,6 +39,9 @@ The slicer helper outputs the HTML5 <nav> tag by default. In addition, the helpe
 
 Put this line in your Gemfile:
   gem 'html_slicer'
+  
+Dependencies (for versions 0.2.0+ & Rails 4.2+)
+  gem 'html-scanner', :github => 'addagger/html-scanner' # (fork from Jakob Skjerning, 'koppen/html-scanner')
 
 Then bundle:
   % bundle
@@ -52,7 +55,7 @@ Then bundle:
 
 where: 
 * <method_name> - any method name which returns source String (can be called with .send()).
-* <configuration> - Hash of configuration options and/or +:config+ parameter.
+* <configuration> - Hash of configuration options and/or +:config+ parameter as a symbol.
 
 === Basic example
 
@@ -62,30 +65,30 @@ where:
   
 where:
 * <tt>:content</tt> is an attribute accessor for Article which returns a target String object.
-* <tt>:as</tt> is a name of basic accessor for result.
+* <tt>:as</tt> is a name of basic accessor for the result.
 * <tt>:slice</tt> is a hash of <tt>slicing options</tt> as a part of configuration.
 * <tt>:resize</tt> is a hash of <tt>resizing options</tt> as a part of configuration.
 * <tt>:cache_to</tt> is an accessor name used to store the cache. +True+ value make it by default.
 
 You can define any configuration key you want. Otherwise, default configuration options (if available) will be picked up automatically.
   
-Console:
+Console example:
   
   @article = Article.find(1)
   @article.content
   # => "Words like violence break the silence\r\nCome crashing in into my little world\r\n<iframe width=\"560\" height=\"315\" src=\"http://www.youtube.com/embed/ms0bd_hCZsk\" frameborder=\"0\" allowfullscreen></iframe>\r\nPainful to me, pierce right through me\r\nCan't you understand, oh my little girl?"
 
   @article_paged = @article.paged
-  # => "Words like violence bre"
+  # => "Words like violence bre" # Page 1
   
-  @article_paged.slice!(2)
+  @article_paged.slice!(2) # Page 2
   # => "ak the silence"
 
-  @article_paged.slice!(4)
+  @article_paged.slice!(4) # Page 4
   # => "rld
   <iframe width="300" height="169" src="http://www.youtube.com/embed/ms0bd_hCZsk" frameborder="0" allowfullscreen></iframe>"  
 
-The <tt>.slice!()</tt> method accepts number of slice (page). No argument (or +nil+) assumes it is number +1+. Passed slice number is remembered.
+The <tt>.slice!()</tt> method accepts slice number (page) as an integer. Blank argument (or +nil+) assumes it is number +1+.
 
 === Configuration options
 
@@ -108,8 +111,8 @@ All configuration keys:
 
 * <tt>:unit</tt> is a +Regexp/String/Hash+ description of text units counted to split the text by slices.
 When value is a +Hash+, it assumes the unit is a HTML tag (look at <tt>:only/:except</tt> options for details).
-Undefined value or +nil+ assumes it by default regular expression <tt>/&#?\w+;|\S/</tt>. As you can see it counts any regular character or HTML special character as a unit.
-* <tt>:maximum</tt> is a +Fixnum+ number of units to be a one slice.
+Undefined value or +nil+ assumes it by default regular expression <tt>/&#?\w+;|\S/</tt>. As you can see it counts any regular character or HTML special character as a one unit.
+* <tt>:maximum</tt> is a +Fixnum+ number of units to be in a one slice.
 
 If +:unit+ defined as Regexp or String, default value is 300.
 
@@ -126,8 +129,8 @@ It can be an ellipsis or any other symbol.
 * <tt>:only</tt> is a +Hash+ or +Array+ of hashes, describes which exactly nodes of HTML content to slice.*
 * <tt>:except</tt> is a +Hash+ or +Array+ of hashes, describes which exactly nodes of HTML content NOT to slice.*
 
-  * Actually the hash is an argument for HTML::Conditions class (the part of ActionPack's html_scanner code). Look at http://github.com/rails/rails/blob/master/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
-  This is a very flexible utility to navigate via HTML content. Read native documentation for details.
+  * Actually the hash is an argument for ::HTML::Conditions class (the part of <tt>html_scanner</tt> code). Look at http://github.com/koppen/html-scanner/blob/master/lib/html/node.rb
+  This is a very useful utility to navigate via HTML content. Read native documentation for details and thank you, Assaf Arkin for that legendary code being with Rails up to 4.1 since 2006.
   
   For example: ID for <tt><hr class="break"></tt> tag is a hash: <tt>{:tag => "hr", :attributes => {:class => "break"}}</tt>
 

data/html_slicer.gemspec

@@ -9,13 +9,12 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Valery Kvon"]
   s.email       = ["addagger@gmail.com"]
-  s.homepage    = %q{http://vkvon.ru/projects/html_slicer}
+  s.homepage    = %q{http://github.com/addagger/html_slicer}
   s.summary     = %q{Paginate (split) long HTML text to pages and partials. Resize embeddings on fly. Flexible configuration.}
-  s.description = %q{HTML truncation & pagination for Rails 3. Optional feature: recalculate resolution values of HTML tags (within width/height/style attributes).}
+  s.description = %q{HTML truncation & pagination for Rails 3+. Optional feature: recalculate resolution values of HTML tags (within width/height/style attributes).}
   
-  s.add_dependency "actionpack", ['>= 3.0.0']
   s.add_dependency "activesupport", ['>= 3.0.0']
-  s.add_dependency "active_tools", ['>= 0.0.2']
+  s.add_dependency "active_tools", ['>= 0.0.18']
 
   s.rubyforge_project = "html_slicer"
 

data/lib/html_slicer.rb

@@ -3,7 +3,6 @@
 require "html_slicer/version"
 
 module HtmlSlicer
-  
   def self.load!
     require 'html_slicer/utilities'
     require 'html_slicer/config'
@@ -13,7 +12,6 @@ module HtmlSlicer
     require 'html_slicer/helpers/slicer'
     require 'html_slicer/railtie'
   end
-  
 end
   
 HtmlSlicer.load!

data/lib/html_slicer/interface.rb

@@ -31,6 +31,10 @@ module HtmlSlicer
       load!
     end
     
+    def inspect
+      "'#{to_s}'"
+    end
+    
     # Getting source content
     def source
       case options[:processors].present?
@@ -60,7 +64,7 @@ module HtmlSlicer
         CachedStuff.new
       end
       if @document.blank? || !@cached_stuff.valid_text?(text) # Initialize new @document if not exist or content has been changed
-        @document = HTML::Document.new(text)
+        @document = ::HTML::Document.new(text)
         @cached_stuff.hexdigest_for = text
       end
       if @cached_stuff.changed? || !@cached_stuff.valid_resizing_options?(@resizing_options) # Initialize new resizing process if the content or options has been changed
@@ -133,8 +137,8 @@ module HtmlSlicer
     def view(node, slice, &block)
       slice = slice.to_i
       case node
-      when HTML::Tag then
-        children_view = node.children.collect {|child| view(child, slice, &block)}.compact.join
+      when ::HTML::Tag then
+        children_view = node.children.map {|child| view(child, slice, &block)}.compact.join
         if resized?
           resizing.resize_node(node)
         end
@@ -158,7 +162,7 @@ module HtmlSlicer
         else
           node.to_s
         end
-      when HTML::Text then
+      when ::HTML::Text then
         if sliced?
           if range = slicing.map.get(node, slice)
             (range.is_a?(Array) ? node.content[Range.new(*range)] : node.content).tap do |export|
@@ -173,10 +177,10 @@ module HtmlSlicer
         else
           node.to_s
         end
-      when HTML::CDATA then
+      when ::HTML::CDATA then
         node.to_s
-      when HTML::Node then
-        node.children.collect {|child| view(child, slice, &block)}.compact.join
+      when ::HTML::Node then
+        node.children.map {|child| view(child, slice, &block)}.compact.join
       end
     end
 

data/lib/html_slicer/mappers/resizing.rb

@@ -19,7 +19,7 @@ module HtmlSlicer
       end    
 
       def initialize(document, options)
-        raise(TypeError, "HTML::Document expected, '#{document.class}' passed") unless document.is_a?(HTML::Document)
+        raise(TypeError, "::HTML::Document expected, '#{document.class}' passed") unless document.is_a?(::HTML::Document)
         raise(TypeError, "HtmlSlicer::Options expected, '#{options.class}' passed") unless options.is_a?(HtmlSlicer::Options)
         @options = options
         @map = Map.new
@@ -42,8 +42,8 @@ module HtmlSlicer
 
       def process!(root)
         parse(root) do |node|
-          if node.is_a?(HTML::Tag) && resizeable?(node)
-            target_width = node.parent.is_a?(HTML::Tag) ? @map.width(node.parent)||@options.width : @options.width
+          if node.is_a?(::HTML::Tag) && resizeable?(node)
+            target_width = node.parent.is_a?(::HTML::Tag) ? @map.width(node.parent)||@options.width : @options.width
             if target_width.present? && node_width = width(node)
               node_height = height(node)
               if node_width > target_width
@@ -67,7 +67,7 @@ module HtmlSlicer
           values << absolute_resolution(node.attributes["width"])
         end
         if style = node.attributes["style"]
-          style.gsub!(/width:\s+\d+(?=px);/) do |w|
+          style.gsub!(/(?<width:\s*>)(\d+)(?=px)/) do |w|
             if block_given?
               yield
             else
@@ -87,7 +87,7 @@ module HtmlSlicer
           values << absolute_resolution(node.attributes["height"])
         end
         if style = node.attributes["style"]
-          style.gsub!(/height:\s+\d+(?=px);/) do |h|
+          style.gsub!(/(?<height:\s*>)(\d+)(?=px)/) do |h|
             if block_given?
               yield
             else

data/lib/html_slicer/mappers/slicing.rb

@@ -18,7 +18,7 @@ module HtmlSlicer
       end
 
       def initialize(document, options)
-        raise(TypeError, "HTML::Document expected, '#{document.class}' passed") unless document.is_a?(HTML::Document)
+        raise(TypeError, "::HTML::Document expected, '#{document.class}' passed") unless document.is_a?(::HTML::Document)
         raise(TypeError, "HtmlSlicer::Options expected, '#{options.class}' passed") unless options.is_a?(HtmlSlicer::Options)
         @options = options
         @map = Map.new
@@ -34,7 +34,7 @@ module HtmlSlicer
       def process_by_text!(root)
         units_count = 0
         parse(root) do |node|
-          if node.is_a?(HTML::Text) && sliceable?(node)
+          if node.is_a?(::HTML::Text) && sliceable?(node)
             sanitize_content!(node)
             content = node.to_s
             begin
@@ -87,7 +87,7 @@ module HtmlSlicer
       end
 
       def sanitize_content!(node)
-        content = HTML::FullSanitizer.new.sanitize(node.to_s)
+        content = ::HTML::FullSanitizer.new.sanitize(node.to_s)
         node.instance_variable_set(:@content, content)
       end
 

data/lib/html_slicer/models/active_record_extension.rb

@@ -2,7 +2,7 @@ require 'html_slicer/installer'
 
 module HtmlSlicer
   module ActiveRecordExtension
-    
+
     def self.included(base)
       base.extend(ClassMethods)
     end
@@ -14,8 +14,7 @@ module HtmlSlicer
     end
 
     module InstanceMethods
-
     end
-            
+       
   end
 end

data/lib/html_slicer/options.rb

@@ -19,7 +19,7 @@ module HtmlSlicer
     end
     
     def string_value
-      instance_variables.collect {|name| name.to_s + ":" + instance_variable_get(name).to_s}.join
+      instance_variables.map {|name| name.to_s + ":" + instance_variable_get(name).to_s}.join
     end
     
   end

data/lib/html_slicer/utilities.rb

@@ -5,7 +5,7 @@ module HtmlSlicer
       def parse(node, &block)
         node.children.each do |node|
           yield node if block_given?
-          if node.is_a?(HTML::Tag)
+          if node.is_a?(::HTML::Tag)
             parse(node, &block)
           end
         end

data/lib/html_slicer/version.rb

@@ -1,3 +1,3 @@
 module HtmlSlicer
-  VERSION = "0.1.8"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,58 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: html_slicer
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.1
 platform: ruby
 authors:
 - Valery Kvon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: active_tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
-description: 'HTML truncation & pagination for Rails 3. Optional feature: recalculate
+        version: 0.0.18
+description: 'HTML truncation & pagination for Rails 3+. Optional feature: recalculate
   resolution values of HTML tags (within width/height/style attributes).'
 email:
 - addagger@gmail.com
@@ -60,7 +46,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG
 - Gemfile
 - MIT-LICENSE
@@ -106,7 +92,7 @@ files:
 - lib/html_slicer/railtie.rb
 - lib/html_slicer/utilities.rb
 - lib/html_slicer/version.rb
-homepage: http://vkvon.ru/projects/html_slicer
+homepage: http://github.com/addagger/html_slicer
 licenses:
 - MIT
 metadata: {}
@@ -116,17 +102,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: html_slicer
-rubygems_version: 2.0.4
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Paginate (split) long HTML text to pages and partials. Resize embeddings