dm-parse 0.3.16 → 0.3.17

data/VERSION

@@ -1 +1 @@
-0.3.16
+0.3.17

data/dm-parse.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dm-parse"
-  s.version = "0.3.16"
+  s.version = "0.3.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zhi-Qiang Lei"]
-  s.date = "2012-08-16"
+  s.date = "2012-08-28"
   s.description = "An extension to make DataMapper working on Parse.com"
   s.email = "zhiqiang.lei@gmail.com"
   s.extra_rdoc_files = [

data/lib/property/parse_geo_point.rb

@@ -4,24 +4,24 @@ module DataMapper
     class ParseGeoPoint < Object
 
       def dump(value)
-        value && {"__type" => "GeoPoint", "latitude" => value["lat"].to_f, "longitude" => value["lng"].to_f}
+        value && value.merge("__type" => "GeoPoint")
       end
 
       def load(value)
-        value && {"lat" => value["latitude"], "lng" => value["longitude"]}
+        value
       end
 
       def typecast(value)
         case value
         when ::Hash
-          lat = value["lat"]
-          lng = value["lng"]
-          { "lat" => lat, "lng" => lng } if lat.present? && lng.present?
+          lat = value["latitude"]
+          lng = value["longitude"]
+          { "latitude" => lat.to_f, "longitude" => lng.to_f } if lat.present? && lng.present?
         end
       end
 
       def valid?(value)
-        return false if value && (value["lat"].blank? || value["lng"].blank?)
+        return false if value && (value["latitude"].blank? || value["longitude"].blank?)
         super
       end
     end

data/spec/integration_spec.rb

@@ -155,12 +155,12 @@ describe Company do
   subject { described_class.new attributes }
 
   let(:attributes)  { { location: location } }
-  let(:location)    { { "lat" => "5.0", "lng" => "0.0" } }
+  let(:location)    { { "latitude" => "5.0", "longitude" => "0.0" } }
 
   it { should be_valid }
 
   context "when location is invalid" do
-    let(:location) { { "lat" => "", "lng" => "" } }
+    let(:location) { { "latitude" => "", "longitude" => "" } }
 
     it { should_not be_valid }
   end

data/spec/parse_geo_point_spec.rb

@@ -8,9 +8,9 @@ describe DataMapper::Property::ParseGeoPoint do
   describe "#dump" do
     subject { property.dump value }
 
-    let(:value) { { "lat" => "20", "lng" => "50" } }
+    let(:value) { { "latitude" => 20.0, "longitude" => 50.0 } }
 
-    it { should eq("__type" => "GeoPoint", "latitude" => value["lat"].to_f, "longitude" => value["lng"].to_f) }
+    it { should eq("__type" => "GeoPoint", "latitude" => 20.0, "longitude" => 50.0) }
 
     context "when value is nil" do
       let(:value) { nil }
@@ -24,7 +24,7 @@ describe DataMapper::Property::ParseGeoPoint do
 
     let(:value) { { "__type" => "GeoPoint", "latitude" => 20.0, "longitude" => 50.0 } }
 
-    it { should eq("lat" => value["latitude"], "lng" => value["longitude"]) }
+    it { should eq(value) }
 
     context "when value is nil" do
       let(:value) { nil }
@@ -36,31 +36,31 @@ describe DataMapper::Property::ParseGeoPoint do
   describe "#valid?" do
     subject { property.valid? value }
 
-    let(:value) { { "lat" => lat, "lng" => lng } }
+    let(:value) { { "latitude" => lat, "longitude" => lng } }
     let(:lat)   { "20.0" }
     let(:lng)   { "50.0" }
 
     it { should be_true }
 
-    context "when lat is nil" do
+    context "when latitude is nil" do
       let(:lat) { nil }
 
       it { should be_false }
     end
 
-    context "when lat is empty string" do
+    context "when latitude is empty string" do
       let(:lat) { "" }
 
       it { should be_false }
     end
 
-    context "when lng is nil" do
+    context "when longitude is nil" do
       let(:lng) { nil }
 
       it { should be_false }
     end
 
-    context "when lng is empty string" do
+    context "when longitude is empty string" do
       let(:lng) { "" }
 
       it { should be_false }
@@ -76,31 +76,31 @@ describe DataMapper::Property::ParseGeoPoint do
   describe "#typecast" do
     subject { property.typecast value }
 
-    let(:value) { { "lat" => lat, "lng" => lng } }
+    let(:value) { { "latitude" => lat, "longitude" => lng } }
     let(:lat)   { "20.0" }
     let(:lng)   { "50.0" }
 
-    it { should eq(value) }
+    it { should eq("latitude" => lat.to_f, "longitude" => lng.to_f) }
 
-    context "when lat is nil" do
+    context "when latitude is nil" do
       let(:lat) { nil }
 
       it { should be_blank }
     end
 
-    context "when lat is empty string" do
+    context "when latitude is empty string" do
       let(:lat) { "" }
 
       it { should be_blank }
     end
 
-    context "when lng is nil" do
+    context "when longitude is nil" do
       let(:lng) { nil }
 
       it { should be_blank }
     end
 
-    context "when lng is empty string" do
+    context "when longitude is empty string" do
       let(:lng) { "" }
 
       it { should be_blank }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-parse
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
@@ -258,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3903379747305984450
+      hash: -1110332828123516189
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: