aweplug 1.0.0.a23 → 1.0.0.a24

data/aweplug.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'faraday_middleware', '>= 0.9.0'
   gem.add_dependency 'curb', '~> 0.8.5'
   gem.add_dependency 'oauth', '~> 0.3.6'
+  gem.add_dependency 'net-http-persistent', '~> 2.9.4'
 
   gem.add_development_dependency 'guard-rspec', '~> 3.0.0'
   gem.add_development_dependency 'rake', '~> 10.0.4'

data/lib/aweplug/extensions/asciidoc_example.rb

@@ -3,7 +3,6 @@ require 'asciidoctor'
 require 'aweplug/helpers/git_metadata'
 require 'aweplug/helpers/searchisko'
 require 'json'
-require 'pry'
 
 module Aweplug
   module Extensions
@@ -19,7 +18,9 @@ module Aweplug
       include Aweplug::Helper::Git::Commit::Metadata
       include Aweplug::Helper::Git::Repository
 
-      # Public: Initialization method, used in the awestruct pipeline.
+      # Public: Initialization method, used in the awestruct pipeline. This
+      #         makes use of the Aweplug::Helper::Searchisko class, please see 
+      #         that class for more info on options and settings for Searchisko.
       #
       # opts - A Hash of options, some being required, some not (default: {}). 
       #        :repository               - The String name of the directory 
@@ -78,7 +79,7 @@ module Aweplug
                                                        :searchisko_username => ENV['dcp_user'], 
                                                        :searchisko_password => ENV['dcp_password'], 
                                                        :cache => site.cache,
-                                                       :logger => site.profile == 'developement'})
+                                                       :logger => site.log_faraday})
         Find.find @directory do |path|
           Find.prune if File.directory?(path) && !@recurse_subdirectories
 

data/lib/aweplug/extensions/kramdown_quickstart.rb

@@ -11,7 +11,9 @@ module Aweplug
       # Public: An awestruct extension for guides / examples written in AsciiDoc.
       #         Files with the .asciidoc or .adoc extension are considered to be
       #         AsciiDoc files. This extension makes use of asciidoctor to 
-      #         render the files.
+      #         render the files. This makes use of the 
+      #         Aweplug::Helper::Searchisko class, please see that class for 
+      #         more info on options and settings for Searchisko.
       #
       # Example
       #
@@ -65,7 +67,7 @@ module Aweplug
                                                          :searchisko_username => ENV['dcp_user'], 
                                                          :searchisko_password => ENV['dcp_password'], 
                                                          :cache => site.cache,
-                                                         :logger => site.profile == 'developement'})
+                                                         :logger => site.log_faraday})
           Dir["#{@repo}/*/README.md"].each do |file|
             next if @excludes.include?(File.dirname(file))
             
@@ -95,7 +97,8 @@ module Aweplug
               :sys_created => metadata[:commits].collect { |c| DateTime.parse c[:date] }.last,
               :sys_activity_dates => metadata[:commits].collect { |c| DateTime.parse c[:date] },
               :sys_updated => metadata[:commits].collect { |c| DateTime.parse c[:date] }.first,
-              :target_product => metadata[:target_product]
+              :target_product => metadata[:target_product],
+              :github_repo_url => metadata[:github_repo_url]
             } 
 
             unless site.profile =~ /development/

data/lib/aweplug/extensions/vimeo.rb

@@ -6,8 +6,10 @@ module Aweplug
   module Extensions
     module Video
       # Public: Awestruct Extension which iterates over a site variable which 
-      # contains vimeo URLs and creates pages out of them, also sends the info 
-      # over to a searchisko instance for indexing.
+      #         contains vimeo URLs and creates pages out of them, also sends 
+      #         the info over to a searchisko instance for indexing. This 
+      #         makes use of the Aweplug::Helper::Searchisko class, please see 
+      #         that class for more info on options and settings for Searchisko.  
       class Vimeo
         include Aweplug::Helpers::Vimeo
 
@@ -33,7 +35,7 @@ module Aweplug
                                                          :searchisko_username => ENV['dcp_user'], 
                                                          :searchisko_password => ENV['dcp_password'], 
                                                          :cache => site.cache,
-                                                         :logger => site.profile == 'developement'})
+                                                         :logger => site.log_faraday})
 
           site[@variable].each do |url|
             id = url.match(/^.*\/(\d*)$/)[1] 
@@ -48,29 +50,12 @@ module Aweplug
             page.send('video=', video)
             page.send('video_url=', url)
             site.pages << page 
-
-            unless video.fetch_info['title'].include? 'Unable to fetch'
-              searchisko_payload = {
-                :sys_type => 'jbossdeveloper_video',
-                :sys_content_provider => 'jboss-developer',
-                :sys_content_type => 'video',
-                :sys_content_id => video.id,
-                :sys_updated => video.modified_date,
-                :sys_contributors => video.cast,
-                :sys_activity_dates => [video.modified_date, video.upload_date],
-                :sys_created => video.upload_date,
-                :sys_title => video.title,
-                :sys_url_view => "http://vimeo.com/#{video.id}",
-                :sys_description => video.description,
-                :duration => video.duration,
-                :thumbnail => video.thumb_url,
-                :tag => video.tags
-              }
-
+            
+            unless (payload = video.searchisko_payload).nil?
               unless site.profile =~ /development/
-                searchisko.push_content(searchisko_payload[:sys_type], 
-                  searchisko_payload[:sys_content_id], 
-                  searchisko_payload.to_json)
+                searchisko.push_content(payload[:sys_type], 
+                  payload[:sys_content_id], 
+                  payload.to_json)
               end 
             end
           end

data/lib/aweplug/helpers/searchisko.rb

@@ -1,6 +1,7 @@
 require 'faraday'
 require 'faraday_middleware' 
 require 'aweplug/cache/yaml_file_cache'
+require 'logger'
 
 module Aweplug
   module Helpers
@@ -13,7 +14,7 @@ module Aweplug
       #        :authenticate - boolean flag for authentication
       #        :searchisko_username - Username to use for auth
       #        :searchisko_password - Password to use for auth
-      #        :logging - Boolean to log responses
+      #        :logger - Boolean to log responses or an instance of Logger to use
       #        :raise_error - Boolean flag if 404 and 500 should raise exceptions
       #        :adapter - faraday adapter to use, defaults to :net_http
       #        :cache - Instance of a cache to use, required.
@@ -28,11 +29,17 @@ module Aweplug
               $LOG.warn 'Missing username and / or password for searchisko'
             end
           end
-          builder.response :logger if opts[:logging]
+          if (opts[:logger]) 
+            if (opts[:logger].is_a?(::Logger))
+              builder.response :logger, opts[:logger]
+            else 
+              builder.response :logger, ::Logger.new('_tmp/faraday.log', 'daily')
+            end
+          end
           builder.response :raise_error if opts[:raise_error]
           builder.use FaradayMiddleware::Caching, opts[:cache], {}
           #builder.response :json, :content_type => /\bjson$/
-          builder.adapter opts[:adapter] || :net_http
+          builder.adapter opts[:adapter] || :net_http_persistent
         end
       end
 

data/lib/aweplug/helpers/vimeo.rb

@@ -153,11 +153,11 @@ module Aweplug
         end
 
         def author
-          @author
+          @cast[0] ? @cast[0] : OpenStruct.new({"display_name" => "Unknown"})
         end
 
         def cast
-          @cast || ''
+          @cast
         end
 
         def tags
@@ -182,6 +182,7 @@ module Aweplug
               @video = JSON.parse(body)["video"][0]
               @cache.write(@id, body)
             else
+              @fetch_failed = true
               @video = {"title" => "Unable to fetch video info from vimeo"}
             end
           else
@@ -189,6 +190,30 @@ module Aweplug
           end
         end
 
+        def searchisko_payload
+          unless @fetch_failed
+            cast_as_hash = []
+            @cast.each do |c|
+              cast_as_hash << c.marshal_dump
+            end
+            author_as_hash = @cast[0] ? @cast[0].marshal_dump : {}
+            searchisko_payload = {
+              :sys_title => title,
+              :sys_description => description,
+              :sys_url_view => "http://#{@site.base_url}/video/vimeo/#{id}",
+              :sys_type => 'jbossdeveloper_video',
+              :author => author_as_hash,
+              :contributors => cast_as_hash,
+              :sys_created => @video["upload_date"],
+              :sys_activity_dates => [@video["modified_date"], @video["upload_date"]],
+              :sys_updated => @video["modified_date"],
+              :duration => duration,
+              :thumbnail => thumb_url,
+              :tag => tags
+            }
+          end
+        end
+
         def fetch_thumb_url
           if @video['thumbnails']
             @thumb = @video["thumbnails"]["thumbnail"][1]
@@ -214,7 +239,6 @@ module Aweplug
               end
             end
           end 
-          @author = @cast[0] ? @cast[0] : OpenStruct.new({"display_name" => "Unknown"})
         end
 
         # Internal: Execute a method against the Vimeo API

data/lib/aweplug/version.rb

@@ -1,4 +1,4 @@
 module Aweplug
-  VERSION='1.0.0.a23'
+  VERSION='1.0.0.a24'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aweplug
 version: !ruby/object:Gem::Version
-  version: 1.0.0.a23
+  version: 1.0.0.a24
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -97,6 +97,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.6
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.9.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.9.4
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -189,9 +205,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1575929041350407489
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: