assetify 0.7.0.rc1 → 1.0.0.rc1

data/Gemfile.lock

@@ -2,10 +2,10 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.6)
-    crack (0.1.8)
-    diff-lcs (1.1.2)
+    crack (0.3.1)
+    diff-lcs (1.1.3)
     git (1.2.5)
-    jeweler (1.6.2)
+    jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
@@ -18,7 +18,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    webmock (1.6.4)
+    webmock (1.7.6)
       addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
 

data/README.md

@@ -18,18 +18,18 @@ On any project`s root:
     assetify
 
 
-This will create a Jsfile if not found.
+This will create a `Jsfile` if not found.
 
 
 Jsfile
 ======
 
-Just like a Gemfile, but you choose the filetype (or extension) before:
+Like a `Gemfile`, but you choose the filetype (or extension) before:
 
     type "name", "url", <"version"> or <:options>
 
     js "jquery", "http://code.jquery.com/jquery-{VERSION}.min.js", "1.6"
-    js "tipsy", "https://github.com/jaz303/tipsy/.../jquery.tipsy.js"
+    js "tipsy",  "https://github.com/jaz303/tipsy/.../jquery.tipsy.js"
 
 Stylesheets:
 
@@ -46,11 +46,11 @@ Now just run `assetify` to make sure everything is installed/up-to-date.
 Groups
 ------
 
-When using some compressor/minimizer (Jammit/Smurf...) namespaces come
-in handy:
+Use groups/namespaces to group related assets together:
 
     group "forms" do
-      js "validator", "link"
+      js "validator", url
+      js "textmask",  url
     end
 
 
@@ -59,9 +59,9 @@ This will install as "vendor/assets/javascripts/forms/validator.js"
 You can nest groups too:
 
     group "forms" do
-      js "validator", "link"
+      js "validator", url
       group "extra" do
-        js "another", "link"
+        js "another", url
       end
     end
 
@@ -116,6 +116,25 @@ that returns the *first match* inside the archive. Check out libarchive
 or the pkg.rb source for more info.
 
 
+Global 'a'
+----------
+
+If the link contains the file extension, say: 'fu.com/lib.js'
+You can use just 'a' to specify each asset:
+
+
+    a  "tipsy", "http://...tipsy.js"
+    a  "tipsy", "http://...tipsy.css"
+    a  "video", "http://...video.mpeg"
+
+
+Versions
+--------
+
+Assetify first recognizes the file as text or binary.
+If the file is human readable, try a X.X.Xxx pattern match
+that if found, is used, otherwise use md5sum.
+
 
 Other
 -----

data/VERSION

@@ -1 +1 @@
-0.7.0.rc1
+1.0.0.rc1

data/assetify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{assetify}
-  s.version = "0.7.0.rc1"
+  s.version = "1.0.0.rc1"
 
   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-07-14}
+  s.date = %q{2011-09-30}
   s.default_executable = %q{assetify}
   s.description = %q{Downloads/updates assets based on a Jsfile. Any framework.}
   s.email = %q{x@nofxx.com}
@@ -30,18 +30,24 @@ Gem::Specification.new do |s|
     "bin/assetify",
     "lib/assetify.rb",
     "lib/assetify/asset.rb",
-    "lib/assetify/colored.rb",
+    "lib/assetify/asset/pathfix.rb",
+    "lib/assetify/asset/pkg.rb",
     "lib/assetify/dsl.rb",
+    "lib/assetify/extensions/string.rb",
+    "lib/assetify/gui/server.rb",
+    "lib/assetify/gui/views/home.html.erb",
     "lib/assetify/helpers.rb",
-    "lib/assetify/pkg.rb",
-    "lib/assetify/tui.rb",
+    "lib/assetify/tui/colored.rb",
+    "lib/assetify/tui/term.rb",
     "spec/assetify/asset_spec.rb",
     "spec/assetify/dsl_spec.rb",
     "spec/assetify/helpers_spec.rb",
+    "spec/assetify/path_spec.rb",
     "spec/assetify/pkg_spec.rb",
     "spec/assetify_spec.rb",
     "spec/fixtures/complex.tgz",
     "spec/fixtures/fancy.tgz",
+    "spec/fixtures/sassify.css",
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/nofxx/assetify}

data/bin/assetify

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-#require 'rubygems'
+require 'rubygems' if RUBY_VERSION < '1.9'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'optparse'
 require 'assetify'

data/lib/assetify.rb

@@ -18,13 +18,17 @@ module Assetify
   end
 end
 
-require "assetify/colored"
+# Ruby Extensions
+require "assetify/extensions/string"
+
+# Text Interface
+require "assetify/tui/term"
+require "assetify/tui/colored"
+
+# Core
 require "assetify/helpers"
 require "assetify/asset"
-require "assetify/path"
 require "assetify/dsl"
-require "assetify/pkg"
-
 
 module Assetify
   class << self
@@ -63,7 +67,7 @@ TXT
     def read_jsfile
       file = File.open("Jsfile") # ruby 1.8/1.9 (ugly) fix
       code = file.send(file.respond_to?(:lines) ? :lines : :readlines).map do |line|
-        next if line =~ /^\w*\#|^#/
+        # Parse options
         if line =~ /^\w{2,3}path/
           key, val = line.split(" ")
           Opt[key.to_sym] = val
@@ -71,7 +75,7 @@ TXT
         end
         line
       end.reject(&:nil?)
-      DSL.parse code.join(";")
+      DSL.parse code.join("")
     end
 
     #
@@ -99,6 +103,12 @@ TXT
       when /^u/
         check_param params, "update"
         find_assets(params[1]).map { |a| a.install! :force }
+      when /^c/
+        check_param params, "check"
+        find_assets(params[1]).map { |a| a.check! }
+      when /^w/
+        check_param params, "web"
+        gui!
       else
         puts "Dunno how to #{params.join}."
       end
@@ -108,13 +118,17 @@ TXT
       puts "-" * TSIZE
     end
 
+    def gui!
+      require "assetify/gui/server"
+      Sinatra::Application.run!
+    end
 
     def work!(params)
       start = Time.now
       puts "Assetify"
       bar
       find_jsfile
-      @assets = read_jsfile
+      Asset.set_all @assets = read_jsfile
       work_on params
       bar
       puts "Done in #{Time.now - start}s"

data/lib/assetify/asset.rb

@@ -1,11 +1,13 @@
-require 'net/http'
-require 'fileutils'
+require "net/http"
+require "fileutils"
+require "assetify/asset/pkg"
+require "assetify/asset/pathfix"
 
 module Assetify
+
   class Asset
     include Helpers
-    attr_accessor :type, :name, :url, :ns, :pkg, :ver
-    alias :ext :type
+    attr_accessor :type, :name, :url, :ns, :pkg, :ver, :ext
 
     def initialize(type, name, url, ver = nil, params={})
       raise "NoType" unless type
@@ -13,16 +15,20 @@ module Assetify
       raise "NoURL" unless url
       @type, @name = type, name.to_s
       @url = (@ver = ver) ? url.gsub(/{VERSION}/, @ver) : url
+      if @name =~ /\./
+        @name, @ext = name.split(".")
+      else
+        @ext = @type == :img ? find_ext_for(url) : @type
+      end
+
+      @pkg = params[:pkg]
       @ns = params[:ns] || ""
       @to = params[:to] || ""
-      @pkg = params[:pkg]
     end
 
     def filename
       return @filename if @filename
-      @filename = Opt[:newname] ? name : url.split("/").last
-      @filename += ".#{type}" unless @filename =~ /\.\w{1,6}$/
-      @filename
+      @filename = "#{name}.#{ext}"
     end
 
     def find_path_for txt
@@ -33,6 +39,10 @@ module Assetify
       end
     end
 
+    def find_ext_for file
+      file.split(".").last[0,3]
+    end
+
     def path
       args = if @to.empty?
         tpath = Opt[find_path_for(type)]
@@ -48,7 +58,7 @@ module Assetify
       @fullpath ||= File.join(path, filename)
     end
 
-    def check?
+    def file_exists?
       File.exists? fullpath
     end
 
@@ -68,9 +78,23 @@ module Assetify
       @ver ||= find_version(@data)
     end
 
-    def install!(force = false)
+    def header
       LINE.p "-> #{name}.#{type}"
-      if !force && check?
+    end
+
+    def check!
+      header
+      if  file_exists? # Return if file is on path
+        @data = File.read(fullpath)
+        LINE.f "#{print_version}Installed"
+      else
+        LINE.f "Not Found", :red
+      end
+    end
+
+    def install!(force = false)
+      header
+      if !force && file_exists? # Return if file is on path
         @data = File.read(fullpath)
         return LINE.f "#{print_version}Installed"
       end
@@ -89,6 +113,16 @@ module Assetify
 
     end
 
+    class << self
+      # Simple cache for Jsfile
+      def self.set_all v
+        @all = v
+      end
+      def self.all
+        @all
+      end
+    end
+
   end
 
 end

data/lib/assetify/asset/pathfix.rb

@@ -0,0 +1,41 @@
+module Path
+  class Findr
+
+    def initialize chunk, ns = nil
+      @chunk = chunk
+      @ns = ns
+      matches
+    end
+
+    def sass?
+      true
+    end
+
+    def replace src
+      if sass?
+        "image-url('#{@ns}#{src}')"
+      else
+        "url('<%= image_path(#{@ns}#{src}) %>)"
+      end
+    end
+
+    def matches
+      @images = @chunk.scan(/url\((.*)\)/).flatten
+    end
+
+    def images
+      @images
+    end
+
+    def fixed
+      sprocketized = @chunk
+      @images.each do |uri|
+        sprocketized["url(#{uri})"] = replace uri.split("/").last
+        #gsub(/\.|\//, "")
+      end
+      sprocketized
+    end
+
+  end
+
+end

data/lib/assetify/dsl.rb

@@ -3,10 +3,13 @@ module Assetify
   class DSL
     attr_reader :assets
 
-    def set_namespace(name)
-      @ns = @ns.nil? ? name : "#{@ns}/#{name}"
-    end
 
+    #
+    # Makes a pkg, a gz/tar/zip asset/
+    #
+    # pkg :foo, "http://to.tgz" do
+    # end
+    #
     def pkg name, url, opts = {}, &block
       @pkg = Pkg.new name, url
       if block_given?
@@ -19,6 +22,13 @@ module Assetify
       assets
     end
 
+
+    #
+    # Makes a group, a namspace for the assets.
+    #
+    # group :foo do
+    # end
+    #
     def group name, &block
       set_namespace name
       instance_exec &block
@@ -40,13 +50,9 @@ module Assetify
       end
     end
 
-    # Create assets path setters
-    Assetify::ASSETS.each do |asset|
-      define_method asset do |path|
-        Opt[asset] = path
-      end
-    end
 
+    #
+    # Parse the assets.
     #
     # js "foo", "http://foo.com"
     # js "foo", "http://foo.com", :to => "/other/place"
@@ -59,12 +65,38 @@ module Assetify
       (@assets ||= []) << Asset.new(method.to_sym, name, uri, ver, opts)
     end
 
-    class << self
+    #
+    # Global command, detects the filetype
+    #
+    #    a "jquery", "http://...jquery.js"
+    #
+    def a name, url, *params
+      ext, *rest = url.split(".").reverse
+      send(ext, name, url)
+    end
 
-      def parse io
-        new.instance_eval(io) #.assets
+
+    # Create Jsfile assets path setters
+    #
+    # javascript "new/path"
+    # ...
+    Assetify::ASSETS.each do |asset|
+      define_method asset do |path|
+        Opt[asset] = path
       end
+    end
 
+    def set_namespace name
+      @ns = @ns.nil? ? name : "#{@ns}/#{name}"
+    end
+
+    #
+    # DSL.parse()
+    #
+    def self.parse chunk
+      # puts "Assetify - Error Parsing 'Jsfile'."
+      # Instance eval with 2nd, 3rd args to the rescue
+      new.instance_eval(chunk, "Jsfile", 1)
     end
 
   end

data/lib/assetify/extensions/string.rb

@@ -0,0 +1,17 @@
+class String
+
+  #
+  # Adapted ptools - http://rdoc.info/gems/ptools/1.2.1/File.binary%3F
+  #
+  def binary?
+    #s = (File.read(file, File.stat(file).blksize) || "").split(//)
+    s = (self[0..4096].force_encoding("binary") || "") #.split(//)
+    ratio =  s.gsub(/\d|\w|\s|[-~\.]/,'').size / s.size.to_f
+    # if Opt[:debug]
+    #   print "Detecting #{s}"
+    #   puts "Ratio #{ratio}"
+    # end
+    ratio > 0.3
+  end
+
+end

data/lib/assetify/gui/server.rb

@@ -0,0 +1,25 @@
+require 'sinatra'
+require 'erb'
+
+get '/' do
+  @assets = Asset.all
+  erb :"home.html"
+end
+
+get '/new' do
+  headers = {} #"Allow"   => "BREW, POST, GET, PROPFIND, WHEN",  "Refresh" => "Refresh: 20; http://www.ietf.org/rfc/rfc2324.txt"
+  body "T#{Time.now.to_i}"
+end
+
+post '/edit' do
+  puts params
+
+  body "OK"
+end
+
+get '/i' do
+end
+
+
+get '/u' do
+end

data/lib/assetify/gui/views/home.html.erb

@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Assetify</title>
+  <link rel="stylesheet" href="http://code.jquery.com/mobile/1.0b3/jquery.mobile-1.0b3.min.css" />
+  <script src="http://code.jquery.com/jquery-1.6.3.min.js"></script>
+  <script src="http://code.jquery.com/mobile/1.0b3/jquery.mobile-1.0b3.min.js"></script>
+</head>
+
+<body>
+
+<!-- HOME -->
+<div data-role="page" id="foo">
+
+  <div data-role="header">
+    <h1>Assets</h1>
+  </div>
+
+  <div data-role="content" id="one">
+    <ul data-role="listview" data-theme="g">
+    <h2>Jsfile</h2>
+    <% for asset in @assets %>
+      <li> asset </li>
+    <% end %>
+
+    <p>Test</p>
+
+    <h3>Asset store:</h3>
+    <p><a href="#two" data-role="button">Show page "two"</a></p>
+    <p><a href="#popup"data-role="button" data-rel="dialog" data-transition="pop">Show page "popup" (as a dialog)</a></p>
+  </div>
+
+
+  <div data-role="footer" data-theme="d">
+    <h4>Assetify</h4>
+  </div>
+</div>
+
+
+<!-- NEW -->
+<div data-role="page" id="two" data-theme="a">
+
+  <div data-role="header">
+    <h1>Two</h1>
+  </div>
+
+  <div data-role="content" data-theme="a">
+    <h2>Two</h2>
+    <p><a href="#one" data-direction="reverse" data-role="button" data-theme="b">Back to page "one"</a></p>
+  </div>
+
+
+  <div data-role="footer">
+    <h4>Page Footer</h4>
+  </div>
+</div>
+
+
+<!-- EDIT -->
+<div data-role="page" id="popup">
+
+  <div data-role="header" data-theme="e">
+    <h1>Dialog</h1>
+
+  </div>
+
+  <div data-role="content" data-theme="d">
+    <h2>Popup</h2>
+    <p>I have an id of "popup" on my page container and only look like a dialog because the link to me had a <code>data-rel="dialog"</code> attribute which gives</p>
+    <p><a href="#one" data-rel="back" data-role="button" data-inline="true" data-icon="back">Back to page "one"</a></p>
+  </div>
+
+
+  <div data-role="footer">
+    <h4>Page Footer</h4>
+  </div><!-- /footer -->
+</div><!-- /page popup -->
+
+</body>
+</html>

data/lib/assetify/helpers.rb

@@ -1,22 +1,5 @@
-# require 'pry'
 require 'digest/md5'
 
-class String
-  #
-  # From ptools - http://rdoc.info/gems/ptools/1.2.1/File.binary%3F
-  #
-  def binary?
-    #s = (File.read(file, File.stat(file).blksize) || "").split(//)
-    s = (self[0..4096].force_encoding("binary") || "") #.split(//)
-    ratio =  s.gsub(/\d|\w|\s|[-~\.]/,'').size / s.size.to_f
-    # if Opt[:debug]
-    #   print "Detecting #{s}"
-    #   puts "Ratio #{ratio}"
-    # end
-    ratio > 0.3
-  end
-end
-
 module Assetify
   module Helpers
 

data/spec/assetify/dsl_spec.rb

@@ -20,6 +20,36 @@ describe DSL do
     a.fullpath.should eql("vendor/assets/images/foo.gif")
   end
 
+  it "should parse img nicely from link (gif)" do
+    a = Assetify::DSL.parse("img 'foo', 'foolink.gif'")[0]
+    a.should be_an Asset
+    a.fullpath.should eql("vendor/assets/images/foo.gif")
+  end
+
+  it "should parse img nicely from link (png)" do
+    a = Assetify::DSL.parse("img 'foo', 'foolink-ra.png'")[0]
+    a.should be_an Asset
+    a.fullpath.should eql("vendor/assets/images/foo.png")
+  end
+
+  it "should parse js with global 'a' keyword" do
+    a = Assetify::DSL.parse("a 'foo', 'foolink.js'")[0]
+    a.should be_an Asset
+    a.fullpath.should eql("vendor/assets/javascripts/foo.js")
+  end
+
+  it "should parse css with global 'a' keyword" do
+    a = Assetify::DSL.parse("a 'foo', 'http://w.foolink/c/?foo.css'")[0]
+    a.should be_an Asset
+    a.fullpath.should eql("vendor/assets/stylesheets/foo.css")
+  end
+
+  it "should parse img with global 'a' keyword" do
+    a = Assetify::DSL.parse("a 'foo.gif', 'foolink.gif'")[0]
+    a.should be_an Asset
+    a.fullpath.should eql("vendor/assets/images/foo.gif")
+  end
+
   it "should accept a especific location with :to" do
     Dir.should_receive(:pwd).and_return("/home/nofxx/git/assetify")
     a = Assetify::DSL.parse("rb 'foo', 'foolink', :to => 'spec/rock'")[0]

data/spec/assetify/path_spec.rb

@@ -0,0 +1,24 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Path do
+
+  it "should spawn!" do
+    f = Path::Findr.new "fu"
+    f.should be_instance_of Path::Findr
+  end
+
+  describe "Instantiated" do
+
+    let (:f) { Path::Findr.new ".tipsy { padding: 5px;  background-image: url(../images/tipsy.gif); }" }
+
+    it "should detect images" do
+      f.images.should eql(["../images/tipsy.gif"])
+    end
+
+    it "should change css" do
+      f.fixed.should eql ".tipsy { padding: 5px;  background-image: url(../images/tipsy.gif); }"
+    end
+
+  end
+
+end

data/spec/assetify/pkg_spec.rb

@@ -38,4 +38,8 @@ describe Pkg do
     `rm -rf vendor/assets/vendor`
   end
 
+  it "should shallow paths" do
+
+
+  end
 end

data/spec/fixtures/sassify.css

@@ -0,0 +1,12 @@
+/* jQuery.Rating Plugin CSS - http://www.fyneworks.com/jquery/star-rating/ */
+div.rating-cancel,div.star-rating{float:left;width:17px;height:15px;text-indent:-999em;cursor:pointer;display:block;background:transparent;overflow:hidden}
+div.rating-cancel,div.rating-cancel a{background:url(delete.gif) no-repeat 0 -16px}
+div.star-rating,div.star-rating a{background:url(star.gif) no-repeat 0 0px}
+div.rating-cancel a,div.star-rating a{display:block;width:16px;height:100%;background-position:0 0px;border:0}
+div.star-rating-on a{background-position:0 -16px!important}
+div.star-rating-hover a{background-position:0 -32px}
+/* Read Only CSS */
+div.star-rating-readonly a{cursor:default !important}
+/* Partial Star CSS */
+div.star-rating{background:transparent!important;overflow:hidden!important}
+/* END jQuery.Rating Plugin CSS */

metadata

@@ -3,11 +3,12 @@ name: assetify
 version: !ruby/object:Gem::Version 
   prerelease: true
   segments: 
+  - 1
   - 0
-  - 7
   - 0
-  - rc1
-  version: 0.7.0.rc1
+  - rc
+  - 1
+  version: 1.0.0.rc1
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-14 00:00:00 -03:00
+date: 2011-09-30 00:00:00 -03:00
 default_executable: assetify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,18 +96,24 @@ files:
 - bin/assetify
 - lib/assetify.rb
 - lib/assetify/asset.rb
-- lib/assetify/colored.rb
+- lib/assetify/asset/pathfix.rb
+- lib/assetify/asset/pkg.rb
 - lib/assetify/dsl.rb
+- lib/assetify/extensions/string.rb
+- lib/assetify/gui/server.rb
+- lib/assetify/gui/views/home.html.erb
 - lib/assetify/helpers.rb
-- lib/assetify/pkg.rb
-- lib/assetify/tui.rb
+- lib/assetify/tui/colored.rb
+- lib/assetify/tui/term.rb
 - spec/assetify/asset_spec.rb
 - spec/assetify/dsl_spec.rb
 - spec/assetify/helpers_spec.rb
+- spec/assetify/path_spec.rb
 - spec/assetify/pkg_spec.rb
 - spec/assetify_spec.rb
 - spec/fixtures/complex.tgz
 - spec/fixtures/fancy.tgz
+- spec/fixtures/sassify.css
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/nofxx/assetify
@@ -122,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1037575616706131439
+      hash: -4058179870759459477
       segments: 
       - 0
       version: "0"