higcm 0.0.3 → 0.0.4

data/higcm.gemspec

@@ -4,9 +4,9 @@ $:.unshift File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name         = "higcm"
-  s.version      = "0.0.3"
+  s.version      = "0.0.4"
   s.authors      = ["hifrank"]
-  s.email        = "frank_chen@htc.com"
+  s.email        = "r7692118@gmail.com"
   s.homepage     = "https://github.com/hifrank/higcm"
   s.summary      = "ruby wrapper for GCM google cloud messaging."
   s.description  = %q{ruby wrapper for GCM google cloud messaging.}

data/lib/higcm/sender.rb

@@ -8,9 +8,9 @@ module HiGCM
       attr_accessor :api_key, :api_status, :hydra, :requests
 
       OPTIONAL_OPTIONS = {
-        :collapse_key     => String, 
-        :data             => Hash, 
-        :delay_while_idle => Fixnum, 
+        :collapse_key     => String,
+        :data             => Hash,
+        :delay_while_idle => [true, false],
         :time_to_live     => Fixnum
       }
 
@@ -41,7 +41,23 @@ module HiGCM
         #fill up option
         OPTIONAL_OPTIONS.each do | key, type |
           if opts.key?(key)
-            raise SenderError.new("#{key} should be Type #{type}") unless opts[key].is_a?(type)
+            if type.is_a?(Array)
+              @valid_value = false
+              type.each do | v |
+                if opts[key] == v
+                  @valid_value = true
+                  break
+                end
+              end
+              raise SenderError.new("#{key} should be Type #{type}") unless @valid_value
+            else
+              raise SenderError.new("#{key} should be Type #{type}") unless opts[key].is_a?(type)
+            end
+            # convert payload data to String for issue #3
+            case key
+            when :data
+              opts[key] = convert_hash(opts[key])
+            end
             body[key] = opts[key]
           end
         end
@@ -70,5 +86,19 @@ module HiGCM
         @hydra.run
       end
 
+      def convert_hash(hash)
+        hash.each do | k, v |
+          if v.is_a?(Hash)
+            hash[k] = convert_hash(v)
+          else
+            if v.respond_to?(:to_s)
+              hash[k] = v.to_s
+            else
+              raise SenderError "data value must respond to to_s function for converting to String"
+            end
+          end
+        end
+      end
+
     end
 end

data/spec/lib/higcm/sender_spec.rb

@@ -67,14 +67,46 @@ describe HiGCM::Sender do
       expect { @sender.send_async(@registration_ids, {:data => {} }, HiGCM::Handler.new) }.not_to raise_error(HiGCM::SenderError)
     end
 
+    it "should convert all opts[:data] to String" do
+      test_value = 1
+      rs = JSON.parse(@sender.send_async(@registration_ids, {:data => {:name => test_value} }, HiGCM::Handler.new).body)
+      rs["data"]["name"].should == "1"
+    end
+
     it "should raise exception if opts[:delay_while_idle] && opts[:time_to_live] is not Fixnum" do
       expect { @sender.send_async(@registration_ids, {:delay_while_idle => [] }, HiGCM::Handler.new) }.to raise_error(HiGCM::SenderError)
-      expect { @sender.send_async(@registration_ids, {:delay_while_idle => 1 }, HiGCM::Handler.new) }.not_to raise_error(HiGCM::SenderError)
+      expect { @sender.send_async(@registration_ids, {:delay_while_idle => true }, HiGCM::Handler.new) }.not_to raise_error(HiGCM::SenderError)
       expect { @sender.send_async(@registration_ids, {:time_to_live => [] }, HiGCM::Handler.new) }.to raise_error(HiGCM::SenderError)
       expect { @sender.send_async(@registration_ids, {:time_to_live => 1 }, HiGCM::Handler.new) }.not_to raise_error(HiGCM::SenderError)
     end
   end
 
+  describe "#convert_hash" do
+    it "should convert all the Hash value to String according to to_s function" do
+      sample = {
+        :name => 'frank',
+        :age  => 32,
+        :setting => {
+          'gundam' => true,
+          'style'  => {
+            :color => 1
+          }
+        }
+      }
+      expected_sample = {
+        :name => 'frank',
+        :age  => 32.to_s,
+        :setting => {
+          'gundam' => true.to_s,
+          'style'  => {
+            :color => 1.to_s
+          }
+        }
+      }
+      @sender.convert_hash(sample).should == expected_sample
+    end
+  end
+
   describe "#send_async_run" do
     it "should run Typhoeus::Hydra when send requests" do
       hydra  = double(Typhoeus::Hydra)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: higcm
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000Z
+date: 2012-08-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &2160619160 !ruby/object:Gem::Requirement
+  requirement: &2152835700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2160619160
+  version_requirements: *2152835700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160618400 !ruby/object:Gem::Requirement
+  requirement: &2152835200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2160618400
+  version_requirements: *2152835200
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2160617000 !ruby/object:Gem::Requirement
+  requirement: &2152834720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160617000
+  version_requirements: *2152834720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160616060 !ruby/object:Gem::Requirement
+  requirement: &2152834240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,9 +54,9 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160616060
+  version_requirements: *2152834240
 description: ruby wrapper for GCM google cloud messaging.
-email: frank_chen@htc.com
+email: r7692118@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []