optipipe 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85492f3aeccad8a655259c18a3dacfea5b68944b
-  data.tar.gz: 525e89e4da9b61eca8c8e179664f208624f17449
+  metadata.gz: e934634eec7b8b742655a7d7a7fdc6bab110e324
+  data.tar.gz: af7f6028b8c35d384a70554d26b35ec80ae60a25
 SHA512:
-  metadata.gz: 4001b43c9690715a1539e60b2c231607fba61cff2816c88c87791b456b03b8a61a2f67888aec8ca04ed23ad07ba6c02d212fd28acf09c62ff66c73681679bdc7
-  data.tar.gz: 7767ae51b75fb9a4eb00fdc67bb4b0c13df9e4be4a8ddf0fc1a41a6201523c70153ed8eb84322a980fde8bf8c7bfbaa4f8d231595c6ef165c6f057045e7ba571
+  metadata.gz: 2cc1285a4696f09eba8ae8f3a940197e17aafdca339fa8e21107f27de6219394f052f2580f5ca9208018bd5b0640452e1cc4bca6a6f3d6717fe9beb4fa07ffe2
+  data.tar.gz: ff1b610312dfda6631d10f578ae215336b41a4069bcefab785c5d5b19a9bb5e114223d73dc1124887be6a045618af010e0334498fb7d5a79e8b67755871dd89d

data/lib/optipipe/engine.rb

@@ -29,7 +29,7 @@ module Optipipe
     end
 
     # Add helpers
-    initializer 'gtm_on_rails.action_view_helpers' do
+    initializer 'optipipe.action_view_helpers' do
       ActiveSupport.on_load :action_view do
         include Optipipe::TagHelper
       end

data/lib/optipipe/helpers/tag_helper.rb

@@ -58,7 +58,7 @@ module Optipipe
       return if mappers.blank?
 
       conditions.each do |key, value|
-        mappers.select! do |mapper|
+        mappers = mappers.select do |mapper|
           mapper[key.to_s] == value
         end
       end

data/lib/optipipe/models/mapper.rb

@@ -1,9 +1,4 @@
 module Optipipe
-  def self.initial_load!
-    Mapper.load_yaml_data('javascripts')
-    Mapper.load_yaml_data('stylesheets')
-  end
-
   class Mapper
     class << self
       def get_javascript_mappers(controller_path)
@@ -14,21 +9,34 @@ module Optipipe
         get_yaml_data('stylesheets')[controller_path]
       end
 
-      def load_yaml_data(type)
-        const_name = :"#{type.upcase}_YAML_DATA"
-        yaml_data = {}
-        Dir.glob(Rails.root.join('app', 'assets', type, 'optipipe', 'mappers', '*')).each do |mapper_yaml|
-          data = YAML.load(File.open(mapper_yaml))
-          yaml_data[data['controller_path']] ||= []
-          yaml_data[data['controller_path']] << data
+      def load_yamls!
+        javascript_files = Dir.glob(Rails.root.join('app', 'assets', 'javascripts', 'optipipe', 'mappers', '*'))
+        stylesheet_files = Dir.glob(Rails.root.join('app', 'assets', 'stylesheets', 'optipipe', 'mappers', '*'))
+
+        mapper_data = {
+          javascripts: {},
+          stylesheets: {}
+        }
+        javascript_files.sort.each do |yaml_path|
+          data = YAML.load(File.open(yaml_path))
+          mapper_data[:javascripts][data['controller_path']] ||= []
+          mapper_data[:javascripts][data['controller_path']] << data
+        end
+        stylesheet_files.sort.each do |yaml_path|
+          data = YAML.load(File.open(yaml_path))
+          mapper_data[:stylesheets][data['controller_path']] ||= []
+          mapper_data[:stylesheets][data['controller_path']] << data
         end
-        self.const_set(const_name, yaml_data)
+        
+        Kernel.send(:remove_const, :OPTIPIPE_MAPPER_DATA) if Kernel.const_defined?(:OPTIPIPE_MAPPER_DATA)
+        Kernel.const_set(:OPTIPIPE_MAPPER_DATA, Marshal.load(Marshal.dump(mapper_data)))
       end
 
       private
       
       def get_yaml_data(type)
-        self.const_get(:"#{type.upcase}_YAML_DATA")
+        data = Kernel.const_get(:OPTIPIPE_MAPPER_DATA)
+        Marshal.load(Marshal.dump(data))[type.to_sym]
       end
     end
   end

data/lib/optipipe/railtie.rb

@@ -0,0 +1,10 @@
+module Optipipe
+  if defined?(Rails::Railtie)
+    class Railtie < Rails::Railtie
+      # Parse the mappers before any of the initializers
+      initializer :load_optipipe_mappers, :before => :load_environment_config do
+        Optipipe::Mapper.load_yamls!
+      end
+    end
+  end
+end

data/lib/optipipe/version.rb

@@ -1,3 +1,3 @@
 module Optipipe
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

data/lib/optipipe.rb

@@ -1,4 +1,5 @@
 require "optipipe/engine"
+require "optipipe/railtie"
 
 module Optipipe
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optipipe
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - ykogure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,7 @@ files:
 - lib/optipipe/engine.rb
 - lib/optipipe/helpers/tag_helper.rb
 - lib/optipipe/models/mapper.rb
+- lib/optipipe/railtie.rb
 - lib/optipipe/version.rb
 - lib/tasks/optipipe_tasks.rake
 homepage: https://github.com/ZIGExN/optipipe