sinatra-assetpack 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85807c666c94309174caeec412e18a2e42a032a0
-  data.tar.gz: 432466f8a853a360fd18bd68c35b86274d1ec682
+  metadata.gz: 188c63c21768ada8ce6b04d78d71cc57a0910379
+  data.tar.gz: 54d64ece5af1de3334eafa6cc35caae866b7ce3c
 SHA512:
-  metadata.gz: cb9ef79de434ac6e32982ca5f1e395e541e019947fd90cb4ed6a354adb15057448a3103bb1772c5c6b086380680ec2d52ead133a8bbe0ead8c2bfddea6766402
-  data.tar.gz: 9cfe6c2dd7de1580d132dc3153a9b01ee900fa1f736bb6d1081800cb8a7d5feb7a40b5b504dbee3763b7b1a7c43fcb8d6e35eb7f591aa45a916d0774c479e204
+  metadata.gz: eb6d31246a8b947ca3fcc032b3d98638ca913c1cfffc9cbb567e7649286999bc0d112137382bd43023b32c4e926f67a301ae8ab7335f03fa518d4c2903be9768
+  data.tar.gz: 033400d94121789374c1a5b770a22362d6a50fe4706056a54535d033c347bf560a854411cc489c4490c9c21ae59aaa9d2f01b110d14f9ee860eb6234c63a8dee

checksums.yaml.gz.sig

@@ -1,2 +1,3 @@
-p7�_�Na��q���`Zs8~����`�eH!�r�7��^��
R�Ϡ;)t���L��۫X�����R�U�Ǝ�'S���'huB� ~~S��ǡN���,�w�Q�8�,
-3%e'6o�v�r����`�jW'OC�VC��b��Pϳ�1>ЇE�K+��sqQ�9Q����J&�vl�̸!��
+(Fv ��/u�_�
+���N���Y*��~�*�g&m�x�l��:ly�C�o�sޚ_��O��f|\��Bͼ��`��m�}�8X��
+�'���E�6dW)*�u[�ik	��
���7m�,AZ�EI=���F�t�����=

data.tar.gz.sig

@@ -1,4 +1,2 @@
-_��2�㕳�K��XM�)�(�
-FQX.͙�5��BR��B R�AB���?S��e5u�|��\B8�
-��
-�n/P	��s^�p�_Wd��ܚ�v6X-�p�\m��m�� 1j�蘧f7�G��=t>��
���Nw�ݤ0����#]z�VŹ��;�|��Ԣ֊�uL�jl۷���Y��W9b�XZ:��.�j�&���k�!�X�r�Ft˩��~��>�)g"I����@
��	0��E|iK��>T�L'������-�trW�B
+���R�{�54x����x��.s�Y^	�� b�Q�A�#��G�����e���a[PK2"Kw���6�M��.�Qq!p�l@�e����I'f��1�X�
+�ʬ6�ߛ#=���F���R@2��I�\Ի�2�$����sX�C�'�v�7�����0�Z�{�0+��pz�k��J�5���v�9�/�z7wK���*=�pJ��꓏�_��9�nWA�tD��؟�ϖ���3�fsc�Z�Jȕ��Y

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v0.2.7 - June 22, 2013
+
+### Fixed
+  * Change glob matching behaviour to match Dir#glob. (#108)
+
+### Improvements
+  * Removed contest development dependency.
+  * Rewrote glob method with reduced complexity.
+
 ## v0.2.6 - June 18, 2013
 
 ### Fixed

data/Gemfile

@@ -2,12 +2,13 @@ source 'https://rubygems.org'
 
 # Gems for gem development
 group :debug do
-  gem 'debugger'
+  gem 'debugger', :platform => 'mri'
   gem 'awesome_print'
   gem 'gem-release'
 end
 
 group :test do
+  gem 'contest'
   gem 'rake'
   gem 'mocha'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sinatra-assetpack (0.2.5)
+    sinatra-assetpack (0.2.7)
       jsmin
       rack-test
       sinatra

data/lib/sinatra/assetpack/options.rb

@@ -266,26 +266,22 @@ module Sinatra
       #
       #     glob('spec')
       #     glob(['spec1', 'spec2' ...])
-      #     glob('spec', preserve: true)
       #
-      # If `preserve` is set to true, it will preserve any specs that are not
-      # wildcards that don't match anything.
-      #
-      def glob(match, options={})
-        match = [*match]  # Force array-ness
-
-        paths = match.map { |spec|
-          if options[:preserve] && !spec.include?('*')
-            spec
+      def glob(match)
+        paths = Array.new(match) # Force array-ness
+
+        paths.map! do |spec|
+          if spec.include?('*')
+            files.select do |file, _|
+              # Dir#glob like source matching
+              File.fnmatch?(spec, file, File::FNM_PATHNAME | File::FNM_DOTMATCH)
+            end.sort
           else
-            files.keys.select { |f| File.fnmatch?(spec, f) }.sort
+            [spec, files[spec]]
           end
-        }.flatten
-
-        paths  = paths.uniq
-        tuples = paths.map { |key| [key, files[key]] }
+        end
 
-        Hash[*tuples.flatten]
+        Hash[*paths.flatten]
       end
 
       # Fetches the contents of a dynamic asset. If `cache_dynamic_assets` is set,

data/lib/sinatra/assetpack/package.rb

@@ -37,7 +37,7 @@ module Sinatra
 
       # Returns a list of URIs
       def paths_and_files
-        list = @assets.glob(@filespecs, :preserve => true)
+        list = @assets.glob(@filespecs)
         list.reject! { |path, file| @assets.ignored?(path) }
         list
       end

data/lib/sinatra/assetpack/version.rb

@@ -1,6 +1,6 @@
 module Sinatra
   module AssetPack
-    VERSION = "0.2.6"
+    VERSION = "0.2.7"
 
     # @deprecated Please use AssetPack::VERSION instead
     def self.version

data/sinatra-assetpack.gemspec

@@ -21,8 +21,6 @@ Gem::Specification.new do |s|
 
   # Supported preprocessors (each is optional)
   s.add_development_dependency 'coffee-script'
-  s.add_development_dependency 'coffee-script'
-  s.add_development_dependency 'contest'
   s.add_development_dependency 'haml'
   s.add_development_dependency 'less'
   s.add_development_dependency 'sass'

data/test/app/app/js_glob/a/lvl2.js

@@ -0,0 +1 @@
+alert("lvl2");

data/test/app/app/js_glob/lvl1.js

@@ -0,0 +1 @@
+alert('lvl1');

data/test/glob_test.rb

@@ -21,6 +21,8 @@ class GlobTest < UnitTest
   should "match double-star globs recursively" do
     app.stubs(:development?).returns(true)
     get '/a'
+    assert body.include?("lvl1.")
+    assert body.include?("lvl2.")
     assert body.include?("a/b/c1/hello.")
     assert body.include?("a/b/c2/hi.")
     assert body.include?("a/b/c2/hola.")

data/test/stylus_test.rb

@@ -1,4 +1,6 @@
 require File.expand_path('../test_helper', __FILE__)
+require 'stylus'
+require 'stylus/tilt'
 
 class StylusTest < UnitTest
   class App < Main

data/test/test_helper.rb

@@ -1,12 +1,5 @@
 require 'contest'
-require 'jsmin'
-require 'tilt'
-require 'haml'
-require 'sass'
-require 'stylus'
-require 'stylus/tilt'
 require 'rack/test'
-require 'yaml'
 require 'mocha/setup'
 
 ENV['RACK_ENV'] = 'test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-assetpack
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Rico Sta. Cruz
@@ -30,7 +30,7 @@ cert_chain:
   kzgF4O2OL+8O23we4E1LvfRn5gV77Dij6s9V4HHzMBuLwnNb8T+6lOnUWbtiIddD
   e8c8i7PlrzhVJ/8sXUJsCkyE8d2MyRyjlxM=
   -----END CERTIFICATE-----
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsmin
@@ -102,34 +102,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coffee-script
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: contest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -312,6 +284,8 @@ files:
 - test/app/app/js_glob/a/b/c1/hello.js
 - test/app/app/js_glob/a/b/c2/hi.js
 - test/app/app/js_glob/a/b/c2/hola.js
+- test/app/app/js_glob/a/lvl2.js
+- test/app/app/js_glob/lvl1.js
 - test/app/app/packages/a_package/package.css
 - test/app/app/packages/a_package/package.js
 - test/app/app/packages/a_package/package.png