astro 0.1.1 → 0.2.0

data/README.md

@@ -2,6 +2,20 @@
 
 Astro is your DIY asset distribution web service.
 
+## Usage
+
+Add this line to your application's Gemfile:
+
+    gem 'astro'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install astro
+
 ## TODOs
 
 - Asset versioning.
@@ -14,3 +28,12 @@ Astro is your DIY asset distribution web service.
 - Deploy to heroku.
 - Release on rubygems.
 - Make sure astro can be mounted within a rails app.
+- Command-line tool.
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/astro.gemspec

@@ -18,15 +18,18 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'sinatra',   '~> 1.4.3'
-  spec.add_dependency 'sprockets', '~> 2.10.0'
+  spec.add_dependency 'sinatra',         '~> 1.4.3'
+  spec.add_dependency 'sinatra-contrib', '~> 1.4.0'
+  spec.add_dependency 'sprockets',       '~> 2.10.0'
 
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'bundler',       '~> 1.3'
   spec.add_development_dependency 'rspec',         '~> 2.13.0'
   spec.add_development_dependency 'rack-test',     '~> 0.6.2'
-  spec.add_development_dependency 'git-approvals', '~> 0.2.2'
+  spec.add_development_dependency 'git-approvals', '~> 0.4.0'
   spec.add_development_dependency 'uglifier',      '~> 2.1.1'
+  spec.add_development_dependency 'awesome_print', '~> 1.1.0'
+  spec.add_development_dependency 'sass',          '~> 3.2.9'
   spec.add_development_dependency 'guard-rspec',   '~> 3.0.1'
   spec.add_development_dependency 'pry',           '~> 0.9.12.2'
 end

data/lib/assets/stylesheets/astro.css

@@ -0,0 +1,11 @@
+/**
+ *  ______           __
+ * /\  _  \         /\ \__                   __
+ * \ \ \L\ \    ____\ \ ,_\  _ __   ___     /\_\    ____
+ *  \ \  __ \  /',__\\ \ \/ /\`'__\/ __`\   \/\ \  /',__\
+ *   \ \ \/\ \/\__, `\\ \ \_\ \ \//\ \L\ \__ \ \ \/\__, `\
+ *    \ \_\ \_\/\____/ \ \__\\ \_\\ \____/\_\_\ \ \/\____/
+ *     \/_/\/_/\/___/   \/__/ \/_/ \/___/\/_/\ \_\ \/___/
+ *                                          \ \____/
+ *                                           \/___/
+ */

data/lib/astro/assets.rb

@@ -23,6 +23,7 @@ module Astro
       app.configure :development, :production do |app|
         app.before do
           assets.append_path 'app/assets/javascripts'
+          assets.append_path 'app/assets/stylesheets'
         end
       end
 
@@ -30,13 +31,12 @@ module Astro
       app.configure :test do |app|
         app.before do
           assets.append_path 'spec/assets/javascripts'
+          assets.append_path 'spec/assets/stylesheets'
         end
       end
 
       app.before do
-        assets.register_preprocessor \
-          'application/javascript', :astro do |context, data|
-
+        processor = lambda do |context, data|
           ##
           # If we're processing the root asset, require all of
           # the assets in the assets list and return the data
@@ -50,6 +50,11 @@ module Astro
 
           data
         end
+
+        assets.register_preprocessor \
+          'application/javascript', :astro, &processor
+        assets.register_preprocessor \
+          'text/css', :astro, &processor
       end
 
     end

data/lib/astro/middleware/sprockets.rb

@@ -15,6 +15,7 @@ module Astro
       def call( env )
         sprockets = ::Sprockets::Environment.new
         sprockets.append_path 'lib/assets/javascripts'
+        sprockets.append_path 'lib/assets/stylesheets'
 
         env[ 'astro.sprockets' ] = sprockets
 

data/lib/astro/server.rb

@@ -1,9 +1,11 @@
 require 'sinatra/base'
+require 'sinatra/respond_with'
 
 module Astro
   class Server < Sinatra::Base
 
     register Astro::Assets
+    register Sinatra::RespondWith
 
     use Astro::Middleware::QueryString
     use Astro::Middleware::Sprockets
@@ -11,17 +13,23 @@ module Astro
     ##
     # TODO docs
     error Sprockets::FileNotFound do
-      halt 404, erb( :error )
+      status 404
+      respond_with :error
     end
 
     ##
     # TODO docs
     before( '/javascripts' ){ content_type 'application/javascript' }
+    before( '/stylesheets' ){ content_type 'text/css' }
 
     ##
     # TODO docs
     get( '/javascripts' ){ assets[ 'astro.js' ].to_s }
 
+    ##
+    # TODO docs
+    get( '/stylesheets' ){ assets[ 'astro.css' ].to_s }
+
     # TODO get /javascripts/:name
     # - display available versions?
     # - 3xx if found, 4xx if missing?

data/lib/astro/version.rb

@@ -1,3 +1,3 @@
 module Astro
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/lib/astro/views/error.css.erb

@@ -0,0 +1,4 @@
+/**
+ * Astro.js <%= $!.to_s %>.
+ */
+body { background : #f00; }

data/spec/assets/stylesheets/bar.css

@@ -0,0 +1,5 @@
+/*
+ *= require foo
+ */
+
+/* bar.css */

data/spec/assets/stylesheets/foo.css

@@ -0,0 +1 @@
+/* foo.css */

data/spec/astro/middleware/sprockets_spec.rb

@@ -14,9 +14,12 @@ describe Astro::Middleware::Sprockets do
   subject { last_request.env[ 'astro.sprockets' ] }
 
   it { should be_a( Sprockets::Environment ) }
-  it { should have( 1 ).paths }
+  it { should have( 2 ).paths }
 
-  it 'has the correct paths' do
+  it 'has the javascripts directory in the path' do
     subject.paths[ 0 ].should =~ /lib\/assets\/javascripts$/
   end
+  it 'has the stylesheets directory in the path' do
+    subject.paths[ 1 ].should =~ /lib\/assets\/stylesheets$/
+  end
 end

data/spec/astro/server_spec.rb

@@ -14,29 +14,61 @@ describe Astro::Server do
     context 'empty' do
       before { get '/javascripts' }
       its( :status ){ should == 200 }
-      example( 'headers' ){ verify { subject.headers } }
-      example( 'body'    ){ verify( :format => :js ){ subject.body } }
+      example( 'headers' ){ verify( :format => :txt ){ subject.headers } }
+      example( 'body'    ){ verify( :format => :js  ){ subject.body } }
     end
 
     context 'foo' do
       before { get '/javascripts?foo' }
       its( :status ){ should == 200 }
-      example( 'headers' ){ verify { subject.headers } }
-      example( 'body'    ){ verify( :format => :js ){ subject.body } }
+      example( 'headers' ){ verify( :format => :txt ){ subject.headers } }
+      example( 'body'    ){ verify( :format => :js  ){ subject.body } }
     end
 
     context 'bar' do
       before { get '/javascripts?bar' }
       its( :status ){ should == 200 }
-      example( 'headers' ){ verify { subject.headers } }
-      example( 'body'    ){ verify( :format => :js ){ subject.body } }
+      example( 'headers' ){ verify( :format => :txt ){ subject.headers } }
+      example( 'body'    ){ verify( :format => :js  ){ subject.body } }
     end
 
     context 'baz' do
       before { get '/javascripts?baz' }
       its( :status ){ should == 404 }
-      example( 'headers' ){ verify { subject.headers } }
-      example( 'body'    ){ verify( :format => :js ){ subject.body } }
+      example( 'headers' ){ verify( :format => :txt ){ subject.headers } }
+      example( 'body'    ){ verify( :format => :js  ){ subject.body } }
+    end
+  end
+
+  describe 'stylesheets' do
+    subject { last_response }
+
+    context 'empty' do
+      before { get '/stylesheets' }
+      its( :status ){ should == 200 }
+      example( 'headers' ){ verify( :format => :txt ){ subject.headers } }
+      example( 'body'    ){ verify( :format => :css ){ subject.body } }
+    end
+
+    context 'foo' do
+      before { get '/stylesheets?foo' }
+      its( :status ){ should == 200 }
+      example( 'headers' ){ verify( :format => :txt ){ subject.headers } }
+      example( 'body'    ){ verify( :format => :css ){ subject.body } }
+    end
+
+    context 'bar' do
+      before { get '/stylesheets?bar' }
+      its( :status ){ should == 200 }
+      example( 'headers' ){ verify( :format => :txt ){ subject.headers } }
+      example( 'body'    ){ verify( :format => :css ){ subject.body } }
+    end
+
+    context 'baz' do
+      before { get '/stylesheets?baz' }
+      its( :status ){ should == 404 }
+      example( 'headers' ){ verify( :format => :txt ){ subject.headers } }
+      example( 'body'    ){ verify( :format => :css ){ subject.body } }
     end
   end
 end

data/spec/astro/server_spec/astro_server/stylesheets/bar/body.css

@@ -0,0 +1,16 @@
+/* foo.css */
+/*
+
+ */
+/* bar.css */
+/**
+ *  ______           __
+ * /\  _  \         /\ \__                   __
+ * \ \ \L\ \    ____\ \ ,_\  _ __   ___     /\_\    ____
+ *  \ \  __ \  /',__\ \ \/ /\`'__\/ __`\   \/\ \  /',__\
+ *   \ \ \/\ \/\__, `\ \ \_\ \ \//\ \L\ \__ \ \ \/\__, `\
+ *    \ \_\ \_\/\____/ \ \__\ \_\ \____/\_\_\ \ \/\____/
+ *     \/_/\/_/\/___/   \/__/ \/_/ \/___/\/_/\ \_\ \/___/
+ *                                          \ \____/
+ *                                           \/___/
+ */

data/spec/astro/server_spec/astro_server/stylesheets/bar/headers.txt

@@ -0,0 +1,5 @@
+{
+  "Content-Type"           => "text/css;charset=utf-8",
+  "Content-Length"         => "516",
+  "X-Content-Type-Options" => "nosniff"
+}

data/spec/astro/server_spec/astro_server/stylesheets/baz/body.css

@@ -0,0 +1,6 @@
+/**
+ * Astro.js couldn't find file 'baz'.
+ */
+body {
+  background: #f00;
+}

data/spec/astro/server_spec/astro_server/stylesheets/baz/headers.txt

@@ -0,0 +1,5 @@
+{
+  "Content-Type"           => "text/css;charset=utf-8",
+  "Content-Length"         => "74",
+  "X-Content-Type-Options" => "nosniff"
+}

data/spec/astro/server_spec/astro_server/stylesheets/empty/body.css

@@ -0,0 +1,11 @@
+/**
+ *  ______           __
+ * /\  _  \         /\ \__                   __
+ * \ \ \L\ \    ____\ \ ,_\  _ __   ___     /\_\    ____
+ *  \ \  __ \  /',__\ \ \/ /\`'__\/ __`\   \/\ \  /',__\
+ *   \ \ \/\ \/\__, `\ \ \_\ \ \//\ \L\ \__ \ \ \/\__, `\
+ *    \ \_\ \_\/\____/ \ \__\ \_\ \____/\_\_\ \ \/\____/
+ *     \/_/\/_/\/___/   \/__/ \/_/ \/___/\/_/\ \_\ \/___/
+ *                                          \ \____/
+ *                                           \/___/
+ */

data/spec/astro/server_spec/astro_server/stylesheets/empty/headers.txt

@@ -0,0 +1,5 @@
+{
+  "Content-Type"           => "text/css;charset=utf-8",
+  "Content-Length"         => "477",
+  "X-Content-Type-Options" => "nosniff"
+}

data/spec/astro/server_spec/astro_server/stylesheets/foo/body.css

@@ -0,0 +1,12 @@
+/* foo.css */
+/**
+ *  ______           __
+ * /\  _  \         /\ \__                   __
+ * \ \ \L\ \    ____\ \ ,_\  _ __   ___     /\_\    ____
+ *  \ \  __ \  /',__\ \ \/ /\`'__\/ __`\   \/\ \  /',__\
+ *   \ \ \/\ \/\__, `\ \ \_\ \ \//\ \L\ \__ \ \ \/\__, `\
+ *    \ \_\ \_\/\____/ \ \__\ \_\ \____/\_\_\ \ \/\____/
+ *     \/_/\/_/\/___/   \/__/ \/_/ \/___/\/_/\ \_\ \/___/
+ *                                          \ \____/
+ *                                           \/___/
+ */

data/spec/astro/server_spec/astro_server/stylesheets/foo/headers.txt

@@ -0,0 +1,5 @@
+{
+  "Content-Type"           => "text/css;charset=utf-8",
+  "Content-Length"         => "492",
+  "X-Content-Type-Options" => "nosniff"
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: astro
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.3
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +155,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.1
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.9
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.9
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -192,15 +240,19 @@ files:
 - astro.gemspec
 - config.ru
 - lib/assets/javascripts/astro.js
+- lib/assets/stylesheets/astro.css
 - lib/astro.rb
 - lib/astro/assets.rb
 - lib/astro/middleware/query_string.rb
 - lib/astro/middleware/sprockets.rb
 - lib/astro/server.rb
 - lib/astro/version.rb
-- lib/astro/views/error.erb
+- lib/astro/views/error.css.erb
+- lib/astro/views/error.js.erb
 - spec/assets/javascripts/bar.js
 - spec/assets/javascripts/foo.js
+- spec/assets/stylesheets/bar.css
+- spec/assets/stylesheets/foo.css
 - spec/astro/middleware/query_string_spec.rb
 - spec/astro/middleware/sprockets_spec.rb
 - spec/astro/server_spec.rb
@@ -212,6 +264,14 @@ files:
 - spec/astro/server_spec/astro_server/javascripts/empty/headers.txt
 - spec/astro/server_spec/astro_server/javascripts/foo/body.js
 - spec/astro/server_spec/astro_server/javascripts/foo/headers.txt
+- spec/astro/server_spec/astro_server/stylesheets/bar/body.css
+- spec/astro/server_spec/astro_server/stylesheets/bar/headers.txt
+- spec/astro/server_spec/astro_server/stylesheets/baz/body.css
+- spec/astro/server_spec/astro_server/stylesheets/baz/headers.txt
+- spec/astro/server_spec/astro_server/stylesheets/empty/body.css
+- spec/astro/server_spec/astro_server/stylesheets/empty/headers.txt
+- spec/astro/server_spec/astro_server/stylesheets/foo/body.css
+- spec/astro/server_spec/astro_server/stylesheets/foo/headers.txt
 - spec/spec_helper.rb
 - spec/support/approvals.rb
 - spec/support/pry.rb
@@ -243,6 +303,8 @@ summary: Your DIY asset distribution web service.
 test_files:
 - spec/assets/javascripts/bar.js
 - spec/assets/javascripts/foo.js
+- spec/assets/stylesheets/bar.css
+- spec/assets/stylesheets/foo.css
 - spec/astro/middleware/query_string_spec.rb
 - spec/astro/middleware/sprockets_spec.rb
 - spec/astro/server_spec.rb
@@ -254,6 +316,14 @@ test_files:
 - spec/astro/server_spec/astro_server/javascripts/empty/headers.txt
 - spec/astro/server_spec/astro_server/javascripts/foo/body.js
 - spec/astro/server_spec/astro_server/javascripts/foo/headers.txt
+- spec/astro/server_spec/astro_server/stylesheets/bar/body.css
+- spec/astro/server_spec/astro_server/stylesheets/bar/headers.txt
+- spec/astro/server_spec/astro_server/stylesheets/baz/body.css
+- spec/astro/server_spec/astro_server/stylesheets/baz/headers.txt
+- spec/astro/server_spec/astro_server/stylesheets/empty/body.css
+- spec/astro/server_spec/astro_server/stylesheets/empty/headers.txt
+- spec/astro/server_spec/astro_server/stylesheets/foo/body.css
+- spec/astro/server_spec/astro_server/stylesheets/foo/headers.txt
 - spec/spec_helper.rb
 - spec/support/approvals.rb
 - spec/support/pry.rb