pubba 0.3.0 → 0.4.0

data/CHANGES

@@ -1,5 +1,10 @@
 master
 
+0.4.0
+
+  * Extract page tag creation from asset processing
+  * Replace crappy before filter process in dev/test mode with fssm
+
 0.3.0
 
   * Include YUICompressor processing of stylesheets and javascripts

data/lib/sinatra/pubba.rb

@@ -9,12 +9,6 @@ module Sinatra
     def self.registered(app)
       Site.configure(app)
 
-      if app.settings.development? || app.settings.test?
-        app.before do
-          Site.process(app)
-        end
-      end
-
       app.helpers Sinatra::Pubba::HTML::Helpers
     end
   end # Pubba

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

@@ -4,12 +4,12 @@ module Sinatra
   module Pubba
     module Assets
       class Configuration
-        attr_reader :yaml
-        attr_reader :name
+        attr_reader :yaml, :name, :disclaimer
 
         def initialize(config_file)
-          @name = File.basename(config_file)
           @yaml = Psych.load_file(config_file)
+          @name = File.basename(config_file)
+          @disclaimer = "// This file is automatically generated from the contents\n// in #{name}\n//\n"
         end
 
         def global_config!

data/lib/sinatra/pubba/monitor.rb

@@ -0,0 +1,24 @@
+require 'fssm'
+
+module Sinatra
+  module Pubba
+    module Monitor
+      extend self
+
+      def do
+        start_monitor unless @running
+      end
+
+      def start_monitor
+        @running = Thread.new do
+          puts "Pubba is now monitoring: #{Site.asset_folder}"
+          FSSM.monitor(Site.asset_folder, '**/*', :directories => true) do
+            update {|base, relative, type| Site.process}
+            delete {|base, relative, type| Site.process}
+            create {|base, relative, type| Site.process}
+          end
+        end
+      end
+    end # Monitor
+  end # Pubba
+end # Sinatra

data/lib/sinatra/pubba/page.rb

@@ -14,14 +14,15 @@ module Sinatra
             @assets["styles"][key] = value.dup
         end
 
-        @assets["scripts"]["head"] = global_configuration["scripts"]["head"] || []
-        @assets["scripts"]["body"] = global_configuration["scripts"]["body"] || []
+        script_groups do |group|
+          @assets["scripts"][group] = global_configuration["scripts"][group] || []
+        end
       end
 
       def add_asset(type, section)
         if type == "styles"
-           section.each do |section_name, hsh|
-             hsh.each do |key, value|
+           section.each do |section_name, hash|
+             hash.each do |key, value|
               if key == "urls"
                 @assets[type][section_name][key] += value
               else
@@ -30,8 +31,9 @@ module Sinatra
             end
           end
         else
-          @assets["scripts"]["head"] += section["head"] if section["head"]
-          @assets["scripts"]["body"] += section["body"] if section["body"]
+          script_groups do |group|
+            @assets["scripts"][group] += section[group] if section[group]
+          end
         end
       end
 
@@ -40,6 +42,20 @@ module Sinatra
         create_script_assets
       end
 
+      def tagify
+        style_groups do |group, hash|
+          style_urls(group) do |url|
+            add_style_tag(group, hash, url)
+          end
+        end
+
+        script_groups do |group|
+          script_urls(group) do |url|
+            add_script_tag(group, url)
+          end
+        end
+      end
+
       def method_missing(meth, *args)
         if Site.locale && (t = Site.locale.get(name, meth, *args))
           return t
@@ -56,55 +72,69 @@ module Sinatra
       end
 
       def create_style_assets
-        @assets["styles"].each do |part, hsh|
+        style_groups do |group, hash|
           content = []
-          @assets["styles"][part]["urls"].each do |url|
-            add_style_tag(part, hsh, url)
+          style_urls(group) do |url|
             next if url.start_with?("http")
             content << "//= require #{url}.css"
           end
-          write_asset(Site.style_asset_folder, part, "css", content.compact.join("\n"))
+          write_asset(Site.style_asset_folder, group, "css", content.compact.join("\n"))
         end
       end
 
       def create_script_assets
-        ["head", "body"].each do |part|
+        script_groups do |group|
           content = []
-          @assets["scripts"][part].each do |url|
-            add_script_tag(part, url)
+          script_urls(group) do |url|
             next if url.start_with?("http")
             content << "//= require #{url}.js"
           end
-          write_asset(Site.script_asset_folder, part, "js", content.compact.join("\n"))
+          write_asset(Site.script_asset_folder, group, "js", content.compact.join("\n"))
         end
       end
 
-      def add_style_tag(part, hsh, url)
+      def style_groups
+        @assets["styles"].each{|group, hash| yield group, hash }
+      end
+
+      def style_urls(group)
+        @assets["styles"][group]["urls"].each{|url| yield url }
+      end
+
+      def script_groups
+        ["head", "body"].each{|group| yield group }
+      end
+
+      def script_urls(group)
+        @assets["scripts"][group].each{|url| yield url }
+      end
+
+      def add_style_tag(group, hash, url)
         h = { tag: 'link', type: 'text/css', rel: 'stylesheet' }
-        h[:media] = hsh['media'] if hsh['media']
-        h[:href]  = url.start_with?("http") ? url : "/stylesheets/#{name}-#{part}.css"
+        h[:media] = hash['media'] if hash['media']
+        h[:href]  = url.start_with?("http") ? url : "/stylesheets/#{name}-#{group}.css"
 
         maybe_add_tag(@head_tags, h, :href)
       end
 
-      def add_script_tag(part, url)
+      def add_script_tag(group, url)
         h = { tag: 'script', type: "text/javascript" }
-        h[:src]   = url.start_with?("http") ? url : "/javascripts/#{name}-#{part}.js"
+        h[:src]   = url.start_with?("http") ? url : "/javascripts/#{name}-#{group}.js"
 
-        tag_set = (part == "head") ? @head_tags : @body_tags
+        tag_set = (group == "head") ? @head_tags : @body_tags
         maybe_add_tag(tag_set, h, :src)
       end
 
-      def maybe_add_tag(tag_set, hsh, key)
+      def maybe_add_tag(tag_set, hash, key)
         found = false
-        tag_set.each{|tag| found = true if tag[key] == hsh[key]}
-        tag_set << hsh unless found
+        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.disclaimer
+          f.write Site.asset_configuration.disclaimer
           f.write content
         end
       end

data/lib/sinatra/pubba/site.rb

@@ -7,14 +7,19 @@ 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 :asset_configuration, :asset_handler, :asset_minifier
-      attr_reader :disclaimer, :locale, :r18n_folder, :r18n_locale
+      attr_reader :locale, :r18n_folder, :r18n_locale
 
 
       def configure(app)
+        return if @configured
+
+        puts "Configuring Pubba..."
+
         settings = app.settings
 
         validate_settings(settings)
@@ -26,8 +31,6 @@ module Sinatra
         # Load 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)
 
@@ -38,19 +41,22 @@ module Sinatra
         asset_configuration.process do |p, config|
           add_page(p, config)
         end
-      end
 
-      def process(app)
-        pages.each do |name, p|
-          p.assetize
-        end
+        if app.settings.development? || app.settings.test?
+          process
 
-        # Write assets to public_folder
-        compile_assets(app)
+          require_relative 'monitor'
+          Monitor.do
+        end
 
-        minify_assets(app)
+        @configured = true
       end
 
+      def process
+        pages.each{|name, p| p.assetize }
+        compile_assets
+        minify_assets
+      end
 
       def validate_settings(settings)
         missing_settings = []
@@ -71,8 +77,9 @@ module Sinatra
       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')
+        @asset_folder         = settings.asset_folder
+        @script_asset_folder  = File.join(@asset_folder, 'javascripts')
+        @style_asset_folder   = File.join(@asset_folder, 'stylesheets')
       end
 
       def maybe_init_r18n(settings)
@@ -120,12 +127,14 @@ module Sinatra
         p.add_asset('styles', hsh['styles']) if hsh['styles']
         p.add_asset('scripts', hsh['scripts']) if hsh['scripts']
 
+        p.tagify
+
         pages[name] = p
       end
 
       private
 
-      def compile_assets(app)
+      def compile_assets
         process_assets(script_asset_folder, script_public_folder)
         process_assets(style_asset_folder, style_public_folder)
       end
@@ -137,7 +146,7 @@ module Sinatra
         end
       end
 
-      def minify_assets(app)
+      def minify_assets
         asset_minifier.minify(script_public_folder, :js)
         asset_minifier.minify(style_public_folder, :css)
       end

data/lib/sinatra/pubba/version.rb

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

data/pubba.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pubba
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-11 00:00:00.000000000 Z
+date: 2011-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &2152383640 !ruby/object:Gem::Requirement
+  requirement: &2151925720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152383640
+  version_requirements: *2151925720
 - !ruby/object:Gem::Dependency
   name: r18n-desktop
-  requirement: &2152382760 !ruby/object:Gem::Requirement
+  requirement: &2151913100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.13
   type: :runtime
   prerelease: false
-  version_requirements: *2152382760
+  version_requirements: *2151913100
 - !ruby/object:Gem::Dependency
   name: yui-compressor
-  requirement: &2152381900 !ruby/object:Gem::Requirement
+  requirement: &2151918540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152381900
+  version_requirements: *2151918540
+- !ruby/object:Gem::Dependency
+  name: fssm
+  requirement: &2151911280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.7
+  type: :runtime
+  prerelease: false
+  version_requirements: *2151911280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152381020 !ruby/object:Gem::Requirement
+  requirement: &2151799920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2152381020
+  version_requirements: *2151799920
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2152380000 !ruby/object:Gem::Requirement
+  requirement: &2151804560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2152380000
+  version_requirements: *2151804560
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &2152379420 !ruby/object:Gem::Requirement
+  requirement: &2151803660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2152379420
+  version_requirements: *2151803660
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152378680 !ruby/object:Gem::Requirement
+  requirement: &2151802660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152378680
+  version_requirements: *2151802660
 description: 
 email:
 - andy@stonean.com
@@ -111,6 +122,7 @@ files:
 - lib/sinatra/pubba/errors.rb
 - lib/sinatra/pubba/html/helpers.rb
 - lib/sinatra/pubba/locale.rb
+- lib/sinatra/pubba/monitor.rb
 - lib/sinatra/pubba/page.rb
 - lib/sinatra/pubba/site.rb
 - lib/sinatra/pubba/version.rb