rik 0.1.0 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/lib/rik/api.rb

@@ -7,10 +7,11 @@ module Rik
   class API
     
     class Error < RuntimeError
-      attr_accessor :error
+      attr_accessor :fault_code, :fault
       
-      def initialize(error)
-        @error = error
+      def initialize(fault, fault_code)
+        @fault = fault
+        @fault_code = fault_code
       end
     end
     
@@ -21,7 +22,8 @@ module Rik
       
     attr_accessor *VALID_OPTIONS_KEYS
     
-    BASE_URI = 'http://engine.qik.com/api/jsonrpc'.freeze
+    # http://engine.qik.com/api/jsonrpc
+    BASE_URI = 'http://72.5.78.64/api/jsonrpc'.freeze
     
     def initialize
       @uri = URI.parse(BASE_URI)
@@ -42,7 +44,8 @@ module Rik
       answer = JSON.parse(response.body)
       
       if answer[0] == nil
-        raise Error.new(answer['fault']), answer['faultString']
+        raise Error.new(answer['fault'], answer['faultCode']),
+          answer['faultString']
       end
       
       answer[0]

data/lib/rik/client/stream.rb

@@ -10,12 +10,19 @@ module Rik
         filter_shared = true if filter_shared.nil?
         limit = options[:limit] || 10
         
-        call 'qik.stream.subscribe_follow_streams', create, 
-          filter_shared, limit
+        begin
+          call 'qik.stream.subscribe_follow_streams', create, 
+            filter_shared, limit
         
-      rescue Rik::API::Error => error
-        STDERR << error
-        nil
+        rescue Rik::API::Error => error
+          unless error.fault_code == 2002 
+            STDERR << error
+            nil
+          else # invalid session lets renew
+            recreate
+            retry
+          end
+        end
       end
       
       def subscribe_own_user_streams(*args)
@@ -23,7 +30,18 @@ module Rik
         
         limit = options[:limit] || 10
         
-        call 'qik.stream.subscribe_own_user_streams', create, limit
+        begin
+          call 'qik.stream.subscribe_own_user_streams', create, limit
+          
+        rescue Rik::API::Error => error
+          unless error.fault_code == 2002 
+            STDERR << error
+            nil
+          else # invalid session lets renew
+            recreate
+            retry
+          end
+        end
       end
       
       def subscribe_public_streams(*args)
@@ -33,15 +51,22 @@ module Rik
         live = options[:live]
         limit = options[:limit]
         
-        if recent || (!recent && !live)
-          call 'qik.stream.subscribe_public_recent', create, limit || 50
-        else
-          call 'qik.stream.subscribe_public_live', create, limit || 10
+        begin
+          if recent || (!recent && !live)
+            call 'qik.stream.subscribe_public_recent', create, limit || 50
+          else
+            call 'qik.stream.subscribe_public_live', create, limit || 10
+          end
+          
+        rescue Rik::API::Error => error
+          unless error.fault_code == 2002 
+            STDERR << error
+            nil
+          else # invalid session lets renew
+            recreate
+            retry
+          end
         end
-        
-      rescue Rik::API::Error => error
-        STDERR << error
-        nil
       end
       
       def subscribe_user_streams(*args)
@@ -52,8 +77,19 @@ module Rik
         do_public = options[:public] ? '_public' : ''
         limit = options[:limit] || 10
         
-        call "qik.stream.subscribe#{do_public}_user_streams", create, 
-          username, limit
+        begin
+          call "qik.stream.subscribe#{do_public}_user_streams", create, 
+            username, limit
+            
+        rescue Rik::API::Error => error
+          unless error.fault_code == 2002 
+            STDERR << error
+            nil
+          else # invalid session lets renew
+            recreate
+            retry
+          end
+        end
       end
     end
   end

data/lib/rik/client/user.rb

@@ -8,10 +8,17 @@ module Rik
          
          user = args.first || get_user_id
          
-         call 'qik.user.followers', user
-       rescue Rik::API::Error => error
-         STDERR << error
-         nil
+         begin
+           call 'qik.user.followers', user
+         rescue Rik::API::Error => error
+           unless error.fault_code == 2002 
+             STDERR << error
+             nil
+           else # invalid session lets renew
+             recreate
+             retry
+           end
+         end
        end
        
        def following(*args)
@@ -19,10 +26,17 @@ module Rik
          
          user = args.first || get_user_id
          
-         call 'qik.user.following', user
-       rescue Rik::API::Error => error
-         STDERR << error
-         nil
+         begin
+           call 'qik.user.following', user
+         rescue Rik::API::Error => error
+           unless error.fault_code == 2002 
+             STDERR << error
+             nil
+           else # invalid session lets renew
+             recreate
+             retry
+           end
+         end
        end
        
        def public_profile(*args)
@@ -32,11 +46,18 @@ module Rik
          
          detailed = options[:detailed] ? '_detailed' : ''
          by_id = user.is_a?(Numeric) ? '_by_id' : ''
-          
-         call "qik.user.public#{detailed}_profile#{by_id}", user
-       rescue Rik::API::Error => error
-         STDERR << error
-         nil
+
+         begin 
+           call "qik.user.public#{detailed}_profile#{by_id}", user
+         rescue Rik::API::Error => error
+           unless error.fault_code == 2002 
+             STDERR << error
+             nil
+           else # invalid session lets renew
+             recreate
+             retry
+           end
+         end
        end
        
        private

data/lib/rik/client/video.rb

@@ -4,11 +4,17 @@ module Rik
     module Video
       
       def public_user_streams(username)
-        call 'qik.stream.public_user_streams', username
-        
-      rescue Rik::API::Error => error
-        STDERR << error
-        nil
+        begin
+          call 'qik.stream.public_user_streams', username
+        rescue Rik::API::Error => error
+          unless error.fault_code == 2002 
+            STDERR << error
+            nil
+          else # invalid session lets renew
+            recreate
+            retry
+          end
+        end
       end
       
       def info(*args)
@@ -17,15 +23,21 @@ module Rik
         video_id = args.first
         detailed = options[:detailed] 
         
-        if detailed
-          call 'qik.stream.info', create, video_id
-        else
-          call 'qik.stream.public_info', video_id
+        begin
+          if detailed
+            call 'qik.stream.info', create, video_id
+          else
+            call 'qik.stream.public_info', video_id
+          end
+        rescue Rik::API::Error => error
+          unless error.fault_code == 2002 
+            STDERR << error
+            nil
+          else # invalid session lets renew
+            recreate
+            retry
+          end
         end
-        
-      rescue Rik::API::Error => error
-        STDERR << error
-        nil
       end
     end
   end

data/rik.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rik}
-  s.version = "0.1.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Jauregui"]
-  s.date = %q{2011-06-22}
+  s.date = %q{2011-06-24}
   s.description = %q{Ruby bindings for Qik API, inspired by the twitter gem}
   s.email = %q{joel.jauregui@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -2,7 +2,7 @@
 name: rik
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors: 
 - Joel Jauregui
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-22 00:00:00 -07:00
+date: 2011-06-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1563252108867835538
+      hash: 2855009934251164808
       segments: 
       - 0
       version: "0"