apropos 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDRiY2QyOWQwNzJiODdlNTE1OTdkZDFlOWM3NDhhOTM3MGIzMjZlNg==
-  data.tar.gz: !binary |-
-    YzFkYmUzZWM0YTgwZDM5MjdhZDgyYTVmYjZkOTY2YmYzODUwZDJjMw==
+SHA1:
+  metadata.gz: 8cbde75867c5ff6dcd09a8af5b4b2ec1efad48ca
+  data.tar.gz: a715f82b9671766874ef9309a89212742cb4c061
 SHA512:
-  metadata.gz: !binary |-
-    NDk0ZTA2MmVmNmRlYzFiN2Y1ZGE0YzQ3YjVjMTNhOWI0ZmQyMDIzZWRmZmE3
-    ZWM3NjEyNjNmY2JmNzUwYjk0MjViYjViODVhZTg2NjE1YzEzMTk5OGQwNmUx
-    ZmIzNGVmMmRiNzRiMmFhZDc0YjAwNDJiMWRkZmQ1MWJlNGM0OGU=
-  data.tar.gz: !binary |-
-    ZjUwYjM3ZWQ2ZjI0ZWViZTllZDVhZDdhMTMzOTIwY2QxZmUzNTI0ZTkyMjA4
-    YWFjZGY3ZDI0M2ZiOGYxMjU3YWZjYjM1ZGVmZDA0ZjU2NDExNzljNDFhMjU0
-    YWJjYjhhY2ZhNmViY2RlYjhmNjY4ZWI5YmEwN2QxYzcwNzc3YTE=
+  metadata.gz: 0270ef1ee44405a6021ffc6569e340d893b91c32be77a42004463e3a03ff0fe68c49931215876a26e9e9905fa4a86a718f986a65714700a5df3c368f78248723
+  data.tar.gz: 3672e7ac58743e3e6def005222faa7bf5baa07997fb7e6fb8dc929f7987d254df9fc3a3a420ed60ce5dff929002fda1f3311bd51bfbcc6b06df2540cefe6ca79

data/Rakefile

@@ -10,7 +10,7 @@ begin
 
   desc "Run cane to check quality metrics"
   Cane::RakeTask.new(:quality) do |cane|
-    cane.abc_max = 10
+    cane.abc_max = 12
     cane.style_glob = 'lib/**/*.rb'
   end
 

data/lib/apropos/functions.rb

@@ -6,11 +6,12 @@
 module Apropos
   module_function
 
+  def image_set(path)
+    Set.new(path, images_dir)
+  end
+
   def image_variant_rules(path)
-    set = Set.new(path, images_dir)
-    set.variants.select(&:valid?).map do |variant|
-      variant.rule
-    end
+    image_set(path).valid_variants.map(&:rule)
   end
 
   def add_dpi_image_variant(id, query, order=0)

data/lib/apropos/sass_functions.rb

@@ -27,8 +27,14 @@ module Apropos
 
     def image_variants(path)
       assert_type path, :String
-      out = ::Apropos.image_variant_rules(path.value)
-      ::Apropos.convert_to_sass_value(out)
+      set = ::Apropos.image_set(path.value)
+      set.invalid_variants.each do |variant|
+        message = "Ignoring unknown extensions " +
+          "'#{variant.invalid_codes.join("', '")}' (#{variant.path})"
+        Sass.logger.info message
+        $stderr.puts message
+      end
+      ::Apropos.convert_to_sass_value(set.valid_variant_rules)
     end
 
     def add_dpi_image_variant(id, query, sort=0)

data/lib/apropos/set.rb

@@ -17,6 +17,18 @@ module Apropos
       end.sort
     end
 
+    def valid_variants
+      variants.select(&:valid?)
+    end
+
+    def invalid_variants
+      variants.reject(&:valid?)
+    end
+
+    def valid_variant_rules
+      valid_variants.map(&:rule)
+    end
+
     def variant_paths
       paths = {}
       self.class.glob(@basedir.join(variant_path_glob)).each do |path|

data/lib/apropos/variant.rb

@@ -14,6 +14,7 @@ module Apropos
     def initialize(code_fragment, path)
       @code_fragment = code_fragment
       @path = path
+      @_invalid_codes = []
     end
 
     def codes
@@ -21,12 +22,11 @@ module Apropos
     end
 
     def conditions
-      @_conditions ||= codes.map do |code|
-        ExtensionParser.each_parser.inject(nil) do |_, parser|
-          query_or_selector = parser.match(code)
-          break query_or_selector if query_or_selector
-        end
-      end.compact
+      parse_codes && @_conditions
+    end
+
+    def invalid_codes
+      parse_codes && @_invalid_codes
     end
 
     def conditions_by_type
@@ -42,7 +42,7 @@ module Apropos
     end
 
     def valid?
-      !conditions.empty?
+      !conditions.empty? && @_invalid_codes.empty?
     end
 
     def rule
@@ -63,5 +63,18 @@ module Apropos
     def <=>(other)
       aggregate_sort_value <=> other.aggregate_sort_value
     end
+
+    private
+    def parse_codes
+      @_conditions ||= codes.map do |code|
+        ExtensionParser.each_parser.inject(nil) do |_, parser|
+          query_or_selector = parser.match(code)
+          break query_or_selector if query_or_selector
+        end.tap do |match|
+          # Track codes not recognized by any parser
+          @_invalid_codes << code unless match
+        end
+      end.compact
+    end
   end
 end

data/lib/apropos/version.rb

@@ -1,3 +1,3 @@
 module Apropos
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/apropos/extension_parser_spec.rb

@@ -1,9 +1,9 @@
 require_relative "../spec_helper.rb"
 
 describe Apropos::ExtensionParser do
-  before :each do
-    described_class.parsers.clear
-  end
+  before { described_class.parsers.clear }
+
+  after { described_class.parsers.clear }
 
   describe ".parsers" do
     it "keeps track of variant parsers" do
@@ -16,7 +16,7 @@ describe Apropos::ExtensionParser do
 
   describe ".add_parser" do
     it "overrides previously defined parsers with the same extension" do
-      old_parser = described_class.add_parser('2x')
+      described_class.add_parser('2x')
       new_parser = described_class.add_parser('2x')
       described_class.parsers['2x'].should == new_parser
     end

data/spec/apropos/functions_spec.rb

@@ -12,11 +12,12 @@ describe Apropos do
   before do
     Compass.configuration.stub(:images_path).and_return(images_dir) if images_dir
     Compass.configuration.stub(:project_path).and_return(project_dir) if project_dir
+    Apropos.clear_image_variants
   end
 
-  describe ".add_class_image_variant" do
-    after { Apropos.clear_image_variants }
+  after { Apropos.clear_image_variants }
 
+  describe ".add_class_image_variant" do
     it "adds a simple class variant" do
       Apropos.add_class_image_variant('alt', 'alternate')
       stub_files("/foo.alt.jpg")
@@ -60,7 +61,7 @@ describe Apropos do
   end
 
   describe ".image_variant_rules" do
-    before :all do
+    before do
       Apropos.add_dpi_image_variant('2x', "(-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi)", 0.5)
       Apropos.add_breakpoint_image_variant('medium', 'min-width: 768px', 1)
       Apropos.add_breakpoint_image_variant('large', 'min-width: 1024px', 2)
@@ -79,10 +80,6 @@ describe Apropos do
       end
     end
 
-    after :all do
-      Apropos.clear_image_variants
-    end
-
     it "ignores invalid variants" do
       stub_files("/foo.1x.jpg", "/foo.de.jpg", "/foo.ca.jpg")
       rules.should == [

data/spec/apropos/set_spec.rb

@@ -1,9 +1,7 @@
 require_relative "../spec_helper.rb"
 
 describe Apropos::Set do
-  def subject
-    @subject ||= described_class.new("foo.jpg", "/dir")
-  end
+  subject { described_class.new("foo.jpg", "/dir") }
 
   it "detects paths with indicators before the base file extension" do
     subject.variant_path_glob.should == Pathname.new("foo.*.jpg")
@@ -31,4 +29,9 @@ describe Apropos::Set do
     set = described_class.new("foo.jpg", "/foo/bar")
     set.remove_basedir("/Users/bob/foo/bar/foo.fr.jpg").should == "foo.fr.jpg"
   end
+
+  it "detects valid variants" do
+    subject.should_receive(:variants).and_return([double(valid?: false), double(valid?: true)])
+    subject.valid_variants.length.should == 1
+  end
 end

data/spec/apropos/variant_spec.rb

@@ -12,6 +12,8 @@ describe Apropos::Variant do
   end
 
   before :all do
+    Apropos::ExtensionParser.parsers.clear
+
     Apropos::ExtensionParser.add_parser('2x') do |match|
       dpi_selector
     end
@@ -40,6 +42,7 @@ describe Apropos::Variant do
     v = variant("1x")
     v.conditions.should == []
     v.should_not be_valid
+    v.invalid_codes.should == %w[1x]
     v2 = variant("2x")
     v2.should be_valid
   end

data/spec/stylesheets_spec.rb

@@ -124,4 +124,28 @@ describe 'stylesheets' do
       images.should == ["hero.jpg"] + sorted_images
     end
   end
+
+  describe "invalid variants" do
+    let(:log) { '' }
+
+    before :each do
+      stub_files(%w[hero.jpg hero.foo.jpg hero.bar.jpg])
+      Sass.logger.stub(:info) do |message|
+        log << message << "\n"
+      end
+    end
+
+    it "logs invalid variants during compilation" do
+      @scss_file = %Q{
+        @import "apropos";
+        .foo {
+          @include apropos-bg-variants('hero.jpg');
+        }
+      }
+      css_file.should_not include('/hero.foo.jpg')
+      css_file.should_not include('/hero.bar.jpg')
+      log.should include("unknown extensions 'foo'")
+      log.should include("unknown extensions 'bar'")
+    end
+  end
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: apropos
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Gabriel Gilder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: cane
   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: simplecov
   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'
 description: Apropos helps your site serve up the appropriate image for every visitor.
@@ -105,9 +105,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -146,17 +146,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Apropos helps your site serve up the appropriate image for every visitor.