assetify 0.4.0 → 0.7.0.rc1

data/README.md

@@ -54,7 +54,7 @@ in handy:
     end
 
 
-This will install as "public/javascripts/forms/validator.js"
+This will install as "vendor/assets/javascripts/forms/validator.js"
 
 You can nest groups too:
 
@@ -93,6 +93,7 @@ Results in:
 Also, please check out the note about link inside pkgs below.
 
 
+
 Dir
 ___
 
@@ -114,6 +115,8 @@ Note: Have in mind that the "link" inside dir/packages *is a regex*
 that returns the *first match* inside the archive. Check out libarchive
 or the pkg.rb source for more info.
 
+
+
 Other
 -----
 
@@ -132,10 +135,10 @@ Options
 
 Change some default settings:
 
-    newname  true || false
-    jspath  "public/javascripts"
-    csspath "public/stylesheets"
-    imgpath "public/images"
+    newname      true || false
+    javascripts  "public/javascripts"
+    stylesheets  "public/stylesheets"
+    images       "public/images"
 
 If newname is set to true (default) the file will be renamed. Ex:
 
@@ -145,6 +148,13 @@ Filename will be: "validator.js"
 
 
 
+Rails
+-----
+
+Out of the box support for rails 3.1, defaults to 'vendor/assets'.
+Rails 3.0< users should change the options as above.
+
+
 
 Contributing
 ------------

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.7.0.rc1

data/assetify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{assetify}
-  s.version = "0.4.0"
+  s.version = "0.7.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2011-06-30}
+  s.date = %q{2011-07-14}
   s.default_executable = %q{assetify}
   s.description = %q{Downloads/updates assets based on a Jsfile. Any framework.}
   s.email = %q{x@nofxx.com}

data/bin/assetify

@@ -24,7 +24,7 @@ BANNER
 
 
   o.on('-h', "Show help") { puts o; exit }
-  o.on('-d', "Verbose (Debug)") { Opt[:debug] = true }
+  o.on('-d', "Verbose (Debug)") { Assetify::Opt[:debug] = true }
   o.parse!
 end
 

data/lib/assetify.rb

@@ -1,28 +1,32 @@
-require "assetify/colored"
-require "assetify/helpers"
-require "assetify/asset"
 require "assetify/tui"
-require "assetify/dsl"
-require "assetify/pkg"
-
 module Assetify
 
+  Opt = {
+    :vendor   =>  "public/vendor",
+    :newname  =>  true
+  }
+
   TSIZE = 80
-  LINE = TUI.new
+  LINE  = TUI.new
+  ASSETS_PATH = "vendor/assets"
   ASSETS = [:javascripts, :stylesheets, :images]
+  ASSETS.each do |asset|
+    Opt.merge!(asset => "#{ASSETS_PATH}/#{asset}")
+  end
 
   class NoJSFile < StandardError
   end
+end
 
-  Opt = {
-    :jspath   =>  "public/javascripts",
-    :csspath  =>  "public/stylesheets",
-    :imgpath  =>  "public/images",
-    :vendor   =>  "public/vendor",
-    :newname  =>  true
-  }
+require "assetify/colored"
+require "assetify/helpers"
+require "assetify/asset"
+require "assetify/path"
+require "assetify/dsl"
+require "assetify/pkg"
 
 
+module Assetify
   class << self
 
     #
@@ -104,6 +108,7 @@ TXT
       puts "-" * TSIZE
     end
 
+
     def work!(params)
       start = Time.now
       puts "Assetify"

data/lib/assetify/asset.rb

@@ -25,9 +25,17 @@ module Assetify
       @filename
     end
 
+    def find_path_for txt
+      case txt
+      when /js/  then :javascripts
+      when /css|style/ then :stylesheets
+      else :images
+      end
+    end
+
     def path
       args = if @to.empty?
-        tpath = Opt["#{type}path".to_sym]
+        tpath = Opt[find_path_for(type)]
         raise "Don`t know where to put #{type} files..." unless tpath
         [tpath,  @ns ? @ns.to_s : ""]
       else

data/lib/assetify/dsl.rb

@@ -40,6 +40,13 @@ module Assetify
       end
     end
 
+    # Create assets path setters
+    Assetify::ASSETS.each do |asset|
+      define_method asset do |path|
+        Opt[asset] = path
+      end
+    end
+
     #
     # js "foo", "http://foo.com"
     # js "foo", "http://foo.com", :to => "/other/place"

data/spec/assetify/asset_spec.rb

@@ -16,7 +16,7 @@ describe Asset do
     end
 
     it "should have fullpath" do
-      as.fullpath.should eql("public/javascripts/sweet.js")
+      as.fullpath.should eql("vendor/assets/javascripts/sweet.js")
     end
 
     it "should detect version" do

data/spec/assetify/dsl_spec.rb

@@ -5,19 +5,19 @@ describe DSL do
   it "should parse js nicely" do
     a = Assetify::DSL.parse("js 'foo', 'foolink'")[0]
     a.should be_an Asset
-    a.fullpath.should eql("public/javascripts/foo.js")
+    a.fullpath.should eql("vendor/assets/javascripts/foo.js")
   end
 
   it "should parse css nicely" do
     a = Assetify::DSL.parse("css 'foo', 'foolink'")[0]
     a.should be_an Asset
-    a.fullpath.should eql("public/stylesheets/foo.css")
+    a.fullpath.should eql("vendor/assets/stylesheets/foo.css")
   end
 
   it "should parse img nicely (gif)" do
     a = Assetify::DSL.parse("img 'foo.gif', 'foolink'")[0]
     a.should be_an Asset
-    a.fullpath.should eql("public/images/foo.gif")
+    a.fullpath.should eql("vendor/assets/images/foo.gif")
   end
 
   it "should accept a especific location with :to" do
@@ -38,25 +38,25 @@ describe DSL do
     it "should group and use a namespace" do
       a = Assetify::DSL.parse "group 'common' do; js 'foo', 'foolink'; end"
       a[0].should be_an Asset
-      a[0].fullpath.should eql("public/javascripts/common/foo.js")
+      a[0].fullpath.should eql("vendor/assets/javascripts/common/foo.js")
     end
 
     it "should group and use a namespace 2" do
       a = Assetify::DSL.parse "group 'common' do; js 'foo', 'foolink'; js 'rock', 'rocklink'; end"
       a[0].should be_an Asset
-      a[0].fullpath.should eql("public/javascripts/common/foo.js")
+      a[0].fullpath.should eql("vendor/assets/javascripts/common/foo.js")
     end
 
     it "should go back to root" do
       a = Assetify::DSL.parse "group 'common' do; js 'foo', 'foolink'; end; js 'rock', 'rocklink'"
       a[1].should be_an Asset
-      a[1].fullpath.should eql("public/javascripts/rock.js")
+      a[1].fullpath.should eql("vendor/assets/javascripts/rock.js")
     end
 
     it "should work with nested namespaces" do
       a = Assetify::DSL.parse "group 'common' do; group 'nice' do; js 'foo', 'foolink'; end; end"
       a[0].should be_an Asset
-      a[0].fullpath.should eql("public/javascripts/common/nice/foo.js")
+      a[0].fullpath.should eql("vendor/assets/javascripts/common/nice/foo.js")
     end
 
   end
@@ -66,19 +66,19 @@ describe DSL do
     it "should group and use a namespace" do
       a = Assetify::DSL.parse "pkg 'fancy', 'http://fancy.zip' do; js 'foo', 'foolink'; end"
       a[0].should be_an Asset
-      a[0].fullpath.should eql("public/javascripts/fancy/foo.js")
+      a[0].fullpath.should eql("vendor/assets/javascripts/fancy/foo.js")
     end
 
     it "should accept shallow too" do
       a = Assetify::DSL.parse "pkg 'fancy', 'http://fancy.zip', :shallow => true do; js 'foo', 'foolink'; end"
       a[0].should be_an Asset
-      a[0].fullpath.should eql("public/javascripts/foo.js")
+      a[0].fullpath.should eql("vendor/assets/javascripts/foo.js")
     end
 
     it "should fetch inside archive" do
       a = Assetify::DSL.parse "pkg 'fancy', 'http://fancy.zip' do; js 'foo', 'foolink'; end"
       a[0].should be_an Asset
-      a[0].fullpath.should eql("public/javascripts/fancy/foo.js")
+      a[0].fullpath.should eql("vendor/assets/javascripts/fancy/foo.js")
     end
 
     it "should unpack to vendor if no block given" do
@@ -103,7 +103,19 @@ describe DSL do
       as[0].fullpath.should eql("/home/nofxx/git/assetify/images/complex/two.png")
     end
 
+  end
+
+  describe "Paths" do
 
+    it "should change js path" do
+      Assetify::DSL.parse "javascripts 'other/foo'"
+      Opt[:javascripts].should eql('other/foo')
+    end
+
+    it "should change css path" do
+      Assetify::DSL.parse "stylesheets 'other/foo'"
+      Opt[:javascripts].should eql('other/foo')
+    end
   end
 
 end

data/spec/assetify/pkg_spec.rb

@@ -35,7 +35,7 @@ describe Pkg do
     as = Pkg.new "complex", "/tmp/complex/complex.tgz"
     as.unpack_to_vendor #.should be_a Hash #(hash_including "complex/images/3.png"=>"Im a png image..3\n")
     File.exists?("public/vendor/complex/src/main.js").should be_true
-    `rm -rf public/vendor`
+    `rm -rf vendor/assets/vendor`
   end
 
 end

data/spec/assetify_spec.rb

@@ -32,7 +32,7 @@ describe Assetify do
     end
 
     it "should have fullpath" do
-      asset.fullpath.should eql("public/stylesheets/grid.css")
+      asset.fullpath.should eql("vendor/assets/stylesheets/grid.css")
     end
 
   end
@@ -58,7 +58,7 @@ describe Assetify do
     end
 
     it "should have fullpath" do
-      asset.fullpath.should eql("public/javascripts/cool.js")
+      asset.fullpath.should eql("vendor/assets/javascripts/cool.js")
     end
 
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assetify
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
-  - 4
+  - 7
   - 0
-  version: 0.4.0
+  - rc1
+  version: 0.7.0.rc1
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 -03:00
+date: 2011-07-14 00:00:00 -03:00
 default_executable: assetify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -121,18 +122,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3303407953126557976
+      hash: -1037575616706131439
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: