opium 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0f70beb198984ac00eabd7d1846b019aaac4b88
-  data.tar.gz: a3c498197bab34dfdf975896ca7433d27c9674f8
+  metadata.gz: 07aca24af6b9ba852256c1c3c7af22edb123b079
+  data.tar.gz: e74fb2a45195da1987a2a10e2d8aeb41672e027d
 SHA512:
-  metadata.gz: e19ebe57797de055860c1e4a0007bb65857a9fa2a84e25bc0cd506859b7397c98578b98f4cdb10105cdc37156b9fed1c163992959d251e1bfaa51695d83d6c94
-  data.tar.gz: a7426e0281a31ea40c4c24615bf9e37eba51b1409fd7025847868f2670bff81588af480b53648e3cf635102186e3c33fb3a466a324a36496adabcb530769a3bc
+  metadata.gz: ef07d8f75c9b1dbc346258477854c7a5c14ce63e69ec26baa05f55eba4564dbef2d5c07d42d9bc58727d116b540422414943b7264280c072c8d67d1c3f049e84
+  data.tar.gz: dcbea8a0e2b70fe38018fd4fb060a56ed13c4847e26f41e99cda85df4a50e6e16ff7beb3eb25f926b1db6526c00ddd16127c3f0a90f6774e828ec75f3f2e7c29

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.3.3
+### New Features
+- Opium::GeoPoint now implements Comparable
+- Opium::GeoPoint now has a constant, NULL_ISLAND, which has a lat/long of 0/0.
+
 ## 1.3.2
 ### Resolved Issues
 - #51: Queryable#translate_to_parse now attempts to ensure that constraint values

data/lib/opium/extensions/geo_point.rb

@@ -1,5 +1,7 @@
 module Opium
   class GeoPoint
+    include Comparable
+
     def initialize( value )
       self.latitude, self.longitude = *
         case value
@@ -13,29 +15,35 @@ module Opium
           raise ArgumentError.new( "invalid value for GeoPoint: \"#{ value }\"" )
         end
     end
-  
+
     attr_accessor :latitude, :longitude
-  
+
     def to_geo_point
       self
     end
-  
+
     def to_parse
       { "__type" => "GeoPoint", "latitude" => self.latitude, "longitude" => self.longitude }
     end
-  
+
     def to_s
       "#{ self.latitude },#{ self.longitude }"
     end
 
+    def <=>( geo_point )
+      [self.latitude, self.longitude] <=> [geo_point.latitude, geo_point.longitude]
+    end
+
+    NULL_ISLAND = new( [0, 0] ).freeze
+
     class << self
       def to_ruby(object)
         object.to_geo_point unless object.nil?
       end
-    
+
       def to_parse(object)
         object.to_geo_point.to_parse
       end
     end
   end
-end
+end

data/lib/opium/version.rb

@@ -1,3 +1,3 @@
 module Opium
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

data/spec/opium/extensions/geo_point_spec.rb

@@ -2,12 +2,22 @@ require 'spec_helper'
 
 describe Opium::GeoPoint do
   subject { described_class }
-  
+
   it { is_expected.to respond_to( :to_ruby, :to_parse ).with( 1 ).argument }
-  
+  it { is_expected.to be <= Comparable }
+  it { expect( described_class.constants ).to include( :NULL_ISLAND ) }
+
+  describe Opium::GeoPoint::NULL_ISLAND do
+    it { is_expected.to be_frozen }
+    it { is_expected.to be_a Opium::GeoPoint }
+
+    it { expect( subject.latitude ).to eq 0 }
+    it { expect( subject.longitude ).to eq 0 }
+  end
+
   describe '.to_ruby' do
     let(:result) { subject.to_ruby( convert_from ) }
-    
+
     context 'with valid object representations' do
       [ "33.33, -117.117", {latitude: 33.33, longitude: -117.117}, [33.33, -117.117], described_class.new( [33.33, -117.117] ) ].each do |value|
         let(:convert_from) { value }
@@ -17,63 +27,86 @@ describe Opium::GeoPoint do
         it( 'sets the proper longitude' ) { expect( result.longitude ).to eq -117.117 }
       end
     end
-    
+
     context 'with invalid object representations' do
       [ "malformed", {latitude: 0, bad_key: :unknown}, [0], 1, 1.0, true, false ].each do |value|
         let(:convert_from) { value }
         it { expect { subject.to_ruby( value ) }.to raise_exception }
-      end      
+      end
     end
   end
-  
+
   describe '.to_parse' do
     let(:result) { subject.to_parse( convert_from ) }
     let(:expected) { { "__type" => "GeoPoint", "latitude" => 33.33, "longitude" => -117.117 } }
-    
+
     context 'with valid object representations' do
       [ "33.33, -117.117", {latitude: 33.33, longitude: -117.117}, [33.33, -117.117], described_class.new( [33.33, -117.117] ) ].each do |value|
         let(:convert_from) { value }
-        
+
         it { expect { result }.to_not raise_exception }
         it { expect( result ).to eq expected }
-      end    
+      end
     end
   end
-  
+
   describe '#initialize' do
     let(:result) { described_class.new( initialize_from ) }
-    
+
     context 'with an array value' do
       let(:initialize_from) { [ 33.33, -117.117 ] }
-      
+
       it { expect { result }.to_not raise_exception }
     end
-    
+
     context 'with a hash value' do
       let(:initialize_from) { { latitude: 33.33, longitude: -117.117 } }
-      
+
       it { expect { result }.to_not raise_exception }
     end
-    
+
     context 'with a string value' do
       let(:initialize_from) { "33.33, -117.117" }
-      
+
       it { expect { result }.to_not raise_exception }
     end
-    
+
     context 'with anything else' do
       let(:initialize_from) { 42 }
-      
+
       it { expect { result }.to raise_exception }
     end
   end
-  
+
+  describe '#<=>' do
+    let(:a) { described_class.new( [0, 0] ) }
+    let(:result) { a <=> b }
+
+    context 'with a value less than a test value' do
+      let(:b) { described_class.new( [1, 1] ) }
+
+      it { expect( result ).to eq -1 }
+    end
+
+    context 'with a value equal to a test value' do
+      let(:b) { described_class.new( [0, 0] ) }
+
+      it { expect( result ).to eq 0 }
+    end
+
+    context 'with a value greater than a test value' do
+      let(:b) { described_class.new( [-1, -1] ) }
+
+      it { expect( result ).to eq 1 }
+    end
+  end
+
   describe "instance" do
     describe "with an array value" do
       subject { described_class.new [33.33, -117.117] }
       it { should respond_to(:latitude, :longitude, :to_geo_point, :to_parse).with(0).arguments }
       it { should respond_to(:latitude=, :longitude=).with(1).argument }
-    
+
       its(:latitude) { should == 33.33 }
       its(:longitude) { should == -117.117 }
       its(:to_geo_point) { should == subject }
@@ -93,4 +126,4 @@ describe Opium::GeoPoint do
       its(:to_s) { should == "33.33,-117.117" }
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opium
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Joshua Bowers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -372,7 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: An Object Parse.com Mapping technology for defining models.