envvy 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a8c9b57ae7afb83cfdd4cbb25cc1fa50a324604
-  data.tar.gz: fbbe6f6c3cc54dae2478bcd9d6927a4aa9ad8c67
+  metadata.gz: d3fa08ec3c434f18e06a89d6c8a9d59d53170f6b
+  data.tar.gz: a30f7891b0b24938d6969af9f33e5b8c076b9f59
 SHA512:
-  metadata.gz: c30f85e71c3b90c76e44b19ccfddb7c407156ce1a3aca974b408b32652463b9d496c79719a9bbb100f24ce0dcebef191335a2e0b055ea59458f56b29dc89b8b2
-  data.tar.gz: 662814e482c2a093f1ac56eb61223d92009340bcc6bc7b0b1c2ed52e7ee02d7d143f2fa97d9e9d31e04e65c27574df1415825341e32a353e402132be460cc713
+  metadata.gz: 4647ef7630bae61bb21709317f24611e0215c36b63adc5f46d817764dd6d49697cf9c467e03d2d6c5bd31c83d93349107354df7b4a5fb9cfe1e75bb6b953ba84
+  data.tar.gz: d6b7ed27ae08359dc4ce33a15fbc5e6af38d15883ccdaef949901628c28a0b8e004216d440c3b11f2da7572af79f81cc994e55c42d12965b75ee367cdd7d177b

data/.gitignore

@@ -18,3 +18,5 @@ test/dummy_app/log/*.log
 test/dummy_app/tmp/
 test/dummy_app/.sass-cache
 
+*.gem
+

data/lib/envvy.rb

@@ -1,19 +1,7 @@
 require "envvy/version"
-require "envvy/railtie"
 require "envvy/js"
+require "envvy/engine"
 
 module Envvy
-  class << self
 
-    def register_engine
-      require "envvy/engine"
-    end
-
-    def get arg
-      Railtie.get arg
-    end
-  end
-
-
-  Envvy.register_engine
 end

data/lib/envvy/engine.rb

@@ -1,10 +1,66 @@
+require 'yaml'
+
 module Envvy
+  class Engine < Rails::Engine
+    attr_accessor :env
+
+    class << self
+      attr_accessor :config_path
 
-  class Engine < ::Rails::Engine
-    initializer 'env-loader.precompile' do |app|
+      def config_path
+        @config_path || File.join(Rails.root, "config", "env_vars.yml")
+      end
+    end
+
+    initializer "env-loader.precompile" do |app|
       app.config.assets.paths << root.join('assets', 'javascripts').to_s
     end
-  end
 
+    initializer "envvy.register_preprocessor", :after => "sprockets.environment" do
+      Rails.application.assets.register_preprocessor "application/javascript", :"js_env" do |context, source|
+        if context.logical_path == "js_env" && File.exist?(self.class.config_path)
+          context.depend_on(File.expand_path(self.class.config_path))
+        end
+        source
+      end
+    end
+
+    config.before_initialize do
+      self.get("config") do |config|
+        config.each do |k, v|
+          ENV[k.to_s.upcase] ||= v
+        end
+      end
+    end
+
+    config.before_configuration do
 
+      set_env self.config_path
+
+      if Rails.env.development?
+        require 'filewatch/watch'
+        conf_watcher = FileWatch::Watch.new
+        conf_watcher.watch(self.config_path)
+
+        Thread.new do
+          conf_watcher.subscribe(1,5) do |_status, path|
+            set_env path
+          end
+        end
+      end
+    end
+
+    def set_env file
+      self.env = {"js_config" => {}, "config" => {}}
+      self.env.merge! YAML.load(File.read(file)) if File.exist?(file)
+    end
+
+    def get(key, &block)
+      if block_given?
+        yield self.env[key]
+      else
+        return self.env[key]
+      end
+    end
+  end
 end

data/lib/envvy/js.rb

@@ -3,7 +3,7 @@ module Envvy
     mattr_accessor :env
 
     def self.env
-      @env ||= Envvy.get("js_config")
+      @env ||= Envvy::Engine.get("js_config")
     end
   end
 end

data/lib/envvy/version.rb

@@ -1,3 +1,3 @@
 module Envvy
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/test/dummy_app/config/environments/development.rb

@@ -27,7 +27,4 @@ Dummy::Application.configure do
   config.assets.debug = true
 
   config.eager_load = false
-
-  config.eh_surveillance_policy_identifier = "0020422201"
-  config.eh_insurance_policy_identifier = "0020422201"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envvy
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Guillaume Balaine
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -139,12 +139,10 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/js_env.js.erb
-- envvy-1.0.3.gem
 - envvy.gemspec
 - lib/envvy.rb
 - lib/envvy/engine.rb
 - lib/envvy/js.rb
-- lib/envvy/railtie.rb
 - lib/envvy/version.rb
 - test/compilation/js_test.rb
 - test/dummy_app/Rakefile

data/lib/envvy/railtie.rb

@@ -1,52 +0,0 @@
-require 'yaml'
-
-module Envvy
-  class Railtie < Rails::Railtie
-    attr_accessor :env
-
-    class << self
-      attr_accessor :config_path
-
-      def config_path
-        @config_path || File.join(Rails.root, "config", "env_vars.yml")
-      end
-    end
-
-    config.before_initialize do
-      self.get("config") do |config|
-        config.each do |k, v|
-          ENV[k.to_s.upcase] = v
-        end
-      end
-    end
-
-    config.before_configuration do
-
-      set_env self.config_path
-
-      if Rails.env.development?
-        require 'filewatch/watch'
-        conf_watcher = FileWatch::Watch.new
-        conf_watcher.watch(self.config_path)
-
-        Thread.new do
-          conf_watcher.subscribe(1,5) do |status, path|
-            set_env path
-          end
-        end
-      end
-    end
-
-    def set_env file
-      self.env = if File.exist?(file) then YAML.load(File.read(file)) else {"js_config" => {}, "config" => {}} end
-    end
-
-    def get(key, &block)
-      if block_given?
-        yield self.env[key]
-      else
-        return self.env[key]
-      end
-    end
-  end
-end