rails-sass-images 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9806128e2e822ebd8108ca48e2b066a9f7ffa5fa
-  data.tar.gz: fbe35722a0d6dc11de4668e286acb1e5b0211c2f
+  metadata.gz: 0a313b8d58d03d3b7bc2820f00b72a769c19f839
+  data.tar.gz: c7930af69f98b6526ef628164fab6ec83c25f7b3
 SHA512:
-  metadata.gz: ec1f223607e5e7afa37bfbf065bdc52463a77ff98de4448c241fe84712c8bf75642f6e2c2a7fed2553573163480ef022e714568f6f28128ee3c9fbb5cde18fba
-  data.tar.gz: 56a66de671a3cbe7722ef50c5ff4516f35d16b4dea61b1f73aded30cd8803943ccbcc394999d497dc21b59f75e0852f997a6b766a2b2beadb07a3e77e8a56eef
+  metadata.gz: 7a41f969226d64fa32f8939bba614e242c004f10083f757287ea40267f5a66fb5c622e0f9251838da531eff741afbed5f8282caedb8c4ff579efbf27e9d5ae31
+  data.tar.gz: 23a160ecca764803a1e26a70376ab36438cc73f509806d00d690008c0131e6165b3908357d359dca959ebd2a7c981a6830f79d5d6eec15918c353c4b8e424e8e

data/ChangeLog.md

@@ -1,3 +1,7 @@
+### 0.5 “Gentile Bellini”
+* Allow to use gem without Sprockets.
+* Add `hidpi-background` mixin for repeated backgrounds.
+
 ### 0.4 “Alessandro di Mariano di Vanni Filipepi”
 * Allow to work in Rails with disabled `initialize_on_precompile`.
 

data/README.md

@@ -61,7 +61,7 @@ and import mixins in your `application.sass`:
 @import "rails-sass-images"
 ```
 
-# Other
+### Sprockets
 
 You can use Rails Sass Images with plain Ruby application with Sprockets.
 Just install in to Sprockets environment:
@@ -77,3 +77,15 @@ and import mixins in your Sass files:
 ```sass
 @import "rails-sass-images"
 ```
+
+### Other
+
+You can use Rails Sass Images without Sprockets. Just set dir to load assets:
+
+```ruby
+require 'rails-sass-images'
+
+RailsSassImages.load_from = './images/'
+```
+
+By default, load dir will be current dir `.`.

data/lib/assets/stylesheets/rails-sass-images.sass

@@ -1,3 +1,4 @@
 @import "rails-sass-images/image-size"
 @import "rails-sass-images/hidpi-image"
 @import "rails-sass-images/hidpi-inline"
+@import "rails-sass-images/hidpi-background"

data/lib/assets/stylesheets/rails-sass-images/hidpi-background.sass

@@ -0,0 +1,8 @@
+// Set HiDPI (Retina) image background.
+//
+//   .loader
+//      background-repeat: repeat-x
+//      +hidpi-background("nice/button.png")
+@mixin hidpi-background($path)
+  background-image: image-url($path)
+  background-size: (image-width($path) / 2) (image-height($path) / 2)

data/lib/assets/stylesheets/rails-sass-images/hidpi-image.sass

@@ -4,5 +4,5 @@
 //      +hidpi-image("nice/button.png")
 @mixin hidpi-image($path)
   +image-size($path, 2)
-  background: image-url($path) no-repeat
-  background-size: (image-width($path) / 2) (image-height($path) / 2)
+  +hidpi-background($path)
+  background-repeat: no-repeat

data/lib/rails-sass-images.rb

@@ -4,37 +4,49 @@ module RailsSassImages
   # Return asset by file `path` from Sass parser
   def self.asset(path)
     path  = path.value
-    asset = self.assets[path]
-    raise "Can't find asset #{path}" unless asset
+
+    @load_from = @load_from.call() if @load_from.is_a? Proc
+
+    if @load_from.is_a? Pathname
+      asset = @load_from.join(path)
+      raise "Can't find asset #{path} in #{@load_from}" unless asset.exist?
+    elsif sprockets? @load_from
+      asset = @load_from[path]
+      raise "Can't find asset #{path}" unless asset
+      asset = asset.pathname
+    end
+
     asset
   end
 
   # Set Sprockets environment and add Rails Sass Images styles paths
   def self.install(sprockets)
     sprockets.append_path(Pathname(__FILE__).dirname.join('assets/stylesheets'))
-    self.assets = sprockets
+    @load_from = sprockets
   end
 
-  # Set Sprockets environment
-  def self.assets=(env = nil)
-    @assets = env
+  # Set Sprockets environment or assets dir path
+  def self.load_from=(source)
+    source = Pathname(source) if source.is_a? String
+    @load_from = source
   end
 
-  # Get Sprockets environment
-  def self.assets
-    if @assets
-      @assets
-    elsif @assets_loader
-      @assets = @assets_loader.call()
-    end
+  # Get Sprockets environment or assets dir path
+  def self.load_from
+    @load_from
   end
 
-  # Set lazy loader for assets
-  def self.assets_loader=(loader)
-    @assets_loader = loader
+private
+
+  # Safe detect is `var` is a Sprockets environment
+  def self.sprockets?(var)
+    return false unless defined? Sprockets
+    var.is_a? Sprockets::Environment or var.is_a? Sprockets::Index
   end
 end
 
+RailsSassImages.load_from = '.'
+
 dir = Pathname(__FILE__).dirname.join('rails-sass-images')
 require dir.join('version')
 require dir.join('sass')

data/lib/rails-sass-images/railtie.rb

@@ -5,6 +5,6 @@ module RailsSassImages
 
   # Rails integration
   class Railtie < Rails::Railtie
-    RailsSassImages.assets_loader = proc { Rails.application.assets }
+    RailsSassImages.load_from = proc { Rails.application.assets }
   end
 end

data/lib/rails-sass-images/sass/inline.rb

@@ -12,8 +12,8 @@ module RailsSassImages::Sass
   def inline(path)
     asset = RailsSassImages.asset(path)
 
-    mime = MIME::Types.type_for(asset.pathname.to_s).first.content_type
-    file = asset.pathname.read
+    mime = MIME::Types.type_for(asset.to_s).first.content_type
+    file = asset.read
     file = [file].flatten.pack('m').gsub("\n", '')
 
     Sass::Script::String.new("url('data:#{mime};base64,#{file}')")

data/lib/rails-sass-images/sass/size.rb

@@ -4,12 +4,12 @@ module RailsSassImages::Sass
   # Get image width
   def image_width(path)
     asset = RailsSassImages.asset(path)
-    Sass::Script::Number.new(Dimensions.width(asset.pathname), ["px"])
+    Sass::Script::Number.new(Dimensions.width(asset), ["px"])
   end
 
   # Get image height
   def image_height(path)
     asset = RailsSassImages.asset(path)
-    Sass::Script::Number.new(Dimensions.height(asset.pathname), ["px"])
+    Sass::Script::Number.new(Dimensions.height(asset), ["px"])
   end
 end

data/lib/rails-sass-images/version.rb

@@ -1,3 +1,3 @@
 module RailsSassImages
-  VERSION = '0.4'.freeze unless defined? RailsSassImages::VERSION
+  VERSION = '0.5'.freeze unless defined? RailsSassImages::VERSION
 end

data/rails-sass-images.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.license  = 'MIT'
 
   s.add_dependency 'sass',       ['> 0']
-  s.add_dependency 'sprockets',  ['> 0']
   s.add_dependency 'dimensions', ['> 0']
   s.add_dependency 'mime-types', ['> 0']
 end

data/spec/app/app/assets/stylesheets/hidpi-background.sass

@@ -0,0 +1,4 @@
+@import "rails-sass-images"
+
+.icon
+  +hidpi-background("monolith.png")

data/spec/app/app/assets/stylesheets/relative.sass

@@ -0,0 +1,3 @@
+.icon
+  width: image-width("spec/app/app/assets/images/monolith.png")
+  height: image-height("spec/app/app/assets/images/monolith.png")

data/spec/plain_spec.rb

@@ -4,7 +4,7 @@ require 'sprockets'
 
 describe RailsSassImages do
   before do
-    @original = RailsSassImages.assets
+    @original = RailsSassImages.load_from
 
     @assets = Sprockets::Environment.new
     @assets.append_path(DIR.join('app/app/assets/images'))
@@ -16,51 +16,87 @@ describe RailsSassImages do
         "/assets/#{path}"
       end
     end
-
-    RailsSassImages.install(@assets)
   end
 
   after do
-    RailsSassImages.assets        = @original
-    RailsSassImages.assets_loader = nil
+    RailsSassImages.load_from = @original
   end
 
-  it "loads assets lazy" do
-    RailsSassImages.assets = nil
-    another = Sprockets::Environment.new
+  describe 'assets loading' do
 
-    RailsSassImages.assets_loader = proc { another }
+    it "loads from dir" do
+      RailsSassImages.load_from = DIR.join('app/app/assets/images')
+      @assets['size.css'].to_s.should == ".icon{width:4px;height:6px}\n"
+    end
 
-    RailsSassImages.assets.should == another
-  end
+    it "loads by default from current dir" do
+      RailsSassImages.load_from = '.'
+      @assets['relative.css'].to_s.should == ".icon{width:4px;height:6px}\n"
+    end
 
-  it "inlines assets" do
-    @assets['inline.css'].to_s.should == ".icon{background:#{INLINE}}\n"
-  end
+    it "loads assets from sprockets" do
+      RailsSassImages.load_from = @assets
+      @assets['size.css'].to_s.should == ".icon{width:4px;height:6px}\n"
+    end
 
-  it "raises error on unknown file" do
-    proc {
-      @assets['wrong-inline.css']
-    }.should raise_error(/Can't find asset no\.png/)
-  end
+    it "loads assets lazy" do
+      RailsSassImages.load_from = proc { @assets }
+      @assets['size.css'].to_s.should == ".icon{width:4px;height:6px}\n"
+    end
 
-  it "gets image size" do
-    @assets['size.css'].to_s.should == ".icon{width:4px;height:6px}\n"
-  end
+    it "raises error on unknown file in assets" do
+      RailsSassImages.load_from = @assets
+      proc {
+        @assets['wrong-inline.css']
+      }.should raise_error(/Can't find asset no\.png/)
+    end
 
-  it "gets image size by mixin" do
-    @assets['image-size.css'].to_s.should == ".icon{width:4px;height:6px}\n"
-  end
+    it "raises error on unknown file in path" do
+      RailsSassImages.load_from = '.'
+      proc {
+        @assets['wrong-inline.css']
+      }.should raise_error(/Can't find asset no\.png in \./)
+    end
 
-  it "has hidpi-image mixin" do
-    @assets['hidpi-image.css'].to_s == ".icon{width:2px;height:3px;" +
-      "background:url(/assets/monolith.png) no-repeat;" +
-      "background-size:2px 3px}\n"
   end
 
-  it "has hidpi-inline mixin" do
-    @assets['hidpi-inline.css'].to_s.should == ".icon{width:2px;height:3px;" +
-      "background:#{INLINE} no-repeat;" +
-      "background-size:2px 3px}\n"
+  describe 'mixins' do
+    before do
+      RailsSassImages.install(@assets)
+    end
+
+    it "inlines assets" do
+      @assets['inline.css'].to_s.should == ".icon{background:#{INLINE}}\n"
+    end
+
+    it "gets image size" do
+      @assets['size.css'].to_s.should == ".icon{width:4px;height:6px}\n"
+    end
+
+    it "gets image size by mixin" do
+      @assets['image-size.css'].to_s.should == ".icon{width:4px;height:6px}\n"
+    end
+
+    it "has hidpi-background mixin" do
+      @assets['hidpi-background.css'].to_s.should == (".icon{" +
+        "background-image:url(/assets/monolith.png);" +
+        "background-size:2px 3px}\n")
+    end
+
+    it "has hidpi-image mixin" do
+      @assets['hidpi-image.css'].to_s.should == ".icon{" +
+        "width:2px;height:3px;" +
+        "background-image:url(/assets/monolith.png);" +
+        "background-size:2px 3px;" +
+        "background-repeat:no-repeat}\n"
+    end
+
+    it "has hidpi-inline mixin" do
+      @assets['hidpi-inline.css'].to_s.should == ".icon{" +
+        "width:2px;height:3px;" +
+        "background:#{INLINE} no-repeat;" +
+        "background-size:2px 3px}\n"
+    end
+
   end
 end

data/spec/rails_spec.rb

@@ -30,18 +30,29 @@ describe CssController, type: :controller do
     response.body.should == ".icon{width:4px;height:6px}\n"
   end
 
+  it "has hidpi-background mixin" do
+    get :test, file: 'hidpi-background'
+    response.should be_success
+    response.body.should == ".icon{" +
+      "background-image:url(/assets/monolith.png);" +
+      "background-size:2px 3px}\n"
+  end
+
   it "has hidpi-image mixin" do
     get :test, file: 'hidpi-image'
     response.should be_success
-    response.body.should == ".icon{width:2px;height:3px;" +
-      "background:url(/assets/monolith.png) no-repeat;" +
-      "background-size:2px 3px}\n"
+    response.body.should == ".icon{" +
+      "width:2px;height:3px;" +
+      "background-image:url(/assets/monolith.png);" +
+      "background-size:2px 3px;" +
+      "background-repeat:no-repeat}\n"
   end
 
   it "has hidpi-inline mixin" do
     get :test, file: 'hidpi-inline'
     response.should be_success
-    response.body.should == ".icon{width:2px;height:3px;" +
+    response.body.should == ".icon{" +
+      "width:2px;height:3px;" +
       "background:#{INLINE} no-repeat;" +
       "background-size:2px 3px}\n"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-sass-images
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Andrey "A.I." Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -24,20 +24,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  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: dimensions
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +70,7 @@ files:
 - README.md
 - Rakefile
 - lib/assets/stylesheets/rails-sass-images.sass
+- lib/assets/stylesheets/rails-sass-images/hidpi-background.sass
 - lib/assets/stylesheets/rails-sass-images/hidpi-image.sass
 - lib/assets/stylesheets/rails-sass-images/hidpi-inline.sass
 - lib/assets/stylesheets/rails-sass-images/image-size.sass
@@ -96,10 +83,12 @@ files:
 - rails-sass-images.gemspec
 - spec/app/.gitignore
 - spec/app/app/assets/images/monolith.png
+- spec/app/app/assets/stylesheets/hidpi-background.sass
 - spec/app/app/assets/stylesheets/hidpi-image.sass
 - spec/app/app/assets/stylesheets/hidpi-inline.sass
 - spec/app/app/assets/stylesheets/image-size.sass
 - spec/app/app/assets/stylesheets/inline.sass
+- spec/app/app/assets/stylesheets/relative.sass
 - spec/app/app/assets/stylesheets/size.sass
 - spec/app/app/assets/stylesheets/wrong-inline.sass
 - spec/app/app/controllers/application_controller.rb