pubba 0.1.0 → 0.2.0

data/CHANGES

@@ -0,0 +1,8 @@
+master
+
+  * Ability to add external references
+  * Ability to add media query requirement to styles
+
+0.1.0
+
+  * Initial release

data/README.md

@@ -6,10 +6,10 @@ pubba is a Sinatra extension designed to help you manage your site. It uses [Spr
 
 This extension is under heavy, heavy development and is subject to massive changes over the next week or so.
 
+__I do not consider this project production ready at this time. It will be soon though.__
+
 TODO:
 
-* Support 3rd part script tags in pubba.yml
-* Add support for media queries on style definitions. This will obviously change the current pubba.yml format.
 * Remove requirement for placing of scripts/styles in subdirectories. For instance, the convention now is scripts would be in subdirs like javascripts/custom and javscripts/third-party. The only scripts/styles in the root dir are those generated by this extension.
 * Compress the combined assets
 * More tests!
@@ -23,7 +23,7 @@ If you've ever had to deal with an audit department, you understand some of the
 
 Any process that involves changing code between environments, even in an automated fashion, is great fodder for the audit machine. This extension makes sure the javascript and css you work with in development is the same as it will be in production.
 
-This does the require the use of a cache bursting query parameter to be added to the url instead of the digest per asset approach. While the digest approach is much more accurate it complicates using a commit/tag to completely represent the deployment contents.
+This does result in the use of a cache bursting query parameter to be added to the url instead of the digest per asset approach. While the digest approach is much more accurate it complicates using a commit/tag to completely represent the deployment contents.
 
 As mentioned, code organization is another focus of Pubba. The config file __pubba.yml__  uses the global section to clearly state which assets should be on all pages. In addition, when using R18n, Pubba gives you access through a single page object.
 
@@ -80,23 +80,45 @@ Next up is creating the all important __pubba.yml__ config file:
 
     global:
       styles:
-        - "custom/global"
-      head_scripts:
-        - "third-party/jquery-1.7.0.min"
-      body_scripts:
-        - "third-party/jquery.cookie"
-        - "custom/autocomplete"
-        - "custom/application"
+        all:
+          urls:
+            - "http://twitter.github.com/bootstrap/1.4.0/bootstrap.min.css"
+            - "custom/global"
+        phone:
+          media: "only screen and (min-width: 480px)"
+          urls:
+            - "custom/large"
+        desktop:
+          media: "only screen and (max-width: 480px)"
+          urls:
+            - "custom/small"
+      scripts:
+        head:
+          - "https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"
+          - "third-party/modernizr"
+        body:
+          - "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"
+          - "third-party/backbone"
+          - "custom/app"
+          - "custom/tracker"
 
     # Home page configuration
     home:
       styles:
-        - "custom/home"
+        all:
+          urls:
+            - "custom/home"
 
     # Search results page configuration
     search:
       styles:
-        - "custom/search"
+        all:
+          urls:
+            - "custom/search"
+      scripts:
+        body:
+          - "custom/lightbox"
+
 
 The config file is referencing the javascripts and stylesheets located in the `asset_folder`.
 

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

@@ -11,7 +11,7 @@ module Sinatra
         end
 
         def global_config!
-          yaml.delete("global")
+          yaml.delete("global") || {}
         end
 
         def process

data/lib/sinatra/pubba/html/helpers.rb

@@ -3,11 +3,17 @@ module Sinatra
     module HTML
       module Helpers
         def page_head_tags
-          tag_content('link', '', { href: burst("/stylesheets/#{@page.name}-styles.css"), rel: "stylesheet", type: "text/css" }) + tag_content('script', '', { src: burst("/javascripts/#{@page.name}-head.js"), type: "text/javascript" })
+          @page.head_tags.collect do |tag|
+            type = tag.delete(:tag)
+            tag_content(type, '', tag)
+          end
         end
 
         def page_body_tags
-          tag_content('script', '', { src: burst("/javascripts/#{@page.name}-body.js"), type: "text/javascript" })
+          @page.body_tags.collect do |tag|
+            type = tag.delete(:tag)
+            tag_content(type, '', tag)
+          end
         end
 
         def burst(url)
@@ -23,8 +29,8 @@ module Sinatra
         def tag_attrs(attrs)
           return '' if attrs.empty?
 
-          return " " + attrs.collect do |k,v|
-            %|#{k}="#{v}"|
+          return " " + attrs.keys.sort.collect do |k|
+            %|#{k}="#{attrs[k]}"|
           end.join(' ')
         end
       end

data/lib/sinatra/pubba/page.rb

@@ -2,23 +2,42 @@ module Sinatra
   module Pubba
     class Page
       attr_accessor :name
-      attr_reader :assets
+      attr_reader :assets, :head_tags, :body_tags
 
       def initialize(name, global_configuration = {})
         @name = name
-        @assets = {}
+        @assets = {"styles" => {}, "scripts" => {}}
+        @head_tags = []
+        @body_tags = []
 
-        Site.asset_types.keys.each do |asset|
-          @assets[asset] = global_configuration[asset] || []
+        global_configuration["styles"].each do |key, value|
+            @assets["styles"][key] = value.dup
         end
+
+        @assets["scripts"]["head"] = global_configuration["scripts"]["head"] || []
+        @assets["scripts"]["body"] = global_configuration["scripts"]["body"] || []
       end
 
-      def add_asset(name, array)
-        assets[name] += array unless array.empty?
+      def add_asset(type, section)
+        if type == "styles"
+           section.each do |section_name, hsh|
+             hsh.each do |key, value|
+              if key == "urls"
+                @assets[type][section_name][key] += value
+              else
+                @assets[type][section_name][key] = value
+              end
+            end
+          end
+        else
+          @assets["scripts"]["head"] += section["head"] if section["head"]
+          @assets["scripts"]["body"] += section["body"] if section["body"]
+        end
       end
 
       def assetize
-        Site.asset_types.each{ |key, val| create_asset(key, val) }
+        create_style_assets
+        create_script_assets
       end
 
       def method_missing(meth, *args)
@@ -36,15 +55,57 @@ module Sinatra
         array.each{|ele| scripts << ele }
       end
 
-      def create_asset(asset, dir)
-        type = asset.split('_').first
-        ext  = asset.end_with?('styles') ? 'css' : 'js'
+      def create_style_assets
+        @assets["styles"].each do |part, hsh|
+          content = []
+          @assets["styles"][part]["urls"].each do |url|
+            add_style_tag(part, hsh, url)
+            next if url.start_with?("http")
+            content << "//= require #{url}.css"
+          end
+          write_asset(Site.style_asset_folder, part, "css", content.compact.join("\n"))
+        end
+      end
 
-        File.open( File.join(dir, "#{name}-#{type}.#{ext}"), 'w') do |f|
-          f.write Site.disclaimer
-          assets[asset].each do |script|
-            f.write "//= require #{script}.#{ext}\n"
+      def create_script_assets
+        ["head", "body"].each do |part|
+          content = []
+          @assets["scripts"][part].each do |url|
+            add_script_tag(part, url)
+            next if url.start_with?("http")
+            content << "//= require #{url}.js"
           end
+          write_asset(Site.script_asset_folder, part, "js", content.compact.join("\n"))
+        end
+      end
+
+      def add_style_tag(part, hsh, 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"
+
+        maybe_add_tag(@head_tags, h, :href)
+      end
+
+      def add_script_tag(part, url)
+        hsh = { tag: 'script', type: "text/javascript" }
+        hsh[:src]   = url.start_with?("http") ? url : "/javascripts/#{name}-#{part}.js"
+
+        tag_set = (part == "head") ? @head_tags : @body_tags
+        maybe_add_tag(tag_set, hsh, :src)
+      end
+
+      def maybe_add_tag(tag_set, hsh, key)
+        found = false
+        tag_set.each{|tag| found = true if tag[key] == hsh[key]}
+        tag_set << hsh 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 content
         end
       end
     end # Page

data/lib/sinatra/pubba/site.rb

@@ -6,15 +6,11 @@ module Sinatra
   module Pubba
     module Site
       extend self
-      attr_accessor :global_asset_configuration, :asset_handler
-
-      attr_reader :asset_types
       attr_reader :script_asset_folder, :style_asset_folder
       attr_reader :script_public_folder, :style_public_folder
 
-      attr_reader :disclaimer
-
-      attr_reader :locale, :r18n_folder, :r18n_locale
+      attr_reader :global_asset_configuration, :asset_handler
+      attr_reader :disclaimer, :locale, :r18n_folder, :r18n_locale
 
 
       def configure(app)
@@ -36,12 +32,12 @@ module Sinatra
         @global_asset_configuration = asset_configuration.global_config!
 
         # Process the remaining @pubba_config sections
-        asset_configuration.process do |page, config|
-          Site.add_page(page, config).assetize
+        asset_configuration.process do |p, config|
+          add_page(p, config).assetize
         end
 
         # Write assets to public_folder
-        compile_assets(app)
+        # compile_assets(app)
       end
 
 
@@ -67,10 +63,6 @@ module Sinatra
         @script_asset_folder  = File.join(settings.asset_folder, 'javascripts')
         @style_asset_folder   = File.join(settings.asset_folder, 'stylesheets')
 
-        @asset_types = {'styles' => style_asset_folder,
-                        'head_scripts' => script_asset_folder,
-                        'body_scripts' => script_asset_folder}
-
         @disclaimer = "// This file is automatically generated from the contents\n// in #{settings.pubba_config}\n//\n"
       end
 
@@ -106,14 +98,13 @@ module Sinatra
         @pages ||= {}
       end
 
-      def add_page(name, hash)
-        page = Page.new(name, global_asset_configuration)
+      def add_page(name, hsh)
+        p = Page.new(name, @global_asset_configuration)
 
-        asset_types.keys.each do |asset|
-          page.add_asset(asset, hash[asset]) if hash[asset]
-        end
+        p.add_asset('styles', hsh['styles']) if hsh['styles']
+        p.add_asset('scripts', hsh['scripts']) if hsh['scripts']
 
-        pages[name] = page
+        pages[name] = p
       end
 
       private
@@ -129,8 +120,6 @@ module Sinatra
           asset.save_as "#{to_folder}/#{File.basename(file)}"
         end
       end
-
-    @global_asset_configuration = {}
     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.1.0'
+  VERSION = '0.2.0'
 end

data/test/helper.rb

@@ -42,12 +42,12 @@ class TestPubba < MiniTest::Unit::TestCase
 
       register Sinatra::Pubba
 
-      get('/home-page-head-tags') do 
+      get('/home-page-head-tags') do
         @page = Sinatra::Pubba::Site.page('home');
         page_head_tags
       end
-      
-      get('/home-page-body-tags') do 
+
+      get('/home-page-body-tags') do
         @page = Sinatra::Pubba::Site.page('home');
         page_body_tags
       end

data/test/pubba/assets/test_configuration.rb

@@ -6,12 +6,14 @@ class TestPubbaAssetsConfiguration < TestPubba
   end
 
   def test_yaml_is_initialized
-    hsh = {"global"=>{"styles"=>["custom/global"], "head_scripts"=>["third-party/jq"], "body_scripts"=>["third-party/jqc", "custom/app"]}, "home"=>{"styles"=>["custom/home"]}, "search"=>{"styles"=>["custom/search", "third-party/widget"]}}
+    hsh = {"global"=>{"styles"=>{"all"=>{"urls"=>["http://twitter.github.com/bootstrap/1.4.0/bootstrap.min.css", "custom/global"]}, "phone"=>{"media"=>"only screen and (max-width: 480px)", "urls"=>["custom/small"]}, "desktop"=>{"media"=>"only screen and (min-width: 480px)", "urls"=>["custom/large"]}}, "scripts"=>{"head"=>["https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js", "third-party/modernizr"], "body"=>["https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js", "third-party/backbone", "custom/app", "custom/tracker"]}}, "home"=>{"styles"=>{"all"=>{"urls"=>["custom/home"]}}}, "search"=>{"styles"=>{"all"=>{"urls"=>["custom/search", "third-party/widget"]}}, "scripts"=>{"body"=>["custom/lightbox"]}}}
+
     assert_equal hsh, @config.yaml
   end
 
   def test_global_config
-    hsh = {"styles"=>["custom/global"], "head_scripts"=>["third-party/jq"], "body_scripts"=>["third-party/jqc", "custom/app"]}
+    hsh = {"styles"=>{"all"=>{"urls"=>["http://twitter.github.com/bootstrap/1.4.0/bootstrap.min.css", "custom/global"]}, "phone"=>{"media"=>"only screen and (max-width: 480px)", "urls"=>["custom/small"]}, "desktop"=>{"media"=>"only screen and (min-width: 480px)", "urls"=>["custom/large"]}}, "scripts"=>{"head"=>["https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js", "third-party/modernizr"], "body"=>["https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js", "third-party/backbone", "custom/app", "custom/tracker"]}}
+
     assert_equal hsh, @config.global_config!
 
     assert_nil @config.yaml["global"]

data/test/pubba/html/test_helpers.rb

@@ -5,14 +5,16 @@ class TestPubbaHTMLHelper < TestPubba
   include Sinatra::Pubba::HTML::Helpers
 
   def test_home_page_head_tags
-    res = get('/home-page-head-tags').body.gsub /\d/,'1'
-    str = %|<link href="/stylesheets/home-styles.css?aid=111111111" rel="stylesheet" type="text/css"></link><script src="/javascripts/home-head.js?aid=111111111" type="text/javascript"></script>|
+    res = get('/home-page-head-tags').body
+    str = %|<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" rel="stylesheet" type="text/css"></link><link href="/stylesheets/home-phone.css" media="only screen and (max-width: 480px)" rel="stylesheet" type="text/css"></link><link href="/stylesheets/home-desktop.css" 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" type="text/javascript"></script>|
+
     assert_equal str, res
   end
 
   def test_home_page_body_tags
-    res = get('/home-page-body-tags').body.gsub /\d/,'1'
-    str = %|<script src="/javascripts/home-body.js?aid=111111111" type="text/javascript"></script>|
+    res = get('/home-page-body-tags').body
+    str = %|<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js" type="text/javascript"></script><script src="/javascripts/home-body.js" type="text/javascript"></script>|
+
     assert_equal str, res
   end
 end

data/test/pubba/test_page.rb

@@ -14,4 +14,132 @@ class TestPubbaPage < TestPubba
     assert_equal 'Search title', page.title
     assert_equal 'Logout', page.logout_link
   end
+
+  def test_home_all_css_asset
+    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}
+//
+//= require custom/global.css
+//= require custom/home.css
+TEXT
+
+    assert_equal contents.chomp, css
+  end
+
+  def test_home_phone_css_asset
+    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}
+//
+//= require custom/small.css
+TEXT
+
+    assert_equal contents.chomp, css
+  end
+
+  def test_home_desktop_css_asset
+    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}
+//
+//= require custom/large.css
+TEXT
+
+    assert_equal contents.chomp, css
+  end
+
+  def test_search_all_css_asset
+    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}
+//
+//= require custom/global.css
+//= require custom/search.css
+//= require third-party/widget.css
+TEXT
+
+    assert_equal contents.chomp, css
+  end
+
+  def test_search_phone_css_asset
+    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}
+//
+//= require custom/small.css
+TEXT
+
+    assert_equal contents.chomp, css
+  end
+
+  def test_search_desktop_css_asset
+    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}
+//
+//= require custom/large.css
+TEXT
+
+    assert_equal contents.chomp, css
+  end
+
+  def test_home_head_js_asset
+    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}
+//
+//= require third-party/modernizr.js
+TEXT
+
+    assert_equal contents.chomp, js
+  end
+
+  def test_home_body_js_asset
+    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}
+//
+//= require third-party/backbone.js
+//= require custom/app.js
+//= require custom/tracker.js
+TEXT
+
+    assert_equal contents.chomp, js
+  end
+
+  def test_search_head_js_asset
+    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}
+//
+//= require third-party/modernizr.js
+TEXT
+
+    assert_equal contents.chomp, js
+  end
+
+  def test_search_body_js_asset
+    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}
+//
+//= require third-party/backbone.js
+//= require custom/app.js
+//= require custom/tracker.js
+//= require custom/lightbox.js
+TEXT
+
+    assert_equal contents.chomp, js
+  end
 end

data/test/pubba/test_site.rb

@@ -1,11 +1,6 @@
 require 'helper'
 
 class TestPubbaSite < TestPubba
-  def test_global_asset_configuration_initialization
-    hsh = {"styles"=>["custom/global"], "head_scripts"=>["third-party/jq"], "body_scripts"=>["third-party/jqc", "custom/app"]}
-    assert_equal hsh, Sinatra::Pubba::Site.global_asset_configuration
-  end
-
   def test_asset_handler_initialization
     assert_equal Sinatra::Pubba::Assets::SprocketsHandler, Sinatra::Pubba::Site.asset_handler
   end
@@ -25,12 +20,4 @@ class TestPubbaSite < TestPubba
   def test_style_asset_folder_initialization
     assert_equal "#{R.asset_folder}/stylesheets", Sinatra::Pubba::Site.style_asset_folder
   end
-
-  def test_asset_types_initialization
-    asset_types = Sinatra::Pubba::Site.asset_types
-    assert_equal Sinatra::Pubba::Site.style_asset_folder, asset_types.delete('styles')
-    assert_equal Sinatra::Pubba::Site.script_asset_folder, asset_types.delete('head_scripts')
-    assert_equal Sinatra::Pubba::Site.script_asset_folder, asset_types.delete('body_scripts')
-    assert asset_types.empty?
-  end
 end

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

@@ -0,0 +1,3 @@
+function lightbox(){
+  alert('This is the lightbox test file');
+}

data/test/sinatra/app/assets/javascripts/third-party/backbone.js

@@ -0,0 +1,3 @@
+function backbone(){
+  alert('This is the backbone test file');
+}

data/test/sinatra/app/assets/javascripts/third-party/modernizr.js

@@ -0,0 +1,3 @@
+function modernizr(){
+  alert('This is the modernizr test file');
+}

data/test/sinatra/app/assets/stylesheets/custom/large.css

@@ -0,0 +1 @@
+#page {width:800px;margin:0 auto;position:relative;}

data/test/sinatra/app/assets/stylesheets/custom/small.css

@@ -0,0 +1 @@
+#page {width:320px;margin:0 auto;position:relative;padding:0 }

data/test/sinatra/config/pubba.yml

@@ -1,20 +1,39 @@
-# Global configuration. Settings here will be applied to all pages.
 global:
   styles:
-    - "custom/global"
-  head_scripts:
-    - "third-party/jq"
-  body_scripts:
-    - "third-party/jqc"
-    - "custom/app"
+    all:
+      urls:
+        - "http://twitter.github.com/bootstrap/1.4.0/bootstrap.min.css"
+        - "custom/global"
+    phone:
+      media: "only screen and (max-width: 480px)"
+      urls:
+        - "custom/small"
+    desktop:
+      media: "only screen and (min-width: 480px)"
+      urls:
+        - "custom/large"
+  scripts:
+    head:
+      - "https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"
+      - "third-party/modernizr"
+    body:
+      - "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"
+      - "third-party/backbone"
+      - "custom/app"
+      - "custom/tracker"
 
-# Home page configuration
 home:
   styles:
-    - "custom/home"
+    all:
+      urls:
+        - "custom/home"
 
-# Search page configuration
 search:
   styles:
-    - "custom/search"
-    - "third-party/widget"
+    all:
+      urls:
+        - "custom/search"
+        - "third-party/widget"
+  scripts:
+    body:
+      - "custom/lightbox"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pubba
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-03 00:00:00.000000000 Z
+date: 2011-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &2151906900 !ruby/object:Gem::Requirement
+  requirement: &2151907280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2151906900
+  version_requirements: *2151907280
 - !ruby/object:Gem::Dependency
   name: r18n-desktop
-  requirement: &2151906320 !ruby/object:Gem::Requirement
+  requirement: &2151906520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.11
   type: :runtime
   prerelease: false
-  version_requirements: *2151906320
+  version_requirements: *2151906520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151905780 !ruby/object:Gem::Requirement
+  requirement: &2151906000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2151905780
+  version_requirements: *2151906000
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2151905080 !ruby/object:Gem::Requirement
+  requirement: &2151905480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2151905080
+  version_requirements: *2151905480
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &2151904480 !ruby/object:Gem::Requirement
+  requirement: &2151904780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2151904480
+  version_requirements: *2151904780
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2151903920 !ruby/object:Gem::Requirement
+  requirement: &2151904200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151903920
+  version_requirements: *2151904200
 description: Pubba is a Sinatra extension designed to help you manage your site.
 email:
 - andy@stonean.com
@@ -87,6 +87,7 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .yardopts
+- CHANGES
 - Gemfile
 - README.md
 - Rakefile
@@ -108,12 +109,15 @@ files:
 - test/pubba/test_page.rb
 - test/pubba/test_site.rb
 - test/sinatra/app/assets/javascripts/custom/app.js
-- test/sinatra/app/assets/javascripts/custom/track.js
-- test/sinatra/app/assets/javascripts/third-party/jq.js
-- test/sinatra/app/assets/javascripts/third-party/jqc.js
+- test/sinatra/app/assets/javascripts/custom/lightbox.js
+- test/sinatra/app/assets/javascripts/custom/tracker.js
+- test/sinatra/app/assets/javascripts/third-party/backbone.js
+- test/sinatra/app/assets/javascripts/third-party/modernizr.js
 - test/sinatra/app/assets/stylesheets/custom/global.css
 - test/sinatra/app/assets/stylesheets/custom/home.css
+- test/sinatra/app/assets/stylesheets/custom/large.css
 - test/sinatra/app/assets/stylesheets/custom/search.css
+- test/sinatra/app/assets/stylesheets/custom/small.css
 - test/sinatra/app/assets/stylesheets/third-party/widget.css
 - test/sinatra/app/i18n/en.yml
 - test/sinatra/config/pubba.yml

data/test/sinatra/app/assets/javascripts/third-party/jq.js

@@ -1,3 +0,0 @@
-function jq(){
-  alert('This is the jq test file');
-}

data/test/sinatra/app/assets/javascripts/third-party/jqc.js

@@ -1,3 +0,0 @@
-function jqc(){
-  alert('This is the jqc test file');
-}