Merge pull request #25 from D1reCT/master

Fixed gem. Updated normalize.css

lib/generators/skeleton/install/install_generator.rb

@@ -3,13 +3,13 @@
 
 module Skeleton
   module Generators
-    class InstallGenerator < ::Rails::Generators::Base
+    class InstallGenerator < Rails::Generators::Base
 
       desc "This generator installs Skeleton CSS framework to Asset Pipeline"
       def add_assets
         css_inject = " *= require normalize\n *= require skeleton\n"
-        app_scss = File.join(::Rails.root, 'app', 'assets', 'stylesheets', 'application.scss')
-        app_css = File.join(::Rails.root, 'app', 'assets', 'stylesheets', 'application.css')
+        app_scss = File.join(Rails.root, 'app', 'assets', 'stylesheets', 'application.scss')
+        app_css = File.join(Rails.root, 'app', 'assets', 'stylesheets', 'application.css')
 
         if File.exist?(app_scss)
           insert_into_file app_scss, css_inject, :after => "require_self\n"

lib/skeleton-rails.rb

@@ -1,8 +1,6 @@
 require "skeleton-rails/version"
-require "skeleton-rails/rails/engine"
+require "skeleton-rails/engine"
 
 module Skeleton
-  module Rails
-    require 'skeleton-rails/rails/engine' if defined?(Rails)
-  end
+  require 'skeleton-rails/engine'
 end

lib/skeleton-rails/engine.rb

@@ -0,0 +1,10 @@
+require 'rails'
+
+module Skeleton
+  class Engine < Rails::Engine
+    initializer 'skeleton-rails.setup',
+      :group => :all do |app|
+        app.paths['config'] << File.join(config.root, 'vendor')
+    end
+  end
+end

lib/skeleton-rails/version.rb

@@ -1,5 +1,3 @@
 module Skeleton
-  module Rails
-    VERSION = "1.1.0"
-  end
+  VERSION = "1.1.0"
 end

skeleton-rails.gemspec

@@ -4,7 +4,7 @@ require "skeleton-rails/version"
 
 Gem::Specification.new do |s|
   s.name        = "skeleton-rails"
-  s.version     = Skeleton::Rails::VERSION
+  s.version     = Skeleton::VERSION
   s.authors     = ["Helios Technologies"]
   s.email       = ["support@heliostech.fr"]
   s.homepage    = "https://github.com/helios-technologies/skeleton-rails"
@@ -17,8 +17,4 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
 end