enklawa 0.1.4 → 0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjRjYmQ1NDZmMDEzZjJiYmQwYTk3OTUyZjgwYTBjNGViZTFmZTEzYg==
+    MDA1MDcyOTVhNmEzMWQ0Nzg2YTFhN2MyMDBkNTVkZTIyODhhMDU1Yw==
   data.tar.gz: !binary |-
-    YWY3Y2FjOTE3ZmQxYTU4Yjc5NjYzZmQ0Y2YzMWM3MmYxMTJkYzA5YQ==
+    Yjc2MmEwMGEzNDEyZTdmNjMxMjY1YzMwMDdiNDE3OGYxNzYyZTM5Ng==
 SHA512:
   metadata.gz: !binary |-
-    ODUyYWE3OGQ0MjdjMzAxOGM2MDdlNWZhNDYyMTQ5ZjdmMjg0ODU4YjY4ZmZi
-    ZTIxNjZiZmJlOTA2ZjlhM2NlNGIzNTJjZGFlMTQwZWI3Zjc0NmYyZWExMDVi
-    NTkzZGJhN2E0MmQ2YjQyN2VjMTQ5NzBlMDhiZDAxMDlhYTYxMzY=
+    YTI1YzZlNWYzYTg0NDk4MTJiODQ1MDVjZDljNzJkYmE0YmRmMDgxOWVhOTA0
+    YzQ0MmVjNjcxNjM5NTdmMzRiYzkxY2JhMjJkNjU0ZmJhZDI5MDhkMTIzYWQx
+    N2RkOTJiMTZjNDNiMzY0MzA0YTRhYWE2OGJlM2JjZDlhMDZiZTM=
   data.tar.gz: !binary |-
-    ZDViYmE2MzNhZmQ5NzNmZDQ4MzcyMjg4OGFiNjhlNjIyMTgzMGY4YmRmY2Ri
-    YzJmOTc4OTU5Nzc0YTRjNGYzMzIzMDMzZGIwODE4YjNkMzViZTRkNmU3NjI2
-    ODJkZDZiNjgxOTkyNzM1MDZlYWVhYjA3ZWY2Yjc0M2UzYzkyY2E=
+    ZTZjZGM4YjhkMjlhOGE4ZWI2NDYwY2M4MTAxZTU0ZGQ3MTM4MDZmMWVmY2Rh
+    YzViODAzMmM3MWRmMjNmMDQ4ODMwMzZjMDI4MzkzNzAzNGM0MTY2OTkwOTMx
+    ZDM5NjQxMTdlNzg5MzhmNzQzMzNjNGI1N2U2ODE5ZjRiMWI4YWY=

data/.gitignore

@@ -20,3 +20,5 @@ tmp
 *.o
 *.a
 mkmf.log
+*.json
+*.yml

data/lib/enklawa/api.rb

@@ -12,8 +12,8 @@ require "cgi"
 module Enklawa
   module Api
 
-    def self.fetch
-      request = Request.new
+    def self.fetch(url)
+      request = Request.new(url)
       request.get!
     end
 

data/lib/enklawa/api/program.rb

@@ -1,14 +1,18 @@
 module Enklawa
   module Api
     class Program < Struct.new(:id, :name, :description, :author, :live, :category_id)
-      attr_accessor :episodes
+      attr_accessor :episodes, :base_url
 
       def initialize
         self.episodes = []
       end
 
       def image
-        "http://www.enklawa.net/images/programs/#{id}.jpg"
+        if base_url.match("enklawa")
+          File.join([base_url, "/images/programs/#{id}.jpg"])
+        else
+          File.join([base_url, "/images/programs/240/#{id}.jpg"])
+        end
       end
 
       def <<(episode)
@@ -16,7 +20,7 @@ module Enklawa
       end
 
       def feed_url
-        "http://www.enklawa.net/program#{self.id}.xml"
+        File.join([base_url, "/program#{self.id}.xml"])
       end
 
       def to_h

data/lib/enklawa/api/request.rb

@@ -4,12 +4,11 @@ require "yaml"
 module Enklawa
   module Api
     class Request
-      INFO_XML_URL       = "http://www.enklawa.net/info.xml"
-      MAIN_PAGE_URL      = "http://enklawa.net"
-      FORUM_FEED_URL     = "http://forum.enklawa.net/feed.php"
-      ENKLAWA_CACHE_FILE = '/tmp/enklawa_cache.yml'
-      def initialize
-        @cache = YAML::load_file(ENKLAWA_CACHE_FILE) if File.exists?(ENKLAWA_CACHE_FILE)
+      def initialize(url)
+        @info_xml_url  = File.join([url, "info.xml"])
+        @main_page_url = url
+        @cache_key     = url.gsub(/[^a-z]/i,"") + ".yml"
+        @cache = YAML::load_file(@cache_key) if File.exists?(@cache_key)
         @cache ||= {
           'images' => {},
           'durations' => {}
@@ -18,44 +17,32 @@ module Enklawa
 
       def get!
         @response = Response.new
-        get_forum_feeds!
-        get_categories!
         get_info!
         get_programs!
         get_episodes!
 
-        File.open(ENKLAWA_CACHE_FILE, 'w') {|f| f.write @cache.to_yaml }
+        File.open(@cache_key, 'w') {|f| f.write @cache.to_yaml }
 
         @response
       end
 
       private
 
-      def get_categories!
-        doc = Nokogiri::HTML(open(MAIN_PAGE_URL))
-
-        doc.search("select#ProgramsSelector option").each do |option|
-          category      = Category.new
-          category.name = option.text
-          category.id   = option[:value].to_i
-
-          @response.add_category(category)
-        end
-      end
-
       def get_info!
-        @info_xml_doc    = Nokogiri::XML(open(INFO_XML_URL).read)
+        @info_xml_doc    = Nokogiri::XML(open(@info_xml_url).read)
 
         @response.skype = @info_xml_doc.search("settings call skype").text
         @response.phone = @info_xml_doc.search("settings call phone").text
 
-        shoutcast_pls_url = "http:"+CGI.unescape(@info_xml_doc.search("settings listen shoutcast").text)
+        shoutcast_pls_url = CGI.unescape(@info_xml_doc.search("settings listen shoutcast").text)
+        shoutcast_pls_url = "http:"+ shoutcast_pls_url unless shoutcast_pls_url.match("http")
         @response.radio   = open(shoutcast_pls_url).read.strip.split("\n")[-1].gsub("File1=","")
       end
 
       def get_programs!
         @info_xml_doc.search("programs p").each do |program_node|
           program              = Program.new
+          program.base_url     = @main_page_url
           program.id           = program_node[:id].to_i
           program.name         = program_node.search("name").text
           program.description  = program_node.search("description").text
@@ -78,25 +65,9 @@ module Enklawa
         @response.programs.reject! { |program| program.episodes.empty? }
       end
 
-      def get_forum_feeds!
-        feed = Feedjira::Feed.fetch_and_parse(FORUM_FEED_URL)
-        return if feed == 404
-
-        feed.entries.each do |entry|
-          thread             = ForumThread.new
-          thread.id          = entry.id
-          thread.title       = entry.title
-          thread.link        = entry.url
-          thread.content     = entry.content
-          thread.pub_date    = entry.published
-          thread.author      = entry.author
-          @response.add_thread(thread)
-        end
-      end
-
       def check_if_image_exists_or_use_from_program(program, episode)
         return @cache['images'][episode.id] if @cache['images'].key?(episode.id)
-        image = "http://www.enklawa.net/images/episodes/#{episode.id}.jpg"
+        image = File.join([@main_page_url, "/images/episodes/#{episode.id}.jpg"])
 
         uri = URI(image)
 

data/lib/enklawa/api/version.rb

@@ -1,5 +1,5 @@
 module Enklawa
   module Api
-    VERSION = "0.1.4"
+    VERSION = "0.2"
   end
 end

data/lib/enklawa/cli.rb

@@ -10,8 +10,8 @@ module Enklawa
     end
 
     desc "save", "fetch and save episodes"
-    def save(path)
-      @response = Enklawa::Api.fetch
+    def save(url, path)
+      @response = Enklawa::Api.fetch(url)
       @response.save(path)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enklawa
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: '0.2'
 platform: ruby
 authors:
 - Arkadiusz Buras
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json