bower-rails 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aaf9a0d471ed511ce2f9d98a433117cb9f70595
-  data.tar.gz: d9c3bf796251d8e2aba1bce1fb9afcf49b542245
+  metadata.gz: 065bcccfc41af7421a73a3dbc925806269a0c1e3
+  data.tar.gz: a2b254f45c3532b226c226a446abb73ca95afd63
 SHA512:
-  metadata.gz: 9b37bf6cb706d84d02e5a958383a593c127fd9cea2029f526b42f639ae28a5c431eb7446b7eabfacec15447c78c9047915c23419b44f471bceec8fa9fa16e023
-  data.tar.gz: 9bb77af61131dde588d5719ceb8b93450f473eef14890b314dc0c81fc87dcda3f37822dcd2fa64cc1ba1fb3dcdde9aaaff86016686a197922f6e986304c0a4c2
+  metadata.gz: dc683b0bd9d8094ad23bb3328a60335bca99d1ff58568817bb9b76b485c4a485efb05e45d7ce7330bea94515aca55d1f784c467a6a0d136b51e690bcb8b7706b
+  data.tar.gz: 2be8d8141f6c6b4c1682051ea80216cb36ea954ee63d71033236448e9628294e4b2b654acba6535c579b05261c7cd7b1bf8735bd43c6a3893b6960b9fce7a446

data/README.md

@@ -4,11 +4,11 @@ bower-rails
 [![Gem Version](http://img.shields.io/gem/v/bower-rails.svg)][gem]
 [![Code Climate](http://img.shields.io/codeclimate/github/42dev/bower-rails.svg)][codeclimate]
 [![Dependency Status](http://img.shields.io/gemnasium/SergeyKishenin/bower-rails.svg)][gemnasium]
-[![Build Status](http://img.shields.io/travis/mbj/concord/master.svg)][travis]
+[![Build Status](https://travis-ci.org/42dev/bower-rails.svg?branch=master)][travis]
 [![Coverage Status](https://coveralls.io/repos/42dev/bower-rails/badge.png)][coveralls]
 
 [gem]: https://rubygems.org/gems/bower-rails
-[travis]: https://travis-ci.org/mbj/concord
+[travis]: https://travis-ci.org/42dev/bower-rails
 [gemnasium]: https://gemnasium.com/SergeyKishenin/bower-rails
 [codeclimate]: https://codeclimate.com/github/42dev/bower-rails
 [coveralls]: https://coveralls.io/r/42dev/bower-rails
@@ -157,6 +157,30 @@ results in the following bower.json file:
 ```
 NOTE: Available dependency groups are `:dependencies` (default) and `:dev_dependencies`. Others are not allowed according to the Rails convention.
 
+## Bower Resolutions
+
+To specify a [bower resolution][] use `resolution` DSL method in your Bowerfile:
+
+```ruby
+resolution "angular", "1.2.22"
+```
+
+That will produce `bower.json` like:
+
+``` javascript
+{
+  "name" : "dsl-generated dependencies",
+  "dependencies" : {
+    "angular" : "1.2.22"
+  },
+  "resolutions": {
+    "angular": "1.2.22"
+  }
+}
+```
+
+[#bower resolution]: http://jaketrent.com/post/bower-resolutions/
+
 ##Configuration
 
 Change options in your `config/initializers/bower_rails.rb`:

data/lib/bower-rails/dsl.rb

@@ -17,37 +17,10 @@ module BowerRails
       @root_path = root_path
       @bower_dependencies_list = []
       @dependencies = {}
+      @resolutions = {}
       @assets_path ||= "assets"
     end
 
-    def eval_file(file)
-      instance_eval(File.open(file, "rb") { |f| f.read }, file.to_s)
-    end
-
-    def directories
-      @dependencies.keys
-    end
-
-    def group(name, options = {}, &block)
-      options[:assets_path] ||= @assets_path
-
-      assert_asset_path options[:assets_path]
-      assert_group_name name
-
-      @current_group = add_group name, options
-      yield if block_given?
-    end
-
-    def dependency_group(name, options = {}, &block)
-
-      assert_dependency_group_name name
-      add_dependency_group name
-
-      yield if block_given?
-
-      remove_dependency_group!
-    end
-
     def asset(name, *args)
       group = @current_group || default_group
       options = Hash === args.last ? args.pop.dup : {}
@@ -71,28 +44,22 @@ module BowerRails
       @dependencies[normalized_group_path][current_dependency_group_normalized][name] = version
     end
 
-    def write_bower_json
-      @dependencies.each do |dir, data|
-        FileUtils.mkdir_p dir unless File.directory? dir
-        File.open(File.join(dir, "bower.json"), "w") do |f|
-          f.write(dependencies_to_json(data))
-        end
-      end
+    def dependency_group(name, options = {}, &block)
+
+      assert_dependency_group_name name
+      add_dependency_group name
+
+      yield if block_given?
+
+      remove_dependency_group!
     end
 
-    def generate_dotbowerrc
-      contents = JSON.parse(File.read(File.join(root_path, '.bowerrc'))) rescue {}
-      contents["directory"] = "bower_components"
-      JSON.pretty_generate(contents)
+    def directories
+      @dependencies.keys
     end
 
-    def write_dotbowerrc
-      groups.map do |group|
-        normalized_group_path = normalize_location_path(group.first, group_assets_path(group))
-        File.open(File.join(normalized_group_path, ".bowerrc"), "w") do |f|
-          f.write(generate_dotbowerrc)
-        end
-      end
+    def eval_file(file)
+      instance_eval(File.open(file, "rb") { |f| f.read }, file.to_s)
     end
 
     def final_assets_path
@@ -101,31 +68,56 @@ module BowerRails
       end.uniq
     end
 
+    def generate_dotbowerrc
+      contents = JSON.parse(File.read(File.join(root_path, '.bowerrc'))) rescue {}
+      contents["directory"] = "bower_components"
+      JSON.pretty_generate(contents)
+    end
+
     def group_assets_path group
       group.last[:assets_path]
     end
 
-    private
+    def group(name, options = {}, &block)
+      options[:assets_path] ||= @assets_path
 
-    # Returns name for the current dependency from the stack
-    #
-    def current_dependency_group
-      @dependency_groups.last || DEFAULT_DEPENDENCY_GROUP.to_sym
+      assert_asset_path options[:assets_path]
+      assert_group_name name
+
+      @current_group = add_group name, options
+      yield if block_given?
     end
 
-    # Returns normalized current dependency group name
-    #
-    def current_dependency_group_normalized
-      normalize_dependency_group_name current_dependency_group
+    def resolution(name, version)
+      @resolutions[name] = version
     end
 
-    # Implementing ActiveSupport::Inflector camelize(:lower)
-    #
-    def normalize_dependency_group_name(name)
-      segments = name.to_s.dup.downcase.split(/_/)
-      [segments.shift, *segments.map{ |word| word.capitalize }].join('').to_sym
+    def resolutions_with_root
+      { :resolutions => @resolutions }
     end
 
+    def write_bower_json
+      @dependencies.each do |dir, data|
+
+        FileUtils.mkdir_p dir unless File.directory? dir
+        File.open(File.join(dir, "bower.json"), "w") do |f|
+          data.merge!(resolutions_with_root)
+          f.write(dependencies_to_json(data))
+        end
+      end
+    end
+
+    def write_dotbowerrc
+      groups.map do |group|
+        normalized_group_path = normalize_location_path(group.first, group_assets_path(group))
+        File.open(File.join(normalized_group_path, ".bowerrc"), "w") do |f|
+          f.write(generate_dotbowerrc)
+        end
+      end
+    end
+
+    private
+
     # Stores the dependency group name in the stack
     #
     def add_dependency_group(dependency_group)
@@ -134,32 +126,10 @@ module BowerRails
       dependency_group
     end
 
-    # Removes the dependency group name in the stack
-    #
-    def remove_dependency_group!
-      @dependency_groups.pop
-    end
-
     def add_group(*group)
       @groups = (groups << group) and return group
     end
 
-    def groups
-      @groups ||= [default_group]
-    end
-
-    def default_group
-      [:vendor, { :assets_path => @assets_path }]
-    end
-
-    # Attempts to parse data from @dependencies to JSON
-    #
-    def dependencies_to_json(data)
-      JSON.pretty_generate({
-        :name => "dsl-generated dependencies"
-      }.merge(data))
-    end
-
     def assert_dependency_group_name(name)
       unless [:dependencies, :devDependencies].include?(normalize_dependency_group_name(name))
         raise ArgumentError, "Dependency group should be either dependencies or dev_dependencies, provided: #{name}"
@@ -181,8 +151,49 @@ module BowerRails
       raise ArgumentError, "Group name should be :lib or :vendor only" unless [:lib, :vendor].include?(name)
     end
 
+    # Returns name for the current dependency from the stack
+    #
+    def current_dependency_group
+      @dependency_groups.last || DEFAULT_DEPENDENCY_GROUP.to_sym
+    end
+
+    # Returns normalized current dependency group name
+    #
+    def current_dependency_group_normalized
+      normalize_dependency_group_name current_dependency_group
+    end
+
+    def default_group
+      [:vendor, { :assets_path => @assets_path }]
+    end
+
+    # Attempts to parse data from @dependencies to JSON
+    #
+    def dependencies_to_json(data)
+      JSON.pretty_generate({
+        :name => "dsl-generated dependencies"
+      }.merge(data))
+    end
+
+    def groups
+      @groups ||= [default_group]
+    end
+
+    # Implementing ActiveSupport::Inflector camelize(:lower)
+    #
+    def normalize_dependency_group_name(name)
+      segments = name.to_s.dup.downcase.split(/_/)
+      [segments.shift, *segments.map{ |word| word.capitalize }].join('').to_sym
+    end
+
     def normalize_location_path(loc, assets_path)
       File.join(root_path, loc.to_s, assets_path)
     end
+
+    # Removes the dependency group name in the stack
+    #
+    def remove_dependency_group!
+      @dependency_groups.pop
+    end
   end
 end

data/lib/bower-rails/performer.rb

@@ -120,7 +120,7 @@ module BowerRails
       Dir['bower_components/**/*.css'].each do |filename|
         contents = File.read(filename) if FileTest.file?(filename)
         # http://www.w3.org/TR/CSS2/syndata.html#uri
-        url_regex = /url\(\s*['"]?(?![a-z]+:)([^'"\)]*)['"]?\s*\)/
+        url_regex = /url\((?!\#)\s*['"]?(?![a-z]+:)([^'"\)]*)['"]?\s*\)/
 
         # Resolve paths in CSS file if it contains a url
         if contents =~ url_regex

data/lib/bower-rails/railtie.rb

@@ -23,7 +23,6 @@ module BowerRails
     end
 
     rake_tasks do
-      require "tasks/helpers/before_hook.rb"
       load "tasks/bower.rake"
     end
   end

data/lib/bower-rails/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module BowerRails
-  VERSION = "0.8.3"
+  VERSION = "0.9.0"
 end

data/lib/generators/bower_rails/initialize/templates/bower_rails.rb

@@ -10,4 +10,7 @@ BowerRails.configure do |bower_rails|
 
   # Invokes rake bower:clean before precompilation. Defaults to false
   # bower_rails.clean_before_precompile = true
-end
+  
+  # Invokes rake bower:install:deployment instead rake bower:install. Defaults to false
+  # bower_rails.use_bower_install_deployment = true
+end

data/lib/tasks/bower.rake

@@ -1,3 +1,4 @@
+require 'tasks/helpers/before_hook'
 require 'bower-rails/performer'
 
 include BeforeHook
@@ -78,7 +79,7 @@ namespace :bower do
   end
 end
 
-before 'assets:precompile' do
+before_rake_task 'assets:precompile' do
   BowerRails.tasks.map do |task|
     Rake::Task[task].invoke
   end

data/lib/tasks/helpers/before_hook.rb

@@ -1,7 +1,7 @@
 module BeforeHook
-  # The `before` hook for rake tasks. 
+  # The `before` hook for rake tasks.
   # The code was taken from https://github.com/guillermo/rake-hooks/blob/master/lib/rake/hooks.rb#L2
-  def before(*task_names, &new_task)
+  def before_rake_task(*task_names, &new_task)
     task_names.each do |task_name|
       old_task = Rake.application.instance_variable_get('@tasks').delete(task_name.to_s)
       return unless old_task

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bower-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Ross Harrison