woody-decorators 1.4.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8cb244d781bfa1025da6fdc3bd6af5bb1f58ce8
-  data.tar.gz: 485f1d4a6a2e7e54dbe70996f8a8219a7b5315f7
+  metadata.gz: 96f41a3deba0d2e3b2b596713003fbfdca6f13d5
+  data.tar.gz: 5bc6fd4b221b075a661a86cddef0b05875b87fea
 SHA512:
-  metadata.gz: 8a8ee42cfd3a9bd4a29ca4af1a2cc44f34b65e1899a1a2d582e5dba0d1abffaadc11d00119907fd27cca9c522918343478bbd53004f23d720444fbd7d0fc16e3
-  data.tar.gz: 445ebe77e427e6a8018ee985ae9a315be1cca0b9a99148648ff0ceddb43f1b4df6f77f8959865d73470128171b2dc9a1d20896cae3c307c1bcae5dbc114b8381
+  metadata.gz: 1b5d1bc5d6eb74bc24c7dd679534c3a2b6e3599bf7ad0e341708e7a27652938f2038fce7d143b23a720b3f3d67bde6153eb506a6298daefba8f646a3aa68aae9
+  data.tar.gz: 3fb7ca4ffa4143704b38836fdb08fba48e29a4c32522b655be025e83a01a7b1030cd9cd6508f3c8b31123969ba861157cca7d83c4db52aaf3120cdcd6702a354

data/lib/woody/decorators/brand_user.rb

@@ -4,11 +4,7 @@ module Woody
   module Decorators
     class BrandUser < User
       def avatar
-        default_avatar
-      end
-
-      def default_avatars
-        1
+        super("brands")
       end
     end
   end

data/lib/woody/decorators/challenge.rb

@@ -12,7 +12,7 @@ module Woody
       end
 
       def concept_questions
-        questions.fetch("concept", {})
+        questions.fetch("concept") { {} }
       end
 
       def draft?
@@ -25,7 +25,7 @@ module Woody
       end
 
       def essentials_questions
-        questions.fetch("essentials", {})
+        questions.fetch("essentials") { {} }
       end
 
       def exist?
@@ -57,9 +57,7 @@ module Woody
       def questions
         @questions ||= Wes::Data::API::Challenge.questions.map do |question|
           ChallengeQuestion.new(question, @model.answers)
-        end.group_by do |question|
-          question.section
-        end
+        end.group_by(&:section)
       end
 
       def brand

data/lib/woody/decorators/challenge_question.rb

@@ -4,8 +4,8 @@ module Woody
   module Decorators
     class ChallengeQuestion < Base
       def initialize(model, answers)
-        super(model)
         @answers = answers
+        super(model)
       end
 
       def answer
@@ -13,8 +13,8 @@ module Woody
         answer_item ? answer_item.answer : ""
       end
 
-      def has_answer?
-        answer_for_question(@model.id)
+      def answered?
+        answer_for_question(@model.id).nil? ? false : true
       end
 
       def text_type?

data/lib/woody/decorators/creator_user.rb

@@ -3,8 +3,8 @@ require "woody/decorators/user"
 module Woody
   module Decorators
     class CreatorUser < User
-      def default_avatars
-        5
+      def avatar
+        super("creator")
       end
 
       def location
@@ -14,6 +14,12 @@ module Woody
       def portfolio_url
         format("/u/%s", @model.portfolio_username)
       end
+
+      protected
+
+      def default_avatars
+        5
+      end
     end
   end
 end

data/lib/woody/decorators/user.rb

@@ -8,8 +8,10 @@ module Woody
         super(model)
       end
 
-      def avatar
-        @model.onboarded ? user_avatar : default_avatar
+      def avatar(platform)
+        invalid_platform(platform) unless %w(creator brands).include?(platform)
+        return user_avatar(platform) if platform == "brands"
+        @model.onboarded ? user_avatar(platform) : default_avatar(platform)
       end
 
       def exist?
@@ -34,18 +36,25 @@ module Woody
 
       private
 
-      def default_avatar
+      def default_avatar(platform)
         r = rand(1..default_avatars)
         format(
-          "%s/%s/%s/00%d.png",
-          @config.s3_domain, @config.public_s3_bucket, @config.s3_avatar_path, r
+          "%s/%s/%s/avatars/00%d.png",
+          @config.s3_domain, @config.public_s3_bucket, platform, r
         )
       end
 
-      def user_avatar
+      def invalid_platform(platform)
+        raise(
+          ArgumentError,
+          "'#{platform}' is not a supported platform"
+        )
+      end
+
+      def user_avatar(platform)
         format(
-          "%s/%s/%s/%s.png",
-          @config.s3_domain, @config.public_s3_bucket, @config.s3_avatar_path, id
+          "%s/%s/%s/avatars/%s.png",
+          @config.s3_domain, @config.public_s3_bucket, platform, id
         )
       end
     end

data/lib/woody/decorators/video.rb

@@ -78,7 +78,9 @@ module Woody
       def dev_url
         format(
           "%s/%s/%s",
-          app_config["s3_domain"], app_config["private_s3_bucket"], @model.url_path
+          app_config["s3_domain"],
+          app_config["private_s3_bucket"],
+          @model.url_path
         )
       end
 

data/lib/woody/decorators.rb

@@ -1,5 +1,5 @@
 module Woody
   module Decorators
-    VERSION = "1.4.1".freeze
+    VERSION = "2.0.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: woody-decorators
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0
 platform: ruby
 authors:
 - ''
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler