apropos 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cbde75867c5ff6dcd09a8af5b4b2ec1efad48ca
-  data.tar.gz: a715f82b9671766874ef9309a89212742cb4c061
+  metadata.gz: a962f1179e0409d400951f76f62f6c27ecf3e718
+  data.tar.gz: a7514086b04b178327d6a14c89c6ffd036a466d4
 SHA512:
-  metadata.gz: 0270ef1ee44405a6021ffc6569e340d893b91c32be77a42004463e3a03ff0fe68c49931215876a26e9e9905fa4a86a718f986a65714700a5df3c368f78248723
-  data.tar.gz: 3672e7ac58743e3e6def005222faa7bf5baa07997fb7e6fb8dc929f7987d254df9fc3a3a420ed60ce5dff929002fda1f3311bd51bfbcc6b06df2540cefe6ca79
+  metadata.gz: 43c755d4b4c123e5bddf399e4aefee29635724adf031a46ffdcdafd0857a1821690df4444f81f04b1cdfb48f9134de3d38564550618db98e624fefd8672f87f6
+  data.tar.gz: 031ddabc39cf60f8d590008e90eb465c0128ce72d23c6ad171a244420a1ea852b141ea1fc3709d70eef3e8233ccc7bd7d5dee906b1d5fb6160a6f8d6a6d189cb

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
   - 2.0.0
+  - 2.1.2
   - 1.9.3
   - jruby-19mode
-  - rbx-19mode
+  - rbx-2

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.1.3 (2014-10-16)
+
+Bug fix for compatiblity with Sass 3.3.
+
+## 0.1.2 (2014-03-18)
+
+Ignore and log invalid image variants (files that match a general pattern but aren't used by an Apropos rule).
+
 ## 0.1.1 (2013-11-18)
 
 Minor fix release for full Compass compatibility.

data/lib/apropos/sass_functions.rb

@@ -16,9 +16,7 @@ module Apropos
       ::Sass::Script::Functions.declare :add_dpi_image_variant, []
       ::Sass::Script::Functions.declare :add_breakpoint_image_variant, []
       ::Sass::Script::Functions.declare :nth_polyfill, [:list, :index]
-      unless sass_function_exist? :str_index
-        ::Sass::Script::Functions.declare :str_index, [:string, :substring]
-      end
+      ::Sass::Script::Functions.declare :str_contains, [:string, :substring]
     end
 
     def self.value(val)
@@ -58,18 +56,10 @@ module Apropos
       list[index - 1]
     end
 
-    # Polyfill for `str-index` function from master branch of Sass.
-    # Implementation taken from:
-    # https://github.com/nex3/sass/blob/master/lib/sass/script/functions.rb
-    # Using Sass::Script::Number rather than Sass::Script::Value::Number for
-    # backwards compatibility, however.
-    unless sass_function_exist? :str_index
-      def str_index(string, substring)
-        assert_type string, :String, :string
-        assert_type substring, :String, :substring
-        index = string.value.index(substring.value) || -1
-        ::Sass::Script::Number.new(index + 1)
-      end
+    def str_contains(string, substring)
+      assert_type string, :String, :string
+      assert_type substring, :String, :substring
+      ::Sass::Script::Bool.new(string.value.include?(substring.value))
     end
   end
 end

data/lib/apropos/version.rb

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

data/spec/apropos/functions_spec.rb

@@ -10,6 +10,7 @@ describe Apropos do
   let(:rules) { Apropos.image_variant_rules("foo.jpg") }
 
   before do
+    Compass.configuration.stub(:http_images_path) { '/' }
     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
@@ -189,7 +190,14 @@ describe Apropos do
     context "with images_path undefined" do
       let(:images_dir) { nil }
       let(:project_dir) { '/path/to/project' }
-      it { Apropos.images_dir.to_s.should == project_dir }
+      it 'uses the Compass default' do
+        expected = if Compass.configuration.respond_to?(:default_images_dir)
+          File.join(project_dir, Compass.configuration.default_images_dir)
+        else
+          project_dir
+        end
+        Apropos.images_dir.to_s.should == expected
+      end
     end
   end
 end

data/spec/stylesheets_spec.rb

@@ -12,7 +12,8 @@ describe 'stylesheets' do
   }
 
   before do
-    Compass.configuration.stub(:images_path).and_return(images_dir)
+    Compass.configuration.stub(:http_images_path) { '/' }
+    Compass.configuration.stub(:images_path) { images_dir }
     Compass.configuration.stub(:asset_cache_buster).and_return( lambda { |path| nil } )
   end
 
@@ -35,6 +36,22 @@ describe 'stylesheets' do
     css_file.strip.should == ".foo { background-image: url('/hero.jpg'); }"
   end
 
+  context "with fixture images" do
+    before do
+      Compass.configuration.stub(:images_path) { File.expand_path('fixtures/images', File.dirname(__FILE__)) }
+    end
+
+    it "can generate heights" do
+      @scss_file = %Q{
+        @import "apropos";
+        .foo {
+          @include apropos-bg-variants('kitten.jpg', true);
+        }
+      }
+      css_file.strip.should == ".foo { background-image: url('/kitten.jpg'); height: 286px; }"
+    end
+  end
+
   describe "hidpi stylesheet" do
     it "generates default hidpi rules" do
       stub_files(%w[hero.jpg hero.2x.jpg])

data/stylesheets/apropos/_core.sass

@@ -36,5 +36,5 @@
 // ===========================================================================
 =apropos-bg-image-with-height($path, $generate-height, $query: "")
   background-image: image-url($path)
-  @if $generate-height and not (str-index($query, "dpi") > 0 or str-index($query, "pixel-ratio") > 0)
+  @if $generate-height and not (str-contains($query, "dpi") or str-contains($query, "pixel-ratio"))
     height: image-height($path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apropos
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Gabriel Gilder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
@@ -130,6 +130,7 @@ files:
 - spec/apropos/media_query_spec.rb
 - spec/apropos/set_spec.rb
 - spec/apropos/variant_spec.rb
+- spec/fixtures/images/kitten.jpg
 - spec/spec_helper.rb
 - spec/stylesheets_spec.rb
 - stylesheets/_apropos.sass
@@ -167,5 +168,6 @@ test_files:
 - spec/apropos/media_query_spec.rb
 - spec/apropos/set_spec.rb
 - spec/apropos/variant_spec.rb
+- spec/fixtures/images/kitten.jpg
 - spec/spec_helper.rb
 - spec/stylesheets_spec.rb