mp3_player 0.1.0 → 0.1.1

data/lib/mp3_player.rb

@@ -3,7 +3,12 @@ require 'mp3_player/version'
 require 'mp3_player/view_helper'
 require 'mp3_player/layout_helper'
 require 'mp3_player/engine'
+require 'mp3_player/configuration'
 # includes the view and layout helpers to ActionView::Base
 ActionView::Base.send(:include, Mp3Player::ViewHelper)
 ActionView::Base.send(:include, Mp3Player::LayoutHelper)
 
+module Mp3Player
+  mattr_accessor :default_options
+  @@default_options = nil
+end

data/lib/mp3_player/configuration.rb

@@ -0,0 +1,10 @@
+module Mp3Player
+  class Configuration
+    def self.load_options
+      config_file_path = Rails.root.join('config', 'mp3_player.yml')
+      if File.exists? config_file_path
+        Mp3Player.default_options = YAML::load(File.open(config_file_path))
+      end
+    end
+  end
+end

data/lib/mp3_player/engine.rb

@@ -2,5 +2,16 @@ module Mp3Player
   # Required for assets to be discoverable in the asset pipeline
   # @private
   class Engine < ::Rails::Engine
+    initializer 'mp3_player.assets_precompile', group: :all do |app|
+          app.config.assets.precompile += [
+              'audio-player.js',
+              'audio-player-noswfobject.js',
+              'player.swf'
+          ]
+    end
+
+    initializer 'mp3_player.load_options' do
+      Configuration.load_options
+    end
   end
 end

data/lib/mp3_player/layout_helper.rb

@@ -1,18 +1,12 @@
 module Mp3Player
   module LayoutHelper
-    if Rails.env.production?
-      load_config_options
-    else
-      @@default_options = nil
-    end
-
     def mp3_player_headers options = {}
       ViewHelper.reset_player_count
 
       # Don't reload configuration options in production env
-      load_config_options if !Rails.env.production?
+      Configuration.load_options if !Rails.env.production?
 
-      options.reverse_merge! @@default_options if @@default_options
+      options.reverse_merge! Mp3Player.default_options if Mp3Player.default_options
       options.reverse_merge!({ width: 290 })
 
       audio_player_path = if options[:with_swfobject] == false
@@ -24,18 +18,8 @@ module Mp3Player
       javascript_include_tag(audio_player_path) +
           %Q[
           <script type="text/javascript">
-            AudioPlayer.setup("#{asset_path('player.swf')}/", #{options.to_json} );
+            AudioPlayer.setup("#{asset_path('player.swf')}", #{options.to_json} );
           </script>].html_safe
     end
-
-    private
-    def load_config_options
-      config_file_path = Rails.root.join('config', 'mp3_player.yml')
-      @@default_options = if File.exists? config_file_path
-                            YAML::load(File.open(config_file_path))
-                          else
-                            nil
-                          end
-    end
   end
 end

data/lib/mp3_player/version.rb

@@ -1,3 +1,3 @@
 module Mp3Player
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -2,7 +2,7 @@
 name: mp3_player
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Gavin Morrice
@@ -60,6 +60,7 @@ files:
 - lib/generators/mp3_player/templates/mp3_player.yml
 - lib/generators/mp3_player/yml_generator.rb
 - lib/mp3_player.rb
+- lib/mp3_player/configuration.rb
 - lib/mp3_player/engine.rb
 - lib/mp3_player/layout_helper.rb
 - lib/mp3_player/version.rb