film_on 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ac20cf181e3e9f389e09b1adaf6210c7eccb0c9
-  data.tar.gz: b0a227d56364fd7a38a018eb2d8cc78ab73e8b50
+  metadata.gz: 9efdd8dd4b4cdcca8b5a343771f6df528fdd4380
+  data.tar.gz: bb6089ae1d5deb0456fc66b27a700ec4b3d2fd70
 SHA512:
-  metadata.gz: 8ac19a1335d5dc4da61520c267bd4dab531824cefcb42aeafe094920122924a94017a54da0cc5d2a5d762ca7ad485f91cf122f0e8709269595f08eee0fd1ffb7
-  data.tar.gz: cbc84e660530eabadd4778eba7dd5e73dbd166d1f97784cfc9f0f751a84d36526b34d2496860034c5503e013e040bc99b8b906dc43fd3783d38b8225c6b22ffd
+  metadata.gz: eb4467b49dade7576649770380ec9d1c013e937f29200ede41dbab47b3e95ffffb5e87b5298a614470ef796895759ac720df30e12d6442c4f4c486c7c77936d7
+  data.tar.gz: c3b47e63d510f8f9dfb0d89a44cc29b6d8cdad7f1954fe4d86a9fc189591f577512790b8ee743d9634479bd766229782e216a0a4dcebfddafb5e50dfd4100b6b

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/film_on/base.rb

@@ -19,7 +19,8 @@ module FilmOn
 
     def init_request
       response = get("init")
-      @session_key = response["session_key"]
+      init_hash = JSON.parse(response)
+      @session_key = init_hash["session_key"]
       self
     end
 
@@ -31,7 +32,7 @@ module FilmOn
       full_service_url = "#{protocol}#{URI}#{service}"
       response = HTTParty.post(full_service_url, {body: query, headers: {'Content-Type' => 'application/json'}})
       if response && response.code == 200
-        return JSON.parse(response.body)
+        return response.body
       else
         response.response
       end
@@ -43,7 +44,7 @@ module FilmOn
       full_service_url = "#{protocol}#{URI}#{service}?#{query.map{|k,v| "#{k}=#{v}"}.join("&")}"
       response = HTTParty.get(full_service_url)
       if response && response.code == 200
-        return JSON.parse(response.body)
+        return response.body
       else
         response.response
       end

data/lib/film_on/services.rb

@@ -2,21 +2,36 @@ module FilmOn
 
   module Services
 
-    def channel(id)
+    def channel(id, opts={})
       return @channel[id] if @channel[id]
-      hash = get("channel/#{id}")
+      json = get("channel/#{id}")
+      if opts[:json]
+        @channel[id] = json
+        return json
+      end
+      hash = JSON.parse(json)
       @channel[id] = FilmOn::Channel.new(hash)
     end
 
-    def channels
+    def channels(opts={})
       return @channels if @channels
-      hash = get("channels")
+      json = get("channels")
+      if opts[:json]
+        @channels = json
+        return json
+      end
+      hash = JSON.parse(json)
       @channels = hash.map{|ch| FilmOn::Channel.new(ch)}
     end
 
-    def groups
+    def groups(opts={})
       return @groups if @groups
-      hash = get("groups")
+      json = get("groups")
+      if opts[:json]
+        @groups = json
+        return json
+      end
+      hash = JSON.parse(json)
       @groups = hash.map{|gr| FilmOn::Group.new(gr)}
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: film_on
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Stuart Hanscombe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler