ncmb-ruby-client 0.1.3 → 0.2.0

data/examples/relation.rb

@@ -1,18 +1,24 @@
-$:.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.initialize application_key: yaml['application_key'],  client_key: yaml['client_key']
+NCMB.initialize(
+  application_key: yaml['application_key'],
+  client_key: yaml['client_key']
+)
 
 Food = NCMB::DataStore.new 'Food'
 
 Basket = NCMB::DataStore.new('Basket')
 basket = Basket.new
 basket.foods = []
-basket.foods << Food.new(name: "banana", type: "fruit")
-basket.foods << Food.new(name: "pear", type: "fruit")
+basket.foods << Food.new(name: 'banana', type: 'fruit')
+basket.foods << Food.new(name: 'pear', type: 'fruit')
 
 # relation = NCMB::Relation.new
 # relation << Food.new(name: "banana", type: "fruit", objectId: "test1")

data/examples/script.rb

@@ -0,0 +1,25 @@
+# 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.initialize(
+  application_key: yaml['application_key'],
+  client_key: yaml['client_key']
+)
+
+script = NCMB::Script.new 'helloworld.js'
+results = script.get
+puts results
+
+script = NCMB::Script.new 'helloworld2.js'
+results = script.get(query: {a: 'b'})
+puts results
+
+script = NCMB::Script.new 'email.js'
+results = script.post(body: {email: 'atsushi@moongift.jp', option: 'Test', body: 'message'})
+puts results

data/examples/signature.rb

@@ -1,11 +1,25 @@
-$:.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'))
-@client = NCMB.initialize application_key: "6145f91061916580c742f806bab67649d10f45920246ff459404c46f00ff3e56",  client_key: "1343d198b510a0315db1c03f3aa0e32418b7a743f8e4b47cbff670601345cf75"
+@client = NCMB.initialize(
+  application_key: yaml['application_key'],
+  client_key: yaml['client_key']
+)
 
 # puts @client.application_key
-puts @client.generate_signature :get, "/2013-09-01/classes/TestClass", "2013-12-02T02:44:35.452Z", {where: {testKey: "testValue"}}
+puts @client.generate_signature(:get, 
+  '/2013-09-01/classes/TestClass',
+  '2013-12-02T02:44:35.452Z',
+  {
+    where: {
+      testKey: 'testValue'
+    }
+  }
+)
 

data/examples/user_test.rb

@@ -1,10 +1,16 @@
-$:.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.initialize application_key: yaml['application_key'],  client_key: yaml['client_key']
+NCMB.initialize(
+  application_key: yaml['application_key'],
+  client_key: yaml['client_key']
+)
 
 if @user = NCMB::User.login('testUser2', 'testPassword2')
   puts NCMB.CurrentUser.userName
@@ -20,9 +26,10 @@ end
 @user.set('userName', 'testUser2')
 @user.set('password', 'testPassword2')
 if @user.signUp
-  puts "User create successful."
-  @user.set("Hello", "World")
+  puts 'User create successful.'
+  @user.set('Hello', 'World')
   @user.update
+  puts 'User update successful.'
 else
   puts "User create failed. #{@user.error.message}"
 end

data/examples/venue_search.rb

@@ -1,36 +1,49 @@
-$:.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'
+venues_class.delete_all
 json['response']['venues'].each do |venue|
+  item = venues_class.new
   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
+  item.set('name', params[:name])
+  item.set('location', params[:location])
+  item.save
+  puts "#{item.objectId} saved."
 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
   }
 }
-#  
-puts venues_class.get params
-#puts venues_class.get queries
+venues_class = venues_class.where("location", params[:where]['location'])
+results = venues_class.get
+
+puts results.length
+
+results.each do |result|
+  puts result.objectId
+end

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
@@ -165,7 +181,7 @@ module NCMB
           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}"

data/lib/ncmb/data_store.rb

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

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
@@ -12,7 +14,7 @@ module NCMB
     end
     
     def save
-      @fields[:file] = open(self.file)
+      @fields[:file] = ::OpenURI.open_uri(self.file)
       super
     end
     alias :update :save