dramavladimir 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b964519da3b2536e9c1458fcf0184182e21281ed
-  data.tar.gz: 7050d719d05e9850f061fdf7d40b9ee7dd783d0e
+  metadata.gz: 40cef7990c6dd613bbb1088acdcd5902e52bb35e
+  data.tar.gz: 5dfde8c947af7af40d0c56cec8f6c1648517cb29
 SHA512:
-  metadata.gz: b1a160f0bc548eb162aee799408ebc6d86dde2f36c6c2be39d0f69c2622ac91d88bd7737a99610256fce87183f98d6ceca1bf3c5326caec619e11be72c9eb724
-  data.tar.gz: 9c921a6375fda3c94de874f1337b3f369e0a3ae0cdfa001699ed4d3f2b533f4663b47099e117da8b9046948aebcc6f59933e49e17068b309549fcd66d7afa35a
+  metadata.gz: c0fd9ccc6c0320cad987caf60534b0b2b68a2ba58c11f40db44cb2872722abafad3439ef4769a51b1ddbafe3183733c3364c3c607372941141a59e62b9595fd8
+  data.tar.gz: 86e74c489181172b72680799f58c41eacd682339db07d8210386adcd7c76a5c93081e5cea119c8ba1bfddd502e0750199a8273f2599b7737af20bab6b54343ff

data/lib/dramavladimir.rb

@@ -2,6 +2,7 @@ require "dramavladimir/version"
 require 'nokogiri'
 require 'httpclient'
 require 'dramavladimir/repertoire'
+require 'dramavladimir/announce'
 
 module Dramavladimir
   NotFound = Class.new StandardError

data/lib/dramavladimir/announce.rb

@@ -0,0 +1,29 @@
+module Dramavladimir
+  class Announce
+    attr_accessor :doc, :url
+
+    def initialize(url, attributes = {})
+      @url = url
+    end
+
+    def content
+      doc.css('#main-mid p').map { |c| c.inner_text }.join('<br />').gsub(/\n|\t/, '').sub(/title=.JoomlaWorks AllVideos Player.>/, '')
+    end
+
+    def video
+      return if doc.css('.avPlayerWrapper.avVideo').empty?
+      doc.at_css('.avPlayerWrapper.avVideo iframe').attribute('src').value
+    end
+
+    def images
+      return if doc.nil? || doc.css('.rokbox-album-inner').empty?
+      doc.css('.rokbox-album-inner a').map { |image| "#{@site}#{image.attribute('href').value}" }
+    end
+
+    private
+
+    def doc
+      @doc ||= Dramavladimir.parse(url)
+    end
+  end
+end

data/lib/dramavladimir/repertoire.rb

@@ -3,78 +3,58 @@ require 'active_support/all'
 
 module Dramavladimir
   class Repertoire
-    attr_accessor :doc, :url, :announce, :announce_content
+    attr_accessor :doc, :url, :spectacle
 
     def initialize(attributes = {})
-      @url = "http://www.dramavladimir.ru/playbill"
+      @site = "http://www.dramavladimir.ru"
+      @url = "#{@site}/playbill"
       doc
     end
 
     def spectacles
       spectacles = []
       get_afisha_links.each do |link|
-        announces = Dramavladimir.parse("http://www.dramavladimir.ru/#{link}")
-        announces.search('.mceItemTable tr').each do |announce|
-          @announce = announce
-          next unless prepare_date
-          spectacles.push({
-            title: prepare_title,
-            scene: prepare_scene,
-            content: prepare_content,
-            video: prepare_video,
-            images: prepare_images,
-            schedules: prepare_date
-          })
+        Dramavladimir.parse("#{@site}/#{link}").search('.mceItemTable tr').each do |spectacle|
+          @spectacle = spectacle
+          next unless schedules
+          s = { title: title, scene: scene, schedules: schedules }
+          s = s.merge({ content: announce.content, video: announce.video, images: announce.images, }) if announce
+          spectacles << s
         end
       end
       spectacles
     end
 
-    def get_afisha_links
-      doc.search('#main-mid table.blog a.contentpagetitle').map { |e| e.attribute('href').value }
-    end
-
-    private
-
-    def prepare_title
-      title = if announce.css('td a strong').last.nil? && announce.css('td strong').last.nil?
-        announce.css('td b').last
-      elsif announce.css('td a strong').last.nil? && announce.css('td b').last.nil?
-        announce.css('td strong').last
+    def title
+      title = if spectacle.css('td a strong').last.nil? && spectacle.css('td strong').last.nil?
+        spectacle.css('td b').last
+      elsif spectacle.css('td a strong').last.nil? && spectacle.css('td b').last.nil?
+        spectacle.css('td strong').last
       else
-        announce.css('td a strong').last
+        spectacle.css('td a strong').last
       end
       title.inner_text.mb_chars.capitalize.to_s
     end
 
-    def prepare_date
-      return false if announce.at_css('td').inner_text.empty?
-      t = DateTime.parse announce.at_css('td').inner_text.gsub!(/ПН|ВТ|СР|ЧТ|ПТ|СБ|ВС|\n/im, '')
+    def schedules
+      return false if spectacle.at_css('td').inner_text.empty?
+      t = DateTime.parse spectacle.at_css('td').inner_text.gsub!(/ПН|ВТ|СР|ЧТ|ПТ|СБ|ВС|\n/im, '')
       t.to_formatted_s(:db)
     end
 
-    def prepare_scene
-      announce.css('td').last.inner_text.mb_chars.downcase.to_s
+    def scene
+      spectacle.css('td').last.inner_text.mb_chars.downcase.to_s
     end
 
-    def prepare_content
-      return '' unless announce_content
-      announce_content.css('#main-mid p').map { |c| c.inner_text }.join(' ').gsub(/\n|\t/, '').sub(/title=.JoomlaWorks AllVideos Player.>/, '')
-    end
-
-    def prepare_video
-      return if announce_content.nil? || announce_content.css('.avPlayerWrapper.avVideo').nil?
-      announce_content.at_css('.avPlayerWrapper.avVideo iframe').attribute('src').value
-    end
+    private
 
-    def prepare_images
-      return if announce_content.nil? || announce_content.css('.rokbox-album-inner').nil?
-      announce_content.css('.rokbox-album-inner a').map { |image| image.attribute('href').value }
+    def get_afisha_links
+      doc.search('#main-mid table.blog a.contentpagetitle').map { |e| e.attribute('href').value }
     end
 
-    def announce_content
-      return if announce.css('td a').first.nil?
-      @announce_content ||= Dramavladimir.parse(announce.css('td a').attribute('href').value)
+    def announce
+      return if spectacle.css('td a').first.nil?
+      Dramavladimir::Announce.new(spectacle.css('td a').attribute('href').value)
     end
 
     def doc

data/lib/dramavladimir/version.rb

@@ -1,3 +1,3 @@
 module Dramavladimir
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dramavladimir
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Eddie Fisher
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,6 +58,7 @@ files:
 - bin/setup
 - dramavladimir.gemspec
 - lib/dramavladimir.rb
+- lib/dramavladimir/announce.rb
 - lib/dramavladimir/repertoire.rb
 - lib/dramavladimir/version.rb
 homepage: https://github.com/anjlab/dramavladimir