dm-parse 0.3.10 → 0.3.11

data/VERSION

@@ -1 +1 @@
-0.3.10
+0.3.11

data/dm-parse.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dm-parse"
-  s.version = "0.3.10"
+  s.version = "0.3.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zhi-Qiang Lei"]
-  s.date = "2012-07-06"
+  s.date = "2012-07-07"
   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

@@ -11,8 +11,17 @@ module DataMapper
         value && {"lat" => value["latitude"], "lng" => value["longitude"]}
       end
 
+      def typecast(value)
+        case value
+        when ::Hash
+          lat = value["lat"]
+          lng = value["lng"]
+          { "lat" => lat, "lng" => lng } if lat.present? && lng.present?
+        end
+      end
+
       def valid?(value)
-        return false if value && (value["lat"].nil? || value["lng"].nil?)
+        return false if value && (value["lat"].blank? || value["lng"].blank?)
         super
       end
     end

data/spec/integration_spec.rb

@@ -145,6 +145,21 @@ describe User do
   end
 end
 
+describe Company do
+  subject { described_class.new attributes }
+
+  let(:attributes)  { { location: location } }
+  let(:location)    { { "lat" => "5.0", "lng" => "0.0" } }
+
+  it { should be_valid }
+
+  context "when location is invalid" do
+    let(:location) { { "lat" => "", "lng" => "" } }
+
+    it { should_not be_valid }
+  end
+end
+
 describe "adapter" do
   subject { adapter }
 

data/spec/parse_geo_point_spec.rb

@@ -48,16 +48,62 @@ describe DataMapper::Property::ParseGeoPoint do
       it { should be_false }
     end
 
+    context "when lat is empty string" do
+      let(:lat) { "" }
+
+      it { should be_false }
+    end
+
     context "when lng is nil" do
       let(:lng) { nil }
 
       it { should be_false }
     end
 
+    context "when lng is empty string" do
+      let(:lng) { "" }
+
+      it { should be_false }
+    end
+
     context "when value is nil" do
       let(:value) { nil }
 
       it { should be_true }
     end
   end
+
+  describe "#typecast" do
+    subject { property.typecast value }
+
+    let(:value) { { "lat" => lat, "lng" => lng } }
+    let(:lat)   { "20.0" }
+    let(:lng)   { "50.0" }
+
+    it { should eq(value) }
+
+    context "when lat is nil" do
+      let(:lat) { nil }
+
+      it { should be_blank }
+    end
+
+    context "when lat is empty string" do
+      let(:lat) { "" }
+
+      it { should be_blank }
+    end
+
+    context "when lng is nil" do
+      let(:lng) { nil }
+
+      it { should be_blank }
+    end
+
+    context "when lng is empty string" do
+      let(:lng) { "" }
+
+      it { should be_blank }
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -56,5 +56,13 @@ class Comment
   belongs_to :article
 end
 
+class Company
+  include DataMapper::Resource
+
+  is :parse
+
+  property :location, ParseGeoPoint, required: true
+end
+
 DataMapper.finalize
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-parse
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2012-07-07 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: -658373257479260408
+      hash: -1903385392634618347
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: