omniturize 0.0.3 → 0.0.4

data/lib/omniturize/base.rb

@@ -38,9 +38,7 @@ module Omniturize
       def filter_collection_for_action(collection, action)
         return collection if action.blank?
         collection.select do |element|
-          (element.only.present? && element.only.include?(action.try(:to_sym))) ||
-          (element.except.present? && !element.except.include?(action.try(:to_sym))) ||
-          (element.only.blank? && element.except.blank?)
+          element.passes_filter?(action)
         end
       end
 
@@ -77,13 +75,21 @@ module Omniturize
       end
     end
 
+    def find_vars(name, options = {})
+      meta_vars_to_vars(self.class.find_meta_vars(name, options))
+    end
+
     def find_var(name, options = {})
-      vars(options[:action]).detect{|x|x.matches_name?(name)}
+      find_vars(name, options).first
+    end
+
+    def find_values(name, options = {})
+      find_vars(name, options).map(&:value)
     end
 
     def meta_vars_to_vars(meta_vars)
       meta_vars.inject([]) do |vars, meta_var|
-        vars << meta_var.value(controller) if meta_var
+        vars << (meta_var.value(controller) if meta_var) rescue nil
         vars
       end
     end

data/lib/omniturize/meta_js.rb

@@ -36,7 +36,21 @@ module Omniture
 
     def return_var(scope)
       value_procs.map{ |p| scope.instance_eval(&p) }.flatten.uniq.join(delimiter)
-      #scope.instance_eval(&p)
     end
+
+    def passes_filter?(filter)
+      passes_only_filter?(filter) && passes_except_filter?(filter)
+    end
+
+    private
+
+    def passes_only_filter?(filter)
+      only.blank? || only.detect{|x| x.is_a?(Regexp) ? filter.match(x) : filter.to_sym == x.to_sym}.present?
+    end
+
+    def passes_except_filter?(filter)
+      except.blank? || except.detect{|x| x.is_a?(Regexp) ? filter.match(x) : filter.to_sym == x.to_sym}.blank?
+    end
+
   end
 end

data/lib/omniturize/meta_var.rb

@@ -48,6 +48,20 @@ module Omniturize
         else raise ArgumentError.new('name must be a String or a Regexp')
       end
     end
-    
+
+    def passes_filter?(filter)
+      passes_only_filter?(filter) && passes_except_filter?(filter)
+    end
+
+    private
+
+    def passes_only_filter?(filter)
+      only.blank? || only.detect{|x| x.is_a?(Regexp) ? filter.match(x) : filter.to_sym == x.to_sym}.present?
+    end
+
+    def passes_except_filter?(filter)
+      except.blank? || except.detect{|x| x.is_a?(Regexp) ? filter.match(x) : filter.to_sym == x.to_sym}.blank?
+    end
+
   end
 end

data/lib/omniturize/printer.rb

@@ -8,9 +8,11 @@ module Omniturize
     end
     
     def js(options = {})
+      html_options = []
+      options[:html_options].each_pair{|k,v| html_options << "#{k}=\"#{v}\""} if options[:html_options].present?
       output = <<-JS
         <script type="text/javascript" language="JavaScript" src="#{Omniturize::js_src}"></script>
-        <script type="text/javascript" language="JavaScript">
+        <script type="text/javascript" language="JavaScript" #{html_options.join(' ')}>
           #{js_vars(options)}
           #{print_js_events(options)}
           #{print_js_snippets(options)}
@@ -42,7 +44,7 @@ module Omniturize
 
     def print_js_events(options = {})
       values = js_events(options).join(',')
-      values.blank? ? nil : "s.events = \"#{values}\""
+      values.blank? ? nil : "s.events=\"#{values}\""
     end
 
     def print_js_snippets(options = {})

data/lib/omniturize/version.rb

@@ -1,3 +1,3 @@
 module Omniturize
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/omniturize_rails.rb

@@ -21,7 +21,7 @@ module Omniturize
 
         @reporter ||=  begin
           options[:controller].present? ? "#{options[:controller].classify}Reporter".constantize.new(self) :
-                                          "#{self.controller_name.capitalize}Reporter".constantize.new(self)
+                                          "#{self.class.name.gsub(/Controller$/, '')}Reporter".constantize.new(self)
         rescue NameError
           BasicReporter.new(self)
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: omniturize
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - eLafo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-13 00:00:00 Z
+date: 2011-09-17 00:00:00 Z
 dependencies: []
 
 description: This gem integrates Omniture SiteCatalyst into your web app. You can specify vars, events and custom javascript for every action of a controller. This gem is proudly based on the omniture_client gem, from which it takes much code and ideas