thumbs_yup 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1adab547f4675b1dd8da06175ff6013a9dbac7fe
-  data.tar.gz: fe8d9a8815a43c696ed42c8e505796af5e6c8aab
+  metadata.gz: 3ed198c40962e0e720ebd79f6269cab89fdae92e
+  data.tar.gz: a69a51d22ae74f955b32ab34e074f7506ff9ddd1
 SHA512:
-  metadata.gz: fd39d1e16f3262f8aa10a7d97ed7dfd0f003319dc487f08333d06e0556d0619d0e1cdd87d0f9416dd866f777e1d33b6264b2ac6dec7bec52ce2d01ebc55bb7cd
-  data.tar.gz: 982da90fe7d1e4bae2653ab5995e24451e5581ea918e535ae88d078649d86929883630f642a8139b39d7e9811cdd7f1c3d10632a76a0671c8de35ea2b97c70e7
+  metadata.gz: c3b38f2c2643004cc3a33d2e743ef05a8376f92dd13ee3a33a637449ecdbde20391a315f266009767bba9884c516b3e914343781faf9c8dbd30318aa667a5525
+  data.tar.gz: b79da320c197e9ccf1bfa28e6bd3e7779dd5dbbb59a7a1112e031ef7ef7b1b1aba9b0a5b19aad5db0bbb06fefc3d9c3483d3cd96f0a125ad4f36638174e62d36

data/lib/thumbs_yup/review_decorator.rb

@@ -0,0 +1,33 @@
+class ReviewDecorator 
+  attr_accessor :review
+
+  def initialize(vars)
+    @review = {
+      "body" => vars["body"],
+      "full_name" => "#{vars["first_name"]} #{vars["last_name"]}",
+      "title_and_business_name" =>  title_and_business_name(vars),
+      "city_state_and_country" =>  city_state_and_country(vars),
+    }
+    @review = clean_vars(@review)
+  end
+
+  private
+
+  def title_and_business_name(vars)
+    separator = ", " if vars["title"] && vars["business_name"]
+    "#{vars["title"]}#{separator}#{vars["business_name"]}"
+  end
+
+  def city_state_and_country(vars)
+    separator1 = ", " if vars["city"] && vars["state"]
+    separator2 = ", " if (vars["city"] && vars["country"]) || (vars["state"] && vars["country"]) 
+    "#{vars["city"]}#{separator1}#{vars["state"]}#{separator2}#{vars["country"]}"
+  end
+
+  def clean_vars(vars)
+    vars.each do |key, value|
+      vars[key] ||= ""
+      vars[key] = CGI::escapeHTML(vars[key])
+    end
+  end
+end

data/lib/thumbs_yup/reviews.erb

@@ -14,9 +14,9 @@
       }
     }
 </script>
-<div class="thumbsYup">
+<div class="thumbsYup yui3-cssreset">
   <div class="pagination">
   </div>
-<%= reviews_html %>
+<%= reviews %>
 </div>
 <script type='text/javascript' src=<%= "'#{settings[:thumbs_yup_url]}" %>/assets/thumbs-yup-client.js'></script>

data/lib/thumbs_yup/server_embed.rb

@@ -8,20 +8,14 @@ module ThumbsYup
       def render_public_reviews(page: nil)
         check_user_identifer!
 
-        reviews_html = ""
-
         review_data = json_review_data(page: page)
         reviews = review_data["reviews"]
         metadata = review_data["metadata"]
 
-        reviews.each do |review|
-          reviews_html += decorate(review)
-        end
-
         html = TemplateRenderer::render_page(
           settings: settings,
           pagination: pagination(metadata),
-          reviews_html: reviews_html
+          reviews: reviews
         )
 
         html.html_safe
@@ -56,10 +50,6 @@ module ThumbsYup
         JSON.parse(response.body)
       end
 
-      def decorate(json_review)
-        TemplateRenderer::render_review(json_review)
-      end
-
       def settings
         {
           review_style: ThumbsYup.configuration.review_style,

data/lib/thumbs_yup/template_renderer.rb

@@ -1,23 +1,42 @@
 require 'erb'
 require 'ostruct'
+require_relative 'review_decorator'
 
 class TemplateRenderer < OpenStruct
-  def self.render_review(vars)
-    style = ThumbsYup.configuration.review_style
-    background = ThumbsYup.configuration.review_background
-    template_file = style + "_" + background + ".erb"
-
-    template = File.read(
-      File.join(File.dirname(__FILE__), 'templates', template_file)
-    )
-    TemplateRenderer.new(vars).render(template)
-  end
+  class << self
+    def render_page(vars)
+      vars[:reviews] = reviews_html(vars[:reviews])
+
+      TemplateRenderer.new(vars).render(page_template)
+    end
+
+    private
+
+    def reviews_html(reviews)
+      reviews.reduce("") do |acc, review|
+        acc << render_review(review)
+      end
+    end
+
+    def render_review(vars)
+      vars = ReviewDecorator.new(vars).review
+      TemplateRenderer.new(vars).render(review_template)
+    end
+
+    def review_template
+      style = ThumbsYup.configuration.review_style
+      background = ThumbsYup.configuration.review_background
+      template_file = style + "_" + background + ".erb"
+      File.read(
+        File.join(File.dirname(__FILE__), 'templates', template_file)
+      )
+    end
 
-  def self.render_page(vars)
-    template = File.read(
-      File.join(File.dirname(__FILE__), 'reviews.erb')
-    )
-    TemplateRenderer.new(vars).render(template)
+    def page_template
+      File.read(
+        File.join(File.dirname(__FILE__), 'reviews.erb')
+      )
+    end
   end
 
   def render(template)

data/lib/thumbs_yup/templates/bubble_hollow.erb

@@ -1,8 +1,10 @@
   <div class="review<%= ThumbsYup.configuration.review_size.capitalize %>">
     <div class="rstyle<%= ThumbsYup.configuration.review_color.capitalize + ThumbsYup.configuration.review_style.capitalize + ThumbsYup.configuration.review_background.capitalize %>">
-      <%= CGI::escapeHTML(body) %>
+      <%= body %>
     </div>
     <p class="signature">
-      <%= CGI::escapeHTML(first_name) %>
+      <%= full_name %><% unless full_name.blank? %><br><% end %>
+      <%= title_and_business_name %><% unless title_and_business_name.blank? %><br><% end %>
+      <%= city_state_and_country %>
     </p>
   </div>

data/lib/thumbs_yup/version.rb

@@ -1,3 +1,3 @@
 module ThumbsYup
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thumbs_yup
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jomana Malone
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-22 00:00:00.000000000 Z
+date: 2017-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,7 @@ files:
 - bin/setup
 - lib/thumbs_yup.rb
 - lib/thumbs_yup/configuration.rb
+- lib/thumbs_yup/review_decorator.rb
 - lib/thumbs_yup/reviews.erb
 - lib/thumbs_yup/server_embed.rb
 - lib/thumbs_yup/template_renderer.rb