static_fm 0.0.1 → 0.0.2

data/README.markdown

@@ -2,12 +2,22 @@
 
 A static file manager: install and upgrade vendor assets (Javascript|CSS).
 
-##
+## About
 
 This project is still under heavy development
 
+## Development
+
+    rake                            # Runs non-network specs
+    rake network                    # Runs all specs, will hit network to test all downloads
+    ASSET=backbone rake network     # Runs all non-network specs + network check for backbone asset
+
 ## Contributing to static_fm
 
+To add a new library to static_fm, fork the project, add an entry to static.yml on a feature branch and submit a pull request.
+
+## Best practices
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 * Fork the project

data/Rakefile

@@ -33,7 +33,7 @@ Jeweler::RubygemsDotOrgTasks.new
 require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
+  spec.pattern = FileList['spec/**/*_spec.rb'].exclude('spec/**/network_spec.rb')
 end
 
 RSpec::Core::RakeTask.new(:rcov) do |spec|
@@ -41,6 +41,11 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
+RSpec::Core::RakeTask.new(:network) do |spec|
+  # includes network_spec which requires network access to perform and check downloads
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
 task :default => :spec
 
 # require 'rake/task'

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/config/static.yml

@@ -1,7 +1,7 @@
 "underscore":
   url: "https://github.com/documentcloud/underscore/raw/{version}/underscore.js"
   description: "javascript's utility belt"
-  compressed: "underscore-min.js"
+  compressed_url: "http://cdnjs.cloudflare.com/ajax/libs/underscore.js/{version}/underscore-min.js"
   version: "1.1.7"
 
 "raphael":
@@ -133,7 +133,7 @@
 
 "backbone":
   url: "https://github.com/documentcloud/backbone/raw/{version}/backbone.js"
-  compressed: "backbone-min.js"
+  compressed_url: "http://cdnjs.cloudflare.com/ajax/libs/backbone.js/{version}/backbone-min.js"
   description: "Backbone supplies structure to Javascript Apps by providing models, views, collections, and events"
   version: "0.5.3"
 
@@ -153,9 +153,10 @@
   version: "4.0"
 
 "modernizr":
-  url: "https://github.com/Modernizr/Modernizr/raw/v{version}/modernizr.js"
+  url: "http://www.modernizr.com/downloads/modernizr-{version}.js"
+  file_name: "modernizr.js"
   description: "Feature detection to test browsers against upcoming features"
-  version: "1.7"
+  version: "2.0.6"
 
 "mustache.js":
   url: "https://raw.github.com/janl/mustache.js/{version}/mustache.js"
@@ -165,4 +166,5 @@
 "jasmine-jquery.js":
   url: "https://github.com/downloads/velesin/jasmine-jquery/jasmine-jquery-{version}.js"
   description: "jQuery matchers and fixture loader for Jasmine framework"
-  version: "1.3.1"
+  version: "1.3.1"
+  file_name: "jasmine-jquery.js"

data/lib/static_fm/asset.rb

@@ -42,15 +42,19 @@ module StaticFM
     end
 
 
-    attr_accessor :name, :url, :version, :compressed, :description, :file_name
+    attr_accessor :name, :url, :version, :compressed, 
+      :compressed_url, :description, :file_name, :dependencies
 
     def initialize(name, attributes = {})
       @name = name
       attributes.each_pair do |attribute, value|
         self.send("#{attribute}=", value)
       end
+    end
 
-      update_url_with_version!
+    def url_with_options(options = {})
+      calculated_url = options[:compress] ? compressed_url : url
+      update_url_with_version(calculated_url, @version)
     end
 
     def host
@@ -69,12 +73,8 @@ module StaticFM
       @file_name.nil? ? basename : @file_name
     end
 
-    def compressed_path
-      @compressed && path.gsub(basename, @compressed)
-    end
-
     def compressed_url
-      @compressed && @url.gsub(basename, @compressed)
+      @compressed_url || (@compressed && @url.gsub(basename, @compressed))
     end
 
     def display_name
@@ -84,11 +84,11 @@ module StaticFM
     protected
 
     def parsed_uri
-      @parsed_uri ||= URI.parse(@url)
+      @parsed_uri ||= URI.parse(update_url_with_version(@url, @version))
     end
 
-    def update_url_with_version!
-      @url.gsub!(/\{version\}/, @version) unless @version.nil?
+    def update_url_with_version(url, version = nil)
+      version.nil? ? url : url.gsub(/\{version\}/, version)
     end
   end
 

data/lib/static_fm/installer.rb

@@ -33,7 +33,8 @@ module StaticFM
     end
 
     def url
-      compressed? ? @asset.compressed_url : @asset.url
+      # @asset.url_with_options(options)
+      @asset.url_with_options({ :compress => compressed? })
     end
 
     def compressed?

data/lib/static_fm/tasks.rb

@@ -4,29 +4,4 @@ namespace :static do
     puts "static <library>"
   end
 
-  namespace :install do
-
-    desc 'Update backbone'
-    task :backbone do
-      dir = File.dirname(File.expand_path(__FILE__))
-      StaticFM::Updater.update! do |u|
-        u.url = "http://documentcloud.github.com/backbone"
-        u.dir = File.join("public", "javascripts")
-        u.files << "backbone.js"
-        u.files << "backbone-min.js"
-      end
-    end
-
-    desc 'Update underscore'
-    task :underscore do
-      StaticFM::Updater.update!.update! do |u|
-        u.url = "http://documentcloud.github.com/underscore"
-        u.dir = Rails.root.join("public", "javascripts", "vendor")
-        u.files << "underscore.js"
-        u.files << "underscore-min.js"
-      end
-    end
-
-  end
-
 end

data/lib/static_fm.rb

@@ -1,5 +1,4 @@
 require "static_fm/installer"
-require "static_fm/updater"
 require "static_fm/asset"
 
 require 'logger'

data/spec/spec_helper.rb

@@ -11,4 +11,12 @@ RSpec.configure do |config|
 
 end
 
-StaticFM::Logger.silence!
+StaticFM::Logger.silence!
+
+at_exit do
+  # Run 'rake network' to test downloads
+  # Run DOWNLOAD=preserve rake network to test downloads and keep directory for inspection
+  if !!ENV['DOWNLOAD'] == "preserve" && File.directory?('./spec/downloads')
+    system "rm ./spec/downloads/*"
+  end
+end

data/spec/static_fm/asset_spec.rb

@@ -45,18 +45,25 @@ describe StaticFM::Asset do
     end
   end
 
-  describe "compressed_path" do
-    it "should replace basename with compressed" do
-      @asset.compressed = "backbone-min.js"
-      @asset.compressed_path.should == "/path/to/backbone-min.js"
+  describe "url_with_options" do
+    before(:each) do
+      @asset = StaticFM::Asset.new("backbone", {
+        :url => "http://www.example.com/path/to/{version}/backbone.js",
+        :version => "0.1"
+      })
     end
 
-    it "should return nil if no compressed basename" do
-      @asset.compressed_path.should be_nil
+    it "should return url with gsubbed version if no special options" do
+      @asset.url_with_options.should == "http://www.example.com/path/to/0.1/backbone.js"
     end
   end
 
   describe "compressed_url" do
+    it "should return explicitly defined url" do
+      @asset.compressed_url = "http://www.example.com/path/to/backbone-min.js"
+      @asset.compressed_url.should == "http://www.example.com/path/to/backbone-min.js"
+    end
+
     it "should replace basename with compressed" do
       @asset.compressed = "backbone-min.js"
       @asset.compressed_url.should == "http://www.example.com/path/to/backbone-min.js"

data/spec/static_fm/network_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "StaticFM integration" do
+
+  def file_should_contain_desired_code(file_name, code)
+    File.readlines(file_name).any? { |line| !!line.match(/#{Regexp.escape(code).downcase}/i) }
+  end
+
+  def file_should_contain_bytes(file_name)
+    File.size(file_name).should > 128
+  end
+
+  describe "downloads" do
+    it "should download assets in static.yml" do
+      config = StaticFM::Asset.config
+      assets = ENV['ASSET'].nil? ? config : {ENV['ASSET'] => config[ENV['ASSET']]}
+      assets.each_pair do |asset_name, attributes|
+        asset = StaticFM::Asset.find(asset_name)
+        destination = "./spec/downloads"
+        installer = StaticFM::Installer.new(asset, destination)
+        installer.download
+
+        File.exist?(installer.file_name).should be_true
+        file_should_contain_bytes(installer.file_name)
+        file_should_contain_desired_code(installer.file_name, asset.name)
+      end
+    end
+  end
+end

data/static_fm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{static_fm}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ross Kaffenberger"]
-  s.date = %q{2011-09-06}
+  s.date = %q{2011-09-09}
   s.description = %q{It's time consuming to look up the URLs to your favorite javascript libraries and css
 frameworks every time you start a new project or need to upgrade to a new version. Static
 FM provides recipes and tasks to speed up the process so you can start using the latest now.
@@ -37,12 +37,11 @@ FM provides recipes and tasks to speed up the process so you can start using the
     "lib/static_fm/installer.rb",
     "lib/static_fm/tasks.rb",
     "lib/static_fm/tasks/static_fm.rake",
-    "lib/static_fm/updater.rb",
     "spec/spec_helper.rb",
     "spec/static_fm/asset_spec.rb",
     "spec/static_fm/command_line_spec.rb",
     "spec/static_fm/installer_spec.rb",
-    "spec/static_fm/integration_spec.rb",
+    "spec/static_fm/network_spec.rb",
     "spec/static_fm_spec.rb",
     "static_fm.gemspec"
   ]

metadata

@@ -2,7 +2,7 @@
 name: static_fm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ross Kaffenberger
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-06 00:00:00 -04:00
+date: 2011-09-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -165,12 +165,11 @@ files:
 - lib/static_fm/installer.rb
 - lib/static_fm/tasks.rb
 - lib/static_fm/tasks/static_fm.rake
-- lib/static_fm/updater.rb
 - spec/spec_helper.rb
 - spec/static_fm/asset_spec.rb
 - spec/static_fm/command_line_spec.rb
 - spec/static_fm/installer_spec.rb
-- spec/static_fm/integration_spec.rb
+- spec/static_fm/network_spec.rb
 - spec/static_fm_spec.rb
 - static_fm.gemspec
 has_rdoc: true
@@ -187,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2290096469839906185
+      hash: 2596875027417535980
       segments: 
       - 0
       version: "0"

data/lib/static_fm/updater.rb

@@ -1,22 +0,0 @@
-module StaticFM
-  class Updater
-
-    def self.update!
-      installer = new
-      yield installer
-      installer.update!
-    end
-
-    attr_accessor :url, :dir, :files
-
-    def files
-      @files ||= []
-    end
-
-    def update!
-      @files.each do |file|
-        system `wget #{File.join(@url, file)} -O#{File.join(@dir, file)}`
-      end
-    end
-  end
-end

data/spec/static_fm/integration_spec.rb

@@ -1,18 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe "StaticFM integration" do
-
-  describe "downloads" do
-    it "should download assets in static.yml" do
-      pending
-      StaticFM::Asset.config.each_pair do |asset_name, attributes|
-        asset = StaticFM::Asset.find(asset_name)
-        destination = "./spec/downloads/#{asset.basename}"
-        StaticFM::Installer.new(asset, destination).download
-        File.exist?(destination).should be_true
-        File.size(destination).should > 128
-        File.readlines(destination).should include(/backbone/i)
-      end
-    end
-  end
-end