spear-cb-api 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 444695bd38aa39bbc18c5b6581e7f83522dd5348
-  data.tar.gz: 167956a503f3dd8884f57a3c903999903f69e452
+  metadata.gz: 9735511da1987a6ebf6037689ccc8bc1c558111d
+  data.tar.gz: e66ee281b2cda1bfc31e7d59c6e26801c9776307
 SHA512:
-  metadata.gz: 6b674f8944523d870bd6851168c21d44e2ab3095c0544168032fb308ce9521915bde5ddb9214eb44c39b88cc018183b1dfde278e7aff72f56ea6895ba1f32243
-  data.tar.gz: f0b6589b4c62deb920a7c9f681e8187e3de511abb26df906b8348a730f930b6d458602fec25f1ff4c7bb4f768a5c469dc758bcf3372dc2a3b68e6e4dbbdd1018
+  metadata.gz: b73ecf48f0b22dd010a6f0899f9636f270388bfcafe4af31cb5e1e59c927869d0f4c41176411c627584bb3ed5497a1ce9a2071a8681936b8daffd32bc5fe3a2b
+  data.tar.gz: 659f62673de00af1023aab7ce2bad3ce63341cb9bdbd6990999653687ec372d7a408b4ce9e66e39f5b854e0d5d0a50be9d6060ca110b1c34926593a7da73d125

data/lib/spear/exceptions.rb

@@ -15,7 +15,15 @@ module Spear
     end
   end
 
-  class ParametersNotValid < Error; end
+  class ParametersNotValid < Error;
+    DEFAULT = 'The parameters is invalid.'
+
+    def initialize(message)
+      super(message || DEFAULT)
+    end
+  end
+
   class NetworkError < Error; end
+  class TimeoutError < Error; end
   class ObjectTypeError < Error; end
 end

data/lib/spear/request.rb

@@ -54,6 +54,8 @@ module Spear
           end
         rescue SocketError => e  # if the network is disconnected, it'll throw SocketError.
           raise Spear::NetworkError.new(e.message)
+        rescue Timeout::Error => e
+          raise Spear::TimeoutError.new(e.message)
         end
       end
 

data/lib/spear/resource/application.rb

@@ -27,7 +27,7 @@ module Spear
         elsif ids.kind_of?(Array)
           Spear::Request.new(:get, Spear.uri_application_status, {query: {AppDID: ids.join(',')}}).execute
         else
-          raise Spear::ParametersNotValid.new('')
+          raise Spear::ParametersNotValid.new
         end
       end
 

data/lib/spear/structure/application/embeded_class.rb

@@ -31,6 +31,30 @@ module Spear
           end
         end
 
+        class ApplicationObject
+          attr_accessor :app_did, :is_viewed, :view_date
+
+          def initialize(app_did, is_viewed, view_date)
+            @app_did = app_did
+            @is_viewed = 'true'.eql?(is_viewed)
+            @view_date = view_date unless view_date.blank?
+          end
+        end
+
+        def generate_apps(apps)
+          if !apps.nil?
+            if apps.kind_of?(Array)
+              apps.map {|app|
+                ApplicationObject.new(app['ApplicationDID'], app['Viewed'], app['ViewedDate'])
+              }
+            else # Hash
+              [] << ApplicationObject.new(apps['ApplicationDID'], apps['Viewed'], apps['ViewedDate'])
+            end
+          else
+            []
+          end
+        end
+
       end
     end
   end

data/lib/spear/structure/application/state.rb

@@ -2,13 +2,17 @@ module Spear
   module Structure
     module Application
       class State < Structure::Base
-        attr_accessor :application_list
+        include EmbededClass
+
+        attr_accessor :applications
 
         def initialize(response)
           super(response)
-          @application_list = @root['ApplicationList']
+
+          @applications = generate_apps(@root['ApplicationList']['Application']) rescue nil
         end
       end
+
     end
   end
 end

data/lib/spear/version.rb

@@ -1,3 +1,3 @@
 module Spear
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/spear_spec.rb

@@ -1,6 +1,6 @@
 describe Spear do
   before :each do
-    Spear.config({dev_key: 'xxx', project: 'ExampleApp', use_model: true})
+    Spear.config({dev_key: ENV['DEVELOPMENT_KEY'], project: 'ExampleApp', use_model: true})
   end
 
   it "check user existing" do
@@ -50,7 +50,7 @@ describe Spear do
 
   it "get application status" do
     # s = Spear.application_status(['JAWS4L16LFXD7ZL87LLC', 'JAWW63876DWNQGSWZ384', 'JA4M44C77CDSR0QHTRJ6'])
-    s = Spear.application_status('JAWW63876DWNQGSWZ384', 'fei.zhang@sina.com.cn')
+    s = Spear.application_status('J3H0YY6LLK553R3Z32Z', 'zhangfei@sina.com.cn')
     puts s.response
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spear-cb-api
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - CBluowei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder