ballonizer 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bf4f7c8da8c6850ded2132c67beebc4bb5306ff
-  data.tar.gz: 8238aea52c3812bdb5ef6113744d2c2f01d0e488
+  metadata.gz: 8b70575ef73f0f6eb75c78152bc2528cf5b265f8
+  data.tar.gz: ee3aca3f015051952cf27d02f566ba82db4d9202
 SHA512:
-  metadata.gz: b7b614154da4bf1e78483c9266e067d33a425f57dd4d10f662732163316a5852b76aac86e59aba5e591ac9531d45d1829b1990b9e3b6d349d2f6ee2693b8d527
-  data.tar.gz: 4ebfcf50deafb861e2cce5f5e20120399e133748ece9865dec01c1def8cf936ff81b926d6e4f1fbca8aca39c8ff6754507a9743c2d1074813a7ef5e1150d31b8
+  metadata.gz: 3e2c3f7d30a6e276d71cbb2cbd3b024e537fb0cd1701afa191a240bbab4d74d7a474ced17b23a5d2a8ebf2cce38939b9787ce1455eaecd6a695dd4be50a03209
+  data.tar.gz: 4314720810323104e83f0cc6b9c9049966b75de5df711126aead63092900a3d9e3824b8ab2b85794898e106e964340f21ef94daeebf581add700087b00d29a1f

data/examples/ballonizer_app/config.ru

@@ -17,9 +17,9 @@ ballonizer = Ballonizer.new(db_uri, {
   create_tables_if_none: true,
   form_handler_url: '/request_handler',
   add_required_css: true,
-  css_asset_path_for_link: '/assets',
+  css_asset_path_for_link: '/assets/',
   add_required_js_libs_for_edition: true,
-  js_asset_path_for_link: '/assets'
+  js_asset_path_for_link: '/assets/'
 })
 
 app = Rack::Builder.new do

data/lib/ballonizer.rb

@@ -84,7 +84,6 @@ class Ballonizer
   # @api private Don't use the methods of this module. They are for internal use only.
   module Workaround
     def self.join_uris(base, relative)
-      base = base.end_with?('/') ? base : base + '/'
       Addressable::URI.parse(base).join(relative).to_s
     end
 
@@ -395,8 +394,8 @@ class Ballonizer
   # @param page [String] The (X)HTML page.
   # @param page_url [String] The url of the page to be ballonized, necessary
   #   to make absolute the src attribute of img (if it's relative).
-  # @param settings [Hash{Symbol => String}] Optional. If not provided the
-  #   #settings will be used.
+  # @param settings [Hash{Symbol => String}] Optional. Hash to be merged with
+  #   the instance #settings (this argument override the #settings ones).
   # @param mime_type A string that have the substring 'text/html' or
   #   'application/xhtml+xml'.
   # @return [String] The ballonized page (new string), or the same string,
@@ -432,10 +431,10 @@ class Ballonizer
       
       head = parsed_page.at_css('head')
       if settings[:add_required_css]
-        head.children.last.add_next_sibling(self.css_html_links)
+        head.children.last.add_next_sibling(css_html_links(settings))
       end
       if settings[:add_required_js_libs_for_edition]
-        head.children.last.add_next_sibling(self.js_libs_html_links)
+        head.children.last.add_next_sibling(js_libs_html_links(settings))
       end
       if settings[:add_js_for_edition]
         head.children.last.add_next_sibling(self.js_load_snippet)
@@ -531,12 +530,14 @@ class Ballonizer
 
   # The (X)HTML fragment with the link tags that are added to the page by
   # ballonize_page if the :add_required_css setting is true (the default
-  # is false). If the :css_asset_path_for_link isn't set (what is the
-  # default) this method return nil.
-  # @return [String,NilClass] A frozen string.
-  def css_html_links
+  # is false).
+  # @param settings [Hash{Symbol => String}] Optional. Hash to be merged with
+  #   the instance #settings (this argument override the #settings ones).
+  # @return [String,NilClass] A String when the :css_asset_path_for_link is
+  #   defined, nil otherwise.
+  def css_html_links(settings = {})
+    settings = self.settings.merge(settings)
     return nil unless settings[:css_asset_path_for_link]
-    return @css_html_links if @css_html_links
 
     link_template = '<link rel="stylesheet" type="text/css" href="PATH" />'
     css_paths = self.class.asset_logical_paths.select do | p |
@@ -548,17 +549,19 @@ class Ballonizer
       link_template.sub('PATH', p)
     end
 
-    @css_html_links = links.join('').freeze
+    links.join('')
   end
 
   # The (X)HTML fragment with the script tags that are added to the page by
   # ballonize_page if the :add_required_js_libs_for_edition setting is true
-  # (the default is false). If the :js_asset_path_for_link isn't set (what
-  # is the default) this method return nil.
-  # @return [String,NilClass] A frozen string.
-  def js_libs_html_links
+  # (the default is false).
+  # @param settings [Hash{Symbol => String}] Optional. Hash to be merged with
+  #   the instance #settings (this argument override the #settings ones).
+  # @return [String,NilClass] A String when the :js_asset_path_for_link is
+  #   defined, nil otherwise.
+  def js_libs_html_links(settings = {})
+    settings = self.settings.merge(settings)
     return nil unless settings[:js_asset_path_for_link]
-    return @js_libs_html_links if @js_libs_html_links
 
     link_template = '<script type="text/javascript" src="PATH" ></script>'
     js_libs_paths = self.class.asset_logical_paths.select do | p |
@@ -570,7 +573,7 @@ class Ballonizer
       link_template.sub('PATH', p)
     end
 
-    @js_libs_html_links = links.join('').freeze
+    links.join('')
   end
 
   # List of paths (relative to the gem root directory) to the directories with

data/spec/ballonizer_spec.rb

@@ -269,7 +269,7 @@ describe Ballonizer do
           let (:ballonizer_settings) do
             ballonizer_settings_example.merge({
               add_required_css: true,
-              css_asset_path_for_link: 'assets/css'
+              css_asset_path_for_link: '/assets/css/'
             })
           end
 
@@ -285,7 +285,7 @@ describe Ballonizer do
               # this option is added to avoid a false positive in the test
               add_js_for_edition: false,
               add_required_js_libs_for_edition: true,
-              js_asset_path_for_link: 'assets/js'
+              js_asset_path_for_link: '/assets/js/'
             })
           end
 
@@ -530,7 +530,7 @@ describe Ballonizer do
           lambda { instance.valid_submit_hash?(submit_hash, true) }
         end
 
-        it { expect(method_call).to_not raise_error(described_class::SubmitError) }
+        it { expect(method_call).to_not raise_error }
         it { expect(method_call.call).to be_true }
       end
     end
@@ -652,47 +652,87 @@ describe Ballonizer do
     end
   end
 
+  # to be used with #css_html_links and #js_libs_html_links
   describe '#css_html_links' do
+    shared_examples 'using settings parameter' do
+      context 'and a path is passed by the settings hash argument' do
+        it 'use the path from the argument' do
+          css_links = instance.css_html_links({
+            css_asset_path_for_link: '/other_assets/css/'
+          })
+          
+          REXML::Document.new("<root>#{css_links}</root>")
+                         .root.children.each do | e |
+            expect(e.attributes['href']).to match(/^\/other_assets\/css\//)
+          end
+        end
+      end
+    end
+
     context "when the path for the css isn't configured" do
       it 'returns nil' do
         expect(instance.css_html_links).to eq nil
       end
+
+      include_examples 'using settings parameter'
     end
     context 'when the path for the css is configured' do
       let (:ballonizer_settings) do
         ballonizer_settings_example.merge({
-          css_asset_path_for_link: 'assets/css'
+          css_asset_path_for_link: '/assets/css/'
         })
       end
 
       it 'return a HTML string with links prefixed by the path' do
         REXML::Document.new("<root>#{instance.css_html_links}</root>")
                        .root.children.each do | e |
-          expect(e.attributes['href']).to match(/^assets\/css/)
+          expect(e.attributes['href']).to match(/^\/assets\/css\//)
         end
       end
+
+      include_examples 'using settings parameter'
     end
   end
 
   describe '#js_libs_html_links' do
+    shared_examples 'using settings parameter' do
+      context 'and a path is passed by the settings hash argument' do
+        it 'use the path from the argument' do
+          js_scripts = instance.js_libs_html_links({
+            js_asset_path_for_link: '/other_assets/js/'
+          })
+          
+          REXML::Document.new("<root>#{js_scripts}</root>")
+                         .root.children.each do | e |
+            expect(e.attributes['src']).to match(/^\/other_assets\/js\//)
+          end
+        end
+      end
+    end
+
     context "when the path for the js libs isn't configured" do
       it 'returns nil' do
         expect(instance.js_libs_html_links).to eq nil
       end
+
+      include_examples 'using settings parameter'
     end
+
     context 'when the path for the js libs is configured' do
       let (:ballonizer_settings) do
         ballonizer_settings_example.merge({
-          js_asset_path_for_link: 'assets/js'
+          js_asset_path_for_link: '/assets/js/'
         })
       end
 
       it 'return a HTML string with links prefixed by the path' do
         REXML::Document.new("<root>#{instance.js_libs_html_links}</root>")
                        .root.children.each do | e |
-          expect(e.attributes['src']).to match(/^assets\/js/)
+          expect(e.attributes['src']).to match(/^\/assets\/js\//)
         end
       end
+
+      include_examples 'using settings parameter'
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ballonizer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Henrique Becker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -151,33 +151,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.4
 - !ruby/object:Gem::Dependency
-  name: rspec-core
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement