geotrigger 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1681ff89f1fb5fa48cee8fb34b31de586e2ca57b
-  data.tar.gz: c4e1f585cc211d2a40e6ddadf9043ae36a831271
+  metadata.gz: 4884037658b1d1060d37d2d134905b6e2b4ee48b
+  data.tar.gz: 1f237b42ce60c8ed9ca3df6a5cb6c90540363554
 SHA512:
-  metadata.gz: a76125f1e937a2a6dffb38e98a966034adc6dab207743c1dc23b091897ec6f7d606ac1841c678a5922dcd0823c142a704ac0a2a56197d5f34b9ddc3fd29c8d2c
-  data.tar.gz: cdf2862f6dce564353b9f9f363729a504a75da4f1ae15c6557b1496103d44ac728f040cfe1e304da1eaa9dd1f2b1f845cace0641d3313697f470b8e3d7654f8b
+  metadata.gz: a50e202502a0e43566451f2525fda48a8b574537eefe074c2d8503e5493ac75193712f435e9c97ad9cc368e7580ad58720e8969d67b2b0f5b29eb1de4e680e7f
+  data.tar.gz: 6080147b5dfcc3f8a73b2ead823a0d0a04dc81316f04b783dc32f78fec39b07d6041696b682d7f682060b69de26be5a88c74fde44253bebe6309777f8aeaca11

data/Gemfile

@@ -1,4 +1,2 @@
 source 'https://rubygems.org'
-
-gem 'httpclient'
-gem 'timecop'
+gemspec

data/geotrigger.gemspec

@@ -15,4 +15,6 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'httpclient'
   gem.add_development_dependency 'timecop'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'pry'
 end

data/lib/geotrigger/session.rb

@@ -19,15 +19,15 @@ module Geotrigger
       @access_token || @ago.access_token
     end
 
-    def headers
+    def headers others = {}
       {
         'Content-Type' => 'application/json',
         'Authorization' => "Bearer #{access_token}"
-      }
+      }.merge others
     end
 
-    def post path, params = {}
-      r = @hc.post BASE_URL % path, params.to_json, headers
+    def post path, params = {}, other_headers = {}
+      r = @hc.post BASE_URL % path, params.to_json, headers(other_headers)
       raise GeotriggerError.new r.body unless r.status == 200
       h = JSON.parse r.body
       raise_error h['error'] if h['error']

data/lib/geotrigger/trigger.rb

@@ -3,6 +3,8 @@ module Geotrigger
   class Trigger < Model
     include Taggable
 
+    CIRCLE_KEYS = %w[latitude longitude distance]
+
     def self.create session, opts
       t = Trigger.new session: session
       t.data = opts
@@ -31,6 +33,11 @@ module Geotrigger
       post_data['triggerIds'] = post_data.delete 'triggerId'
       post_data.delete 'tags'
 
+      if circle?
+        post_data['condition']['geo'].delete 'geojson'
+        post_data['condition']['geo'].delete 'esrijson'
+      end
+
       grok_self_from post 'trigger/update', post_data.merge(opts)
       self
     end
@@ -40,6 +47,10 @@ module Geotrigger
       @data = data['triggers'].select {|t| t['triggerId'] == (id || @data['triggerId'])}.first
     end
 
+    def circle?
+      not CIRCLE_KEYS.map {|k| @data['condition']['geo'].keys.include? k}.select {|e| e}.empty?
+    end
+
   end
 
 end

data/lib/geotrigger/version.rb

@@ -1,3 +1,3 @@
 module Geotrigger
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/geotrigger/device_spec.rb

@@ -3,14 +3,14 @@ require_relative '../helper'
 describe Geotrigger::Device do
 
   let :dev do
-    s = GT::AGO::Session.new client_id: CONF[:client_id],
+    s = Geotrigger::AGO::Session.new client_id: CONF[:client_id],
                                      type: :device
 
-    # can't use this because GT doesn't know it yet
+    # can't use this because Geotrigger doesn't know it yet
     #
     ago_did = s.device_data['deviceId']
 
-    # make a call to GT so it learns of new device
+    # make a call to Geotrigger so it learns of new device
     #
     at = s.access_token
     r = HTTPClient.new.get Geotrigger::Session::BASE_URL % 'device/list',
@@ -23,7 +23,7 @@ describe Geotrigger::Device do
     #
     ago_did.should eq gt_did
 
-    GT::Device.new client_id: CONF[:client_id],
+    Geotrigger::Device.new client_id: CONF[:client_id],
                    client_secret: CONF[:client_secret],
                    device_id: ago_did
   end
@@ -32,7 +32,7 @@ describe Geotrigger::Device do
     ts = dev.tags
     ts.should_not be nil
     ts.should be_a Array
-    ts.first.should be_a GT::Tag
+    ts.first.should be_a Geotrigger::Tag
     ts.first.name.should eq dev.default_tag
   end
 

data/spec/geotrigger/geotrigger_spec.rb

@@ -105,4 +105,23 @@ describe Geotrigger::Session do
     ->{ s.post 'application/permissions' }.should raise_error
   end
 
+  describe 'post' do
+
+    let :session do
+      s = Geotrigger::Session.new client_id: CONF[:client_id],
+                                  client_secret: CONF[:client_secret]
+    end
+
+    it 'posts to the API' do
+      ->{ session.post 'application/permissions' }.should_not raise_error
+    end
+
+    it 'accepts other headers' do
+      ->{
+        session.post 'application/permissions', {}, {other_header: 'other value'}
+      }.should_not raise_error
+    end
+
+  end
+
 end

data/spec/geotrigger/tag_spec.rb

@@ -19,18 +19,18 @@ describe Geotrigger::Tag do
   end
 
   let :tag do
-    GT::Tag.create session, tags: "foo#{Time.now.to_i}"
+    Geotrigger::Tag.create session, tags: "foo#{Time.now.to_i}"
   end
 
   let :dev do
-    s = GT::AGO::Session.new client_id: CONF[:client_id],
+    s = Geotrigger::AGO::Session.new client_id: CONF[:client_id],
                              type: :device
 
-    # can't use this because GT doesn't know it yet
+    # can't use this because Geotrigger doesn't know it yet
     #
     ago_did = s.device_data['deviceId']
 
-    # make a call to GT so it learns of new device
+    # make a call to Geotrigger so it learns of new device
     #
     at = s.access_token
     r = HTTPClient.new.get Geotrigger::Session::BASE_URL % 'device/list',
@@ -43,7 +43,7 @@ describe Geotrigger::Tag do
     #
     ago_did.should eq gt_did
 
-    GT::Device.new client_id: CONF[:client_id],
+    Geotrigger::Device.new client_id: CONF[:client_id],
                    client_secret: CONF[:client_secret],
                    device_id: ago_did
   end
@@ -65,7 +65,7 @@ describe Geotrigger::Tag do
   end
 
   let :trigger do
-    GT::Trigger.create session, trigger_opts
+    Geotrigger::Trigger.create session, trigger_opts
   end
 
   it 'creates a tag' do

data/spec/geotrigger/trigger_spec.rb

@@ -24,12 +24,13 @@ describe Geotrigger::Trigger do
   end
 
   let :trigger do
-    GT::Trigger.create session, opts
+    Geotrigger::Trigger.create session, opts
   end
 
   it 'should create a trigger' do
     t = trigger
     t.trigger_id.should_not be nil
+    t.condition['geo'].delete 'geojson'
     t.condition.should eq opts['condition']
     t.action.should eq opts['action']
   end
@@ -38,7 +39,7 @@ describe Geotrigger::Trigger do
     ts = trigger.tags
     ts.should_not be nil
     ts.should be_a Array
-    ts.first.should be_a GT::Tag
+    ts.first.should be_a Geotrigger::Tag
     ts.first.name.should eq trigger.default_tag
   end
 

data/spec/helper.rb

@@ -6,3 +6,4 @@ CONF = YAML.load_file File.expand_path '../config.yml', __FILE__
 
 require 'timecop'
 require 'geotrigger'
+require 'pry'

metadata

@@ -1,41 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: geotrigger
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A small ruby client for Esri's Geotrigger service
@@ -45,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.md
 - geotrigger.gemspec
@@ -76,17 +104,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A small ruby client for Esri's Geotrigger service
@@ -98,3 +126,4 @@ test_files:
 - spec/geotrigger/tag_spec.rb
 - spec/geotrigger/trigger_spec.rb
 - spec/helper.rb
+has_rdoc: