jekyll-amazon 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c962cc8ef8e8ac44d9eb1c776b34f558b1d0ceae
-  data.tar.gz: 17752eb9437ac70c3cf2c980e48bf28a0f6c5162
+  metadata.gz: da83b3be2c74bd71cdba9a72ab120695ba7f11b1
+  data.tar.gz: da0ba626962a763761bd7c7644339a856a30604f
 SHA512:
-  metadata.gz: 795069dc05db49cb586084461b2df334df1fe3de749e6b99aebac4465b2f7a913bba5540a191e3f886ff1e6ced624ac5efdb6c4eb3bac7afc4b3097f0b296ec5
-  data.tar.gz: ce5b15b49491eed261950faa98f7432a0d1bf7a638bc361e39594088baa81311fc067c3cdb3233734681b9cc876393200b367c8c16ed1eb7f8ab25dd6cdc8e59
+  metadata.gz: fd197cf4998c8a36d9872016e1e666ac53fdc02e2dd987d4c7e26457b491d50c2a0312cf45cc69907f4a41374c86336d09c6563619be2586539318d3dacaba4f
+  data.tar.gz: 1c77ad77a27cc3eb6436ebbe97e8c4e596338f3f0971ce885caa3df5bd5a21c6c79f83107d2aad05cd24ba7396bd5cabb58d3b52c7213b18c74f5e07536a02e9

data/_sass/jk_amazon.scss

@@ -0,0 +1,23 @@
+.jk-amazon-item {
+  margin-bottom: 20px;
+  .jk-amazon-image {
+    float: left;
+    min-height: 1px;
+    width: 130px;
+  }
+  .jk-amazon-info {
+    margin-left: 130px;
+    min-height: 1px;
+    .jk-amazon-info-title {
+      padding-bottom: 10px;
+    }
+  }
+  &:before, &:after {
+    display: table;
+    content: " ";
+  }
+  &:after {
+    display: block;
+    clear: both;
+  }
+}

data/jekyll-amazon.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.add_runtime_dependency "amazon-ecs", "~> 2.4.0"
+  spec.add_runtime_dependency "i18n"
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/lib/jekyll-amazon/amazon_tag.rb

@@ -1,6 +1,7 @@
 # coding: utf-8
 require 'amazon/ecs'
 require 'singleton'
+require 'i18n'
 
 module Jekyll
   module Amazon
@@ -8,6 +9,7 @@ module Jekyll
       include Singleton
 
       CACHE_DIR = '.amazon-cache/'.freeze
+      RESPONSE_GROUP = 'SalesRank,Images,ItemAttributes,EditorialReview'.freeze
 
       ITEM_HASH = {
         asin:             'ASIN',
@@ -20,11 +22,12 @@ module Jekyll
         detail_page_url:  'DetailPageURL',
         small_image_url:  'SmallImage/URL',
         medium_image_url: 'MediumImage/URL',
-        large_image_url:  'LargeImage/URL'
+        large_image_url:  'LargeImage/URL',
+        description:      'EditorialReviews/EditorialReview/Content'
       }.freeze
 
       ECS_ASSOCIATE_TAG = ENV['ECS_ASSOCIATE_TAG'] || ''
-      AWS_ACCESS_KEY_ID = ENV['AWS_ACCESS_KEY'] || ''
+      AWS_ACCESS_KEY_ID = ENV['AWS_ACCESS_KEY_ID'] || ''
       AWS_SECRET_KEY = ENV['AWS_SECRET_KEY'] || ''
 
       raise 'AWS_ACCESS_KEY_ID env variable is not set' if AWS_ACCESS_KEY_ID.empty?
@@ -37,29 +40,40 @@ module Jekyll
       end
 
       def setup(context)
-        context.registers[:site]
+        site = context.registers[:site]
         # ::Amazon::Ecs.debug = true
         ::Amazon::Ecs.configure do |options|
           options[:associate_tag]     = ECS_ASSOCIATE_TAG
           options[:AWS_access_key_id] = AWS_ACCESS_KEY_ID
           options[:AWS_secret_key]    = AWS_SECRET_KEY
-          options[:response_group]    = 'SalesRank,Images,ItemAttributes'
+          options[:response_group]    = RESPONSE_GROUP
           options[:country]           = ENV['ECS_COUNTRY'] || 'jp'
         end
+
+        setup_i18n(site)
+      end
+
+      def setup_i18n(site)
+        locale = 'ja'
+        locale = site.config['amazon_locale'] if site.config['amazon_locale']
+        I18n.enforce_available_locales = false
+        I18n.locale = locale.to_sym
+        dir = File.expand_path(File.dirname(__FILE__))
+        I18n.load_path = [dir + "/../../locales/#{locale}.yml"]
       end
 
       def item_lookup(asin)
         return @result_cache[asin] if @result_cache.key?(asin)
         return read_cache(asin) if read_cache(asin)
-
-        retry_api do
+        item = retry_api do
           res = ::Amazon::Ecs.item_lookup(asin)
-          item = res.first_item
-          data = create_data(item)
-          write_cache(asin, data)
-          @result_cache[asin] = data
-          @result_cache[asin]
+          res.first_item
         end
+        raise ArgumentError unless item
+        data = create_data(item)
+        write_cache(asin, data)
+        @result_cache[asin] = data
+        @result_cache[asin]
       end
 
       private
@@ -86,12 +100,35 @@ module Jekyll
       end
 
       def create_data(item)
+        return unless item
         ITEM_HASH.each_with_object({}) do |(key, value), hash|
           hash[key] = item.get(value).to_s
         end
       end
     end
 
+    class ItemAttribute
+      attr_accessor :key
+      attr_accessor :value
+
+      def initialize(key, value)
+        self.key = key
+        self.value = value
+      end
+
+      def to_html
+        str = "<div class=\"jk-amazon-info-#{key}\">"
+        str += labeled
+        str += '</div>'
+        str
+      end
+
+      def labeled
+        return '' if value.nil? || value.empty?
+        "<span class=\"jk-amazon-info-label\">#{I18n.t(key)} </span>#{value}"
+      end
+    end
+
     class AmazonTag < Liquid::Tag
       attr_accessor :asin
       attr_accessor :template_type
@@ -139,10 +176,14 @@ module Jekyll
       end
 
       def detail(item)
-        author    = item[:author]
-        publisher = item[:publisher]
-        date      = item[:publication_date] || item[:release_date]
-        salesrank = item[:salesrank]
+        attrs = {
+          author: item[:author],
+          publisher: item[:publisher],
+          date: item[:publication_date] || item[:release_date],
+          salesrank: item[:salesrank],
+          description: br2nl(item[:description])
+        }.map { |k, v| ItemAttribute.new(k, v).to_html }.join("\n")
+
         str = <<-"EOS"
 <div class="jk-amazon-item">
   <div class="jk-amazon-image">
@@ -152,27 +193,15 @@ module Jekyll
     <div class="jk-amazon-info-title">
       #{title(item)}
     </div>
-    <div class="jk-amazon-info-author">
-      #{labeled("Author: ", author)}
-    </div>
-    <div class="jk-amazon-info-publisher">
-      #{labeled("Publisher: ", publisher)}
-    </div>
-    <div class="jk-amazon-info-date">
-      #{labeled("Date: ", date)}
-    </div>
-    <div class="jk-amazon-info-salesrank">
-      #{labeled("Sales Rank: ", salesrank)}
-    </div>
+    #{attrs}
   </div>
 </div>
-  EOS
+        EOS
         str.to_s
       end
 
-      def labeled(label, value)
-        return "" if value.nil? || value.empty?
-        "<span class=\"amazon-info-label\">#{label} </span>#{value}"
+      def br2nl(text)
+        text.gsub(%r{&lt;br\s*/?&gt;}, "\n") unless text.nil?
       end
     end
   end

data/lib/jekyll-amazon/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Amazon
-    VERSION = '0.1.3'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

data/locales/en.yml

@@ -0,0 +1,6 @@
+en:
+  author: 'Author: '
+  publisher: 'Publisher: '
+  date: 'Date: '
+  salesrank: 'Sales Rank: '
+  description: 'Description: '

data/locales/ja.yml

@@ -0,0 +1,6 @@
+ja:
+  author: '作者: '
+  publisher: '出版社/メーカー: '
+  date: '発売日: '
+  salesrank: '売上順位: '
+  description: '概要: '

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-amazon
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - tokzk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazon-ecs
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -93,12 +107,15 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- _sass/jk_amazon.scss
 - bin/console
 - bin/setup
 - jekyll-amazon.gemspec
 - lib/jekyll-amazon.rb
 - lib/jekyll-amazon/amazon_tag.rb
 - lib/jekyll-amazon/version.rb
+- locales/en.yml
+- locales/ja.yml
 homepage: https://github.com/tokzk/jekyll-amazon
 licenses:
 - MIT