pubba 0.2.3 → 0.3.0

data/.gitignore

@@ -12,3 +12,7 @@ Gemfile.lock
 doc
 coverage
 pkg
+
+test/sinatra/app/assets/javascripts
+test/sinatra/app/assets/stylesheets
+test/sinatra/public

data/CHANGES

@@ -1,5 +1,24 @@
 master
 
+0.3.0
+
+  * Include YUICompressor processing of stylesheets and javascripts
+  * Update to r18n-desktop 0.4.13 to address require issue
+  * Update disclaimer so it doesn't include the full path.
+  * Move processing of assets to before filter in dev and test mode
+
+0.2.3
+
+  * Remove asset_id functionality. Dead code causing bugs.
+
+0.2.2
+
+  * Asset compilation fix
+
+0.2.1
+
+  * page_head_tags and page_body_tags implemented
+
 0.2.0
 
   * Ability to add external references

data/lib/sinatra/pubba.rb

@@ -7,12 +7,15 @@ require_relative 'pubba/html/helpers'
 module Sinatra
   module Pubba
     def self.registered(app)
+      Site.configure(app)
+
       if app.settings.development? || app.settings.test?
-        Site.configure(app)
+        app.before do
+          Site.process(app)
+        end
       end
 
       app.helpers Sinatra::Pubba::HTML::Helpers
-
     end
   end # Pubba
 end # Sinatra

data/lib/sinatra/pubba/assets/configuration.rb

@@ -5,13 +5,15 @@ module Sinatra
     module Assets
       class Configuration
         attr_reader :yaml
+        attr_reader :name
 
         def initialize(config_file)
+          @name = File.basename(config_file)
           @yaml = Psych.load_file(config_file)
         end
 
         def global_config!
-          yaml.delete("global") || {}
+          @global_config ||= (yaml.delete("global") || {})
         end
 
         def process

data/lib/sinatra/pubba/assets/minifier.rb

@@ -0,0 +1,11 @@
+module Sinatra
+  module Pubba
+    module Assets
+      class Minifier
+        def self.minify(folder, handler)
+          raise NotImplementedError
+        end
+      end # Compressor
+    end # Assets
+  end # Pubba
+end # Sinatra

data/lib/sinatra/pubba/assets/yui_minifier.rb

@@ -0,0 +1,28 @@
+require "yui/compressor"
+require_relative 'minifier'
+
+module Sinatra
+  module Pubba
+    module Assets
+      class YUIMinifier < Minifier
+        def self.minify(folder, handler)
+          compressor = get_compressor(handler)
+          Dir.glob("#{folder}/*.*") do |file|
+            contents = File.read(file)
+            File.open(file, "w") {|f| f.write(compressor.compress(contents))}
+          end
+        end
+
+        private
+
+        def self.get_compressor(handler)
+          case handler
+            when :js then YUI::JavaScriptCompressor.new
+            when :css then YUI::CssCompressor.new
+            else raise ArgumentError, "minify handler must be one of [:js, :css]"
+          end
+        end
+      end # YUIMinifier
+    end # Assets
+  end # Pubba
+end # Sinatra

data/lib/sinatra/pubba/site.rb

@@ -1,5 +1,6 @@
 require_relative 'assets/configuration'
 require_relative 'assets/sprockets_handler'
+require_relative 'assets/yui_minifier'
 require_relative 'page'
 
 module Sinatra
@@ -9,7 +10,7 @@ module Sinatra
       attr_reader :script_asset_folder, :style_asset_folder
       attr_reader :script_public_folder, :style_public_folder
 
-      attr_reader :global_asset_configuration, :asset_handler
+      attr_reader :asset_configuration, :asset_handler, :asset_minifier
       attr_reader :disclaimer, :locale, :r18n_folder, :r18n_locale
 
 
@@ -18,26 +19,36 @@ module Sinatra
 
         validate_settings(settings)
 
-        set_defaults(settings)
+        set_folder_defaults(settings)
 
         maybe_init_r18n(settings)
 
         # Load pubba_config
-        asset_configuration = Sinatra::Pubba::Assets::Configuration.new(settings.pubba_config)
+        @asset_configuration = Sinatra::Pubba::Assets::Configuration.new(settings.pubba_config)
+
+        @disclaimer = "// This file is automatically generated from the contents\n// in #{@asset_configuration.name}\n//\n"
 
         # Set assset handler
         configure_asset_handler(settings)
 
-        # Grab the global section defined in @pubba_config
-        @global_asset_configuration = asset_configuration.global_config!
+        # Set compressor
+        configure_asset_compressor(settings)
 
         # Process the remaining @pubba_config sections
         asset_configuration.process do |p, config|
-          add_page(p, config).assetize
+          add_page(p, config)
+        end
+      end
+
+      def process(app)
+        pages.each do |name, p|
+          p.assetize
         end
 
         # Write assets to public_folder
         compile_assets(app)
+
+        minify_assets(app)
       end
 
 
@@ -57,13 +68,11 @@ module Sinatra
         end
       end
 
-      def set_defaults(settings)
+      def set_folder_defaults(settings)
         @script_public_folder = File.join(settings.public_folder, 'javascripts')
         @style_public_folder  = File.join(settings.public_folder, 'stylesheets')
         @script_asset_folder  = File.join(settings.asset_folder, 'javascripts')
         @style_asset_folder   = File.join(settings.asset_folder, 'stylesheets')
-
-        @disclaimer = "// This file is automatically generated from the contents\n// in #{settings.pubba_config}\n//\n"
       end
 
       def maybe_init_r18n(settings)
@@ -90,6 +99,13 @@ module Sinatra
         @asset_handler.asset_paths style_asset_folder, script_asset_folder
       end
 
+      def configure_asset_compressor(settings)
+        @asset_minifier = Sinatra::Pubba::Assets::YUIMinifier
+        if settings.respond_to?(:asset_minifier) && (minifier = settings.asset_minifier)
+          @asset_minifier = minifier
+        end
+      end
+
       def page(name)
         pages[name]
       end
@@ -99,7 +115,7 @@ module Sinatra
       end
 
       def add_page(name, hsh)
-        p = Page.new(name, @global_asset_configuration)
+        p = Page.new(name, @asset_configuration.global_config!)
 
         p.add_asset('styles', hsh['styles']) if hsh['styles']
         p.add_asset('scripts', hsh['scripts']) if hsh['scripts']
@@ -120,6 +136,11 @@ module Sinatra
           asset.save_as "#{to_folder}/#{File.basename(file)}"
         end
       end
+
+      def minify_assets(app)
+        asset_minifier.minify(script_public_folder, :js)
+        asset_minifier.minify(style_public_folder, :css)
+      end
     end # Site
   end # Pubba
 end # Sinatra

data/lib/sinatra/pubba/version.rb

@@ -1,5 +1,5 @@
 module Pubba
   # Pubba version string
   # @api public
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

data/pubba.gemspec

@@ -20,7 +20,8 @@ Gem::Specification.new do |s|
 
 
   s.add_runtime_dependency('sprockets', ['~> 2.1.2'])
-  s.add_runtime_dependency('r18n-desktop', ['~> 0.4.11'])
+  s.add_runtime_dependency('r18n-desktop', ['~> 0.4.13'])
+  s.add_runtime_dependency('yui-compressor', ['>= 0.9.4'])
 
   s.add_development_dependency('rake', ['>= 0.9.2'])
   s.add_development_dependency('sinatra', ['>= 1.3.1'])

data/test/helper.rb

@@ -42,6 +42,10 @@ class TestPubba < MiniTest::Unit::TestCase
 
       register Sinatra::Pubba
 
+      get('/') do
+        'OK'
+      end
+
       get('/home-page-head-tags') do
         @page = Sinatra::Pubba::Site.page('home');
         page_head_tags
@@ -52,18 +56,8 @@ class TestPubba < MiniTest::Unit::TestCase
         page_body_tags
       end
     end
-  end
 
-  def teardown
-    [R.asset_folder, R.public_folder].each do |root_folder|
-      Dir.glob(File.join(root_folder, 'javascripts', '*.js')) do |f|
-        File.delete(f) if File.exist?(f)
-      end
-
-      Dir.glob(File.join(root_folder, 'stylesheets', '*.css')) do |f|
-        File.delete(f) if File.exist?(f)
-      end
-    end
+    get '/'
   end
 
   def empty_hash

data/test/pubba/assets/test_minifier.rb

@@ -0,0 +1,9 @@
+require 'helper'
+
+class TestMinifier < TestPubba
+  def test_minify
+    assert_raises NotImplementedError do
+      Sinatra::Pubba::Assets::Minifier.minify("/folder/path", :js)
+    end
+  end
+end

data/test/pubba/test_page.rb

@@ -19,7 +19,7 @@ class TestPubbaPage < TestPubba
     css = File.open( File.join(R.asset_folder, 'stylesheets', 'home-all.css')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{R.pubba_config_file}
+// in #{Sinatra::Pubba::Site.asset_configuration.name}
 //
 //= require custom/global.css
 //= require custom/home.css
@@ -32,7 +32,7 @@ TEXT
     css = File.open( File.join(R.asset_folder, 'stylesheets', 'home-phone.css')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{R.pubba_config_file}
+// in #{Sinatra::Pubba::Site.asset_configuration.name}
 //
 //= require custom/small.css
 TEXT
@@ -44,7 +44,7 @@ TEXT
     css = File.open( File.join(R.asset_folder, 'stylesheets', 'home-desktop.css')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{R.pubba_config_file}
+// in #{Sinatra::Pubba::Site.asset_configuration.name}
 //
 //= require custom/large.css
 TEXT
@@ -56,7 +56,7 @@ TEXT
     css = File.open( File.join(R.asset_folder, 'stylesheets', 'search-all.css')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{R.pubba_config_file}
+// in #{Sinatra::Pubba::Site.asset_configuration.name}
 //
 //= require custom/global.css
 //= require custom/search.css
@@ -70,7 +70,7 @@ TEXT
     css = File.open( File.join(R.asset_folder, 'stylesheets', 'search-phone.css')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{R.pubba_config_file}
+// in #{Sinatra::Pubba::Site.asset_configuration.name}
 //
 //= require custom/small.css
 TEXT
@@ -82,7 +82,7 @@ TEXT
     css = File.open( File.join(R.asset_folder, 'stylesheets', 'search-desktop.css')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{R.pubba_config_file}
+// in #{Sinatra::Pubba::Site.asset_configuration.name}
 //
 //= require custom/large.css
 TEXT
@@ -94,7 +94,7 @@ TEXT
     js = File.open( File.join(R.asset_folder, 'javascripts', 'home-head.js')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{R.pubba_config_file}
+// in #{Sinatra::Pubba::Site.asset_configuration.name}
 //
 //= require third-party/modernizr.js
 TEXT
@@ -106,7 +106,7 @@ TEXT
     js = File.open( File.join(R.asset_folder, 'javascripts', 'home-body.js')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{R.pubba_config_file}
+// in #{Sinatra::Pubba::Site.asset_configuration.name}
 //
 //= require third-party/backbone.js
 //= require custom/app.js
@@ -120,7 +120,7 @@ TEXT
     js = File.open( File.join(R.asset_folder, 'javascripts', 'search-head.js')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{R.pubba_config_file}
+// in #{Sinatra::Pubba::Site.asset_configuration.name}
 //
 //= require third-party/modernizr.js
 TEXT
@@ -132,7 +132,7 @@ TEXT
     js = File.open( File.join(R.asset_folder, 'javascripts', 'search-body.js')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{R.pubba_config_file}
+// in #{Sinatra::Pubba::Site.asset_configuration.name}
 //
 //= require third-party/backbone.js
 //= require custom/app.js

data/test/pubba/test_site.rb

@@ -5,6 +5,10 @@ class TestPubbaSite < TestPubba
     assert_equal Sinatra::Pubba::Assets::SprocketsHandler, Sinatra::Pubba::Site.asset_handler
   end
 
+  def test_asset_handler_initialization
+    assert_equal Sinatra::Pubba::Assets::YUIMinifier, Sinatra::Pubba::Site.asset_minifier
+  end
+
   def test_script_public_folder_initialization
     assert_equal "#{R.public_folder}/javascripts", Sinatra::Pubba::Site.script_public_folder
   end

data/test/sinatra/app/assets/javascripts/custom/app.js

@@ -1,3 +1,4 @@
 function app(){
+  var aLongVarName = "12"
   alert('This is the app test file');
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pubba
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-07 00:00:00.000000000 Z
+date: 2011-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &2151904260 !ruby/object:Gem::Requirement
+  requirement: &2152383640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,32 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2151904260
+  version_requirements: *2152383640
 - !ruby/object:Gem::Dependency
   name: r18n-desktop
-  requirement: &2151903600 !ruby/object:Gem::Requirement
+  requirement: &2152382760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.11
+        version: 0.4.13
   type: :runtime
   prerelease: false
-  version_requirements: *2151903600
+  version_requirements: *2152382760
+- !ruby/object:Gem::Dependency
+  name: yui-compressor
+  requirement: &2152381900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152381900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151902900 !ruby/object:Gem::Requirement
+  requirement: &2152381020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2151902900
+  version_requirements: *2152381020
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2151902280 !ruby/object:Gem::Requirement
+  requirement: &2152380000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2151902280
+  version_requirements: *2152380000
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &2151901620 !ruby/object:Gem::Requirement
+  requirement: &2152379420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2151901620
+  version_requirements: *2152379420
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2151901080 !ruby/object:Gem::Requirement
+  requirement: &2152378680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151901080
+  version_requirements: *2152378680
 description: 
 email:
 - andy@stonean.com
@@ -94,7 +105,9 @@ files:
 - lib/sinatra/pubba.rb
 - lib/sinatra/pubba/assets/configuration.rb
 - lib/sinatra/pubba/assets/handler.rb
+- lib/sinatra/pubba/assets/minifier.rb
 - lib/sinatra/pubba/assets/sprockets_handler.rb
+- lib/sinatra/pubba/assets/yui_minifier.rb
 - lib/sinatra/pubba/errors.rb
 - lib/sinatra/pubba/html/helpers.rb
 - lib/sinatra/pubba/locale.rb
@@ -105,6 +118,7 @@ files:
 - test/helper.rb
 - test/pubba/assets/test_configuration.rb
 - test/pubba/assets/test_handler.rb
+- test/pubba/assets/test_minifier.rb
 - test/pubba/html/test_helpers.rb
 - test/pubba/test_page.rb
 - test/pubba/test_site.rb