reviewed_braai 0.2.3 → 0.3.0

data/Users/sbeam/public_html/reviewed_braai/reviewed_braai.gemspec

@@ -0,0 +1,21 @@
+$:.push File.expand_path("../lib", __FILE__)
+
+# Maintain your gem's version:
+require "reviewed_braai/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.name        = "reviewed_braai"
+  s.version     = ReviewedBraai::VERSION
+  s.authors     = ["Kevin Incorvia"]
+  s.email       = ["kincorvia@reviewed.com"]
+  s.homepage    = "http://www.reviewed.com"
+  s.summary     = "Braai matchers for Reviewed.com"
+
+  s.files = Dir["{app,config,db,lib}/**/*"] + [__FILE__, "MIT-LICENSE", "Rakefile", "README.rdoc"]
+
+  s.add_dependency "braai", ">= 1.6.2"
+  s.add_dependency "reviewed", ">= 0.4.0"
+
+  s.add_development_dependency "rspec"
+end

data/lib/reviewed_braai.rb

@@ -7,4 +7,9 @@ require 'reviewed_braai/errors'
 require 'reviewed_braai/matchers'
 
 module ReviewedBraai
+
+  def self.logger
+    @logger ||= Braai.logger
+  end
+
 end

data/lib/reviewed_braai/errors.rb

@@ -9,10 +9,8 @@ module ReviewedBraai
     end
 
     def self.log error
-      if defined?(Rails) && defined?(Rails.logger)
-        msg = "#{error.opts[:error_class]}: #{error.opts[:error_message]} key=#{error.opts[:key]}"
-        Rails.logger.warn(msg)
-      end
+      msg = "#{error.opts[:error_class]}: #{error.opts[:error_message]} key=#{error.opts[:key]}"
+      Braai.logger.warn(msg)
     end
 
   end
@@ -31,7 +29,8 @@ module ReviewedBraai
 
       @key = @opts[:key]
 
-      Notifications.notify(self) || Notifications.log(self)
+      Notifications.notify(self)
+      Notifications.log(self)
 
       super(@opts[:error_message])
     end

data/lib/reviewed_braai/handlers/articles.rb

@@ -8,14 +8,14 @@ module ReviewedBraai
 
     class ArticleAttachmentById < ReviewedBraai::Handlers::Base
       def perform
-        attachment = match_attachment(:id, matches[1])
+        attachment = fetch_attachment_by_id(matches[1])
         ::ReviewedBraai::Attachment.new(attachment).render
       end
     end
 
     class ArticleAttachmentByName < ReviewedBraai::Handlers::Base
       def perform
-        attachment = match_attachment(:name, matches[1])
+        attachment = fetch_attachment_by_name(matches[1], template.attributes[:article])
         ::ReviewedBraai::Attachment.new(attachment).render
       end
     end

data/lib/reviewed_braai/handlers/attachments.rb

@@ -2,15 +2,15 @@ module ReviewedBraai
   module Handlers
     class AttachmentsById < ReviewedBraai::Handlers::Base
       def perform
-        attachment = match_attachment(all_attachments, :id, matches[1])
-        ::ReviewedBraai::Attachment.new(attachment).render
+        attachment = fetch_attachment_by_id(matches[1])
+        Attachment.new(attachment).render
       end
     end
 
     class AttachmentsByName < ReviewedBraai::Handlers::Base
       def perform
-        attachment = match_attachment(all_attachments, :name, matches[1])
-        ::ReviewedBraai::Attachment.new(attachment).render
+        attachment = fetch_attachment_by_name(matches[1])
+        Attachment.new(attachment).render
       end
     end
   end

data/lib/reviewed_braai/handlers/base.rb

@@ -1,15 +1,47 @@
+require 'reviewed'
+
 module ReviewedBraai
   module Handlers
     class Base < Braai::Handlers::Base
       include ReviewedBraai::Helpers
 
+      def initialize(template, key, matches)
+        Braai.logger.debug "#{self.class.name}: matched! - #{matches[1..-1].join(',')}" if matches
+        super(template, key, matches)
+      end
+
       def perform
-        "<!-- #{key} -->"
+        msg = "#{self.class.to_s}: unmatched! #{key}"
+        Braai.logger.warn msg
+        "<!-- #{msg} -->"
       end
 
       def rescue_from_error(e)
-        "<!-- #{key} -->"
+        msg = "#{self.class.to_s}: #{e.message} - #{key}"
+        Braai.logger.warn msg
+        "<!-- #{msg} -->"
+      end
+
+
+      protected
+
+      def fetch_attachments_by_tags tag, scope=nil
+        req = ::Reviewed::Request.new :resource => Reviewed::Attachment, :scope => scope
+        res = req.where :tags => tag
+        res.items
+      end
+
+      def fetch_attachment_by_name name, scope=nil
+        req = ::Reviewed::Request.new :resource => Reviewed::Attachment, :scope => scope
+        res = req.where :name => name
+        res.items.first if res.items
       end
+
+      def fetch_attachment_by_id id
+        req = ::Reviewed::Request.new :resource => Reviewed::Attachment
+        req.find id
+      end
+
     end
   end
 end

data/lib/reviewed_braai/handlers/products.rb

@@ -1,23 +1,24 @@
 module ReviewedBraai
   module Handlers
+
     class ProductVanity < ReviewedBraai::Handlers::Base
       def perform
-        attachment = match_attachment_by_tag(primary_product.attachments, "vanity")
-        ::ReviewedBraai::Attachment.new(attachment).render
+        attachments = fetch_attachments_by_tags('vanity', primary_product)
+        ::ReviewedBraai::Attachment.new(attachments.first).render
       end
     end
 
     class ProductAttachmentById < ReviewedBraai::Handlers::Base
       def perform
-        attachment = match_attachment(primary_product.attachments, :id, matches[1])
-        ::ReviewedBraai::Attachment.new(attachment).render
+        result = fetch_attachment_by_id(matches[1])
+        Attachment.new(result).render
       end
     end
 
     class ProductAttachmentByName < ReviewedBraai::Handlers::Base
       def perform
-        attachment = match_attachment(primary_product.attachments, :name, matches[1])
-        ::ReviewedBraai::Attachment.new(attachment).render
+        result = fetch_attachment_by_name(matches[1], primary_product)
+        Attachment.new(result).render
       end
     end
 
@@ -43,8 +44,8 @@ module ReviewedBraai
     class ProductsVanity < ReviewedBraai::Handlers::Base
       def perform
         product = match_product(:id, matches[1])
-        attachment = match_attachment_by_tag(product.attachments, "vanity")
-        ::ReviewedBraai::Attachment.new(attachment).render
+        attachments = fetch_attachments_by_tags('vanity', product)
+        ::ReviewedBraai::Attachment.new(attachments.first).render
       end
     end
 
@@ -58,17 +59,17 @@ module ReviewedBraai
 
     class ProductsAttachmentById < ReviewedBraai::Handlers::Base
       def perform
-        product = match_product(:id, matches[1])
-        attachment = match_attachment(product.attachments, :id, matches[2])
-        ::ReviewedBraai::Attachment.new(attachment).render
+        result = fetch_attachment_by_id(matches[2])
+        Attachment.new(result).render
       end
     end
 
     class ProductsAttachmentByName < ReviewedBraai::Handlers::Base
       def perform
         product = match_product(:id, matches[1])
-        attachment = match_attachment(product.attachments, :name, matches[2])
-        ::ReviewedBraai::Attachment.new(attachment).render
+
+        result = fetch_attachment_by_name(matches[2], product)
+        Attachment.new(result).render
       end
     end
 

data/lib/reviewed_braai/helpers.rb

@@ -17,28 +17,6 @@ module ReviewedBraai
       end
     end
 
-    def match_attachment(attachments = nil, attr, match)
-      unless attachments
-        attachments = all_attachments
-      end
-      if attachment = attachments.find { |a| a.send(attr) == match }
-        attachment
-      else
-        raise ::ReviewedBraai::TagRenderError::AttachmentNotFound.new(default_args)
-      end
-    end
-
-    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
-        raise ::ReviewedBraai::TagRenderError::AttachmentNotFound.new(default_args)
-      end
-    end
-
     def match_manufacturer_spec(product = template.attributes[:article].primary_product, name)
       if spec = product.manufacturer_specs[name]
         spec
@@ -67,23 +45,6 @@ module ReviewedBraai
       end
     end
 
-    def all_attachments
-      attachments = []
-      #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 } }
     end

data/lib/reviewed_braai/matchers/default.rb

@@ -8,7 +8,6 @@ module ReviewedBraai
       Braai::Template.map(Braai::Matchers::IterationMatcher, Braai::Handlers::Iteration)
 
       Braai::Handlers.rescue_from ReviewedBraai::TagRenderError, ->(handler, e) do
-        # puts %{handler: #{handler.inspect}}
         value = handler.matches[1..-1].join(' ')
         "<!-- #{e.class.to_s}: #{value} -->"
       end

data/lib/reviewed_braai/version.rb

@@ -1,3 +1,3 @@
 module ReviewedBraai
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reviewed_braai
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: braai
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.2
+- !ruby/object:Gem::Dependency
+  name: reviewed
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +86,7 @@ files:
 - lib/reviewed_braai/version.rb
 - lib/reviewed_braai.rb
 - lib/tasks/reviewed_braai_tasks.rake
+- /Users/sbeam/public_html/reviewed_braai/reviewed_braai.gemspec
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
@@ -85,12 +102,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4608000239477455564
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4608000239477455564
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25