parse-ruby-client 0.1.11 → 0.1.12

data/fixtures/vcr_cassettes/test_text_file_save.yml

@@ -0,0 +1,170 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.parse.com/1/files/hello_test.txt
+    body:
+      encoding: US-ASCII
+      string: Testing Hello World!
+    headers:
+      Content-Type:
+      - text/plain
+      Accept:
+      - application/json
+      User-Agent:
+      - Parse for Ruby, 0.0
+      X-Parse-Master-Key:
+      - ''
+      X-Parse-Rest-Api-Key:
+      - D3Y8jNCQk6kpkKhpRGnWLYTrFGQ7j8dtDVnWZRnZ
+      X-Parse-Application-Id:
+      - PPVk6L5M9R1R8GVk8Ye9jT8f5SQNBIeoJUDJLmkT
+      X-Parse-Session-Token:
+      - ''
+      Expect:
+      - ''
+  response:
+    status:
+      code: 201
+      message: !binary |-
+        Q3JlYXRlZA==
+    headers:
+      !binary "QWNjZXNzLUNvbnRyb2wtQWxsb3ctT3JpZ2lu":
+      - !binary |-
+        Kg==
+      !binary "QWNjZXNzLUNvbnRyb2wtUmVxdWVzdC1NZXRob2Q=":
+      - !binary |-
+        Kg==
+      !binary "Q2FjaGUtQ29udHJvbA==":
+      - !binary |-
+        bm8tY2FjaGU=
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        YXBwbGljYXRpb24vanNvbjsgY2hhcnNldD11dGYtOA==
+      !binary "RGF0ZQ==":
+      - !binary |-
+        VGh1LCAyNCBKYW4gMjAxMyAyMzozOTo1OSBHTVQ=
+      !binary "TG9jYXRpb24=":
+      - !binary |-
+        aHR0cDovL2ZpbGVzLnBhcnNlLmNvbS8zNzJmY2JiOS03ZWFlLTRiOWEtYWJj
+        OC02ZGE5N2ZjYWM1MGQvYWE4NzY4YTQtMTBlMS00YzAyLTkyMGQtODRmNmFk
+        OTAwMzBhLWhlbGxvX3Rlc3QudHh0
+      !binary "U2VydmVy":
+      - !binary |-
+        bmdpbngvMS4yLjI=
+      !binary "U2V0LUNvb2tpZQ==":
+      - !binary |-
+        X3BhcnNlX3Nlc3Npb249QkFoN0Jra2lEM05sYzNOcGIyNWZhV1FHT2daRlJp
+        SWxaVEJtWXpRek16azVZalZqTnpSaU9HSm1NMlUxTkRaaU5tWXdOVFkzTTJN
+        JTNELS01MmFjZTdkNDY3YjM1YTM5YjU0MGNjNDQ3MjFhMTI1ODlhYWE4YzBm
+        OyBkb21haW49LnBhcnNlLmNvbTsgcGF0aD0vOyBleHBpcmVzPVR1ZSwgMjQt
+        SmFuLTIwMjMgMjM6Mzk6NTkgR01UOyBzZWN1cmU7IEh0dHBPbmx5
+      !binary "U3RhdHVz":
+      - !binary |-
+        MjAxIENyZWF0ZWQ=
+      !binary "WC1SdW50aW1l":
+      - !binary |-
+        MC4yMDUxMzE=
+      !binary "WC1VYS1Db21wYXRpYmxl":
+      - !binary |-
+        SUU9RWRnZSxjaHJvbWU9MQ==
+      !binary "Q29udGVudC1MZW5ndGg=":
+      - !binary |-
+        MTgy
+      !binary "Q29ubmVjdGlvbg==":
+      - !binary |-
+        a2VlcC1hbGl2ZQ==
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        eyJ1cmwiOiJodHRwOi8vZmlsZXMucGFyc2UuY29tLzM3MmZjYmI5LTdlYWUt
+        NGI5YS1hYmM4LTZkYTk3ZmNhYzUwZC9hYTg3NjhhNC0xMGUxLTRjMDItOTIw
+        ZC04NGY2YWQ5MDAzMGEtaGVsbG9fdGVzdC50eHQiLCJuYW1lIjoiYWE4NzY4
+        YTQtMTBlMS00YzAyLTkyMGQtODRmNmFkOTAwMzBhLWhlbGxvX3Rlc3QudHh0
+        In0=
+    http_version: 
+  recorded_at: Thu, 24 Jan 2013 23:39:59 GMT
+- request:
+    method: post
+    uri: https://api.parse.com/1/files/hello.txt
+    body:
+      encoding: US-ASCII
+      string: Hello World!
+    headers:
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      User-Agent:
+      - Parse for Ruby, 0.0
+      X-Parse-Master-Key:
+      - ''
+      X-Parse-Rest-Api-Key:
+      - D3Y8jNCQk6kpkKhpRGnWLYTrFGQ7j8dtDVnWZRnZ
+      X-Parse-Application-Id:
+      - PPVk6L5M9R1R8GVk8Ye9jT8f5SQNBIeoJUDJLmkT
+      X-Parse-Session-Token:
+      - ''
+      Expect:
+      - ''
+  response:
+    status:
+      code: 201
+      message: !binary |-
+        Q3JlYXRlZA==
+    headers:
+      !binary "QWNjZXNzLUNvbnRyb2wtQWxsb3ctT3JpZ2lu":
+      - !binary |-
+        Kg==
+      !binary "QWNjZXNzLUNvbnRyb2wtUmVxdWVzdC1NZXRob2Q=":
+      - !binary |-
+        Kg==
+      !binary "Q2FjaGUtQ29udHJvbA==":
+      - !binary |-
+        bm8tY2FjaGU=
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        YXBwbGljYXRpb24vanNvbjsgY2hhcnNldD11dGYtOA==
+      !binary "RGF0ZQ==":
+      - !binary |-
+        VGh1LCAyNCBKYW4gMjAxMyAyMzo1MDoxMiBHTVQ=
+      !binary "TG9jYXRpb24=":
+      - !binary |-
+        aHR0cDovL2ZpbGVzLnBhcnNlLmNvbS8zNzJmY2JiOS03ZWFlLTRiOWEtYWJj
+        OC02ZGE5N2ZjYWM1MGQvYzJjMTI1YTQtMDU5Ni00ZmEwLTljYWEtZGQzYTAy
+        MDQ3NmVhLWhlbGxvLnR4dA==
+      !binary "U2VydmVy":
+      - !binary |-
+        bmdpbngvMS4yLjI=
+      !binary "U2V0LUNvb2tpZQ==":
+      - !binary |-
+        X3BhcnNlX3Nlc3Npb249QkFoN0Jra2lEM05sYzNOcGIyNWZhV1FHT2daRlJp
+        SWxabU5pT1RjeE56VTVaR1l3T0RGbE5EazJaREkwTm1ZMVl6VmpaakF5WkRr
+        JTNELS0zMmY3NThhZmVjMDM4OGE4ZDI1ZGJkMmMwZmFmMzIwODk0MmU1ZWQ4
+        OyBkb21haW49LnBhcnNlLmNvbTsgcGF0aD0vOyBleHBpcmVzPVR1ZSwgMjQt
+        SmFuLTIwMjMgMjM6NTA6MTIgR01UOyBzZWN1cmU7IEh0dHBPbmx5
+      !binary "U3RhdHVz":
+      - !binary |-
+        MjAxIENyZWF0ZWQ=
+      !binary "WC1SdW50aW1l":
+      - !binary |-
+        MC4xMTg5ODE=
+      !binary "WC1VYS1Db21wYXRpYmxl":
+      - !binary |-
+        SUU9RWRnZSxjaHJvbWU9MQ==
+      !binary "Q29udGVudC1MZW5ndGg=":
+      - !binary |-
+        MTcy
+      !binary "Q29ubmVjdGlvbg==":
+      - !binary |-
+        a2VlcC1hbGl2ZQ==
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        eyJ1cmwiOiJodHRwOi8vZmlsZXMucGFyc2UuY29tLzM3MmZjYmI5LTdlYWUt
+        NGI5YS1hYmM4LTZkYTk3ZmNhYzUwZC9jMmMxMjVhNC0wNTk2LTRmYTAtOWNh
+        YS1kZDNhMDIwNDc2ZWEtaGVsbG8udHh0IiwibmFtZSI6ImMyYzEyNWE0LTA1
+        OTYtNGZhMC05Y2FhLWRkM2EwMjA0NzZlYS1oZWxsby50eHQifQ==
+    http_version: 
+  recorded_at: Thu, 24 Jan 2013 23:50:12 GMT
+recorded_with: VCR 2.0.1

data/lib/parse/client.rb

@@ -37,12 +37,16 @@ module Parse
     # with common basic response handling. Will raise a
     # ParseProtocolError if the response has an error status code,
     # and will return the parsed JSON body on success, if there is one.
-    def request(uri, method = :get, body = nil, query = nil)
+    def request(uri, method = :get, body = nil, query = nil, content_type = nil)
       @session.headers[Protocol::HEADER_MASTER_KEY]    = @master_key
       @session.headers[Protocol::HEADER_API_KEY]  = @api_key
       @session.headers[Protocol::HEADER_APP_ID]   = @application_id
       @session.headers[Protocol::HEADER_SESSION_TOKEN]   = @session_token
 
+      if content_type
+        @session.headers["Content-Type"] = content_type
+      end
+
       options = {}
       if body
         options[:data] = body
@@ -61,6 +65,10 @@ module Parse
           raise ParseProtocolError.new(parsed)
         end
 
+        if content_type
+          @session.headers["Content-Type"] = "application/json"
+        end
+
         return parsed
       rescue Patron::TimeoutError
         retry if num_tries <= max_retries

data/lib/parse/datatypes.rb

@@ -306,15 +306,23 @@ module Parse
 
   # File
   # ------------------------------------------------------------
-
+  # tf = Parse::File.new(:body => "Hello World!", :local_filename => "hello.txt")
+  # tf.save
   class File
     # '{"avatar": {"__type":"File", "name":"profile.png", "url"=>"http://files.parse.com/blah/profile.png"}}'
-    attr_accessor :name
+    attr_accessor :local_filename # eg "hello.txt"
+    attr_accessor :parse_filename # eg "12-4-532d-d-g3-3-hello.text"
+    attr_accessor :content_type
+    attr_accessor :body
     attr_accessor :url
 
     def initialize(data)
-      @name = data["name"]
-      @url = data["url"]
+      data = Hash[data.map{ |k, v| [k.to_s, v] }] # convert hash keys to strings
+      @local_filename = data["local_filename"] if data["local_filename"]
+      @parse_filename = data["parse_filename"] if data["parse_filename"]
+      @content_type   = data["content_type"]   if data["content_type"]
+      @url            = data["url"]            if data["url"]
+      @body           = data["body"]           if data["body"]
     end
 
     def eql?(other)
@@ -328,18 +336,25 @@ module Parse
       url.hash
     end
 
+    def save
+      uri = Parse::Protocol.file_uri(@local_filename)
+      resp = Parse.client.request(uri, :post, @body, nil, @content_type)
+      @parse_filename = resp["name"]
+      @url = resp["url"]
+      resp
+    end
+
     def as_json(*a)
       {
-          Protocol::KEY_TYPE => Protocol::TYPE_FILE,
-          "name" => @name,
-          "url" => @url
+        Protocol::KEY_TYPE => Protocol::TYPE_FILE,
+        "name" => @parse_filename,
+        "url" => @url
       }
     end
 
     def to_json(*a)
-        as_json.to_json(*a)
+      as_json.to_json(*a)
     end
   end
 
-
 end

data/parse-ruby-client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "parse-ruby-client"
-  s.version = "0.1.11"
+  s.version = "0.1.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alan deLevie", "Adam Alpern"]
-  s.date = "2013-01-24"
+  s.date = "2013-01-29"
   s.description = "A simple Ruby client for the parse.com REST API"
   s.email = "adelevie@gmail.com"
   s.extra_rdoc_files = [
@@ -36,7 +36,10 @@ Gem::Specification.new do |s|
     "fixtures/vcr_cassettes/test_created_at.yml",
     "fixtures/vcr_cassettes/test_deep_parse.yml",
     "fixtures/vcr_cassettes/test_destroy.yml",
+    "fixtures/vcr_cassettes/test_file_save.yml",
     "fixtures/vcr_cassettes/test_get.yml",
+    "fixtures/vcr_cassettes/test_image_file_associate_with_object.yml",
+    "fixtures/vcr_cassettes/test_image_file_save.yml",
     "fixtures/vcr_cassettes/test_include.yml",
     "fixtures/vcr_cassettes/test_new_model.yml",
     "fixtures/vcr_cassettes/test_new_object.yml",
@@ -47,6 +50,7 @@ Gem::Specification.new do |s|
     "fixtures/vcr_cassettes/test_request_batch.yml",
     "fixtures/vcr_cassettes/test_server_update.yml",
     "fixtures/vcr_cassettes/test_simple_save.yml",
+    "fixtures/vcr_cassettes/test_text_file_save.yml",
     "fixtures/vcr_cassettes/test_update.yml",
     "fixtures/vcr_cassettes/test_updated_at.yml",
     "fixtures/vcr_cassettes/test_user_save.yml",
@@ -67,10 +71,12 @@ Gem::Specification.new do |s|
     "test/cloud_functions/MyCloudCode/cloud/main.js",
     "test/config/global.json",
     "test/helper.rb",
+    "test/parsers.jpg",
     "test/test_batch.rb",
     "test/test_client.rb",
     "test/test_cloud.rb",
     "test/test_datatypes.rb",
+    "test/test_file.rb",
     "test/test_init.rb",
     "test/test_init_from_cloud_code.rb",
     "test/test_model.rb",

data/test/test_datatypes.rb

@@ -75,16 +75,19 @@ class TestDatatypes < Test::Unit::TestCase
     assert_equal gp, q["location"]
   end
 
-  def test_file
-    data = {"name" => "blah.png"}
-    file = Parse::File.new(data)
-    assert_equal JSON.parse(file.to_json)["name"], data["name"]
-    assert_equal JSON.parse(file.to_json)[Parse::Protocol::KEY_TYPE], Parse::Protocol::TYPE_FILE
 
-    post = Parse::Object.new("Post")
-    post["avatar"] = file
-    post.save
-    q = Parse.get("Post", post.id)
-    assert_equal file.name, q["avatar"].name
-  end
+  # deprecating -  see test_file.rb for new implementation
+  # ----------------------------
+  #def test_file
+  #  data = {"name" => "test/parsers.png"}
+  #  file = Parse::File.new(data)
+    # assert_equal JSON.parse(file.to_json)["name"], data["name"]
+    # assert_equal JSON.parse(file.to_json)[Parse::Protocol::KEY_TYPE], Parse::Protocol::TYPE_FILE
+
+  #  post = Parse::Object.new("Post")
+  #  post["avatar"] = file
+  #  post.save
+  #  q = Parse.get("Post", post.id)
+  #  assert_equal file.parse_filename, q["avatar"].parse_filename
+  #end
 end

data/test/test_file.rb

@@ -0,0 +1,68 @@
+require 'helper'
+
+class TestFile < Test::Unit::TestCase
+  def setup
+    Parse.init
+  end
+
+  def test_file_save
+    VCR.use_cassette('test_text_file_save', :record => :new_episodes) do
+      tf = Parse::File.new({
+        :body => "Hello World!", 
+        :local_filename => "hello.txt", 
+        :content_type => "text/plain"
+      })
+      tf.save
+
+      assert tf.local_filename
+      assert tf.url
+      assert tf.parse_filename
+      assert tf.body
+      assert tf.to_json
+      assert_equal String, tf.body.class
+    end
+  end
+
+  def test_image_save
+    #VCR.use_cassette('test_image_file_save', :record => :new_episodes) do
+      tf = Parse::File.new({
+        :body => IO.read("test/parsers.jpg"), 
+        :local_filename => "parsers.jpg", 
+        :content_type => "image/jpeg"
+      })
+      tf.save
+
+      assert tf.local_filename
+      assert tf.url
+      assert tf.parse_filename
+      assert tf.body
+      assert tf.to_json
+    #end
+  end
+
+  def test_associate_with_object
+    #VCR.use_cassette('test_image_file_associate_with_object', :record => :new_episodes) do
+      tf = Parse::File.new({
+        :body => IO.read("test/parsers.jpg"), 
+        :local_filename => "parsers.jpg", 
+        :content_type => "image/jpeg"
+      })
+      tf.save
+
+      assert tf.local_filename
+      assert tf.url
+      assert tf.parse_filename
+      assert tf.body
+      assert tf.to_json
+
+      object = Parse::Object.new("ShouldHaveFile")
+      object["photo"] = tf
+      object.save
+
+      assert object["photo"]
+      assert object["objectId"]
+    #end
+  end
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parse-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: patron
@@ -183,7 +183,10 @@ files:
 - fixtures/vcr_cassettes/test_created_at.yml
 - fixtures/vcr_cassettes/test_deep_parse.yml
 - fixtures/vcr_cassettes/test_destroy.yml
+- fixtures/vcr_cassettes/test_file_save.yml
 - fixtures/vcr_cassettes/test_get.yml
+- fixtures/vcr_cassettes/test_image_file_associate_with_object.yml
+- fixtures/vcr_cassettes/test_image_file_save.yml
 - fixtures/vcr_cassettes/test_include.yml
 - fixtures/vcr_cassettes/test_new_model.yml
 - fixtures/vcr_cassettes/test_new_object.yml
@@ -194,6 +197,7 @@ files:
 - fixtures/vcr_cassettes/test_request_batch.yml
 - fixtures/vcr_cassettes/test_server_update.yml
 - fixtures/vcr_cassettes/test_simple_save.yml
+- fixtures/vcr_cassettes/test_text_file_save.yml
 - fixtures/vcr_cassettes/test_update.yml
 - fixtures/vcr_cassettes/test_updated_at.yml
 - fixtures/vcr_cassettes/test_user_save.yml
@@ -214,10 +218,12 @@ files:
 - test/cloud_functions/MyCloudCode/cloud/main.js
 - test/config/global.json
 - test/helper.rb
+- test/parsers.jpg
 - test/test_batch.rb
 - test/test_client.rb
 - test/test_cloud.rb
 - test/test_datatypes.rb
+- test/test_file.rb
 - test/test_init.rb
 - test/test_init_from_cloud_code.rb
 - test/test_model.rb
@@ -240,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4089803935142513409
+      hash: 555133796256997664
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: