muve 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86078fd9dbc468dc0837688bd28c9ffbad043681
-  data.tar.gz: 3de1f46815f7ec2cdb1511b8c24445277a06df7a
+  metadata.gz: d4afcea38652dfdf7e1a65d693c6816ef44d64fd
+  data.tar.gz: 12560dd7b090bc2120a8cf968295a056e61f43a4
 SHA512:
-  metadata.gz: b83a8681897f5ef214d6aaa3ed729972c38e263bd91e62fa12cc555775fa2cb6e413bad80911d704eb027c553d06c08e2e3ef9b9628fb1e2a5669d11a9a475db
-  data.tar.gz: b0fb6001de7b85bb2b60e9fea97f32466e5365d058bcfba4aa65548b1456fa4b14ec9202270c4c04bc4260c633ed2bc33b9a8d38475b1251ac261841d1251c57
+  metadata.gz: c7dc003d0c9b54dff78491e8929b24936ba83a6b9e07b5bdbb3cf9b22b890d03a1f784065d7750c1cc65ec7cdd135f43c6f5de7124c54fef03aae79c935e1471
+  data.tar.gz: 3a60ad2aab6f4ee29bfe9083f761114eabafd56143b95a39025780d6e364f4b1d1e67775685f7b89e90ee6f681831b1212dcffe6ed48d0ac04c7003f26a41ecd

data/lib/muve/location.rb

@@ -27,7 +27,8 @@ module Muve
       @longitude = value.to_f
     end
 
-    def random(center, range)
+    def save
+      true
     end
   end
 end

data/lib/muve/model.rb

@@ -28,7 +28,7 @@ module Muve
     end
 
     def reload
-      self.send(:populate, extract(adaptor.get(self.class, id))) if id
+      self.send(:populate, extract(adaptor.get(self.class, id), self.class)) if id
       self
     end
 
@@ -202,8 +202,8 @@ module Muve
       self.class.adaptor
     end
 
-    def extract(storeable)
-      self.class.extract(storeable)
+    def extract(storeable, klass=nil)
+      self.class.extract(storeable, klass)
     end
 
     def convert(resource)
@@ -231,8 +231,8 @@ module Muve
         @adaptor or Model.handler
       end
 
-      def extract(storeable)
-        adaptor.formatter.convert_from_storeable_object(storeable)
+      def extract(storeable, klass=nil)
+        adaptor.formatter.convert_from_storeable_object(storeable, klass)
       end
 
       def convert(resource)
@@ -273,8 +273,8 @@ module Muve
 
       # Finds a resource by id
       def find(id)
-        result = self.new()
-        result.send(:populate, extract(self.adaptor.get(self, id)))
+        result = self.new
+        result.send(:populate, extract(self.adaptor.get(self, id), result.class))
         result
       end
 
@@ -285,7 +285,7 @@ module Muve
           (self.adaptor.get(self, nil, params) or []).each do |details|
             details
             result = self.new()
-            result.send(:populate, extract(details))
+            result.send(:populate, extract(details, self.new.class))
             item << result
           end
         end

data/lib/muve/place.rb

@@ -5,6 +5,7 @@ module Muve
     with_fields :name, :location
 
     def valid?
+      return false unless name
       return false unless location.kind_of?(Muve::Location) && location.valid?
       true
     end

data/lib/muve/store.rb

@@ -21,7 +21,7 @@ module Muve
         raise IncompleteImplementation, "convertor to storeable needed"
       end
 
-      def convert_from_storeable_object(storeable)
+      def convert_from_storeable_object(storeable, klass=nil)
         raise IncompleteImplementation, "convertor from storeable needed"
       end
     end

data/lib/muve/version.rb

@@ -1,3 +1,3 @@
 module Muve
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/factories.rb

@@ -2,20 +2,37 @@ FactoryGirl.define do
   factory Muve::Location do
     lat { Faker::Geolocation.lat }
     long { Faker::Geolocation.lng }
+
+    trait :invalid do
+      lat { 200 }
+      long { 200 }
+    end
   end
 
   factory Muve::Traveller do
     name { Faker::Name.name }
+
+    trait :invalid do
+      name { nil }
+    end
   end
 
   factory Muve::Movement do
     traveller { build Muve::Traveller }
     location { build Muve::Location }
     time { Time.now - rand(500000) }
+
+    trait :invalid do
+      location { build Muve::Location, :invalid }
+    end
   end
 
   factory Muve::Place do
     name { Faker::Venue.name }
     location { build Muve::Location }
+
+    trait :invalid do
+      location { build Muve::Location, :invalid }
+    end
   end
 end

data/spec/model_spec.rb

@@ -287,7 +287,7 @@ describe 'Model' do
           resource
         end
 
-        def self.convert_from_storeable_object(storeable)
+        def self.convert_from_storeable_object(storeable, klass=nil)
           storeable
         end
       end
@@ -393,7 +393,7 @@ describe 'Model' do
         expect(AnotherResource.find(@id).new_record?).to be(false)
       end
 
-      it 'converts stored data to a workable object' do
+      it 'calls the extractor on a call' do
         expect(AnotherResource).to receive(:extract).at_least(:once)
         AnotherResource.find(@id)
       end

data/spec/place_spec.rb

@@ -12,4 +12,16 @@ describe Muve::Place do
     expect(build Muve::Place, location: build(Muve::Location, latitude: -100)).to be_invalid
     expect(build Muve::Place, location: build(Muve::Location)).to be_valid
   end
+
+  it 'is invalid when the name is not specified' do
+    expect(build Muve::Place, name: nil).to be_invalid
+  end
+
+  it 'is invalid when the location is invalid' do
+    expect(build Muve::Place, location: build(Muve::Location, :invalid)).to be_invalid
+  end
+
+  it 'is valid when all field are set' do
+    expect(build Muve::Place).to be_valid
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muve
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - David Asabina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies: []
 description: Basic helpers to be used with Muvement
 email: