ncmb-ruby-client 0.1.2 → 0.1.7

data/examples/venue_search.rb

@@ -1,34 +1,37 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$:.unshift(File.dirname(__FILE__))
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
 require 'rubygems'
 require 'ncmb'
 require 'yaml'
 yaml = YAML.load_file(File.join(File.dirname(__FILE__), '..', 'setting.yml'))
-@ncmb = NCMB.init(application_key: yaml['application_key'], 
+NCMB.initialize(application_key: yaml['application_key'], 
                   client_key: yaml['client_key']
                   )
 json = JSON.parse(open(File.join(File.dirname(__FILE__), 'venues.json'), 'r').read)
-venues_class = @ncmb.data_store 'Venues'
+venues_class = NCMB::DataStore.new 'Venues'
 json['response']['venues'].each do |venue|
   params = {
     name: venue['name'],
     location: {
-      "__type" => "GeoPoint",
-      "latitude" => venue['location']['lat'],
-      "longitude" => venue['location']['lng']
+      '__type' => 'GeoPoint',
+      'latitude' => venue['location']['lat'],
+      'longitude' => venue['location']['lng']
     }
   }
   puts venues_class.post(params).body
 end
 params = {}
 params[:where] = {
-  "location" => {
-    "$nearSphere" => {
-      "__type" => "GeoPoint",
-      "longitude" => 139.745433,
-      "latitude" => 35.691152
+  'location' => {
+    '$nearSphere' => {
+      '__type' => 'GeoPoint',
+      'longitude' => 139.745433,
+      'latitude' => 35.691152
     },
-    "$maxDistanceInKilometers" => 10
+    '$maxDistanceInKilometers' => 10
   }
 }
 #  

data/lib/ncmb.rb

@@ -1,26 +1,29 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$:.unshift(File.dirname(__FILE__))
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'time'
 require 'openssl'
 require 'base64'
-require "net/http"
-require "uri"
-require "erb"
-require "json"
+require 'net/http'
+require 'uri'
+require 'erb'
+require 'json'
 require 'securerandom'
 
-require "ncmb/version"
-require "ncmb/client"
-require "ncmb/query"
-require "ncmb/data_store"
-require "ncmb/object"
-require "ncmb/file"
-require "ncmb/user"
-require "ncmb/push"
-require "ncmb/geo_point"
-require "ncmb/increment"
-require "ncmb/acl"
-require "ncmb/role"
-require "ncmb/relation"
-require "ncmb/error"
+require 'ncmb/version'
+require 'ncmb/client'
+require 'ncmb/query'
+require 'ncmb/data_store'
+require 'ncmb/object'
+require 'ncmb/file'
+require 'ncmb/user'
+require 'ncmb/push'
+require 'ncmb/geo_point'
+require 'ncmb/increment'
+require 'ncmb/acl'
+require 'ncmb/role'
+require 'ncmb/relation'
+require 'ncmb/script'
+require 'ncmb/error'

data/lib/ncmb/acl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NCMB
   class Acl
     include NCMB
@@ -23,16 +25,22 @@ module NCMB
       end
       params.to_json
     end
+
+    def fields
+      @fields
+    end
     
-    def public(read_or_write, value = true)
-      @fields['*'.to_sym][read_or_write.to_sym] = value
+    def public(read_or_write, bol = true)
+      @fields['*'.to_sym][read_or_write.to_sym] = bol
     end
     
+    # :reek:DuplicateMethodCall { max_calls: 2 }
     def user(user, read_or_write, value = true)
       @fields[user.objectId.to_sym] = {read: true, write: true} unless @fields[user.objectId.to_sym]
       @fields[user.objectId.to_sym][read_or_write.to_sym] = value
     end
     
+    # :reek:DuplicateMethodCall { max_calls: 2 }
     def role(role, read_or_write, value = true)
       @fields[role.name.to_sym] = {read: true, write: true} unless @fields[role.name.to_sym]
       @fields[role.name.to_sym][read_or_write.to_sym] = value

data/lib/ncmb/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Time
   def to_json(a)
     v = self.getgm
@@ -6,7 +8,9 @@ class Time
 end
 
 module NCMB
-  DOMAIN = 'mb.api.cloud.nifty.com'
+  DOMAIN = 'mbaas.api.nifcloud.com'
+  SCRIPT_DOMAIN = 'script.mbaas.api.nifcloud.com'
+  SCRIPT_API_VERSION = '2015-09-01'
   API_VERSION = '2013-09-01'
   @application_key = nil
   @client_key = nil
@@ -16,28 +20,30 @@ module NCMB
   
   class Client
     include NCMB
-    attr_accessor :application_key, :client_key, :domain, :api_version
+    attr_accessor :application_key, :client_key, :domain, :api_version, :script_api_version
     def initialize(params = {})
       @domain          = NCMB::DOMAIN
       @api_version     = NCMB::API_VERSION
+      @script_domain   = NCMB::SCRIPT_DOMAIN
+      @script_api_version = NCMB::SCRIPT_API_VERSION
       @application_key = params[:application_key]
       @client_key      = params[:client_key]
     end
     
-    def get(path, params = {})
-      request :get, path, params
+    def get(path, params = {}, headers = {})
+      request :get, path, params, headers
     end
     
-    def post(path, params = {})
-      request :post, path, params
+    def post(path, params = {}, headers = {})
+      request :post, path, params, headers
     end
 
-    def put(path, params = {})
-      request :put, path, params
+    def put(path, params = {}, headers = {})
+      request :put, path, params, headers
     end
     
-    def delete(path, params = {})
-      request :delete, path, params
+    def delete(path, params = {}, headers = {})
+      request :delete, path, params, headers
     end
     
     def array2hash(ary)
@@ -58,7 +64,7 @@ module NCMB
       results = {}
       queries.each do |k, v|
         v = array2hash(v) if v.is_a? Array
-        value = URI.encode(v.is_a?(Hash) ? v.to_json : v.to_s).gsub("[", "%5B").gsub(":", "%3A").gsub("]", "%5D")
+        value = URI.encode_www_form_component(v.is_a?(Hash) ? v.to_json : v.to_s).gsub("[", "%5B").gsub(":", "%3A").gsub("]", "%5D")
         results[k.to_s] = value
       end
       results
@@ -88,7 +94,6 @@ module NCMB
           results[k.to_s] = v.to_s
         end
       end
-      puts results
       results
     end
     
@@ -112,10 +117,10 @@ module NCMB
       end
       signature_base = []
       signature_base << method.upcase
-      signature_base << @domain
+      signature_base << get_domain(path)
       signature_base << path
       signature_base << params.collect{|k,v| "#{k}=#{v}"}.join("&")
-      signature = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest.new('sha256'), @client_key, signature_base.join("\n"))).strip()
+      Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest.new('sha256'), @client_key, signature_base.join("\n"))).strip()
     end
     
     def make_boundary(boundary, queries)
@@ -123,7 +128,6 @@ module NCMB
       post_body << "--#{boundary}"
       post_body << "Content-Disposition: form-data; name=\"file\"; filename=\"#{queries[:fileName]}\""
       post_body << "Content-Type: #{queries['mime-type'.to_sym]}"
-      post_body << ""
       post_body << queries[:file].read
       post_body << ""
       post_body << "--#{boundary}"
@@ -134,10 +138,19 @@ module NCMB
       post_body.join("\r\n")
     end
     
-    def request(method, path, queries = {})
+    def get_domain(path)
+      domain = @domain
+      if path.start_with?("/#{@script_api_version}/script\/")
+        domain = @script_domain
+      end
+      domain
+    end
+    
+    def request(method, path, queries = {}, addHeaders = {})
       now = Time.now.utc.iso8601
       signature = generate_signature(method, path, now, queries)
-      http = Net::HTTP.new(@domain, 443)
+      domain = get_domain(path)
+      http = Net::HTTP.new(domain, 443)
       http.use_ssl=true
       headers = {
         "X-NCMB-Application-Key" => @application_key,
@@ -145,8 +158,11 @@ module NCMB
         "X-NCMB-Timestamp" => now,
         "Content-Type" => 'application/json'
       }
+      Array(addHeaders || {}).each do |name, value|
+        headers[name] = value
+      end
       if NCMB.CurrentUser
-        headers['X-NCMB-Apps-Session-Token'] = NCMB.CurrentUser.sessionToken
+        headers['X-NCMB-Apps-Session-Token'] = NCMB.CurrentUser[:sessionToken]
       end
       # queries = hash2query(queries)
       json = nil
@@ -157,10 +173,15 @@ module NCMB
             "#{key}=#{value}"
           end.join("&")
           path = path + (query == '' ? "" : "?"+query)
-          json = JSON.parse(http.get(path, headers).body, symbolize_names: true)
+          rp = Regexp.new "/#{NCMB::API_VERSION}/files/.*"
+          if path =~ rp
+            json = http.get(path, headers).body
+          else
+            json = JSON.parse(http.get(path, headers).body, symbolize_names: true)
+          end
         when :post
           req = Net::HTTP::Post.new(path)
-          if queries[:file].is_a?(File) || queries[:file].is_a?(StringIO)
+          if path.include? "/2013-09-01/files"
             boundary = SecureRandom.uuid
             req.body = make_boundary(boundary, queries)
             headers["Content-Type"] = "multipart/form-data; boundary=#{boundary}"
@@ -195,7 +216,7 @@ module NCMB
         @@last_error =  e
         raise NCMB::APIError.new(e.to_s)
       end
-      if json[:error] != nil
+      if json.is_a?(Hash) && json[:error] != nil
         raise NCMB::APIError.new(json[:error])
       end
       json

data/lib/ncmb/data_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NCMB
   class DataStore
     include NCMB
@@ -74,11 +76,19 @@ module NCMB
     
     def path
       return @path if @path
-      path = "/#{@@client.api_version}/classes/#{@name}"
+      if ["file", "user", "push", "installation"].include? @name
+        if @name == "push"
+          "/#{@@client.api_version}/#{@name}"
+        else
+          "/#{@@client.api_version}/#{@name}s"
+        end
+      else
+        "/#{@@client.api_version}/classes/#{@name}"
+      end
     end
     
     def get
-      return @items unless @items.nil?
+      # return @items unless @items.nil?
       results = @@client.get path, @queries
       return [] unless results
       if results[:error] && results[:error] != ""

data/lib/ncmb/device.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NCMB
   class Devise < NCMB::DataStore
     attr_accessor :client, :name
@@ -7,7 +9,7 @@ module NCMB
     end
     
     def push
-      return NCMB::Push.new(client
+      return NCMB::Push.new(client)
     end
   end
 end

data/lib/ncmb/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NCMB
   class FetchError < StandardError
   end

data/lib/ncmb/file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mime/types'
 module NCMB
   class NFile < NCMB::Object
@@ -8,14 +10,19 @@ module NCMB
         @fields[:fileName] = File.basename(file_path)
         @fields['mime-type'.to_sym] = MIME::Types.type_for(file_path)[0]
       end
+      @content = nil
     end
     
     def save
-      @fields[:file] = open(self.file)
+      @fields[:file] = ::OpenURI.open_uri(self.file)
       super
     end
     alias :update :save
     
+    def get
+      @content = @@client.get path
+    end
+    
     def path
       "#{base_path}/#{@fields[:fileName]}"
     end

data/lib/ncmb/geo_point.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NCMB
   class GeoPoint
     include NCMB
@@ -7,11 +9,11 @@ module NCMB
       @longitude = longitude
     end
     
-    def to_json(a = "")
+    def to_json(a = '')
       {
-        "__type": "GeoPoint",
-        "longitude": @longitude,
-        "latitude": @latitude
+        '__type': 'GeoPoint',
+        'longitude': @longitude,
+        'latitude': @latitude
       }.to_json
     end
     

data/lib/ncmb/increment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NCMB
   class Increment
     include NCMB

data/lib/ncmb/object.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NCMB
   class Object
     include NCMB
@@ -43,7 +45,7 @@ module NCMB
     end
     
     def deletable?
-      if self.acl['*'.to_sym][:write] == true
+      if self.acl.fields[:*][:write] == true
         return true
       end
       return false unless NCMB.CurrentUser
@@ -64,12 +66,12 @@ module NCMB
       @fields[:objectId] != nil
     end
     
-    def post
+    def convert_params
       @fields.each do |key, field|
         if field.is_a?(NCMB::Object)
           field.save unless field.saved?
           @fields[key] = {
-            __type: "Pointer",
+            __type: 'Pointer',
             className: field.ClassName,
             objectId: field.objectId
           }
@@ -83,6 +85,11 @@ module NCMB
           @fields[key] = relation
         end
       end
+    end
+    
+    def post
+      return self.put if saved?
+      convert_params
       result = @@client.post path, @fields
       @fields.merge!(result)
       self
@@ -90,6 +97,8 @@ module NCMB
     alias :save :post
     
     def put
+      return self.post unless saved?
+      convert_params
       put_path = path
       params = @fields
       params.delete :objectId

data/lib/ncmb/push.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NCMB
   class Push < NCMB::Object
     include NCMB