xtify 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/xtify/commands.rb

@@ -76,11 +76,12 @@ module Xtify
     # - content       -> Message or Hash of message
     def push(opts={})
       xids = Array.wrap(opts.delete(:devices)).map {|d| d.is_a?(Device) ? d.xid : d}
+      device_type = opts.delete(:device_type)
       has_tags = Array.wrap(opts.delete(:has_tags))
       not_tags = Array.wrap(opts.delete(:not_tags))
       content = opts.delete(:content)
       unless content.is_a?(Message)
-        content = Message.new(opts)
+        content = Message.new(content)
       end
 
       args = convert_to_args(opts)
@@ -89,6 +90,8 @@ module Xtify
       args[:xids] = xids unless xids.empty?
       args[:hasTags] = has_tags unless has_tags.empty?
       args[:notTags] = not_tags unless not_tags.empty?
+      
+      args['type'] = device_type
 
       post('push', args)
     end
@@ -128,8 +131,9 @@ module Xtify
 
     def post(command, opts)
       args = opts.dup
-      raise ConfigError.new("Must specify app_key in Xtify initializer.") unless Xtify.config.app_key
-      args[:appKey] = Xtify.config.app_key
+      raise ConfigError.new("Must specify app_key in Xtify initializer.") unless (config.app_key_ios || config.app_key_gcm)
+      args[:appKey] = config.send("app_key_#{args['type'].downcase}")
+      args.delete('type') if command == 'push'
 
       response = Curl::Easy.perform(File.join(API_V2, command)) do |curl|
         curl.verbose = config.verbose

data/lib/xtify/config.rb

@@ -1,5 +1,5 @@
 module Xtify
   class Config
-    attr_accessor :app_key, :api_key, :verbose
+    attr_accessor :api_key, :verbose, :app_key_ios, :app_key_gcm
   end
 end

data/test/helper.rb

@@ -16,7 +16,8 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'xtify'
 
 Xtify.configure do |config|
-  config.app_key = 'FAKE_APP_KEY'
+  config.app_key_ios = 'FAKE_APP_KEY'
+  config.app_key_gcm = 'FAKE_APP_KEY'
   config.api_key = 'FAKE_API_KEY'
   config.verbose = false
 end

data/test/message_test.rb

@@ -71,8 +71,10 @@ class MessageTest < Test::Unit::TestCase
           :devices => "ABC123",
           :has_tags => ["apple", "banana"],
           :send_all => true,
-          :inbox_only => false
+          :inbox_only => false,
+          :device_type => 'GCM'
         )
+
       end
 
       should "return success" do

data/test/registration_test.rb

@@ -44,7 +44,9 @@ class RegistrationTest < Test::Unit::TestCase
       @device = Xtify.register_device(
         :install_id => 'fake_user', 
         :type => Xtify::Device::TYPES[:android],
-        :registration_id => 'fake_registration_id')
+        :registration_id => 'fake_registration_id'
+      )
+
     end
 
     should "return expected device" do
@@ -60,7 +62,8 @@ class RegistrationTest < Test::Unit::TestCase
         @device = Xtify.register_device(
           :install_id => 'fake_user', 
           :type => 'FAKE_TYPE',
-          :registration_id => 'fake_registration_id')
+          :registration_id => 'fake_registration_id'
+        )
       end
     end
   end
@@ -71,7 +74,8 @@ class RegistrationTest < Test::Unit::TestCase
       assert_raises Xtify::InvalidRequest do
         @device = Xtify.register_device(
           :type => Xtify::Device::TYPES[:android],
-          :registration_id => 'fake_registration_id')
+          :registration_id => 'fake_registration_id'
+        )
       end
     end
   end

data/xtify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "xtify"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonathan Bell"]
-  s.date = "2013-05-07"
+  s.date = "2013-05-14"
   s.description = "Client library for Xtify's API"
   s.email = "jbell@moxiesoft.com"
   s.extra_rdoc_files = [
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/moxiespaces/xtify"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.25"
   s.summary = "Client library for Xtify's API"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xtify
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70176322612200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70176322612200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70176322611720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70176322611720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &70176322611240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70176322611240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70176322610760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 1.2.3
   type: :development
   prerelease: false
-  version_requirements: *70176322610760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70176322610280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *70176322610280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70176322609800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +101,12 @@ dependencies:
         version: 1.9.0
   type: :development
   prerelease: false
-  version_requirements: *70176322609800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.9.0
 description: Client library for Xtify's API
 email: jbell@moxiesoft.com
 executables: []
@@ -114,9 +144,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -928513645534341231
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -125,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Client library for Xtify's API