apropos 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a962f1179e0409d400951f76f62f6c27ecf3e718
-  data.tar.gz: a7514086b04b178327d6a14c89c6ffd036a466d4
+  metadata.gz: ad98be4a87f9fb9605a909f04e23568f1b145c46
+  data.tar.gz: 924c293bb77515903932e9d113de7a32a2de367e
 SHA512:
-  metadata.gz: 43c755d4b4c123e5bddf399e4aefee29635724adf031a46ffdcdafd0857a1821690df4444f81f04b1cdfb48f9134de3d38564550618db98e624fefd8672f87f6
-  data.tar.gz: 031ddabc39cf60f8d590008e90eb465c0128ce72d23c6ad171a244420a1ea852b141ea1fc3709d70eef3e8233ccc7bd7d5dee906b1d5fb6160a6f8d6a6d189cb
+  metadata.gz: c22b53d22e056c57a2fcd326f2df8e4d41a6bc1795f598050683bcef5e44258df65bfbd45605fc093ec5ddfe36d50e63c16713911dc5c121235c5697e6c9fd51
+  data.tar.gz: 74621277cb2190c35a8f575a6725db5a9e6b405f4faf848092c1176c59983a58a4d6881aea326e0524b4fe785645736b20658c0629a0857fdfde38feb45df38c

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.1.4 (2015-03-27)
+
+Bug fix where extension variants would match substrings (e.g. "extra-small"
+would accidentally match "small" in a file name).
+
 ## 0.1.3 (2014-10-16)
 
 Bug fix for compatiblity with Sass 3.3.

data/lib/apropos/extension_parser.rb

@@ -21,7 +21,7 @@ module Apropos
     attr_reader :pattern
 
     def initialize(pattern, &block)
-      @pattern = pattern
+      @pattern = generate_pattern(pattern)
       @match_block = block
     end
 
@@ -31,5 +31,16 @@ module Apropos
         @match_block.call(matchdata)
       end
     end
+
+    private
+
+    def generate_pattern(pattern)
+      case pattern
+      when String
+        %r(^#{Regexp.escape(pattern)}$)
+      else
+        pattern
+      end
+    end
   end
 end

data/lib/apropos/version.rb

@@ -1,3 +1,3 @@
 module Apropos
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/apropos/extension_parser_spec.rb

@@ -31,41 +31,60 @@ describe Apropos::ExtensionParser do
       described_class.each_parser do |parser|
         vals << parser.pattern
       end
-      vals.should == %w[2x medium fr]
+      vals.should == [
+        /^2x$/,
+        /^medium$/,
+        /^fr$/,
+      ]
     end
   end
 
   describe "#match" do
     let(:locale_pattern) { /^([a-z]{2})$/ }
 
-    it "calls the block when the extension matches" do
-      lastmatch = nil
-      parser = described_class.new(locale_pattern) do |match|
-        lastmatch = match
+    context "with a string pattern" do
+      let(:pattern) { 'extra-small' }
+      let(:parser) { described_class.new(pattern) { |_| true } }
+
+      it "matches the exact string" do
+        parser.match(pattern).should == true
+      end
+
+      it "does not match a substring" do
+        parser.match('small').should be_nil
       end
-      parser.match('fr')
-      lastmatch[1].should == 'fr'
     end
 
-    it "doesn't call the block when there is no match" do
-      expect {
-        parser = described_class.new(/^fr$/) do |match|
-          raise
+    context "with a regular expression pattern" do
+      it "calls the block when the extension matches" do
+        lastmatch = nil
+        parser = described_class.new(locale_pattern) do |match|
+          lastmatch = match
         end
-        parser.match('en').should be_nil
-      }.to_not raise_error
-    end
+        parser.match('fr')
+        lastmatch[1].should == 'fr'
+      end
+
+      it "doesn't call the block when there is no match" do
+        expect {
+          parser = described_class.new(/^fr$/) do |match|
+            raise
+          end
+          parser.match('en').should be_nil
+        }.to_not raise_error
+      end
 
-    it "allows the block to return a nil value" do
-      parser = described_class.new(locale_pattern) do |match|
-        if match[1] == 'fr'
-          true
-        else
-          nil
+      it "allows the block to return a nil value" do
+        parser = described_class.new(locale_pattern) do |match|
+          if match[1] == 'fr'
+            true
+          else
+            nil
+          end
         end
+        parser.match('fr').should == true
+        parser.match('en').should be_nil
       end
-      parser.match('fr').should == true
-      parser.match('en').should be_nil
     end
   end
 end

data/spec/stylesheets_spec.rb

@@ -98,16 +98,20 @@ describe 'stylesheets' do
     end
 
     it "allows setting breakpoints" do
-      stub_files(%w[hero.jpg hero.medium.jpg hero.large.jpg])
+      stub_files(%w[hero.jpg hero.extra-small.jpg hero.small.jpg hero.medium.jpg hero.large.jpg hero.extra-large.jpg])
       @scss_file = %Q{
-        $apropos-breakpoints: (medium, 768px), (large, 1024px);
+        $apropos-breakpoints: ("extra-small", 374px), ("small", 480px), ("medium", 768px), ("large", 1024px), ("extra-large", 1292px);
         @import "apropos";
         .foo {
           @include apropos-bg-variants('hero.jpg');
         }
       }
+      css_file.should include(".foo { background-image: url('/hero.jpg'); }")
+      css_file.should include("@media (min-width: 374px) { .foo { background-image: url('/hero.extra-small.jpg'); } }")
+      css_file.should include("@media (min-width: 480px) { .foo { background-image: url('/hero.small.jpg'); } }")
       css_file.should include("@media (min-width: 768px) { .foo { background-image: url('/hero.medium.jpg'); } }")
       css_file.should include("@media (min-width: 1024px) { .foo { background-image: url('/hero.large.jpg'); } }")
+      css_file.should include("@media (min-width: 1292px) { .foo { background-image: url('/hero.extra-large.jpg'); } }")
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apropos
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Gabriel Gilder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass