reviewed_braai 0.0.3 → 0.0.4

data/lib/reviewed_braai/handlers/articles.rb

@@ -2,7 +2,7 @@ module ReviewedBraai
   module Handlers
     class ArticleMethod < ReviewedBraai::Handlers::Base
       def perform
-        source.send(matches[1])
+        template.attributes[:article].send(matches[1])
       end
     end
 

data/lib/reviewed_braai/handlers/base.rb

@@ -3,17 +3,12 @@ module ReviewedBraai
     class Base
       include ReviewedBraai::Helpers
 
-      attr_accessor :template, :key, :matches, :source
+      attr_accessor :template, :key, :matches
 
       class << self
 
         def call(template, key, matches)
-          begin
-            handler = self.new(template, key, matches)
-          rescue => e
-            return rescue_from_error(key)
-          end
-
+          handler = self.new(template, key, matches)
           handler.safe_perform
         end
 
@@ -26,7 +21,6 @@ module ReviewedBraai
         @template = template
         @key = key
         @matches = matches
-        @source = extract_source(template)
       end
 
       def safe_perform
@@ -41,13 +35,6 @@ module ReviewedBraai
         "<!-- #{key} -->"
       end
 
-      def extract_source(template)
-        unless source = template.attributes[:source]
-          raise ::ReviewedBraai::TagRenderError::SourceNotFound.new(default_args)
-        end
-        return source
-      end
-
       def rescue_from_error(key)
         self.class.rescue_from_error(key)
       end

data/lib/reviewed_braai/helpers.rb

@@ -2,14 +2,14 @@ module ReviewedBraai
   module Helpers
 
     def primary_product
-      if product = source.primary_product
+      if product = template.attributes[:article].primary_product
         product
       else
         raise ::ReviewedBraai::TagRenderError::ProductNotFound.new(default_args)
       end
     end
 
-    def match_brand(product = source.primary_product)
+    def match_brand(product = template.attributes[:article].primary_product)
       if brand = product.brand
         brand
       else
@@ -17,7 +17,10 @@ module ReviewedBraai
       end
     end
 
-    def match_attachment(attachments = source.attachments, attr, match)
+    def match_attachment(attachments = nil, attr, match)
+      unless attachments
+        attachments = all_attachments
+      end
       if attachment = attachments.find { |a| a.send(attr) == match }
         attachment
       else
@@ -25,7 +28,10 @@ module ReviewedBraai
       end
     end
 
-    def match_attachment_by_tag(attachments = source.attachments, tag)
+    def match_attachment_by_tag(attachments = nil, tag)
+      unless attachments
+        attachments = all_attachments
+      end
       if attachment = attachments.find { |a| a.tags.include?(tag) }
         attachment
       else
@@ -33,7 +39,7 @@ module ReviewedBraai
       end
     end
 
-    def match_manufacturer_spec(product = source.primary_product, name)
+    def match_manufacturer_spec(product = template.attributes[:article].primary_product, name)
       if spec = product.manufacturer_specs[name]
         spec
       else
@@ -41,7 +47,7 @@ module ReviewedBraai
       end
     end
 
-    def match_raw_score(product = source.primary_product, name)
+    def match_raw_score(product = template.attributes[:article].primary_product, name)
       if score = product.raw_scores[name] && product.raw_scores[name]["value"]
         return score
       else
@@ -49,7 +55,11 @@ module ReviewedBraai
       end
     end
 
-    def match_product(products = source.products, attr, match)
+    def match_product(products = [], attr, match)
+      if products.empty?
+        art = template.attributes[:article]
+        products = art.products if art
+      end
       if product = products.find { |a| a.send(attr) == match }
         product
       else
@@ -59,14 +69,23 @@ module ReviewedBraai
 
     def all_attachments
       attachments = []
-      attachments << source.attachments
-      attachments << source.primary_product.attachments if source.primary_product
-      attachments << source.products.map{ |x| x.attachments }
-      attachments.flatten!
+      #template.attributes.values.each do |source|
+      template.attributes.values.compact.each do |source|
+        if (source.is_a?(Array))
+          attachments += source.map {|x| x.attachments if x.attachments}.flatten
+        else
+          attachments += source.attachments if source.attachments
+        end
+      end
+      # attachments.flatten! if attachments
+      # attachments.compact! if attachments
+      # attachments.uniq! if attachments
+      # attachments
+      attachments.flatten.compact.uniq
     end
 
     def default_args
-      { key: key, parameters: { template: template, key: key, matches: matches, source: source } }
+      { key: key, parameters: { template: template, key: key, matches: matches } }
     end
   end
 end

data/lib/reviewed_braai/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reviewed_braai
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: braai
@@ -95,4 +95,3 @@ signing_key:
 specification_version: 3
 summary: Braai matchers for Reviewed.com
 test_files: []
-has_rdoc: