html_slicer 0.1.2 → 0.1.7

data/CHANGELOG

@@ -1,3 +1,24 @@
+== 0.1.6
+
+* Dependency bugfixes.
+
+== 0.1.5
+
+* Gem description updated.
+
+== 0.1.4
+
+* Dependency bugfixes. Update with 'bundle update html_slicer'!
+
+== 0.1.3
+
+* Code refactored. Specific tools and methods extracted to stand-alone 'active_tools' gem.
+
+== 0.1.2
+
+* Visual separating (:text_break) functionality improved.
+* "Read more": Now, pass dynamic content to the end of slice, directly from ActionView environment.
+
 == 0.1.1
 
 * Code optimized for speed.

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
 # Specify your gem's dependencies in html_slicer.gemspec
-gemspec
+gemspec

data/html_slicer.gemspec

@@ -10,11 +10,12 @@ Gem::Specification.new do |s|
   s.authors     = ["Valery Kvon"]
   s.email       = ["addagger@gmail.com"]
   s.homepage    = %q{http://vkvon.ru/projects/html_slicer}
-  s.summary     = %q{HTML text pagination for Ruby on Rails}
-  s.description = %q{HTML truncation & pagination for Rails 3. It also provides on option to resize "width"/"height" HTML tags (also as CSS elements in "style="), such as <iframe>, <object>, <img> or any other.}
+  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.add_development_dependency "actionpack", ['>= 3.0.0']
-  s.add_development_dependency "activesupport", ['>= 3.0.0']
+  s.add_dependency "actionpack", ['>= 3.0.0']
+  s.add_dependency "activesupport", ['>= 3.0.0']
+  s.add_dependency "active_tools", ['>= 0.0.2']
 
   s.rubyforge_project = "html_slicer"
 

data/lib/html_slicer/config.rb

@@ -46,7 +46,6 @@ module HtmlSlicer
   class Configuration #:nodoc:
     
     include ActiveSupport::Configurable
-    include HtmlSlicer::Utilities::Deepcopy
     
     config_accessor :as
     config_accessor :slice
@@ -69,7 +68,7 @@ module HtmlSlicer
     
     def duplicate
       Configuration.new.tap do |c|
-        c.config.replace(deepcopy(config))
+         c.config.replace(config.deep_copy)
       end
     end
     

data/lib/html_slicer/engine.rb

@@ -1,3 +1,6 @@
+require 'rubygems'
+require 'active_tools/core_extension'
+
 module HtmlSlicer #:nodoc:
   class Engine < ::Rails::Engine #:nodoc:
   end

data/lib/html_slicer/helpers/action_view_extension.rb

@@ -1,7 +1,8 @@
-# This part of code is almost completely ported from +Kaminari+ gem by Akira Matsuda.
-# Look at http://github.com/amatsuda/kaminari/tree/master/lib/kaminari/helpers
 module HtmlSlicer
-
+  # This part of code is almost completely ported from +Kaminari+ gem by Akira Matsuda.
+  # Look at http://github.com/amatsuda/kaminari/tree/master/lib/kaminari/helpers
+  # ===================================================================================
+  #
   # The part of code, processing the +:param_name+ was rewritten by me.
   # Now you can define +:param_name+ as a +symbol+ or +string+, or as an +array of any object that responses +.to_s+ method and returns +string+.
   # Passing +array+ is the way to define nested :param_name.
@@ -54,7 +55,7 @@ module HtmlSlicer
     def link_to_next_slice(object, name, options = {}, &block)
       params = options[:params] ? self.params.merge(options.delete :params) : self.params
       param_name = options.delete(:param_name) || object.options.param_name
-      link_to_unless object.last_slice?, name, HtmlSlicer::SmartParams.new(params, param_name, (object.current_slice + 1)), options.reverse_merge(:rel => 'next') do
+      link_to_unless object.last_slice?, name, params.merge_hashup(*param_name, object.current_slice + 1), options.reverse_merge(:rel => 'next') do
         block.call if block
       end
     end

data/lib/html_slicer/helpers/slicer.rb

@@ -1,18 +1,18 @@
-# This part of code is almost completely ported from +Kaminari+ gem by Akira Matsuda.
-# Look at http://github.com/amatsuda/kaminari/tree/master/lib/kaminari/helpers
-
 require 'active_support/inflector'
 require 'action_view'
 require 'action_view/log_subscriber'
 require 'action_view/context'
-require 'html_slicer/helpers/smart_params'
 require 'html_slicer/helpers/tags'
 
 module HtmlSlicer
   
   module Helpers
+    # This part of code is almost completely ported from +Kaminari+ gem by Akira Matsuda.
+    # Look at http://github.com/amatsuda/kaminari/tree/master/lib/kaminari/helpers
+    # ===================================================================================
+    #
     # The main container tag
-    
+    #
     # Configure ActiveSupport inflections to pluralize 'slice' in a correct way = 'slices'. # By default would be 'slouse'.
     ActiveSupport::Inflector.inflections do |inflect|
       inflect.plural 'slice', 'slices'

data/lib/html_slicer/helpers/tags.rb

@@ -1,8 +1,10 @@
-# This part of code is almost completely ported from +Kaminari+ gem by Akira Matsuda.
-# Look at http://github.com/amatsuda/kaminari/tree/master/lib/kaminari/helpers
 module HtmlSlicer
+  
   module Helpers
-    
+    # This part of code is almost completely ported from +Kaminari+ gem by Akira Matsuda.
+    # Look at http://github.com/amatsuda/kaminari/tree/master/lib/kaminari/helpers
+    # ===================================================================================
+    #    
     # A tag stands for an HTML tag inside the paginator.
     # Basically, a tag has its own partial template file, so every tag can be
     # rendered into String using its partial template.
@@ -29,8 +31,8 @@ module HtmlSlicer
       end
 
       def slice_url_for(slice)
-        # +HtmlSlicer::SmartParams+: return deep merged params with a new slice number value.
-        @template.url_for HtmlSlicer::SmartParams.new(@params, @param_name, (slice <= 1 ? nil : slice))
+        # +@params.merge_hashup+: returns deep merged params with a new slice number value.
+        @template.url_for @params.merge_hashup(*@param_name, (slice <= 1 ? nil : slice))
       end
     end
 

data/lib/html_slicer/mappers/resizing.rb

@@ -67,14 +67,12 @@ module HtmlSlicer
           values << absolute_resolution(node.attributes["width"])
         end
         if style = node.attributes["style"]
-          style.gsub!(/width:\s+\d+px;/) do |t|
-            t.gsub(/\d+/) do |w|
-              if block_given?
-                yield
-              else
-                values << w.to_i
-                w
-              end
+          style.gsub!(/width:\s+\d+(?=px);/) do |w|
+            if block_given?
+              yield
+            else
+              values << w.to_i
+              w
             end
           end
         end
@@ -89,14 +87,12 @@ module HtmlSlicer
           values << absolute_resolution(node.attributes["height"])
         end
         if style = node.attributes["style"]
-          style.gsub!(/height:\s+\d+px;/) do |t|
-            t.gsub(/\d+/) do |h|
-              if block_given?
-                yield
-              else
-                values << h.to_i
-                h
-              end
+          style.gsub!(/height:\s+\d+(?=px);/) do |h|
+            if block_given?
+              yield
+            else
+              values << h.to_i
+              h
             end
           end
         end

data/lib/html_slicer/utilities.rb

@@ -17,95 +17,6 @@ module HtmlSlicer
         [node.line, node.position]
       end
     end
-
-    module Deepcopy
-      # Return the 'deep' brand new copy of Hash or Array. All nested hashes/arrays rebuilded at the same way.
-      def deepcopy(object)
-        array_copy = Proc.new do |a|
-          duplicate = Array.new
-          a.each do |value|
-            duplicate << case value
-            when Hash then hash_copy.call(value)
-            when Array then array_copy.call(value)
-            else value
-            end
-          end
-          duplicate
-        end
-        hash_copy = Proc.new do |h|
-          duplicate = Hash.new
-          h.each do |key, value|
-            duplicate[key] = case value
-            when Hash then hash_copy.call(value)
-            when Array then array_copy.call(value)
-            else value
-            end
-          end
-          duplicate
-        end
-        case object
-        when Hash then hash_copy.call(object)
-        when Array then array_copy.call(object)
-        else object
-        end
-      end
-    end
-
-    module HashupArray
-      # Return a nested Hash object from Array's elements sequence, where elements used as names of +hash+ keys.
-      # The last element of array would be the last nested value.
-      #
-      # === Example:
-      #   
-      #   hashup([:vehicle, :car, :ford, :mustang, "2 please"])
-      #
-      #   #=> {:vehicle=>{:car=>{:ford=>{:mustang=>"2 please"}}}}
-      def hashup(array)
-        raise(TypeError, "Array expected!") unless array.is_a?(Array)
-        raise(Exception, "At least 2 elements needed!") if array.size < 2
-        value = array.delete_at(-1)
-        {}.tap do |hash|
-          index = 0
-          while index < array.size
-            hash = hash[array.at(index)] = (index + 1 == array.size) ? value : {}
-            index += 1
-          end
-        end
-      end      
-    end
-    
-    module NestedMergeHash
-      include Deepcopy
-
-      # Return the merged Hash with another +hash+, where the possible child hashes are also merged.
-      #
-      # === Example:
-      # 
-      #   h1 = {:breakfast => {:eggs => 2, :bread => 1}, :lunch => {:steak => 1, :salad => 1}}
-      #   h2 = {:breakfast => {:coffee => :espresso, :juice => 1}, :lunch => {:tea => 2}, :dinner => :none}
-      #   nested_merge(h1, h2)
-      #   #=> {:breakfast=>{:eggs=>2, :bread=>1, :coffee=>:espresso, :juice=>1}, :lunch=>{:steak=>1, :salad=>1, :tea=>2}, :dinner=>:none}
-      #
-      def nested_merge(hash, other_hash = {})
-        raise(TypeError, "Hash expected!") unless hash.is_a?(Hash)
-        a = Proc.new do |original, change|
-          change.each do |key, value|
-            if !original.has_key?(key) || !original[key].is_a?(Hash)
-              original[key] = value
-            elsif original[key].is_a?(Hash) && value.is_a?(Hash)
-              a.call(original[key], value)
-            end
-          end
-          original
-        end
-        a.call(deepcopy(hash), other_hash)
-      end
-
-      # .nested_merge replaces the source hash.
-      def nested_merge!(hash, other_hash = {})
-        hash.replace(nested_merge(hash, other_hash = {}))
-      end
-    end
     
     module NodeMatchExtension
     

data/lib/html_slicer/version.rb

@@ -1,3 +1,3 @@
 module HtmlSlicer
-  VERSION = "0.1.2"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html_slicer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -19,7 +19,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -35,7 +35,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -43,9 +43,24 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-description: HTML truncation & pagination for Rails 3. It also provides on option
-  to resize "width"/"height" HTML tags (also as CSS elements in "style="), such as
-  <iframe>, <object>, <img> or any other.
+- !ruby/object:Gem::Dependency
+  name: active_tools
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+description: ! 'HTML truncation & pagination for Rails 3. Optional feature: recalculate
+  resolution values of HTML tags (within width/height/style attributes).'
 email:
 - addagger@gmail.com
 executables: []
@@ -87,7 +102,6 @@ files:
 - lib/html_slicer/engine.rb
 - lib/html_slicer/helpers/action_view_extension.rb
 - lib/html_slicer/helpers/slicer.rb
-- lib/html_slicer/helpers/smart_params.rb
 - lib/html_slicer/helpers/tags.rb
 - lib/html_slicer/installer.rb
 - lib/html_slicer/interface.rb
@@ -120,8 +134,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: html_slicer
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: HTML text pagination for Ruby on Rails
+summary: Paginate (split) long HTML text to pages and partials. Resize embeddings
+  on fly. Flexible configuration.
 test_files: []

data/lib/html_slicer/helpers/smart_params.rb

@@ -1,35 +0,0 @@
-module HtmlSlicer
-
-  class SmartParams < Hash
-    # Implements smart and flexible +params+ merging.
-    # Method accepts passed +params+ hash and merge it with a new :+param_name+ and it's value.
-    # In the case when you passed +param_name+ option as an Array, method returns merged new
-    # instance of hashed params where all subhashes merged into the same way.
-    #
-    # === Example:
-    #
-    #   params = {:controller => "comments", :action => "show", :id => 34, :article_id => 3, :page => {:article => 2}}
-    #
-    #   :slice_params => [:page, :comment]
-    #
-    #   HtmlSlicer::SmartParams.new(params, slice_params, 34)
-    #   # => {:controller => "comments", :action => "show", :id => 34, :article_id => 3, :page => {:article => 2, :comment => 34}}
-    #    
-    def initialize(params = {}, param_name = nil, value = nil)
-      super()
-      param_subhash = case param_name
-      when Array then hashup(param_name.collect {|e| e.to_s} << value)
-      when String, Symbol then {param_name.to_s => value}
-      else {}
-      end
-      update(nested_merge(params, param_subhash))
-    end
- 
-    private
-    
-    include HtmlSlicer::Utilities::HashupArray
-    include HtmlSlicer::Utilities::NestedMergeHash
-    
-  end
-  
-end