film_on 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4174f8ce1370ebefb6c615fac66fc3d58b498a82
-  data.tar.gz: ef1756d9e5d8f763e57dc90c007011a932b65caf
+  metadata.gz: e807fafd2a9389c0d5aadd5beee263d2d7df225b
+  data.tar.gz: 3c479794f5a7824246f1ddc7d2018b167cb7861d
 SHA512:
-  metadata.gz: b42460c154426653f820e04e0c4c8d61d6ad251424d578508e04f2dbc98de9a51917471c977eb5b2887d869060adbe79aa6b81629e7f12f289ae4fd088ae6f0b
-  data.tar.gz: bcca8cbc312055c9cafe9663bcc309e80bcdd0096ce3d0cfe64e1827516f57f652a15351b72dc8e06962bc75b0ba9c39a17ba3e153885fe942f5d49b08fa9d24
+  metadata.gz: 687825d8c2c12afc729eca40a6eccc93d0b98150b48990e2b84ea7421d1bdb64853415b0a28cb5fabc4c4429321313188e400c2b1d59ceaa2fb2814ec617f057
+  data.tar.gz: f69e4acf1ca6e935398f68d1d16e5f4c4561cfeae94c20ef35be00312998f9e79f6e4a1748f345c0f3f79e3907bd453f68149898268d4c8d08898206545c233c

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/film_on/base.rb

@@ -5,6 +5,8 @@ module FilmOn
   class Base
 
     include Services
+    include ChannelHelper
+    include GroupHelper
 
     URI = "www.filmon.com/tv/api/"
 

data/lib/film_on/helpers/channel_helper.rb

@@ -0,0 +1,16 @@
+module FilmOn
+
+  module ChannelHelper
+
+      def convert_channel(id,json)
+        hash = JSON.parse(json)
+        FilmOn::Channel.new(hash)
+      end
+
+      def convert_channels(json)
+        hash = JSON.parse(json)
+        hash.map{|ch| FilmOn::Channel.new(ch)}
+      end
+
+  end
+end

data/lib/film_on/helpers/group_helper.rb

@@ -0,0 +1,14 @@
+module FilmOn
+  module GroupHelper
+
+    def convert_groups(json)
+      hash = JSON.parse(json)
+      hash.map{|gr| FilmOn::Group.new(gr)}
+    end
+
+    def find_group(id)
+      groups.select{|gr| gr.id == id}.first
+    end
+
+  end
+end

data/lib/film_on/services.rb

@@ -9,12 +9,7 @@ module FilmOn
         @channel[id] = json
         return json
       end
-      convert_channel(id, json)
-    end
-
-    def convert_channel(id, json)
-      hash = JSON.parse(json)
-      @channel[id] = FilmOn::Channel.new(hash)
+      @channel[id] = convert_channel(id, json)
     end
 
     def channels(opts={})
@@ -24,12 +19,7 @@ module FilmOn
         @channels = json
         return json
       end
-      convert_channels(json)
-    end
-
-    def convert_channels(json)
-      hash = JSON.parse(json)
-      @channels = hash.map{|ch| FilmOn::Channel.new(ch)}
+      @channels = convert_channels(json)
     end
 
     def groups(opts={})
@@ -39,12 +29,7 @@ module FilmOn
         @groups = json
         return json
       end
-      convert_groups(json)
-    end
-
-    def convert_groups(json)
-      hash = JSON.parse(json)
-      @groups = hash.map{|gr| FilmOn::Group.new(gr)}
+      @groups = convert_groups(json)
     end
 
   end

data/lib/film_on.rb

@@ -1,5 +1,7 @@
 require "film_on/version"
 require "film_on/services"
+require "film_on/helpers/channel_helper"
+require "film_on/helpers/group_helper"
 require "film_on/base"
 require "film_on/models/channel"
 require "film_on/models/group"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: film_on
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Stuart Hanscombe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,6 +114,8 @@ files:
 - film_on.gemspec
 - lib/film_on.rb
 - lib/film_on/base.rb
+- lib/film_on/helpers/channel_helper.rb
+- lib/film_on/helpers/group_helper.rb
 - lib/film_on/models/channel.rb
 - lib/film_on/models/group.rb
 - lib/film_on/models/programme.rb