parsecom 0.0.5 → 0.0.6

data/README.md

@@ -132,8 +132,7 @@ If you want to update attributes without retrieving the object, you can use
 the Parse::Client object for it.
 
 ```ruby
-score = GameScore.new :objectId => 'Ed1nuqPvcm'
-Parse::Client.default_client.update score, :score => 73453
+Parse::Client.default.update :GaemScore, 'Ed1nuqPvcm', :score => 73453
 ```
 
 ### Deleting Objects

data/lib/parse/client.rb

@@ -7,7 +7,7 @@ module Parse
 
     attr_accessor :http_client, :session_token, :master_key
 
-    def self.default_client
+    def self.default
       @@default_client ||= new
     end
 
@@ -62,22 +62,20 @@ module Parse
       @session_token = nil
     end
 
-    def find parse_class, object_id_or_conditions, opts={}
+    def find parse_class_name, object_id_or_conditions, opts={}
       case object_id_or_conditions
       when :all
-        find_by_query parse_class, opts
+        find_by_query parse_class_name, opts
       when String, Symbol
-        find_by_id parse_class, object_id_or_conditions, opts
+        find_by_id parse_class_name, object_id_or_conditions, opts
       when Hash
-        find_by_query parse_class, object_id_or_conditions
+        find_by_query parse_class_name, object_id_or_conditions
       else
         raise ArgumentError.new('the first argument should be a string, a symbol, or a hash.')
       end
     end
 
-    def find_by_id parse_class, object_id, opts={}
-      parse_class_name = parse_class.is_a?(Parse::Object) \
-        ? parse_class.parse_class_name : parse_class
+    def find_by_id parse_class_name, object_id, opts={}
       call_api :get, "classes/#{parse_class_name}/#{object_id}" do |resp_body|
         if opts.has_key? :include
           included_keys = [opts[:include]].flatten
@@ -95,8 +93,8 @@ module Parse
       end
     end
 
-    def find_by_query parse_class, conditions
-      query = Query.new parse_class
+    def find_by_query parse_class_name, conditions
+      query = Query.new parse_class_name, self
       query.limit conditions[:limit] if conditions.has_key? :limit
       query.skip conditions[:skip] if conditions.has_key? :skip
       query.count conditions[:count] if conditions.has_key? :count
@@ -128,20 +126,20 @@ module Parse
       query.invoke
     end
 
-    def create parse_object, values
-      call_api :post, "classes/#{parse_object.parse_class_name}", values.to_json do |resp_body|
+    def create parse_class_name, values
+      call_api :post, "classes/#{parse_class_name}", values.to_json do |resp_body|
         resp_body
       end
     end
 
-    def update parse_object, values
-      call_api :put, "classes/#{parse_object.parse_class_name}/#{parse_object.parse_object_id}", values.to_json do |resp_body|
+    def update parse_class_name, parse_object_id, values
+      call_api :put, "classes/#{parse_class_name}/#{parse_object_id}", values.to_json do |resp_body|
         resp_body
       end
     end
 
-    def delete parse_object
-      call_api :delete, "classes/#{parse_object.parse_class_name}/#{parse_object.parse_object_id}" do |resp_body|
+    def delete parse_class_name, parse_object_id
+      call_api :delete, "classes/#{parse_class_name}/#{parse_object_id}" do |resp_body|
         resp_body
       end
     end

data/lib/parse/installation.rb

@@ -0,0 +1,6 @@
+# coding:utf-8
+module Parse
+  class Installation < Object
+    # TODO
+  end
+end

data/lib/parse/object.rb

@@ -1,7 +1,9 @@
 # coding:utf-8
 module Parse
   RESERVED_PARSE_CLASS = {
-    '_User' => 'Parse::User'
+    '_User' => 'Parse::User',
+    '_Role' => 'Parse::Role',
+    '_Installation' => 'Parse::Installation'
   }
 
   class Object
@@ -33,11 +35,11 @@ module Parse
       end
 
       def parse_client
-        @parse_client ||= Parse::Client.default_client
+        @parse_client ||= Parse::Client.default
       end
 
       def find object_id_or_conditions, opts={}
-        results = [parse_client.find(self, object_id_or_conditions, opts)].flatten
+        results = [parse_client.find(self.parse_class_name, object_id_or_conditions, opts)].flatten
         results.map! {|hash| self.new hash}
       end
 
@@ -47,7 +49,7 @@ module Parse
 
       # TODO: need refactoring
       def find! object_id_or_conditions, opts={}
-        results = [parse_client.find!(self, object_id_or_conditions, opts)].flatten
+        results = [parse_client.find!(self.parse_class_name, object_id_or_conditions, opts)].flatten
         results.map! {|hash| self.new hash}
       end
 
@@ -90,7 +92,9 @@ module Parse
             when 'File'
               Parse::File.new v
             when 'Pointer'
-              Parse::Pointer.new self, v
+              Parse::Pointer.new v, self
+            when 'Relation'
+              Parse::Relation.new self, k, v
             else
               v
             end
@@ -141,9 +145,8 @@ module Parse
       check_deleted!
       hash = string_keyed_hash hash
       @updated_hash.update hash
-      #parse_client.create(self, @updated_hash).tap do |response|
       method = use_master_key ? :create! : :create
-      parse_client.send(method, self, @updated_hash).tap do |response|
+      parse_client.send(method, self.parse_class_name, @updated_hash).tap do |response|
         @parse_object_id = response['objectId']
         @created_at = Date.parse response['createdAt']
         @updated_at = @created_at
@@ -162,7 +165,7 @@ module Parse
       hash = string_keyed_hash hash
       #parse_client.update(self, hash).tap do |response|
       method = use_master_key ? :update! : :update
-      parse_client.send(method, self, hash).tap do |response|
+      parse_client.send(method, parse_class_name, parse_object_id, hash).tap do |response|
         @updated_at = Date.parse response['updatedAt']
         @raw_hash.update @updated_hash
         @updated_hash.clear
@@ -176,9 +179,8 @@ module Parse
     def delete use_master_key=false
       raise 'You cannot delete new object' if new?
       check_deleted!
-      #parse_client.delete(self).tap do |response|
       method = use_master_key ? :delete! : :delete
-      parse_client.send(method, self).tap do |response|
+      parse_client.send(method, parse_class_name, parse_object_id).tap do |response|
         @deleted = true
       end
     end
@@ -214,6 +216,10 @@ module Parse
       @updated_hash[name] = value
     end
 
+    def to_pointer
+      Pointer.new 'className' => parse_class_name, 'objectId' => parse_object_id
+    end
+
     def to_s
       "<#{parse_class_name}: #{{}.update(@raw_hash).update(@updated_hash).to_s}>"
     end

data/lib/parse/pointer.rb

@@ -3,9 +3,9 @@ module Parse
   class Pointer
     attr_reader :object
 
-    def initialize parent, hash
-      @parent_object = parent
+    def initialize hash, parent=nil
       @raw_hash = hash
+      @parent_object = parent
 
       if @raw_hash.has_key? 'body'
         @object = pointed_parse_class.new @raw_hash['body']
@@ -13,10 +13,11 @@ module Parse
     end
 
     def load
-      unless @object
-        @object = pointed_parse_class.find_by_id @raw_hash['objectId']
-      end
-      @object
+      @object ||= pointed_parse_class.find_by_id @raw_hash['objectId']
+    end
+
+    def to_json
+      %Q|{"__type":"Pointer","className":"#{@raw_hash['className']}","objectId":"#{@raw_hash['objectId']}"}|
     end
 
     private

data/lib/parse/query.rb

@@ -3,26 +3,19 @@ module Parse
     attr_reader :keys
     attr_accessor :parse_class_name, :parse_client
 
-    def initialize parse_class_or_name=nil
-      if parse_class_or_name.is_a?(Class) && parse_class_or_name < Parse::Object
-        @parse_class = parse_class_or_name
-        @parse_class_name = parse_class_or_name.parse_class_name
-        @parse_client = parse_class_or_name.parse_client
-      else
-        @parse_class = nil
-        @parse_class_name = parse_class_or_name.to_s
-        @parse_client = Parse::Client.default_client
-      end
+    def initialize parse_class_name=nil, parse_client=nil
+      @parse_class_name = parse_class_name.to_s
+      @parse_client = parse_client || Parse::Client.default
       @limit = nil
       @skip = nil
       @count = false
-      @where = []
+      @where = [] # array of Conditions
       @order = []
       @include = []
       @keys = []
     end
 
-    def invoke &block
+    def run &block
       block = proc do |body| 
         # TODO: should handle error
         body['results']
@@ -32,7 +25,7 @@ module Parse
         : "classes/#{@parse_class_name}"
       @parse_client.call_api :get, "#{endpoint}?#{to_params}", nil, &block
     end
-    alias run invoke
+    alias invoke run
 
     def limit val=nil
       if val
@@ -143,6 +136,12 @@ module Parse
     end
     alias _or_ or_condition
 
+    def related_to column_name, pointer
+      RelatedToCondition.new(column_name, pointer).tap do |condition|
+        @where.push condition
+      end
+    end
+
     class Subquery < Query
       attr_accessor :parent
 
@@ -283,6 +282,17 @@ module Parse
         %Q|"$or":[#{@conditions.map {|c| "{#{c.to_s}}"}.join ','}]|
       end
     end
+
+    class RelatedToCondition
+      def initialize column_name, pointer
+        @column_name = column_name
+        @pointer = pointer
+      end
+
+      def to_s
+        %Q|"$relatedTo":{"object":#{@pointer.to_json},"key":"#{@column_name}"}|
+      end
+    end
   end
 
   def Query parse_class_name=nil

data/lib/parse/relation.rb

@@ -0,0 +1,22 @@
+# coding:utf-8
+module Parse
+  class Relation
+    def initialize parent, column_name, hash
+      @parent_object = parent
+      @column_name = column_name
+      @raw_hash = hash
+    end
+
+    def load parse_client=Parse::Client.default
+      unless @objects
+        pointer = @parent_object.to_pointer
+        key = @column_name
+        related_class = Parse::Object @raw_hash['className']
+        @objects = related_class.find :where => proc {
+          related_to key, pointer
+        }
+      end
+      @objects
+    end
+  end
+end

data/lib/parse/role.rb

@@ -0,0 +1,6 @@
+# coding:utf-8
+module Parse
+  class Role < Object
+    # TODO
+  end
+end

data/lib/parse/version.rb

@@ -1,3 +1,3 @@
 module Parse
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/parsecom.rb

@@ -13,7 +13,10 @@ require 'parse/client'
 require 'parse/query'
 require 'parse/object'
 require 'parse/user'
+require 'parse/role'
+require 'parse/installation'
 require 'parse/pointer'
+require 'parse/relation'
 require 'parse/file'
 
 module Parse

data/parsecom.gemspec

@@ -14,7 +14,6 @@ Gem::Specification.new do |gem|
   gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
  

data/spec/parse_query_spec.rb

@@ -108,21 +108,12 @@ describe Parse::Query, 'when it builds conditions' do
     query.to_params.should have_params('where' => '{"post":{"$notInQuery":{"where":{"image":{"$exists":true}},"className":"Post"}}}')
     query.where.clear
 
-#    query.where do
-#      #{
-#      #  "$relatedTo":{
-#      #    "object":{
-#      #      "__type":"Pointer",
-#      #      "className":"Post",
-#      #      "objectId":"8TOXdXf3tz"
-#      #    },
-#      #    "key":"likes"
-#      #  }
-#      #}
-#      # TODO
-#    end
-#    query.to_params.should == 'where={}'
-#    query.where.clear
+    query.where do
+      pointer = Parse::Pointer.new('className' => 'Post', 'objectId' => '8TOXdXf3tz')
+      related_to :likes, pointer
+    end
+    query.to_params.should have_params('where' => '{"$relatedTo":{"object":{"__type":"Pointer","className":"Post","objectId":"8TOXdXf3tz"},"key":"likes"}}')
+    query.where.clear
 
     query.where do
       column(:wins).gt(150).or column(:wins).lt(5)

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ RSpec::Matchers.define :have_params do |expected|
   match do |actual|
     expected.to_a.map do |k, v|
       actual.include? "#{k}=#{URI.encode v.to_s}"
-    end.inject(true) {|s, v| s || v}
+    end.inject(true) {|s, v| s && v}
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parsecom
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -77,9 +77,12 @@ files:
 - lib/parse/ext/string.rb
 - lib/parse/file.rb
 - lib/parse/http_client.rb
+- lib/parse/installation.rb
 - lib/parse/object.rb
 - lib/parse/pointer.rb
 - lib/parse/query.rb
+- lib/parse/relation.rb
+- lib/parse/role.rb
 - lib/parse/user.rb
 - lib/parse/version.rb
 - lib/parsecom.rb