campfire_logic 2.0.2 → 2.0.3

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

data/app/models/locale.rb

@@ -20,7 +20,7 @@ class Locale
   scope :canada, :where => {:name => 'Canada'}
   scope :cities, :where => {:kind => 'city' }
   scope :countries, :where => {:kind => 'country'}
-  scope :locations, :where => {:kind => 'location'}
+  scope :valid_location, :excludes => {:location_id => nil}
   scope :states, :where => {:kind => 'state'}
   scope :us, :where => {:name => 'United States'}
 
@@ -118,12 +118,12 @@ class Locale
 
   # Returns location-locales found within this locale.
   def location_locales
-    self.descendants.select{ |d| d.location? && d.location }
+    self.descendants.valid_location
   end
 
   # Returns locations found within this locale.
   def locations
-    (self.location_locales.map{ |l| l.location } | [self.location]).compact
+    (location_locales.map{ |l| l.location } | [self.location]).compact
   end
 
   # Returns an array of this locale's ancestors and itself. Countries are omitted.

data/app/models/location.rb

@@ -34,6 +34,7 @@ class Location
   has_and_belongs_to_many :services, :inverse_of => :locations
   has_one :locale, :dependent => :destroy
   index [[ :coordinates, Mongo::GEO2D ]], :min => -200, :max => 200
+  scope :geocoded, :excludes => {:coordinates => nil}
 
   # Macros =========================================================================================
   attr_accessor :geocoder_result

data/campfire_logic.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "campfire_logic"
-  s.version = "2.0.2"
+  s.version = "2.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roderick Monje"]

data/spec/models/locale_spec.rb

@@ -55,7 +55,7 @@ describe Locale do
   end
 
   context 'when location' do
-    subject { Locale.locations.first }
+    subject { Locale.valid_location.first }
     specify { subject.name.should == 'Prospect Park Zoo' }
     specify { subject.should be_location }
     specify { subject.geocoding_address.should be_nil }

data/spec/models/location_spec.rb

@@ -5,11 +5,6 @@ describe Location do
 end
 
 describe Location do
-  before(:all) do
-    Locale.delete_all
-    Location.delete_all
-  end
-
   context '' do
     before(:all) { create_locations }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: campfire_logic
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 2
   - 0
-  - 2
-  version: 2.0.2
+  - 3
+  version: 2.0.3
 platform: ruby
 authors: 
 - Roderick Monje