parsecom 0.5.0 → 0.5.1

data/lib/parse/date.rb

@@ -1,9 +1,24 @@
+# encoding:utf-8
 module Parse
-  class Date < Time
+  class ParseDate
+    include Util
+
+    class <<self
+      def parse str
+        new :iso => str
+      end
+    end
+
+    def initialize hash={}
+      hash = string_keyed_hash hash
+      @raw_hash = hash
+      @time = ::Time.parse hash['iso'] if hash.has_key? 'iso'
+    end
+
     def to_h
       {
         "__type" => "Date",
-        "iso" => strftime('%Y-%m-%dT%H:%M:%SZ')
+        "iso" => @time.strftime('%Y-%m-%dT%H:%M:%SZ')
       }
     end
 
@@ -14,5 +29,9 @@ module Parse
     def to_s
       to_json
     end
+
+    def method_missing name, *args, &block
+      @time.__send__ name, *args, &block
+    end
   end
 end

data/lib/parse/event.rb

@@ -48,7 +48,7 @@ module Parse
     def initialize hash={}
       hash = string_keyed_hash hash
       @at = hash.delete 'at'
-      @at = Parse::Date.parse @at if @at.is_a?(String)
+      @at = ParseDate.parse @at if @at.is_a?(String)
       @dimensions = hash.dup
     end
 

data/lib/parse/file.rb

@@ -1,6 +1,6 @@
 # encoding:utf-8
 module Parse
-  class File
+  class ParseFile
     include Util
 
     attr_accessor :name, :url, :content, :type
@@ -18,13 +18,13 @@ module Parse
         '.jpeg' => 'image/jpeg',
         '.png' => 'image/png',
         '.gif' => 'image/gif'
-      }[::File.extname(@name).downcase]
+      }[File.extname(@name).downcase]
       @client = hash['parce_client'] || Parse::Client.default
     end
 
     def save
       raise "Files cannot be updated." if @url
-      @content = ::File.read @content if @type =~ %r|^image/|
+      @content = File.read @content if @type =~ %r|^image/|
       @client.call_api :post, "files/#{@name}", @content, 'Content-Type' => @type, 'Accept' => nil do |resp_body|
         @name = resp_body['name']
         @url = resp_body['url']
@@ -40,14 +40,15 @@ module Parse
 
     def load &block
       open @url do |content| @content = content.read end unless @content
-      block.call @content
+      block.call @content if block
+      @content
     end
 
     def store filepath=nil
       filepath ||= @name
       raise 'filepath is mandatory' unless filepath
 
-      FileUtils.mkdir_p ::File.dirname(filepath)
+      FileUtils.mkdir_p File.dirname(filepath)
       load do |content|
         open filepath, 'wb' do |file|
           file.write content

data/lib/parse/object.rb

@@ -92,9 +92,9 @@ module Parse
             when nil
               Parse::ACL.new v
             when 'Date'
-              Parse::Date.parse v['iso']
+              ParseDate.parse v['iso']
             when 'File'
-              Parse::File.new v
+              ParseFile.new v
             when 'Pointer'
               Parse::Pointer.new v, self
             when 'Relation'
@@ -150,14 +150,14 @@ module Parse
     def create hash, use_master_key=false
       check_deleted!
       hash = string_keyed_hash hash
-      @updated_hash.update hash
+      @updated_hash = @raw_hash.dup.update(@updated_hash).update hash
       @updated_hash.reject! do |k, v|
         v.is_a?(Parse::Relation) && !v.changed?
       end
       method = use_master_key ? :create! : :create
       parse_client.send(method, self.parse_class_name, @updated_hash) do |response|
         @parse_object_id = response['objectId']
-        @created_at = Parse::Date.parse response['createdAt']
+        @created_at = ParseDate.parse response['createdAt']
         @updated_at = @created_at
         @raw_hash.update @updated_hash
         @raw_hash.update response
@@ -165,7 +165,7 @@ module Parse
       end
     end
     
-    def create! hash
+    def create! hash={}
       create hash, true
     end
 
@@ -176,7 +176,7 @@ module Parse
       parse_client.send(method, parse_class_name, parse_object_id, hash) do |response|
         @raw_hash.update @updated_hash
         @raw_hash.update response
-        @updated_at = Parse::Date.parse response['updatedAt']
+        @updated_at = ParseDate.parse response['updatedAt']
         @updated_hash.clear
       end
     end

data/lib/parse/version.rb

@@ -1,3 +1,3 @@
 module Parse
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/parse_date_spec.rb

@@ -0,0 +1,18 @@
+# coding:utf-8
+require 'spec_helper'
+require 'parsecom'
+
+describe Parse::ParseDate, 'when converting from and to json' do
+  it 'should be converted to a correct json' do
+    date = Parse::ParseDate.parse '2013-10-18T20:53:25Z'
+    date.year.should == 2013
+    date.month.should == 10
+    date.to_json.should == '{"__type":"Date","iso":"2013-10-18T20:53:25Z"}'
+  end
+
+  it 'should be converted from a json' do
+    date = Parse::ParseDate.new :iso => '2013-10-18T20:53:25Z'
+    date.year.should == 2013
+    date.month.should == 10
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parsecom
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -112,6 +112,7 @@ files:
 - spec/fixtures/vcr_cassettes/user_sign_up.yml
 - spec/parse_batch_spec.rb
 - spec/parse_client_spec.rb
+- spec/parse_date_spec.rb
 - spec/parse_object_spec.rb
 - spec/parse_query_spec.rb
 - spec/parse_user_spec.rb
@@ -151,6 +152,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/user_sign_up.yml
 - spec/parse_batch_spec.rb
 - spec/parse_client_spec.rb
+- spec/parse_date_spec.rb
 - spec/parse_object_spec.rb
 - spec/parse_query_spec.rb
 - spec/parse_user_spec.rb