dropcam 0.0.1 → 0.0.2

data/README.md

@@ -2,6 +2,9 @@
 
 RubyGem to access Dropcam account and Camera including direct live stream access
 
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/nolanbrown/dropcam)
+
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -24,7 +27,7 @@ Or install it yourself as:
 	camera = dropcam.cameras.first
 	
 	# returns jpg image data of the latest frame captured
-	screenshot = camera.current_image
+	screenshot = camera.screenshot.current
 	
 	# write data to disk
 	File.open("#{camera.title}.jpg", 'w') {|f| f.write(screenshot) }

data/example/basics.rb

@@ -1,15 +1,12 @@
-#dropcam = Dropcam::Session.new("username","password")
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'dropcam'
 require 'awesome_print'
 dropcam = Dropcam::Dropcam.new(ENV["DROPCAM_USERNAME"],ENV["DROPCAM_PASSWORD"])
+ap dropcam.public_cameras
+
 camera = dropcam.cameras.first
 ap camera.uuid
 ap camera.session_token
-ap camera.rtsp_url
-ap camera.rtmpdump_stream_command
-
-settings = camera.settings
-#ap settings["watermark.enabled"].set(false)
+ap camera.settings

data/lib/dropcam/base.rb

@@ -74,8 +74,19 @@ module Dropcam
       request.add_field("Cookie",cookies.join('; ')) if cookies
 
       response = http.request(request)
+            
+      if response.success?
+        return response
+      elsif response.not_authorized?
+        raise AuthorizationError 
+      elsif response.error?
+        message = "Unkown Error"
+        message = JSON.parse(response.body)["status_detail"] if JSON.parse(response.body)["status_detail"]
+        raise UnkownError, message
+      else 
+        raise CameraNotFoundError 
+      end
       
-      return response
     end
     
     def get(path, parameters,cookies, use_nexus=false)
@@ -88,7 +99,13 @@ module Dropcam
       request.add_field("Cookie",cookies.join('; ')) if cookies
             
       response = http.request(request)
-      return response
+      if response.success?
+        return response
+      elsif response.not_authorized?
+        raise AuthorizationError 
+      else 
+        raise CameraNotFoundError 
+      end
     end
     
     def delete(path, parameters,cookies, use_nexus=false)
@@ -101,7 +118,13 @@ module Dropcam
       request.add_field("Cookie",cookies.join('; ')) if cookies
             
       response = http.request(request)
-      return response
+      if response.success?
+        return response.body ## returns a zip
+      elsif response.not_authorized?
+        raise AuthorizationError 
+      else 
+        raise CameraNotFoundError 
+      end
     end
     
     protected

data/lib/dropcam/camera.rb

@@ -1,12 +1,13 @@
-require 'hpricot'
-
 require_relative 'base'
 require_relative 'error'
 require_relative 'notification'
-require_relative 'setting'
-require_relative 'cuepoint'
+require_relative 'notification_base'
+require_relative 'cuepoint_base'
 require_relative 'clip'
+require_relative 'clip_base'
+require_relative 'setting'
 require_relative 'stream'
+require_relative 'screenshot'
 
 module Dropcam
   class Camera < Base
@@ -29,136 +30,60 @@ module Dropcam
       }
     end
     
+    def settings=(new_settings)
+      @settings = {}
+      return @settings unless new_settings
+      new_settings.each{|key,value|
+        @settings[key] = Setting.new(key, value, self)
+      }
+      @settings
+    end
     
-    def get_image(width=1200, timestamp=nil)
-      params = {"uuid"=>@uuid, "width" => width}
-      params["time"] = timestamp if timestamp
+    def settings(force=false)
+      return @settings unless force == true or @settings.length == 0 # key these cached
       
-      response = get(::IMAGE_PATH, params, @cookies, true)      
-      if response.success?
-        return response.body
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
+      response = get(::DROPCAMS_GET_PROPERTIES, {"uuid"=>@uuid}, @cookies)      
+      self.settings = JSON.parse(response.body)["items"][0]
+      @settings
     end
     
-    def current_image(width=1200)
-      return get_image(width)
-    end
     
-    def clips
-      response = get(::CLIP_GET_ALL, {}, @cookies)      
-      if response.success?
-        return response.body ## returns a zip
-        clips = []
-        all_clips = JSON.parse(response.body)["items"]
-        for clip in all_clips
-          c = Clip.new(self, clip)
-          if c.camera_id == self.id
-            clips.push c
-          end
-        end
-        return clips
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
+    def screenshot
+      @screenshot = Screenshot.new(self) unless @screenshot
+      @screenshot
     end
     
-    
-    def create_clip(length, start_date, title, description)
-      params = {"uuid"=>@uuid, "length" => length, "start_date" => start_date, "title" => title, "description" => description}
-      response = post(::VIDEOS_REQUEST, params, @cookies)      
-      if response.success?
-        clip_info = JSON.parse(response.body)["items"][0]
-        return Clip.new(self, clip_info)
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
+    def clip
+      @clip_base = ClipBase.new(self) unless @clip_base
+      @clip_base
     end
-    
-    
-    def get_event_clip_image_archive(cuepoint_id, number_of_frames, width)      
-      params = {"uuid"=>@uuid, "width" => width, "cuepoint_id" => cuepoint_id, "num_frames" => number_of_frames, "format" => "TAR_JPG"}
-      response = get(::NEXUS_GET_EVENT_CLIP_PATH, params, @cookies, true)      
-      if response.success?
-        return response.body ## returns a zip
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
+    def cuepoint
+      @cuepoint_base = CuepointBase.new(self) unless @cuepoint_base
+      @cuepoint_base
     end
-    
-    def get_event_clip_video(cuepoint_id, number_of_frames, width)      
-      params = {"uuid"=>@uuid, "width" => width, "cuepoint_id" => cuepoint_id, "num_frames" => number_of_frames, "format" => "h264"}
-      response = get(::NEXUS_GET_EVENT_CLIP_PATH, params, @cookies, true)      
-      if response.success?
-        return response.body ## returns a zip
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
+
+    def stream
+      @stream = Stream.new(self) unless @stream
+      @stream
     end
     
-    def get_all_cuepoints(limit=2500)
-      params = {"uuid"=>@uuid, "max_results"=>limit}
-      response = get(::NEXUS_GET_REVERSE_PAGINATED_CUEPOINTS_PATH, params, @cookies, true)      
-      if response.success?
-        cuepoints = []
-        all_cuepoints = JSON.parse(response.body)
-        for cuepoint in all_cuepoints
-          cuepoints.push Cuepoint.new(cuepoint)
-        end
-        
-        return cuepoints
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
-    end
-        
-    def get_cuepoint(start_time)
-      params = {"uuid"=>@uuid, "start_time" => start_time}
-      response = get(::NEXUS_GET_CUEPOINT_PATH, params, @cookies, true)      
-      if response.success?
-        return Cuepoint.new(JSON.parse(response.body)[0])        
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
+    def notification
+      @notification = NotifcationBase.new(self) unless @notification
+      @notification
     end
     
+    
     def update_info
       response = get(::CAMERAS_GET, {"id"=>@uuid}, @cookies)      
-      if response.success?
-        self.properties = JSON.parse(response.body)["items"][0]
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
+      self.properties = JSON.parse(response.body)["items"][0]
+
     end
     
     
     
     def public=(is_public)
       response = post(::CAMERAS_UPDATE, {"uuid"=>@uuid, "is_public"=>is_public, "accepted_public_terms_at" => "true"}, @cookies)      
-      if response.success?
-        self.properties = JSON.parse(response.body)["items"][0]
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
+      self.properties = JSON.parse(response.body)["items"][0]
     end
     
     def public?
@@ -167,97 +92,11 @@ module Dropcam
     
     def set_public_token(token)
       response = post(::CAMERAS_UPDATE, {"uuid"=>@uuid, "token"=>token}, @cookies)      
-      if response.success?
-        self.properties = JSON.parse(response.body)["items"][0]
-        return true
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
-    end
-    
-    def settings=(new_settings)
-      @settings = {}
-      new_settings.each{|key,value|
-        @settings[key] = Setting.new(key, value, self)
-      }
-      @settings
+      self.properties = JSON.parse(response.body)["items"][0]
+      true
     end
-    
-    def settings(force=false)
-      return @settings unless force == true or @settings.length == 0 # key these cached
-      
-      response = get(::DROPCAMS_GET_PROPERTIES, {"uuid"=>@uuid}, @cookies)      
-      if response.success?
-        self.settings = JSON.parse(response.body)["items"][0]
-        return @settings
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
-    end
-    
-    def notification_devices
-      
-      response = get(::CAMERA_FIND_NOTIFICATIONS, { "id" => @uuid }, @cookies)      
-      if response.success?
-        notifications = []
+  
 
-        all_notifications = JSON.parse(response.body)["items"]
-        all_notifications.each{|note|
-          notifications.push Notification.new(self, note["target"])
-        }
-        
-        notifications
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
-    end
-    
-    ## API for Notifications doesn't include email notifcations
-    ## The code below parses an HTML Partial to get all notifcation values
-    
-    def all_notification_devices
-      request_path = ::CAMERA_HTML_SETTINGS_BASE + @uuid
-      response = get(request_path, {}, @cookies)      
-      if response.success?
-        raw_html = response.body
-        doc = Hpricot.parse(raw_html)
-    
-        notifications = []
-        doc.search("//div[@class='notification_target']").each { |notification_target|
-          puts notification_target
-          data_id =  notification_target.get_attribute("data-id")
-          puts data_id
-          name =  notification_target.at("div/span").inner_text
-          
-          input =  notification_target.at("div/input")
-    
-          attributes = input.attributes.to_hash
-          data_type = attributes["data-type"]
-          data_value = attributes["data-value"]
-          checked = attributes.has_key?("checked")
-          
-    
-          notifications.push(note)
-        }
-        return notifications
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
-    end
-    
-    
-    
-    def stream
-      Stream.new self
-    end
       
   end
 end

data/lib/dropcam/clip.rb

@@ -1,11 +1,13 @@
+require_relative 'clip_base'
+
 module Dropcam
-  class Clip
+  class Clip < ClipBase    
     attr_reader :id, :public_link, :description, :title, :is_error, :start_time, :server, :camera_id, :generated_time
     attr_reader :filename, :length_in_seconds
     
     attr_accessor :properties
     def initialize(camera, properties = nil)
-      @camera = camera
+      super(camera)
       self.properties = properties
     end
     
@@ -15,6 +17,18 @@ module Dropcam
       }
       @properties = properties
     end
+        
+    # def title=(title)
+    #   return false unless @id
+    #   response = post(::CLIP_DELETE, { "id" => @id, "title" => title }, @camera.cookies)      
+    #   true
+    # end
+    
+    def destroy
+      return false unless @id
+      response = post(::CLIP_DELETE, { "id" => @id }, @camera.cookies)      
+      true
+    end
     
     def direct_link
       return "https://#{@server}/#{@filename}"
@@ -22,31 +36,5 @@ module Dropcam
     def direct_screenshot_link
       return "https://#{@server}/s3#{File.basename(@filename, File.extname(@filename))}.jpg"
     end
-
-    def set_title(title)
-      return false unless @id
-      response = post(::CLIP_DELETE, { "id" => @id, "title" => title }, @cookies)      
-      if response.success?
-        return true
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
-      
-    end
-    
-    def delete
-      return false unless @id
-      response = post(::CLIP_DELETE, { "id" => @id }, @cookies)      
-      if response.success?
-        return true
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
-    end
-    
   end
 end

data/lib/dropcam/clip_archive.rb

@@ -0,0 +1,24 @@
+require_relative 'base'
+
+module Dropcam
+  class ClipArchive < Base
+    
+    def initialize(camera)
+      @camera = camera
+    end
+    
+    def image_archive(cuepoint_id, number_of_frames, width)      
+      clip_with_format(cuepoint_id, number_of_frames, width, "TAR_JPG")
+    end
+    
+    def get_mp4(cuepoint_id, number_of_frames, width)      
+      clip_with_format(cuepoint_id, number_of_frames, width, "h264")
+    end
+    private
+    def clip_with_format(cuepoint_id, number_of_frames, width, format)
+      params = { "uuid"=>@camera.uuid, "width" => width, "cuepoint_id" => cuepoint_id, "num_frames" => number_of_frames, "format" => format }
+      response = get(::NEXUS_GET_EVENT_CLIP_PATH, params, @camera.cookies, true)      
+      response
+    end
+  end
+end

data/lib/dropcam/clip_base.rb

@@ -0,0 +1,35 @@
+require_relative 'base'
+require_relative 'clip_archive'
+module Dropcam
+  class ClipBase < Base
+    def initialize(camera)
+      @camera = camera
+    end
+    
+    def all
+      response = get(::CLIP_GET_ALL,{},@camera.cookies)
+      clips = []
+      all_clips = JSON.parse(response.body)["items"]
+      for clip in all_clips
+        c = Clip.new(@camera, clip)
+        if c.camera_id == @camera.id
+          clips.push c
+        end
+      end
+      clips
+    end
+    
+    def archive
+      ClipArchive.new(@camera)
+    end
+    
+    def create(length, start_date, title, description)
+      params = {"uuid"=>@camera.uuid, "length" => length, "start_date" => start_date, "title" => title, "description" => description}
+      response = post(::VIDEOS_REQUEST, params, @camera.cookies)      
+      clip_info = JSON.parse(response.body)["items"][0]
+      return Clip.new(@camera, clip_info)
+      
+    end
+    
+  end
+end

data/lib/dropcam/cuepoint.rb

@@ -1,11 +1,24 @@
+require_relative 'cuepoint_base'
+require_relative 'clip_archive'
+
 module Dropcam
-  class Cuepoint
+  class Cuepoint < CuepointBase
     attr_reader :id, :note, :type, :time
-    def initialize(details)
+    
+    def initialize(camera,details)
+      super(camera)
       @id = details["id"]
       @note = details["note"]
       @type = details["type"]
       @time = details["time"]
     end
+    
+    def mp4(number_of_frames, width) 
+      ClipArchive.new(@camera).get_mp4(self.id, number_of_frames, width)
+    end
+    
+    def image_archive(number_of_frames, width) 
+      ClipArchive.new(@camera).image_archive(self.id, number_of_frames, width)
+    end
   end
 end

data/lib/dropcam/cuepoint_base.rb

@@ -0,0 +1,27 @@
+module Dropcam
+  class CuepointBase < Base
+    def initialize(camera)
+      @camera = camera
+    end
+    
+    def all(limit=2500)
+      params = {"uuid"=>@camera.uuid, "max_results"=>limit}
+      response = get(::NEXUS_GET_REVERSE_PAGINATED_CUEPOINTS_PATH, params, @camera.cookies, true)      
+      cuepoints = []
+      all_cuepoints = JSON.parse(response.body)
+      for cuepoint in all_cuepoints
+        cuepoints.push Cuepoint.new(cuepoint)
+      end
+      cuepoints
+    end
+        
+    def cuepoint(start_time)
+      params = {"uuid"=>@camera.uuid, "start_time" => start_time}
+      response = get(::NEXUS_GET_CUEPOINT_PATH, params, @camera.cookies, true)      
+      Cuepoint.new(JSON.parse(response.body)[0])        
+    end
+    
+  end
+end
+
+  

data/lib/dropcam/notification.rb

@@ -1,10 +1,12 @@
+require_relative 'notification_base'
+
 module Dropcam
-  class Notification < Base
+  class Notification < NotificationBase
     
     attr_accessor :name, :type, :value, :is_enabled, :id
     
     def initialize(camera, properties={})
-      @camera = camera
+      super(camera)
       @name = properties["name"]
       @type = properties["type"]
       @value = properties["value"]
@@ -15,7 +17,6 @@ module Dropcam
     def find(name)
       note = @camera.notification_devices.select{|note|
         if note.name == name
-          puts "#{note.name} == #{name}"
           return note
         end
       }
@@ -25,41 +26,19 @@ module Dropcam
     def create(email)
       # {"status": 400, "items": [], "status_description": "bad-request", "status_detail": "This notification target already exists"}
       response = post(::CAMERA_ADD_EMAIL_NOTIFICATION, {"email"=>email}, @camera.cookies)     
-      if response.success?
-        return Notification.new(@camera, JSON.parse(response.body)["items"][0])
-      elsif response.error?
-        raise UnkownError, JSON.parse(response.body)["status_detail"]
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
+      return Notification.new(@camera, JSON.parse(response.body)["items"][0])
+
     end
     
     def set(enable)
       # email or gcm or apn
       params = {"id"=>@camera.uuid, "is_enabled"=>enable, "device_token" => @value}
-      puts params
       response = post(::CAMERA_NOTIFICATION_UPDATE, params, @camera.cookies)      
-      if response.success?
-        return true
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
+      true
     end
     
-    def delete(notifcation_id=nil)
-      notifcation_id = @id unless notifcation_id
-      response = post(::CAMERA_DELETE_NOTIFICATION, {"id"=>notifcation_id}, @camera.cookies)      
-      if response.success?
-        return true
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
+    def delete
+      super(@id)
     end
 
   end

data/lib/dropcam/notification_base.rb

@@ -0,0 +1,66 @@
+require_relative 'base'
+module Dropcam
+  class NotificationBase < Base
+    
+    attr_accessor :name, :type, :value, :is_enabled, :id
+    
+    def initialize(camera)
+      @camera = camera
+    end
+    
+    def devices
+      
+      response = get(::CAMERA_FIND_NOTIFICATIONS, { "id" => @camera.uuid }, @camera.cookies)      
+      notifications = []
+
+      all_notifications = JSON.parse(response.body)["items"]
+      all_notifications.each{|note|
+        notifications.push Notification.new(@camera, note["target"])
+      }
+      
+      notifications
+    end
+    
+    def delete(notifcation_id)
+      response = post(::CAMERA_DELETE_NOTIFICATION, {"id"=>notifcation_id}, @camera.cookies)      
+      true
+    end
+    
+    ## API for Notifications doesn't include email notifcations
+    ## The code below parses an HTML Partial to get all notifcation values
+    
+    # def all_notification_devices
+    #   request_path = ::CAMERA_HTML_SETTINGS_BASE + @uuid
+    #   response = get(request_path, {}, @cookies)      
+    #   if response.success?
+    #     raw_html = response.body
+    #     doc = Hpricot.parse(raw_html)
+    # 
+    #     notifications = []
+    #     doc.search("//div[@class='notification_target']").each { |notification_target|
+    #       puts notification_target
+    #       data_id =  notification_target.get_attribute("data-id")
+    #       puts data_id
+    #       name =  notification_target.at("div/span").inner_text
+    #       
+    #       input =  notification_target.at("div/input")
+    # 
+    #       attributes = input.attributes.to_hash
+    #       data_type = attributes["data-type"]
+    #       data_value = attributes["data-value"]
+    #       checked = attributes.has_key?("checked")
+    #       
+    # 
+    #       notifications.push(note)
+    #     }
+    #     return notifications
+    #   elsif response.not_authorized?
+    #     raise AuthorizationError 
+    #   else 
+    #     raise CameraNotFoundError 
+    #   end
+    # end
+
+
+  end
+end

data/lib/dropcam/screenshot.rb

@@ -0,0 +1,24 @@
+
+module Dropcam
+  class Screenshot < Base
+    # 
+    attr_accessor :camera
+    def initialize(name)
+      @camera = camera
+      @name = name
+      @current_value = value
+    end
+    
+    def current(width=1200)
+      return image_at_time(nil, width)
+    end
+    
+    def image_at_time(timestamp, width=1200)
+      params = {"uuid"=>@camera.uuid, "width" => width}
+      params["time"] = timestamp if timestamp
+      response = get(::IMAGE_PATH, params, @camera.cookies, true)      
+      return response
+    end
+  end
+end
+

data/lib/dropcam/session.rb

@@ -15,7 +15,7 @@ module Dropcam
       all_cookies = response.get_fields('set-cookie') # only cookies are set on valid credentials
       
       ## for some reason, dropcam responds with 200 on invalid credentials
-      if response.success? and all_cookies
+      if all_cookies
         
         cookies = []
         all_cookies.each { | cookie |
@@ -35,12 +35,8 @@ module Dropcam
     protected
     def _session_token
       response = get(::USERS_GET_SESSION_TOKEN, {}, @cookies)
-      if response.success?
-        response_json = JSON.parse(response.body)
-        token = response_json["items"][0]
-        return token
-      end
-      return nil
+      token = JSON.parse(response.body)["items"][0]
+      token
     end
 
   end

data/lib/dropcam/setting.rb

@@ -1,7 +1,7 @@
 module Dropcam
   class Setting < Base
     # 
-    attr_accessor :name
+    attr_accessor :name, :camera
     def initialize(name, value, camera)
       @camera = camera
       @name = name
@@ -21,17 +21,9 @@ module Dropcam
     
     def set(value)
       response = post(::DROPCAMS_SET_PROPERTY, {"uuid"=>@camera.uuid, "key" => @name, "value" => value}, @camera.cookies)     
-      if response.success?
-        @current_value = value
-        @camera.settings = JSON.parse(response.body)["items"][0]
-        true
-      elsif response.error?
-        raise UnkownError, JSON.parse(response.body)["status_detail"]
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
+      @current_value = value
+      @camera.settings = JSON.parse(response.body)["items"][0]
+      true
     end
     
   end

data/lib/dropcam/version.rb

@@ -1,3 +1,3 @@
 module Dropcam
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/dropcam.rb

@@ -21,45 +21,35 @@ module Dropcam
     
     def get_public_camera(token)
       response = get(::CAMERAS_GET_BY_PUBLIC_TOKEN, {"token"=>token, "return_deleted"=>true}, @session.cookies)      
-      if response.success?
-        return response.body
-      elsif response.not_authorized?
-        raise AuthorizationError 
-      else 
-        raise CameraNotFoundError 
-      end
+      camera = JSON.parse(response.body)["items"][0]
+      Camera.new(camera["uuid"], camera)
     end
     
     def public_cameras      
       response = get(::CAMERAS_GET_PUBLIC, {}, @session.cookies)
-      cameras = []
-      if response.success?
-        response_json = JSON.parse(response.body)
-        owned = response_json["items"][0]["owned"]
-        owned.each{|camera|
-          c = Camera.new(camera["uuid"], camera)
-          c.cookies = @session.cookies
-          c.session_token = @session.session_token
-          cameras.push(c)
-        }
-      end
-      return cameras
+      public_cameras = JSON.parse(response.body)["items"]
+      json_to_camera(public_cameras)
     end
     
     def cameras      
       response = get(::CAMERAS_GET_VISIBLE, {"group_cameras" => true}, @session.cookies)
+      response_json = JSON.parse(response.body)
+      owned = response_json["items"][0]["owned"]
+      json_to_camera(owned, true)
+    end
+    
+    private
+    def json_to_camera(json, set_session=true)
       cameras = []
-      if response.success?
-        response_json = JSON.parse(response.body)
-        owned = response_json["items"][0]["owned"]
-        owned.each{|camera|
-          c = Camera.new(camera["uuid"], camera)
-          c.cookies = @session.cookies
-          c.session_token = @session.session_token
-          cameras.push(c)
-        }
-      end
-      return cameras
+      
+      json.each{|camera|
+        c = Camera.new(camera["uuid"], camera)
+        c.cookies = @session.cookies if set_session
+        c.session_token = @session.session_token if set_session
+        cameras.push(c)
+      }
+      cameras
     end
+    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dropcam
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-12 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies: []
 description: Access Dropcam account and cameras
 email:
@@ -33,9 +33,14 @@ files:
 - lib/dropcam/base.rb
 - lib/dropcam/camera.rb
 - lib/dropcam/clip.rb
+- lib/dropcam/clip_archive.rb
+- lib/dropcam/clip_base.rb
 - lib/dropcam/cuepoint.rb
+- lib/dropcam/cuepoint_base.rb
 - lib/dropcam/error.rb
 - lib/dropcam/notification.rb
+- lib/dropcam/notification_base.rb
+- lib/dropcam/screenshot.rb
 - lib/dropcam/session.rb
 - lib/dropcam/setting.rb
 - lib/dropcam/stream.rb