dm-parse 0.2.0 → 0.2.1

data/Gemfile

@@ -19,3 +19,4 @@ gem "dm-core", ">= 1.2"
 gem "dm-validations", ">= 1.2"
 gem "activesupport", ">= 3.2"
 gem "nestful", ">= 0.0.8"
+gem "mime-types", ">= 1.19"

data/Gemfile.lock

@@ -26,6 +26,7 @@ GEM
       rake
       rdoc
     json (1.7.3)
+    mime-types (1.19)
     multi_json (1.3.6)
     nestful (0.0.8)
       activesupport (>= 3.0.0.beta)
@@ -56,6 +57,7 @@ DEPENDENCIES
   dm-core (>= 1.2)
   dm-validations (>= 1.2)
   jeweler (>= 1.8.3)
+  mime-types (>= 1.19)
   nestful (>= 0.0.8)
   rdoc (>= 3.12)
   rspec (>= 2.10.0)

data/README.md

@@ -76,7 +76,7 @@ By this, you can use `User.authenticate(username, password)` to sign in, and use
 * ParseKey: the property for objectId, `is :parse` will define it for you.
 * ParsePointer: the pointer, you just need to give it objectId value.
 * ParseDate: the date, use it like you use DateTime.
-* ParseFile: the file, just give it file url.
+* ParseFile: the file, give it a hash contain "name" and "url", or a IO object from web form, it will be uploaded.
 
 ## Contributing to dm-parse
  

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/dm-parse.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dm-parse"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zhi-Qiang Lei"]
-  s.date = "2012-06-28"
+  s.date = "2012-06-29"
   s.description = "An extension to make DataMapper working on Parse.com"
   s.email = "zhiqiang.lei@gmail.com"
   s.extra_rdoc_files = [
@@ -64,6 +64,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<dm-validations>, [">= 1.2"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.2"])
       s.add_runtime_dependency(%q<nestful>, [">= 0.0.8"])
+      s.add_runtime_dependency(%q<mime-types>, [">= 1.19"])
       s.add_development_dependency(%q<rspec>, [">= 2.10.0"])
       s.add_development_dependency(%q<yard>, [">= 0.7"])
       s.add_development_dependency(%q<rdoc>, [">= 3.12"])
@@ -76,6 +77,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<dm-validations>, [">= 1.2"])
       s.add_dependency(%q<activesupport>, [">= 3.2"])
       s.add_dependency(%q<nestful>, [">= 0.0.8"])
+      s.add_dependency(%q<mime-types>, [">= 1.19"])
       s.add_dependency(%q<rspec>, [">= 2.10.0"])
       s.add_dependency(%q<yard>, [">= 0.7"])
       s.add_dependency(%q<rdoc>, [">= 3.12"])
@@ -89,6 +91,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<dm-validations>, [">= 1.2"])
     s.add_dependency(%q<activesupport>, [">= 3.2"])
     s.add_dependency(%q<nestful>, [">= 0.0.8"])
+    s.add_dependency(%q<mime-types>, [">= 1.19"])
     s.add_dependency(%q<rspec>, [">= 2.10.0"])
     s.add_dependency(%q<yard>, [">= 0.7"])
     s.add_dependency(%q<rdoc>, [">= 3.12"])

data/lib/adapters/parse_adapter.rb

@@ -11,7 +11,7 @@ module DataMapper
       API_KEY_HEADER    = "X-Parse-REST-API-Key"
       MASTER_KEY_HEADER = "X-Parse-Master-Key"
 
-      attr_reader :classes, :users, :login, :password_reset
+      attr_reader :classes, :users, :login, :password_reset, :file_storage
 
       def initialize(name, options)
         super
@@ -19,6 +19,7 @@ module DataMapper
         @users          = build_parse_resource_for "users"
         @login          = build_parse_resource_for "login"
         @password_reset = build_parse_resource_for "requestPasswordReset"
+        @file_storage   = build_parse_resource_for "files"
       end
 
       def parse_resources_for(model)
@@ -93,6 +94,26 @@ module DataMapper
         password_reset.post params: {email: email}
       end
 
+      # Upload a file
+      # Parse-only
+      #
+      # @param [String] filename
+      #   the filename
+      #
+      # @param [String] content
+      #   the content
+      #
+      # @param [String] content_type
+      #   the content type
+      #
+      # @return [Hash]
+      #   the uploaded file information
+      def upload_file(filename, content, content_type = MIME::Types.type_for(filename).first)
+        headers = file_storage.options[:headers]
+        headers = headers.merge("Content-Type" => content_type) if content_type
+        file_storage[URI.escape(filename)].post body: content, headers: headers
+      end
+
       def delete(resources)
         resources.each do |resource|
           parse_resource_for(resource).delete
@@ -108,9 +129,15 @@ module DataMapper
 
       private
       def build_parse_resource_for(name)
+        Parse::Resource.new(HOST, format: :json, headers: key_headers)[VERSION][name]
+      end
+
+      def key_headers
         key_type  = @options[:master] ? MASTER_KEY_HEADER : API_KEY_HEADER
-        headers   = {APP_ID_HEADER => @options[:app_id], key_type => @options[:api_key]}
-        Parse::Resource.new(HOST, format: :json, headers: headers)[VERSION][name]
+        {
+          APP_ID_HEADER => @options[:app_id],
+          key_type => @options[:api_key]
+        }
       end
 
       def parse_params_for(query)

data/lib/dm-parse.rb

@@ -2,6 +2,7 @@ require "dm-core"
 require "dm-validations"
 require "active_support/all"
 require "nestful"
+require "mime/types"
 require "collection"
 require "property/parse_key"
 require "property/parse_pointer"

data/lib/property/parse_file.rb

@@ -4,11 +4,20 @@ module DataMapper
     class ParseFile < Object
 
       def dump(value)
-        value && {"__type" => "File", "name" => value.to_s}
+        if value.is_a?(Hash)
+          value.merge("__type" => "File")
+        elsif value.respond_to?(:original_filename) && value.respond_to?(:read)
+          adapter   = model.repository.adapter
+          filename  = value.original_filename
+          content   = value.read
+          adapter.upload_file(filename, content).merge("__type" => "File")
+        else
+          nil
+        end
       end
 
       def load(value)
-        value && value["name"].to_s
+        value
       end
 
     end

data/spec/integration_spec.rb

@@ -96,3 +96,19 @@ describe User do
     end
   end
 end
+
+describe "adapter" do
+  subject { adapter }
+
+  let(:adapter) { DataMapper::Repository.adapters[:default] }
+
+  describe "#upload_file" do
+    subject { adapter.upload_file filename, content }
+
+    let(:filename)  { "xf x.txt" }
+    let(:content)   { "xx" }
+
+    it { should be_has_key("name") }
+    it { should be_has_key("url") }
+  end
+end

data/spec/parse_adapter_spec.rb

@@ -221,6 +221,12 @@ describe DataMapper::Adapters::ParseAdapter do
     it_should_behave_like DataMapper::Parse::Resource
   end
 
+  describe "#file_storage" do
+    subject { adapter.file_storage }
+    its(:url) { should eq("https://api.parse.com/1/files") }
+    it_should_behave_like DataMapper::Parse::Resource
+  end
+
   describe "#parse_resources_for" do
     subject { adapter.parse_resources_for model }
     it { should eq(adapter.classes[model.storage_name]) }

data/spec/parse_file_spec.rb

@@ -8,23 +8,34 @@ describe DataMapper::Property::ParseFile do
   describe "#dump" do
     subject { property.dump value }
 
-    let(:value) { "http://a.cn/a.png" }
+    let(:value) { { "name" => "xx.txt", "url" => "http://a.cn/xx.txt" } }
 
-    it { should eq("__type" => "File", "name" => value) }
+    it { should eq(value.merge("__type" => "File")) }
 
     context "when value is nil" do
       let(:value) { nil }
 
       it { should be_nil }
     end
+
+    context "when value is io" do
+      let(:value) { StringIO.new "xx" }
+      
+      before { value.stub(original_filename: "xx.txt") }
+      before { DataMapper::Parse::Resource.any_instance.stub(post: {"name" => "x", "url" => "y"}) }
+
+      it { should be_has_key("__type") }
+      it { should be_has_key("name") }
+      it { should be_has_key("url") }
+    end
   end
 
   describe "#load" do
     subject { property.load value }
 
-    let(:value) { { "__type" => "File", "name" => "http://a.cn/a.png" } }
+    let(:value) { { "__type" => "File", "name" => "a.png", "url" => "http://a.cn/a.png" } }
 
-    it { should eq(value["name"]) }
+    it { should eq(value) }
 
     context "when value is nil" do
       let(:value) { nil }
@@ -36,7 +47,7 @@ describe DataMapper::Property::ParseFile do
   describe "#valid?" do
     subject { property.valid? value }
 
-    let(:value) { "http://a.cn/a.png" }
+    let(:value) { { "__type" => "File", "name" => "a.png", "url" => "http://a.cn/a.png" } }
 
     it { should be_true }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-parse
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-28 00:00:00.000000000 Z
+date: 2012-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.8
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.19'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -242,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -458598293042877060
+      hash: 1921482253732220163
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: