enklawa 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzVmOWRkYjE3MmJjZjgyY2IwOTU0NTk4MGZhMGJmMDE5ODlhOGU5Yw==
+    YWI0YzdjNGNhNmJkY2M0ZTA3ZjdhNDRhNGU0M2E4OWViNzYxOGZiZQ==
   data.tar.gz: !binary |-
-    ZDEwMmI5NGNmMTkwOWM5NjJlZTFjOTE1MjI5MDA3NmI0NjhiODllZQ==
+    MmZkMjgyYTYyMzA4OGNjNWU3M2I4YjAyOGFkZjA4MGJmNjVmZDcwMA==
 SHA512:
   metadata.gz: !binary |-
-    MGU5MDMxZTgyMDBlYmExYTQ4ZTcyMTQwYmY0NDJjMTM4YWYyM2NhMzY5N2Jj
-    OGY4NGE1MTdhMDdkMzQ3YTY2YjkwYWZjNWI0NjBjMmY4YmQzMWJhZTM5OTk2
-    NmI4YmEzYzY4YjVhNTJhNTY3YjNkZjhjNWQwOTQ3ZDY2MzY2Yjk=
+    NTNlODU4NDM2YzNkMTAzZDM2NjEzNzhkNWM0NWFiYzgzNGEyMDBiYWRjNTUz
+    OGZlMmExNzY4NDJlOWE5MzA3ZGZiNDQ5NDkxZGZjYzIxYmNjYWVmY2I0NWJi
+    N2UzNDAyNjFiZDBiZWJmYzgzZjhlMTE2NWIxNzk0NTVmMmZlMGI=
   data.tar.gz: !binary |-
-    ODI0M2RjMDcyNzllNzIxNDVhMDFmYmE5NTZmM2ExNDJjZDAzOWU3ZmNhMzg1
-    NzA3YmE0MjUwY2UyOGVjZjg3MzcyNzkzOWY3MGY5MzBmNGM2ODkyODEyZGI0
-    OTMzZWZiYzViZWEyYzAyMTQ2OWRmYzQ4OTAyODRlZWUzOTg2ZWU=
+    ZjQwY2Y5MDUwYjI3ZDllM2Q5NTM4YTk1ZTI0NTFiZmIxNTg5YThkZmRhYjI1
+    N2YzMGZhMjk1NzIzYjBlYjBkN2IxYWI1ZjAwNmI3YjUzZDlmNmU5MWI0OWZj
+    MWI5MDE4YjAzMGIxMTRlM2I4ZTk5OTYyZTkzZGI2MWY2YTA3Yjc=

data/README.md

@@ -18,6 +18,9 @@ Next you can use it to download all programs:
 
 <http://enklawa.macbury.ninja/>
 
+## More info
+<http://macbury.ninja/2014/9/enklawa-api-gem>
+
 ## Contributing
 
 1. Fork it ( https://github.com/macbury/enklawa-api/fork )

data/lib/enklawa/api.rb

@@ -1,6 +1,7 @@
 require "enklawa/api/version"
 require "enklawa/api/response"
 require "enklawa/api/program"
+require "enklawa/api/category"
 require "enklawa/api/episode"
 require "enklawa/api/request"
 require "open-uri"

data/lib/enklawa/api/category.rb

@@ -0,0 +1,13 @@
+module Enklawa
+  module Api
+    class Category < Struct.new(:id, :name)
+
+      def to_h
+        {
+          id: id,
+          name: name
+        }
+      end
+    end
+  end
+end

data/lib/enklawa/api/program.rb

@@ -1,6 +1,6 @@
 module Enklawa
   module Api
-    class Program < Struct.new(:id, :name, :description, :author, :live)
+    class Program < Struct.new(:id, :name, :description, :author, :live, :category_id)
       attr_accessor :episodes
 
       def initialize
@@ -28,6 +28,7 @@ module Enklawa
           live: live,
           image: image,
           feed_url: feed_url,
+          category_id: category_id,
           episodes: episodes.map(&:to_h)
         }
       end

data/lib/enklawa/api/request.rb

@@ -4,14 +4,15 @@ require "sanitize"
 module Enklawa
   module Api
     class Request
-      INFO_XML_URL = "http://www.enklawa.net/info.xml"
-
+      INFO_XML_URL  = "http://www.enklawa.net/info.xml"
+      MAIN_PAGE_URL = "http://enklawa.net"
       def initialize
 
       end
 
       def get!
         @response = Response.new
+        get_categories!
         get_info!
         get_programs!
         get_episodes!
@@ -21,6 +22,18 @@ module Enklawa
 
       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)
 
@@ -38,6 +51,7 @@ module Enklawa
           program.name         = program_node.search("name").text
           program.description  = program_node.search("description").text
           program.author       = program_node.search("author").text
+          program.category_id  = program_node.search("cat").text.to_i
           program.live         = program_node.search("live").size > 0
           @response.programs << program
         end

data/lib/enklawa/api/response.rb

@@ -4,7 +4,8 @@ module Enklawa
       attr_accessor :skype, :phone, :radio
 
       def initialize
-        @programs = []
+        @programs   = []
+        @categories = []
       end
 
       def programs
@@ -15,11 +16,17 @@ module Enklawa
         @programs << program
       end
 
+      def add_category(category)
+        @categories << category
+      end
+
       def to_h
         {
+          version: VERSION,
           skype: skype,
           phone: phone,
           radio: radio,
+          categories: @categories.map(&:to_h),
           programs: @programs.map(&:to_h)
         }
       end

data/lib/enklawa/api/version.rb

@@ -1,5 +1,5 @@
 module Enklawa
   module Api
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enklawa
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Arkadiusz Buras
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -182,6 +182,7 @@ files:
 - bin/enklawa
 - enklawa-api.gemspec
 - lib/enklawa/api.rb
+- lib/enklawa/api/category.rb
 - lib/enklawa/api/episode.rb
 - lib/enklawa/api/program.rb
 - lib/enklawa/api/request.rb