pubba 0.6.0 → 0.7.0

data/lib/pubba/site.rb

@@ -0,0 +1,97 @@
+require 'statica'
+
+require_relative 'assets/configuration'
+require_relative 'assets/sprockets_handler'
+require_relative 'assets/yui_minifier'
+require_relative 'page'
+
+module Pubba
+  module Site
+    extend self
+
+    attr_reader :asset_configuration, :locale
+
+    def configure
+      Statica.root_dir  = Pubba.public_folder
+
+      maybe_init_r18n
+
+      # Load pubba_config
+      @asset_configuration = Pubba::Assets::Configuration.new(Pubba.config_file)
+
+      # Set assset handler
+      configure_asset_handler
+
+      # Set pages to empty hash
+      @pages = {}
+
+      # Process the remaining @pubba_config sections
+      asset_configuration.process do |p, config|
+        add_page(p, config)
+      end
+    end
+
+    def process
+      pages.each{|name, p| p.assetize }
+
+      asset_script_folder = File.join(Pubba.asset_folder, 'out', Pubba.script_folder)
+      asset_style_folder = File.join(Pubba.asset_folder, 'out', Pubba.style_folder)
+
+      public_script_folder = File.join(Pubba.public_folder, Pubba.script_folder)
+      public_style_folder = File.join(Pubba.public_folder, Pubba.style_folder)
+
+      Pubba.asset_handler.process(asset_script_folder, public_script_folder)
+      Pubba.asset_handler.process(asset_style_folder, public_style_folder)
+
+      Pubba.asset_minifier.minify(public_script_folder, :js)
+      Pubba.asset_minifier.minify(public_style_folder, :css)
+    end
+
+    def asset_host=(p)
+      @asset_host = p
+    end
+
+    def asset_host
+      @asset_host ||= -> asset {asset}
+    end
+
+    def maybe_init_r18n
+      return unless Pubba.r18n_folder
+
+      locale = 'en'
+      locale = Pubba.r18n_locale if Pubba.r18n_locale
+
+      @r18n_folder  =  Pubba.r18n_folder
+      @r18n_locale   = locale
+
+      require_relative 'locale'
+
+      @locale = Locale.new
+    end
+
+    def configure_asset_handler
+      Pubba.asset_handler.asset_paths  Pubba.asset_folder,
+                                  File.join(Pubba.asset_folder, Pubba.style_folder),
+                                  File.join(Pubba.asset_folder, Pubba.script_folder)
+    end
+
+    def page(name)
+      pages[name]
+    end
+
+    def pages
+      @pages ||= {}
+    end
+
+    def add_page(name, hsh)
+      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']
+
+      p.tagify
+
+      pages[name] = p
+    end
+  end # Site
+end # Pubba

data/lib/{sinatra/pubba → pubba}/version.rb

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

data/pubba.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require File.dirname(__FILE__) + '/lib/sinatra/pubba/version'
+require File.dirname(__FILE__) + '/lib/pubba/version'
 require 'date'
 
 Gem::Specification.new do |s|
@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.date              = Date.today.to_s
   s.authors           = ['Andrew Stone']
   s.email             = ['andy@stonean.com']
-  s.summary           = 'Pubba is a Sinatra extension designed to help you manage the static components of your site.'
+  s.summary           = 'Pubba is a library designed to help you manage the static components of your site.'
   s.homepage          = 'http://github.com/stonean/pubba'
   s.extra_rdoc_files  = %w(README.md)
   s.rdoc_options      = %w(--charset=UTF-8)
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   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_runtime_dependency('statica', ['>= 0.2.0'])
+  s.add_runtime_dependency('statica', ['>= 0.3.0'])
 
   s.add_development_dependency('rake', ['>= 0.9.2'])
   s.add_development_dependency('sinatra', ['>= 1.3.1'])

data/test/helper.rb

@@ -32,27 +32,32 @@ class TestPubba < MiniTest::Unit::TestCase
 
   def setup
     mock_app do
-      require 'sinatra/pubba'
+      require 'pubba'
 
       settings.set :public_folder, R.public_folder
-      settings.set :asset_folder, R.asset_folder
-      settings.set :r18n_folder, R.r18n_folder
 
-      settings.set :pubba_config, R.pubba_config_file
+      Pubba.configure do |p|
+        p.config_file   = R.pubba_config_file
+        p.public_folder = settings.public_folder
+        p.asset_folder  = R.asset_folder
+        p.r18n_folder   = R.r18n_folder
+      end
+
+      Pubba::Site.configure
 
-      register Sinatra::Pubba
+      helpers Pubba::HTML::Helpers
 
       get('/') do
         'OK'
       end
 
       get('/home-page-head-tags') do
-        @page = Sinatra::Pubba::Site.page('home');
+        @page = Pubba::Site.page('home');
         page_head_tags
       end
 
       get('/home-page-body-tags') do
-        @page = Sinatra::Pubba::Site.page('home');
+        @page = Pubba::Site.page('home');
         page_body_tags
       end
     end

data/test/pubba/assets/test_configuration.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 class TestPubbaAssetsConfiguration < TestPubba
   def setup
-    @config = Sinatra::Pubba::Assets::Configuration.new(R.pubba_config_file)
+    @config = Pubba::Assets::Configuration.new(R.pubba_config_file)
   end
 
   def test_yaml_is_initialized

data/test/pubba/assets/test_handler.rb

@@ -3,26 +3,26 @@ require 'helper'
 class TestHandler < TestPubba
   def test_asset
     assert_raises NotImplementedError do
-      Sinatra::Pubba::Assets::Handler.asset('')
+      Pubba::Assets::Handler.asset('')
     end
   end
 
   def test_save_as
-    handler = Sinatra::Pubba::Assets::Handler.new
+    handler = Pubba::Assets::Handler.new
     assert_raises NotImplementedError do
       handler.save_as('')
     end
   end
 
   def test_process
-    handler = Sinatra::Pubba::Assets::Handler.new
+    handler = Pubba::Assets::Handler.new
     assert_raises NotImplementedError do
       handler.process('', '')
     end
   end
 
   def test_build
-    handler = Sinatra::Pubba::Assets::Handler.new
+    handler = Pubba::Assets::Handler.new
     assert_raises NotImplementedError do
       handler.build('', '', '', '')
     end

data/test/pubba/assets/test_minifier.rb

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

data/test/pubba/html/test_helpers.rb

@@ -1,8 +1,8 @@
 require 'helper'
-require 'sinatra/pubba/html/helpers'
+require 'pubba/html/helpers'
 
 class TestPubbaHTMLHelper < TestPubba
-  include Sinatra::Pubba::HTML::Helpers
+  include Pubba::HTML::Helpers
 
   def test_home_page_head_tags
     res = get('/home-page-head-tags').body
@@ -18,4 +18,13 @@ class TestPubbaHTMLHelper < TestPubba
 
     assert_match reg, res
   end
+
+  def test_home_page_body_tags_with_asset_host
+    Pubba::Site.asset_host = -> asset {"http://myasset.mydomain.com#{asset}"}
+    res = get('/home-page-body-tags').body
+    reg = Regexp.new '<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js" type="text/javascript"></script><script src="http://myasset.mydomain.com/js/home-body.js/\w+" type="text/javascript"></script>'
+
+    assert_match reg, res
+    Pubba::Site.asset_host = nil
+  end
 end

data/test/pubba/test_page.rb

@@ -2,14 +2,14 @@ require 'helper'
 
 class TestPubbaPage < TestPubba
   def test_home_r18n
-    page = Sinatra::Pubba::Site.page('home')
+    page = Pubba::Site.page('home')
 
     assert_equal 'Home title', page.title
     assert_equal 'Logout', page.logout_link
   end
 
   def test_search_r18n
-    page = Sinatra::Pubba::Site.page('search')
+    page = Pubba::Site.page('search')
 
     assert_equal 'Search title', page.title
     assert_equal 'Logout', page.logout_link
@@ -19,7 +19,7 @@ class TestPubbaPage < TestPubba
     css = File.open( File.join(R.asset_folder, 'out', 'css', 'home-all.css')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{Sinatra::Pubba::Site.asset_configuration.name}
+// in #{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, 'out', 'css', 'home-phone.css')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{Sinatra::Pubba::Site.asset_configuration.name}
+// in #{Pubba::Site.asset_configuration.name}
 //
 //= require custom/small.css
 TEXT
@@ -44,7 +44,7 @@ TEXT
     css = File.open( File.join(R.asset_folder, 'out', 'css', 'home-desktop.css')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{Sinatra::Pubba::Site.asset_configuration.name}
+// in #{Pubba::Site.asset_configuration.name}
 //
 //= require custom/large.css
 TEXT
@@ -56,7 +56,7 @@ TEXT
     css = File.open( File.join(R.asset_folder, 'out', 'css', 'search-all.css')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{Sinatra::Pubba::Site.asset_configuration.name}
+// in #{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, 'out', 'css', 'search-phone.css')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{Sinatra::Pubba::Site.asset_configuration.name}
+// in #{Pubba::Site.asset_configuration.name}
 //
 //= require custom/small.css
 TEXT
@@ -82,7 +82,7 @@ TEXT
     css = File.open( File.join(R.asset_folder, 'out', 'css', 'search-desktop.css')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{Sinatra::Pubba::Site.asset_configuration.name}
+// in #{Pubba::Site.asset_configuration.name}
 //
 //= require custom/large.css
 TEXT
@@ -94,7 +94,7 @@ TEXT
     js = File.open( File.join(R.asset_folder, 'out', 'js', 'home-head.js')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{Sinatra::Pubba::Site.asset_configuration.name}
+// in #{Pubba::Site.asset_configuration.name}
 //
 //= require third-party/modernizr.js
 TEXT
@@ -106,7 +106,7 @@ TEXT
     js = File.open( File.join(R.asset_folder, 'out', 'js', 'home-body.js')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{Sinatra::Pubba::Site.asset_configuration.name}
+// in #{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, 'out', 'js', 'search-head.js')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{Sinatra::Pubba::Site.asset_configuration.name}
+// in #{Pubba::Site.asset_configuration.name}
 //
 //= require third-party/modernizr.js
 TEXT
@@ -132,7 +132,7 @@ TEXT
     js = File.open( File.join(R.asset_folder, 'out', 'js', 'search-body.js')){|f| f.read }
     contents = <<TEXT
 // This file is automatically generated from the contents
-// in #{Sinatra::Pubba::Site.asset_configuration.name}
+// in #{Pubba::Site.asset_configuration.name}
 //
 //= require third-party/backbone.js
 //= require custom/app.js

data/test/pubba/test_site.rb

@@ -2,26 +2,26 @@ require 'helper'
 
 class TestPubbaSite < TestPubba
   def test_asset_handler_initialization
-    assert_equal Sinatra::Pubba::Assets::SprocketsHandler, Sinatra::Pubba::Site.asset_handler
+    assert_equal Pubba::Assets::SprocketsHandler, Pubba.asset_handler
   end
 
   def test_asset_handler_initialization
-    assert_equal Sinatra::Pubba::Assets::YUIMinifier, Sinatra::Pubba::Site.asset_minifier
+    assert_equal Pubba::Assets::YUIMinifier, Pubba.asset_minifier
   end
 
   def test_asset_folder_initialization
-    assert_equal "#{R.asset_folder}", Sinatra::Pubba::Site.asset_folder
+    assert_equal "#{R.asset_folder}", Pubba.asset_folder
   end
 
   def test_public_folder_initialization
-    assert_equal "#{R.public_folder}", Sinatra::Pubba::Site.public_folder
+    assert_equal "#{R.public_folder}", Pubba.public_folder
   end
 
   def test_script_folder_initialization
-    assert_equal "js", Sinatra::Pubba::Site.script_folder
+    assert_equal "js", Pubba.script_folder
   end
 
   def test_style_folder_initialization
-    assert_equal "css", Sinatra::Pubba::Site.style_folder
+    assert_equal "css", Pubba.style_folder
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pubba
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-22 00:00:00.000000000 Z
+date: 2011-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &2151888640 !ruby/object:Gem::Requirement
+  requirement: &2151888720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2151888640
+  version_requirements: *2151888720
 - !ruby/object:Gem::Dependency
   name: r18n-desktop
-  requirement: &2151887220 !ruby/object:Gem::Requirement
+  requirement: &2151887340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.13
   type: :runtime
   prerelease: false
-  version_requirements: *2151887220
+  version_requirements: *2151887340
 - !ruby/object:Gem::Dependency
   name: yui-compressor
-  requirement: &2151902720 !ruby/object:Gem::Requirement
+  requirement: &2151902760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *2151902720
+  version_requirements: *2151902760
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &2151901700 !ruby/object:Gem::Requirement
+  requirement: &2151901780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,21 +54,21 @@ dependencies:
         version: 0.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *2151901700
+  version_requirements: *2151901780
 - !ruby/object:Gem::Dependency
   name: statica
-  requirement: &2151900860 !ruby/object:Gem::Requirement
+  requirement: &2151901000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151900860
+  version_requirements: *2151901000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151900020 !ruby/object:Gem::Requirement
+  requirement: &2151900060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2151900020
+  version_requirements: *2151900060
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2151899180 !ruby/object:Gem::Requirement
+  requirement: &2151899220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2151899180
+  version_requirements: *2151899220
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &2151898320 !ruby/object:Gem::Requirement
+  requirement: &2151898380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2151898320
+  version_requirements: *2151898380
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2151897500 !ruby/object:Gem::Requirement
+  requirement: &2151897560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151897500
+  version_requirements: *2151897560
 description: 
 email:
 - andy@stonean.com
@@ -124,19 +124,19 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- 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
-- lib/sinatra/pubba/monitor.rb
-- lib/sinatra/pubba/page.rb
-- lib/sinatra/pubba/site.rb
-- lib/sinatra/pubba/version.rb
+- lib/pubba.rb
+- lib/pubba/assets/configuration.rb
+- lib/pubba/assets/handler.rb
+- lib/pubba/assets/minifier.rb
+- lib/pubba/assets/sprockets_handler.rb
+- lib/pubba/assets/yui_minifier.rb
+- lib/pubba/errors.rb
+- lib/pubba/html/helpers.rb
+- lib/pubba/locale.rb
+- lib/pubba/monitor.rb
+- lib/pubba/page.rb
+- lib/pubba/site.rb
+- lib/pubba/version.rb
 - pubba.gemspec
 - test/helper.rb
 - test/pubba/assets/test_configuration.rb
@@ -182,7 +182,7 @@ rubyforge_project: pubba
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Pubba is a Sinatra extension designed to help you manage the static components
-  of your site.
+summary: Pubba is a library designed to help you manage the static components of your
+  site.
 test_files: []
 has_rdoc: