dm-parse 0.2.3 → 0.3.0

data/Gemfile

@@ -18,4 +18,4 @@ end
 gem "dm-core", ">= 1.2"
 gem "dm-validations", ">= 1.2"
 gem "activesupport", ">= 3.2"
-gem "nestful", ">= 0.0.8"
+gem "parse-ruby-client", ">= 0.0.8"

data/Gemfile.lock

@@ -27,8 +27,10 @@ GEM
       rdoc
     json (1.7.3)
     multi_json (1.3.6)
-    nestful (0.0.8)
-      activesupport (>= 3.0.0.beta)
+    parse-ruby-client (0.1.0)
+      patron
+      vcr
+    patron (0.4.18)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -44,6 +46,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
+    vcr (2.2.2)
     yard (0.8.2.1)
 
 PLATFORMS
@@ -56,7 +59,7 @@ DEPENDENCIES
   dm-core (>= 1.2)
   dm-validations (>= 1.2)
   jeweler (>= 1.8.3)
-  nestful (>= 0.0.8)
+  parse-ruby-client (>= 0.0.8)
   rdoc (>= 3.12)
   rspec (>= 2.10.0)
   simplecov (>= 0.6)

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/dm-parse.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "dm-parse"
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zhi-Qiang Lei"]
@@ -34,7 +34,6 @@ Gem::Specification.new do |s|
     "lib/is/parse.rb",
     "lib/parse/engine.rb",
     "lib/parse/query.rb",
-    "lib/parse/resource.rb",
     "lib/property/parse_date.rb",
     "lib/property/parse_file.rb",
     "lib/property/parse_geo_point.rb",
@@ -48,7 +47,6 @@ Gem::Specification.new do |s|
     "spec/parse_key_spec.rb",
     "spec/parse_pointer_spec.rb",
     "spec/query_spec.rb",
-    "spec/resource_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "https://github.com/siegfried/dm-parse"
@@ -64,7 +62,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<dm-core>, [">= 1.2"])
       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<parse-ruby-client>, [">= 0.0.8"])
       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,7 +74,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<dm-core>, [">= 1.2"])
       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<parse-ruby-client>, [">= 0.0.8"])
       s.add_dependency(%q<rspec>, [">= 2.10.0"])
       s.add_dependency(%q<yard>, [">= 0.7"])
       s.add_dependency(%q<rdoc>, [">= 3.12"])
@@ -89,7 +87,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<dm-core>, [">= 1.2"])
     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<parse-ruby-client>, [">= 0.0.8"])
     s.add_dependency(%q<rspec>, [">= 2.10.0"])
     s.add_dependency(%q<yard>, [">= 0.7"])
     s.add_dependency(%q<rdoc>, [">= 3.12"])

data/lib/dm-parse.rb

@@ -1,14 +1,13 @@
 require "dm-core"
 require "dm-validations"
 require "active_support/all"
-require "nestful"
 require "collection"
+require "parse-ruby-client"
 require "property/parse_key"
 require "property/parse_pointer"
 require "property/parse_date"
 require "property/parse_file"
 require "property/parse_geo_point"
-require "parse/resource"
 require "parse/engine"
 require "parse/query"
 require "adapters/parse_adapter"

data/lib/parse/engine.rb

@@ -1,73 +1,76 @@
 module DataMapper
+
+  module ::Parse
+    module Protocol
+      HEADER_MASTER_KEY = "X-Parse-Master-Key"
+    end
+
+    class Client
+      def initialize(data = {})
+        @host     = data[:host] || Protocol::HOST
+        @app_id   = data[:app_id]
+        @api_key  = data[:api_key]
+        @session  = Patron::Session.new
+        @session.timeout = 10
+        @session.connect_timeout = 10
+
+        @session.base_url                 = "https://#{host}"
+        @session.headers["Content-Type"]  = "application/json"
+        @session.headers["Accept"]        = "application/json"
+        @session.headers["User-Agent"]    = "Parse for Ruby, 0.0"
+        @session.headers[Protocol::HEADER_APP_ID] = @app_id
+
+        key_type = data[:master] ? Protocol::HEADER_MASTER_KEY : Protocol::HEADER_API_KEY
+        @session.headers[key_type] = @api_key
+      end
+    end
+  end
+
   module Parse
 
     class Engine
 
-      HOST              = "https://api.parse.com"
-      VERSION           = "1"
-      APP_ID_HEADER     = "X-Parse-Application-Id"
-      API_KEY_HEADER    = "X-Parse-REST-API-Key"
-      MASTER_KEY_HEADER = "X-Parse-Master-Key"
-
-      attr_reader :classes, :users, :login, :password_reset, :file_storage
+      attr_reader :client
 
       def initialize(app_id, api_key, master)
-        @app_id         = app_id
-        @api_key        = api_key
-        @master         = master
-        @classes        = build_parse_resource_for "classes"
-        @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"
+        @client = ::Parse::Client.new app_id: app_id, api_key: api_key, master: master
       end
 
       def read(storage_name, params)
-        parse_resources_for(storage_name).get params: params
+        query = params.inject({}) do |result, (k, v)|
+          result.merge k.to_s => CGI.escape(v.to_s)
+        end
+        client.request uri_for(storage_name), :get, nil, query
       end
 
       def delete(storage_name, id)
-        parse_resources_for(storage_name)[id].delete
+        client.delete uri_for(storage_name, id)
       end
 
       def create(storage_name, attributes)
-        parse_resources_for(storage_name).post body: attributes.to_json
+        client.post uri_for(storage_name), attributes.to_json
       end
 
       def update(storage_name, id, attributes)
-        parse_resources_for(storage_name)[id].put body: attributes.to_json
+        client.put uri_for(storage_name, id), attributes.to_json
       end
 
       def sign_in(username, password)
-        login.get params: {username: username, password: password}
+        client.request ::Parse::Protocol::USER_LOGIN_URI, :get, nil, { username: username, password: password }
       end
 
       def upload_file(filename, content, content_type)
-        storage = file_storage[URI.escape(filename)]
-        storage.options[:headers]["Content-Type"] = content_type
-        storage.post body: content
+        client.post ::Parse::Protocol.file_uri(URI.escape(filename)), content
       end
 
       def request_password_reset(email)
-        password_reset.post params: {email: email}
+        client.post ::Parse::Protocol::PASSWORD_RESET_URI, {email: email}.to_json
       end
 
       private
 
-      def parse_resources_for(storage_name)
-        storage_name == "_User" ? users : classes[storage_name]
-      end
-
-      def build_parse_resource_for(name)
-        Parse::Resource.new(HOST, format: :json, headers: key_headers)[VERSION][name]
-      end
-
-      def key_headers
-        key_type  = @master ? MASTER_KEY_HEADER : API_KEY_HEADER
-        {
-          APP_ID_HEADER => @app_id,
-          key_type => @api_key
-        }
+      def uri_for(storage_name, id = nil)
+        storage_name == "_User" ? ::Parse::Protocol.user_uri(id) : ::Parse::Protocol.class_uri(storage_name, id)
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-parse
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: nestful
+  name: parse-ruby-client
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -212,7 +212,6 @@ files:
 - lib/is/parse.rb
 - lib/parse/engine.rb
 - lib/parse/query.rb
-- lib/parse/resource.rb
 - lib/property/parse_date.rb
 - lib/property/parse_file.rb
 - lib/property/parse_geo_point.rb
@@ -226,7 +225,6 @@ files:
 - spec/parse_key_spec.rb
 - spec/parse_pointer_spec.rb
 - spec/query_spec.rb
-- spec/resource_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/siegfried/dm-parse
 licenses:
@@ -243,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4320882830707755701
+      hash: 1440756048767751093
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/parse/resource.rb

@@ -1,56 +0,0 @@
-module DataMapper
-  module Parse
-    # Read the body to get detail of Parse error
-    class Connection < ::Nestful::Connection
-      def handle_response(response)
-        response.read_body if (400...500).include? response.code.to_i
-        super
-      end
-    end
-
-    ::Nestful::Request.class_eval do
-      def connection
-        conn              = Connection.new(uri, format)
-        conn.proxy        = proxy if proxy
-        conn.user         = user if user
-        conn.password     = password if password
-        conn.auth_type    = auth_type if auth_type
-        conn.timeout      = timeout if timeout
-        conn.ssl_options  = ssl_options if ssl_options
-        conn
-      end
-    end # This is a workaround. Mixin for Connection does not work somehow.
-
-    module ParseError
-      def to_s
-        error = JSON.parse(response.body)["error"]
-        super + "  Response Parse Error = #{error}"
-      end
-    end
-
-    ::Nestful::BadRequest.send          :include, ParseError
-    ::Nestful::UnauthorizedAccess.send  :include, ParseError
-    ::Nestful::ForbiddenAccess.send     :include, ParseError
-    ::Nestful::ResourceNotFound.send    :include, ParseError
-    ::Nestful::MethodNotAllowed.send    :include, ParseError
-    ::Nestful::ResourceConflict.send    :include, ParseError
-    ::Nestful::ResourceGone.send        :include, ParseError
-    ::Nestful::ResourceInvalid.send     :include, ParseError
-
-    class Resource < ::Nestful::Resource
-      attr_reader :options
-
-      def ==(resource)
-        url == resource.url && options == resource.options
-      end
-
-      def delete(options = {})
-        Nestful.delete(url, options.merge(@options))
-      end
-
-      def put(options = {})
-        Nestful.put(url, options.merge(@options))
-      end
-    end
-  end
-end

data/spec/resource_spec.rb

@@ -1,5 +0,0 @@
-require "spec_helper"
-
-describe DataMapper::Parse::Resource do
-  pending "there may be tests in the future"
-end