pannier 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b855f46010a8117eb089ac26b4cac30c4a3dd83
-  data.tar.gz: 48e2e01afed9c21d6bed3d96ff006d600a19d4ee
+  metadata.gz: 3c14f6e2f30ce04e6e8b1044eb60ca68d82114c5
+  data.tar.gz: 112e6bc89794c96557af151afd49cd82708b94e4
 SHA512:
-  metadata.gz: 0daa1753e2f4792161df96e1a1e61f04c07502992ddceb70e28495d492986581aaca39e6fb368e2afb80035797016e962d9e40324dcd8c518686896807cc66ac
-  data.tar.gz: cf8cbb05ea8b5998802a3e9b60e8cc0dd9cb1a4bb907aab40ff094f6a6f7b69badfddc2e6a2b37624fc26aac82f7f8382bf1a748e6adb02d4ab41c114294ef31
+  metadata.gz: c251319c0c18dfa5cc310882562361aa9127dca910cbfee5844ed828dc218d9dbb3d1c82cc5c2db0277607a3b9dbe24512d9afa0939c5a799891e650e850f71c
+  data.tar.gz: 6f7296726a2597f01b920e743ba4b1f017243bd21ed62762fc805d901ac9e38d9ad2691655540094980594cb258aede68de80825eb3f563433ed1e92f9451d2d

data/README.md

@@ -6,10 +6,8 @@ Pannier is a general-purpose Ruby asset processing tool. Its goal is to
 work the same way in any Rack environment. No Rails glue, no mandatory
 JavaScript or CSS libraries, preprocessors or gems.
 
-The configuration DSL was inspired by — but is ultimately quite
-different from — [rake-pipeline][rp]. The config describes a Rack
-application that handles asset processing (modification of file contents
-and file names, file concatenation). No decisions about
+A small configuration DSL describes asset processing: modification of file
+contents and file names, file concatenation. No decisions about
 uglifiers/optimisers/preprocessors have been made; that part is up to you.
 
 The interface for plugging any asset processing library into Pannier is very
@@ -27,7 +25,7 @@ easy too.
 The Rails asset pipeline essentially consists of [Sprockets][sprockets]
 and a bunch of inscrutable Rails coupling. You generate a new Rails app
 and everything is setup for you. We call this "convention over configuration".
-It's a fine idea, but as soon as you need to ditch one or more of those
+It's fine, but as soon as you need to ditch one or more of those
 conventions you'll be frustrated.
 
 I have found the
@@ -39,9 +37,11 @@ configuration.
 
 ## Getting started
 
-Create a config file in the root of your project named `.assets.rb`. The
-example below will simply take all of your stylesheets from one directory
-and concatenate them in another.
+Create a config file in the root of your project named `.assets.rb`.
+
+The example below would take all of your stylesheets from one directory,
+modify them and then concatenate them into a single file in another
+directory.
 
 
 ```ruby
@@ -64,22 +64,28 @@ end
 $ pannier process
 ```
 
-Your stylesheets have now been quuxified and concatenated into
-`public/main.min.css`.
+Your stylesheets from `assets/stylesheets` have now all been quuxified and
+concatenated into `public/main.min.css`.
+
+## Modifying assets
 
 Modifiers are just Ruby *callables*; blocks, procs, lambdas, objects that
 respond to `call`. They are executed in order of specification. Here's a
-typical use case.
+typical use case: assets are run through a couple of modifiers, then
+concatenated into one file, then finally that single file has a hash of
+its contents appended to its name.
 
 ```ruby
+require 'foo'
+require 'bar'
 require 'digest'
 # ...
 
 package :styles do
   # ...
 
-  modify { |content, _|  [foo(content), _] }
-  modify { |content, _|  [bar(content), _] }
+  modify { |content, basename|  [foo(content), basename] }
+  modify { |content, basename|  [bar(content), basename] }
   concat 'main'
   modify do |content, basename|
     [content, "#{basename}-#{Digest::MD5.hexdigest(content)}.min.css"]
@@ -95,12 +101,18 @@ Yes, please contribute! Fork this repo, then send a pull request with a
 note that clearly explains your changes. If you're unsure or you're
 asking for a big change, just open an issue and we can chat about it first.
 
+## Credits
+
+Built by [Joe Corcoran][joe]. Thanks to the authors of [rake-pipeline][rp],
+a project which tried to address a similar problem.
+
 ## License
 
 [MIT][license].
 
 [sprockets]: https://github.com/sstephenson/sprockets
 [pola]: http://en.wikipedia.org/wiki/Principle_of_least_astonishment
+[joe]: https://corcoran.io
 [rp]: https://github.com/livingsocial/rake-pipeline
 [relish]: https://www.relishapp.com/joecorcoran/pannier/docs
 [todo]: https://github.com/joecorcoran/pannier/wiki/Todo

data/lib/pannier/app.rb

@@ -59,8 +59,8 @@ module Pannier
 
     dsl do
 
-      def _
-        @locals ||= OpenStruct.new(:env => env.name)
+      def env
+        __getobj__.env
       end
 
       def input(path)

data/lib/pannier/environment.rb

@@ -1,15 +1,9 @@
 module Pannier
-  class Environment
+  class Environment < Struct.new(:name)
 
-    attr_reader :name
-
-    def initialize(name)
-      @name = name
-    end
-
-    def is?(expression)
+    def matches?(expression)
       expression = Regexp.new(expression)
-      @name =~ expression
+      name =~ expression
     end
 
   end

data/lib/pannier/package.rb

@@ -109,8 +109,12 @@ module Pannier
 
     dsl do
 
-      def _
-        @locals ||= OpenStruct.new(:env => app.env.name)
+      def env
+        self.app.env
+      end
+
+      def env?(expression, &block)
+        self.instance_eval(&block) if env.matches?(expression)
       end
 
       def input(path)
@@ -146,10 +150,6 @@ module Pannier
         add_concatenator(*args)
       end
 
-      def env(expression, &block)
-        self.instance_eval(&block) if self.app.env.is?(expression)
-      end
-
     end
   end
 end

data/lib/pannier/version.rb

@@ -1,3 +1,3 @@
 module Pannier
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pannier
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Joe Corcoran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack