dm-parse 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/dm-parse.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "dm-parse"
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zhi-Qiang Lei"]

data/lib/adapters/parse_adapter.rb

@@ -25,7 +25,7 @@ module DataMapper
           result        = engine.create storage_name, params
 
           initialize_serial resource, result["objectId"]
-          resource.created_at = resource.updated_at = result["createdAt"].to_datetime
+          resource.created_at = resource.updated_at = result["createdAt"]
         end.size
       end
 

data/lib/dm-parse.rb

@@ -1,3 +1,4 @@
+require "uri"
 require "dm-core"
 require "dm-validations"
 require "active_support/all"

data/lib/property/parse_date.rb

@@ -4,13 +4,17 @@ module DataMapper
     class ParseDate < Object
 
       def dump(value)
-        value && {"__type" => "Date", "iso" => value.to_datetime.utc.iso8601(3)}
+        value && {"__type" => "Date", "iso" => value.utc.iso8601(3)}
       end
 
       def load(value)
         value && (value.is_a?(Hash) ? value["iso"].to_datetime : value.to_datetime)
       end
 
+      def typecast(value)
+        value && value.to_datetime
+      end
+
     end
 
   end

data/lib/property/parse_file.rb

@@ -4,11 +4,11 @@ module DataMapper
     class ParseFile < Object
 
       def dump(value)
-        value
+        value && { "__type" => "File", "name" => File.basename(value.path) }
       end
 
       def load(value)
-        value
+        value && URI(value["url"])
       end
 
       def typecast(value)
@@ -17,9 +17,8 @@ module DataMapper
           filename      = value.original_filename
           content       = value.read
           content_type  = value.content_type
-          adapter.upload_file(filename, content, content_type).merge("__type" => "File")
-        else
-          value
+          response      = adapter.upload_file(filename, content, content_type)
+          URI(response["url"])
         end
       end
 

data/spec/integration_spec.rb

@@ -1,5 +1,4 @@
 require "spec_helper"
-require "uri"
 require "net/http"
 require "net/https"
 
@@ -32,9 +31,7 @@ describe "resource" do
       let(:content)     { "xx" }
 
       describe "its file content" do
-        subject { Net::HTTP.get URI(url) }
-
-        let(:url) { resource.attachment["url"] }
+        subject { Net::HTTP.get resource.attachment }
 
         it { should eq(content) }
       end

data/spec/parse_date_spec.rb

@@ -42,4 +42,12 @@ describe DataMapper::Property::ParseDate do
 
     it { should be_true }
   end
+
+  describe "#typecast" do
+    subject { property.typecast value }
+
+    let(:value) { "2011-08-21T18:02:52.249Z" }
+
+    it { should be_a(DateTime) }
+  end
 end

data/spec/parse_file_spec.rb

@@ -3,7 +3,9 @@ require "spec_helper"
 describe DataMapper::Property::ParseFile do
   subject { property }
 
-  let(:property) { Article.properties[:attachment] }
+  let(:property)  { Article.properties[:attachment] }
+  let(:url)       { "http://files.parse.com/3f10b6f9-bec4-4583-b907-8f2ece6e965a/003ce5ad-06c4-4be6-9475-b074b6bd4dc8-test.png" }
+  let(:name)      { File.basename URI(url).path }
 
   describe "#typecast" do
     subject { property.typecast value }
@@ -17,21 +19,27 @@ describe DataMapper::Property::ParseFile do
     context "when value is io" do
       let(:value) { StringIO.new "xx" }
       
-      before { value.stub(original_filename: "xx.txt", content_type: "plain/text") }
-      before { DataMapper::Adapters::ParseAdapter.any_instance.stub(upload_file: {"name" => "x", "url" => "y"}) }
+      before { value.stub(original_filename: "test.png", content_type: "image/png") }
+      before { DataMapper::Adapters::ParseAdapter.any_instance.stub(upload_file: { "name" => name, "url" => url }) }
 
-      it { should be_has_key("__type") }
-      it { should be_has_key("name") }
-      it { should be_has_key("url") }
+      it { should eq(URI(url)) }
     end
   end
 
+  describe "#dump" do
+    subject { property.dump value }
+
+    let(:value) { URI(url) }
+
+    it { should eq("__type" => "File", "name" => name) }
+  end
+
   describe "#load" do
     subject { property.load value }
 
-    let(:value) { { "__type" => "File", "name" => "a.png", "url" => "http://a.cn/a.png" } }
+    let(:value) { { "__type" => "File", "name" => name, "url" => url } }
 
-    it { should eq(value) }
+    it { should eq(URI(url)) }
 
     context "when value is nil" do
       let(:value) { nil }
@@ -43,7 +51,7 @@ describe DataMapper::Property::ParseFile do
   describe "#valid?" do
     subject { property.valid? value }
 
-    let(:value) { { "__type" => "File", "name" => "a.png", "url" => "http://a.cn/a.png" } }
+    let(:value) { URI(url) }
 
     it { should be_true }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-parse
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -241,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 41573292717956535
+      hash: 2256594259984366431
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: