drone_api 0.1.0 → 0.2.0

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+drone_api.sublime-project
+drone_api.sublime-workspace

data/README.md

@@ -42,13 +42,19 @@ This will return a single strike (or nil, if nothing is found). You can also pas
 > x = c.find :bureau_id => 'YEM001' # Returns an array of 1 element
 > six_deaths = c.find :deaths => 6
 
-There are some find_by_X methods. They are based on the attribute names of the Strike class. (If you're familiar with Rails, think model find methods). The following are equale to the examples above:
+There are some find_by_X methods. They are based on the attribute names of the Strike class. (If you're familiar with Rails, think model find methods). The following are equal to the examples above:
 
 > x = c.find_by_bureau_id 'YEM001'
 > six_deaths = c.find_by_deaths 6
 
 One think to keep in mind. All these finders return an array *except* find_by_number. This returns a single instance, just as Client.find does.
 
+The finder methods are:
+- find_by_X(value) - Find all where X equals value
+- find_X_gt[e](value) - Finds all where X is greater than [or equal to] value.
+- find_X_lt[e](value) - Finds all where X is less than [or equal to] value.
+- find_X_btwn(low, high) - Finds all where X is between low and high.
+
 
 ## Contributing
 

data/lib/drone_api.rb

@@ -1,6 +1,7 @@
 require 'drone_api/client'
 require 'drone_api/request'
 require 'drone_api/strike'
+require 'drone_api/geo_json'
 require 'drone_api/version'
 
 module DroneApi
@@ -16,4 +17,5 @@ module DroneApi
   def self.version
     "DroneApi version #{DroneApi::VERSION}"
   end
+
 end

data/lib/drone_api/client.rb

@@ -1,5 +1,16 @@
 module DroneApi
   class Client
+    def initialize
+      @debug = false
+    end
+
+    def debug?
+      @debug
+    end
+
+    def set_debug(flag)
+      @debug = flag
+    end
 
     # Returns entire list of strikes
     #
@@ -19,12 +30,22 @@ module DroneApi
     end
 
     def method_missing(meth, *args, &block)
-      m = meth.to_s.match(/^find_by_(.+)/)
+      if (m = meth.to_s.match(/^find_(.+)_btwn/))
+        new_method = "def #{meth}(low, high); find_between :#{m[1]}, low, high; end"
+      elsif (m = meth.to_s.match /find_(.+?)_([l|g]te?)/)
+        op = m[2].match(/^gt/).nil? ? '<' : '>'
+        op = "#{op}=" if m[2].match(/\=$/)
+
+        new_method = "def #{meth}(val); find_cmp :#{m[1]}, val, '#{op}'; end"
+      elsif (m = meth.to_s.match(/^find_by_(.+)/))
+        new_method = "def #{meth}(val); find_cmp :#{m[1]}, val, '=='; end"
+        args = [args.first]
+      end
+
       if m
         key = m[1].to_sym
         if Strike.new.respond_to? key
-          instance_eval "def #{meth}(val); find_equals :#{key}, val; end"
-          send meth, args.first
+          add_finder(meth.to_s, new_method, *args)
         else
           super
         end
@@ -35,8 +56,17 @@ module DroneApi
 
     protected
 
+    def add_finder(meth, code, *args)
+      instance_eval code
+      debug "meth: #{meth}" 
+      debug "code: #{code}" 
+      debug "args: #{args}" 
+      send meth, *args
+    end
+
     def find_equals(key, value)
       key = key.to_sym
+      value = value.first if value.is_a? Array
       value = value.to_s unless value.nil?
       result = all.select do |s| 
         test = s.send(key)
@@ -49,5 +79,41 @@ module DroneApi
 
     end
 
+    def find_cmp(key, value, op)
+      key = key.to_sym
+      value = value.first if value.is_a? Array
+      result = all.select do |s| 
+        test = s.send(key)
+        eval "value #{op} test"
+      end
+
+      result = result.first if key == :number and not result.nil?
+      return result
+
+    end
+
+    def find_between(key, low, high)
+      # low and high have to 
+      #   1) Be either Integer, Float, date or DateTime and
+      #   2) Be the same class
+      if low.class != high.class
+        raise DroneApi::Error.new "Expected objects of same class; received one #{low.class} and one #{high.class}"
+      end
+
+      if [Date, DateTime, Integer, Float].select {|c| low.is_a? c }.empty?
+        raise DroneApi::Error.new "Receieved #{low.class}. Expected Date, DateTime, Integer, or Float."
+      end
+
+      key = key.to_sym
+      all.select do |s|
+        test = s.send(key)
+        test >= low and test <= high
+      end
+    end
+
+    def debug(msg)
+      puts msg if debug?
+    end
+
   end
 end

data/lib/drone_api/errors.rb

@@ -0,0 +1,3 @@
+module DroneApi
+  class Error < StandardError; end
+ end

data/lib/drone_api/geo_json.rb

@@ -0,0 +1,36 @@
+module DroneApi
+  class GeoJson
+ 	attr_accessor :properties, :coordinates
+
+ 	def initialize(properties={}, coordinates=[])
+ 		@properties = properties
+ 		@coordinates = coordinates
+ 	end
+
+ 	def [](key)
+ 		@properties[key]
+ 	end
+
+ 	def []=(key, value)
+ 		@properties[key] = value
+ 	end
+
+ 	def to_json(*a)
+		{ 
+			"type" => "Feature", 
+			"properties" => @properties, 
+			"geometry" => {
+				"type" => "Point", 
+				"coordinates" => @coordinates
+			} 
+		}.to_json(a)
+ 	end
+
+ 	def self.json_create(o)
+ 		GeoJson.new(
+ 			o['properties'], o['geometry']['coordinates']
+ 		)
+ 	end
+
+  end
+end

data/lib/drone_api/strike.rb

@@ -1,3 +1,4 @@
+require 'date'
 require 'json'
 
 module DroneApi
@@ -27,28 +28,43 @@ module DroneApi
   		unless data.nil?
   			data = JSON.parse(data) if data.is_a? String
 
-  			@id = data['_id'] || ''
-			@number = data['number'].to_i || 0
-			@country = data['country'] || ''
-			@date = data['date'] || ''
-			@town = data['town'] || ''
-			@location = data['location'] || ''
-			@deaths = data['deaths'].to_i || 0
-			@deaths_min = data['deaths_min'].to_i || 0
-			@deaths_max = data['deaths_max'].to_i || 0
-			@civilians = data['civilians'].to_i || 0
-			@injuries = data['injuries'].to_i || 0
-			@children = data['children'].to_i || 0
-			@tweet_id = data['tweet_id'] || ''
-			@bureau_id = data['bureau_id'] || ''
-			@summary_short = data['bij_summary_short'] || ''
-			@link = data['bij_link'] || ''
-			@target = data['target'] || ''
-			@lat = data['lat'] || ''
-			@lon = data['lon'] || ''
-			@articles = data['articles'] || ''
-			@names = data['names'] || ''
+        @id = parse_string(data['_id'])
+        @number = parse_int(data['number'])
+        @country = parse_string(data['country'])
+        @date = parse_date(data['date'])
+        @town = parse_string(data['town'])
+        @location = parse_string(data['location'])
+        @deaths = parse_int(data['deaths'])
+        @deaths_min = parse_int(data['deaths_min'])
+        @deaths_max = parse_int(data['deaths_max'])
+        @civilians = parse_int(data['civilians'])
+        @injuries = parse_int(data['injuries'])
+        @children = parse_int(data['children'])
+        @tweet_id = parse_string(data['tweet_id'])
+        @bureau_id = parse_string(data['bureau_id'])
+        @summary_short = parse_string(data['bij_summary_short'])
+        @link = parse_string(data['bij_link'])
+        @target = parse_string(data['target'])
+        @lat = parse_string(data['lat'])
+        @lon = parse_string(data['lon'])
+        @articles = parse_string(data['articles'])
+        @names = parse_string(data['names'])
+
   		end
   	end
+
+    private
+
+    def parse_int(val)
+      val.nil? ? 0 : val.to_i
+    end
+
+    def parse_date(val)
+      val.nil? ? nil : DateTime.strptime(val, '%Y-%m-%dT%H:%M:%S.%LZ')
+    end
+
+    def parse_string(val)
+      val.nil? ? '' : val
+    end
   end
 end

data/lib/drone_api/version.rb

@@ -1,3 +1,3 @@
 module DroneApi
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/drone_api_spec.rb

@@ -36,4 +36,26 @@ describe 'DroneApi::Strike' do
 	it { should respond_to(:lon) }
 	it { should respond_to(:articles) }
 	it { should respond_to(:names) }
-end
+end
+
+describe 'GeoJson' do
+	describe '#[]=' do
+		it "allows setting @properties" do
+			gj = DroneApi::GeoJson.new
+                        expect { gj[:foo] = :bar }.not_to raise_error
+
+			gj[:foo].should eq :bar
+		end
+	end
+
+	describe '#[]' do
+		before do
+			@gj = DroneApi::GeoJson.new
+			@gj[:foo] = 'bar'
+		end
+
+		it 'allows @properties to be retrieved' do
+		 	@gj[:foo].should eq 'bar'
+		 end
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drone_api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -42,6 +42,8 @@ files:
 - drone_api.gemspec
 - lib/drone_api.rb
 - lib/drone_api/client.rb
+- lib/drone_api/errors.rb
+- lib/drone_api/geo_json.rb
 - lib/drone_api/request.rb
 - lib/drone_api/strike.rb
 - lib/drone_api/version.rb