dm-parse 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/dm-parse.gemspec

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

@@ -4,23 +4,25 @@ module DataMapper
     class ParseFile < Object
 
       def dump(value)
-        if value.is_a?(Hash)
-          value.merge("__type" => "File")
-        elsif value.respond_to?(:original_filename) && value.respond_to?(:read) && value.respond_to?(:content_type)
+        value
+      end
+
+      def load(value)
+        value
+      end
+
+      def typecast(value)
+        if value.respond_to?(:original_filename) && value.respond_to?(:read) && value.respond_to?(:content_type)
           adapter       = model.repository.adapter
           filename      = value.original_filename
           content       = value.read
           content_type  = value.content_type
-          dump adapter.upload_file(filename, content, content_type)
+          adapter.upload_file(filename, content, content_type).merge("__type" => "File")
         else
-          nil
+          value
         end
       end
 
-      def load(value)
-        value
-      end
-
     end
 
   end

data/spec/integration_spec.rb

@@ -25,6 +25,20 @@ describe "resource" do
     its(:id)          { should_not be_nil }
     its(:created_at)  { should_not be_nil }
     its(:updated_at)  { should_not be_nil }
+
+    context "when resource has attachment" do
+      let(:resource)    { Article.new attachment: attachment }
+      let(:attachment)  { Struct.new(:original_filename, :read, :content_type).new("x.txt", content, "plain/txt") }
+      let(:content)     { "xx" }
+
+      describe "its file content" do
+        subject { Net::HTTP.get URI(url) }
+
+        let(:url) { resource.attachment["url"] }
+
+        it { should eq(content) }
+      end
+    end
   end
 
   context "when resource is a child" do

data/spec/parse_file_spec.rb

@@ -5,12 +5,8 @@ describe DataMapper::Property::ParseFile do
 
   let(:property) { Article.properties[:attachment] }
 
-  describe "#dump" do
-    subject { property.dump value }
-
-    let(:value) { { "name" => "xx.txt", "url" => "http://a.cn/xx.txt" } }
-
-    it { should eq(value.merge("__type" => "File")) }
+  describe "#typecast" do
+    subject { property.typecast value }
 
     context "when value is nil" do
       let(:value) { nil }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-parse
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
@@ -241,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4597148251358288016
+      hash: 41573292717956535
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: