pubba 0.4.2 → 0.5.0

data/.gitignore

@@ -13,6 +13,7 @@ doc
 coverage
 pkg
 
-test/sinatra/app/assets/javascripts
-test/sinatra/app/assets/stylesheets
+test/sinatra/app/assets/out
+test/sinatra/app/assets/javascripts/*.js
+test/sinatra/app/assets/stylesheets/*.css
 test/sinatra/public

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

@@ -9,6 +9,14 @@ module Sinatra
         def save_as(file)
           raise NotImplementedError
         end
+
+        def process(pattern, destination)
+          raise NotImplementedError
+        end
+
+        def build(name, type, ext, urls)
+          raise NotImplementedError
+        end
       end # Handler
     end # Assets
   end # Pubba

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

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'sprockets'
 require_relative 'handler'
 
@@ -19,6 +20,24 @@ module Sinatra
           @sprockets ||= Sprockets::Environment.new()
         end
 
+        def self.process(source, pattern, destination)
+          Dir.glob("#{source}/#{pattern}") do |file|
+            asset = find(file)
+            asset.save_as "#{destination}/#{File.basename(file)}"
+          end
+        end
+
+        def self.build(name, type, ext, urls)
+          content = urls.collect{|url| "//= require #{url}.#{ext}"}.compact.join("\n")
+          out_folder = File.join(Site.asset_folder, "out", ext)
+          FileUtils.mkdir_p out_folder
+          fname = File.join(out_folder, "#{name}-#{type}.#{ext}")
+          File.open(fname, 'w') do |f|
+            f.write Site.asset_configuration.disclaimer
+            f.write content
+          end
+        end
+
         attr_reader :asset
 
         def initialize(asset)

data/lib/sinatra/pubba/monitor.rb

@@ -11,16 +11,21 @@ module Sinatra
 
       def start_monitor
         @running = Thread.new do
-          puts "Pubba is now monitoring: #{Site.asset_folder}"
+
+
+          script_asset_folder = File.join(Site.asset_folder, Site.script_folder)
+          style_asset_folder = File.join(Site.asset_folder, Site.style_folder)
+
+          puts ">> Pubba is now monitoring:\n>>   #{script_asset_folder}\n>>   #{style_asset_folder}"
           FSSM.monitor do
-            path Site.script_asset_folder do
+            path script_asset_folder do
               glob '**/*'
               update {|base, relative, type| Site.process}
               delete {|base, relative, type| Site.process}
               create {|base, relative, type| Site.process}
             end
 
-            path Site.style_asset_folder do
+            path style_asset_folder do
               glob '**/*'
               update {|base, relative, type| Site.process}
               delete {|base, relative, type| Site.process}

data/lib/sinatra/pubba/page.rb

@@ -73,23 +73,23 @@ module Sinatra
 
       def create_style_assets
         style_groups do |group, hash|
-          content = []
+          urls = []
           style_urls(group) do |url|
             next if url.start_with?("http")
-            content << "//= require #{url}.css"
+            urls << url
           end
-          write_asset(Site.style_asset_folder, group, "css", content.compact.join("\n"))
+          Site.asset_handler.build(name, group, "css", urls)
         end
       end
 
       def create_script_assets
         script_groups do |group|
-          content = []
+          urls = []
           script_urls(group) do |url|
             next if url.start_with?("http")
-            content << "//= require #{url}.js"
+            urls << url
           end
-          write_asset(Site.script_asset_folder, group, "js", content.compact.join("\n"))
+          Site.asset_handler.build(name, group, "js", urls)
         end
       end
 
@@ -130,14 +130,6 @@ module Sinatra
         tag_set.each{|tag| found = true if tag[key] == hash[key]}
         tag_set << hash unless found
       end
-
-      def write_asset(dir, type, ext, content)
-        fname = File.join(dir, "#{name}-#{type}.#{ext}")
-        File.open(fname, 'w') do |f|
-          f.write Site.asset_configuration.disclaimer
-          f.write content
-        end
-      end
     end # Page
   end # Pubba
 end # Sinatra

data/lib/sinatra/pubba/site.rb

@@ -9,14 +9,10 @@ module Sinatra
   module Pubba
     module Site
       extend self
-      attr_reader :asset_folder
-      attr_reader :script_asset_folder, :style_asset_folder
-      attr_reader :script_public_folder, :style_public_folder
-
+      attr_reader :public_folder, :asset_folder, :script_folder, :style_folder
       attr_reader :asset_configuration, :asset_handler, :asset_minifier
       attr_reader :locale, :r18n_folder, :r18n_locale
 
-
       def configure(app)
         return if @configured
 
@@ -56,8 +52,15 @@ module Sinatra
 
       def process
         pages.each{|name, p| p.assetize }
-        compile_assets
-        minify_assets
+
+        public_script_folder = File.join(public_folder, script_folder)
+        public_style_folder = File.join(public_folder, style_folder)
+
+        asset_handler.process(asset_folder, "*.js",  public_script_folder)
+        asset_handler.process(asset_folder, "*.css", public_style_folder)
+
+        asset_minifier.minify(public_script_folder, :js)
+        asset_minifier.minify(public_style_folder, :css)
       end
 
       def validate_settings(settings)
@@ -77,12 +80,12 @@ module Sinatra
       end
 
       def set_folder_defaults(settings)
-        Statica.root_dir      = settings.public_folder
-        @script_public_folder = File.join(settings.public_folder, 'javascripts')
-        @style_public_folder  = File.join(settings.public_folder, 'stylesheets')
-        @asset_folder         = settings.asset_folder
-        @script_asset_folder  = File.join(@asset_folder, 'javascripts')
-        @style_asset_folder   = File.join(@asset_folder, 'stylesheets')
+        @public_folder    = settings.public_folder
+        @asset_folder     = settings.asset_folder
+        @script_folder    = 'javascripts'
+        @style_folder     = 'stylesheets'
+
+        Statica.root_dir  = settings.public_folder
       end
 
       def maybe_init_r18n(settings)
@@ -106,7 +109,9 @@ module Sinatra
         if settings.respond_to?(:asset_handler) && (handler = settings.asset_handler)
           @asset_handler = handler
         end
-        @asset_handler.asset_paths style_asset_folder, script_asset_folder
+        @asset_handler.asset_paths  asset_folder,
+                                    File.join(asset_folder, style_folder),
+                                    File.join(asset_folder, script_folder)
       end
 
       def configure_asset_compressor(settings)
@@ -134,25 +139,6 @@ module Sinatra
 
         pages[name] = p
       end
-
-      private
-
-      def compile_assets
-        process_assets(script_asset_folder, script_public_folder)
-        process_assets(style_asset_folder, style_public_folder)
-      end
-
-      def process_assets(from_folder, to_folder)
-        Dir.glob("#{from_folder}/*.*") do |file|
-          asset = asset_handler.find(file)
-          asset.save_as "#{to_folder}/#{File.basename(file)}"
-        end
-      end
-
-      def minify_assets
-        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.4.2'
+  VERSION = '0.5.0'
 end

data/test/pubba/assets/test_handler.rb

@@ -13,4 +13,18 @@ class TestHandler < TestPubba
       handler.save_as('')
     end
   end
+
+  def test_process
+    handler = Sinatra::Pubba::Assets::Handler.new
+    assert_raises NotImplementedError do
+      handler.process('', '')
+    end
+  end
+
+  def test_build
+    handler = Sinatra::Pubba::Assets::Handler.new
+    assert_raises NotImplementedError do
+      handler.build('', '', '', '')
+    end
+  end
 end

data/test/pubba/html/test_helpers.rb

@@ -6,7 +6,6 @@ class TestPubbaHTMLHelper < TestPubba
 
   def test_home_page_head_tags
     res = get('/home-page-head-tags').body
-    puts res
     reg = Regexp.new '<link href="http://twitter.github.com/bootstrap/1.4.0/bootstrap.min.css" rel="stylesheet" type="text/css"></link><link href="/stylesheets/home-all.css/\w+" rel="stylesheet" type="text/css"></link><link href="/stylesheets/home-phone.css/\w+" media="only screen and \(max-width: 480px\)" rel="stylesheet" type="text/css"></link><link href="/stylesheets/home-desktop.css/\w+" media="only screen and \(min-width: 480px\)" rel="stylesheet" type="text/css"></link><script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script><script src="/javascripts/home-head.js/\w+" type="text/javascript"></script>'
 
 

data/test/pubba/test_site.rb

@@ -9,19 +9,19 @@ class TestPubbaSite < TestPubba
     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
+  def test_asset_folder_initialization
+    assert_equal "#{R.asset_folder}", Sinatra::Pubba::Site.asset_folder
   end
 
-  def test_style_public_folder_initialization
-    assert_equal "#{R.public_folder}/stylesheets", Sinatra::Pubba::Site.style_public_folder
+  def test_public_folder_initialization
+    assert_equal "#{R.public_folder}", Sinatra::Pubba::Site.public_folder
   end
 
-  def test_script_asset_folder_initialization
-    assert_equal "#{R.asset_folder}/javascripts", Sinatra::Pubba::Site.script_asset_folder
+  def test_script_folder_initialization
+    assert_equal "javascripts", Sinatra::Pubba::Site.script_folder
   end
 
-  def test_style_asset_folder_initialization
-    assert_equal "#{R.asset_folder}/stylesheets", Sinatra::Pubba::Site.style_asset_folder
+  def test_style_folder_initialization
+    assert_equal "stylesheets", Sinatra::Pubba::Site.style_folder
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pubba
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-20 00:00:00.000000000 Z
+date: 2011-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &2151810340 !ruby/object:Gem::Requirement
+  requirement: &2151797060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2151810340
+  version_requirements: *2151797060
 - !ruby/object:Gem::Dependency
   name: r18n-desktop
-  requirement: &2151809760 !ruby/object:Gem::Requirement
+  requirement: &2151812720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.13
   type: :runtime
   prerelease: false
-  version_requirements: *2151809760
+  version_requirements: *2151812720
 - !ruby/object:Gem::Dependency
   name: yui-compressor
-  requirement: &2151809060 !ruby/object:Gem::Requirement
+  requirement: &2151812000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *2151809060
+  version_requirements: *2151812000
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &2151808020 !ruby/object:Gem::Requirement
+  requirement: &2151811180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *2151808020
+  version_requirements: *2151811180
 - !ruby/object:Gem::Dependency
   name: statica
-  requirement: &2151807380 !ruby/object:Gem::Requirement
+  requirement: &2151810620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151807380
+  version_requirements: *2151810620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151806780 !ruby/object:Gem::Requirement
+  requirement: &2151810000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2151806780
+  version_requirements: *2151810000
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2151806120 !ruby/object:Gem::Requirement
+  requirement: &2151809500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2151806120
+  version_requirements: *2151809500
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &2151805560 !ruby/object:Gem::Requirement
+  requirement: &2151808940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2151805560
+  version_requirements: *2151808940
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2151821160 !ruby/object:Gem::Requirement
+  requirement: &2151808040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151821160
+  version_requirements: *2151808040
 description: 
 email:
 - andy@stonean.com