ncmb-ruby-client 0.1.3 → 0.2.0

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,12 +45,12 @@ 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
-      return false unless self.acl[NCMB.CurrentUser.objectId.to_sym]
-      return false unless self.acl[NCMB.CurrentUser.objectId.to_sym][:write]
+      return false unless self.acl.fields[NCMB.CurrentUser.objectId.to_sym]
+      return false unless self.acl.fields[NCMB.CurrentUser.objectId.to_sym][:write]
       true
     end
     
@@ -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

data/lib/ncmb/query.rb

@@ -1,19 +1,21 @@
+# frozen_string_literal: true
+
 module NCMB
   module Query
     [
-      {greaterThan: "$gt"},
-      {notEqualTo: "$ne"},
+      {greaterThan: '$gt'},
+      {notEqualTo: '$ne'},
       {equalTo: nil},
-      {lessThan: "$lt"},
-      {lessThanOrEqualTo: "$lte"},
-      {greaterThanOrEqualTo: "$gte"},
-      {in: "$in"},
-      {notIn: "$nin"},
-      {exists: "$exists"},
-      {regex: "$regex"},
-      {inArray: "$inArray"},
-      {notInArray: "$ninArray"},
-      {allInArray: "$all"},
+      {lessThan: '$lt'},
+      {lessThanOrEqualTo: '$lte'},
+      {greaterThanOrEqualTo: '$gte'},
+      {in: '$in'},
+      {notIn: '$nin'},
+      {exists: '$exists'},
+      {regex: '$regex'},
+      {inArray: '$inArray'},
+      {notInArray: '$ninArray'},
+      {allInArray: '$all'},
     ].each do |m|
       define_method m.keys.first do |name, value|
         params = {}
@@ -29,14 +31,14 @@ module NCMB
     end
 
     [
-      {withinKilometers: "$maxDistanceInKilometers"},
-      {withinMiles: "$maxDistanceInMiles"},
-      {withinRadians: "$maxDistanceInRadians"}
+      {withinKilometers: '$maxDistanceInKilometers'},
+      {withinMiles: '$maxDistanceInMiles'},
+      {withinRadians: '$maxDistanceInRadians'}
     ].each do |m|
       define_method m.keys.first do |name, geo, value|
         params = {}
         params[name] = {
-          "$nearSphere": geo,
+          '$nearSphere': geo,
         }
         params[name][m.values.first] = value
         @queries[@search_key] << params
@@ -47,8 +49,8 @@ module NCMB
     def withinSquare(name, geo1, geo2)
       params = {}
       params[name] = {
-        "$within": {
-          "$box": [
+        '$within': {
+          '$box': [
             geo1,
             geo2
           ]

data/lib/ncmb/relation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NCMB
   class Relation < Array
     include NCMB
@@ -6,16 +8,16 @@ module NCMB
       
     end
     
-    def to_json(a = "")
+    def to_json(a = '')
       params = {
-        "__op": "AddRelation",
+        '__op': 'AddRelation'
       }
-      params["objects"] = []
+      params['objects'] = []
       self.each do |obj|
-        params["objects"] << {
-          "__type": "Pointer",
-          "className": obj.ClassName,
-          "objectId": obj.objectId
+        params['objects'] << {
+          '__type': 'Pointer',
+          'className': obj.ClassName,
+          'objectId': obj.objectId
         }
       end
       params.to_json

data/lib/ncmb/role.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NCMB
   class Role < NCMB::Object
     include NCMB
@@ -10,7 +12,7 @@ module NCMB
           roleName: name
         }
       end
-      @fields[:acl] = NCMB::Acl.new(@fields[:acl])
+      @fields[:acl] = NCMB::Acl.new
     end
     
     def self.find_or_create(name)

data/lib/ncmb/script.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module NCMB
+  class Script
+    include NCMB
+    def initialize(name)
+      @name = name
+      @params = {}
+    end
+    
+    def get(params = {})
+      self.set(params).execute('get')
+    end
+    
+    def post(params = {})
+      self.set(params).execute('post')
+    end
+    
+    def put(params = {})
+      self.set(params).execute('put')
+    end
+    
+    def delete(params = {})
+      self.set(params)
+      @@client.delete 
+    end
+    
+    def set(params)
+      params = Hash[ params.map{ |k, v| [k.to_sym, v] } ]
+      self
+        .header(params[:header])
+        .body(params[:body])
+        .query(params[:query])
+      self
+    end
+    
+    def header(params)
+      @params[:header] = params
+      self
+    end
+    
+    def body(params)
+      @params[:body] = params
+      self
+    end
+    
+    def query(params)
+      @params[:query] = params
+      self
+    end
+    
+    def execute(method)
+      @@client.send(method, "/#{@@client.script_api_version}/script/#{@name}", (@params[:query] || {}).merge(@params[:body] || {}), @params[:header])
+    end
+  end
+end

data/lib/ncmb/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NCMB
   class User < NCMB::Object
     include NCMB
@@ -23,7 +25,7 @@ module NCMB
     end
     
     def put
-      params = @fields
+      params = @fields.clone
       session_key = params[:sessionToken]
       [:objectId, :createDate, :updateDate, :sessionToken, :password].each do |name|
         params.delete name

data/lib/ncmb/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ncmb
-  VERSION = "0.1.3"
+  VERSION = '0.2.0'
 end

data/ncmb-ruby-client.gemspec

@@ -1,24 +1,24 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ncmb/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "ncmb-ruby-client"
+  spec.name          = 'ncmb-ruby-client'
   spec.version       = Ncmb::VERSION
-  spec.authors       = ["Atsushi Nakatsugawa"]
-  spec.email         = ["atsushi@moongift.jp"]
-  spec.description   = %q{A simple Ruby client for the nifty cloud mobile backend REST API}
-  spec.summary       = %q{A simple Ruby client for the nifty cloud mobile backend REST API}
-  spec.homepage      = "http://mb.cloud.nifty.com/"
-  spec.license       = "MIT License"
+  spec.authors       = ['Atsushi Nakatsugawa']
+  spec.email         = ['atsushi@moongift.jp']
+  spec.description   = %q(A simple Ruby client for the nifty cloud mobile backend REST API)
+  spec.summary       = %q(A simple Ruby client for the nifty cloud mobile backend REST API)
+  spec.homepage      = 'http://mb.cloud.nifty.com/'
+  spec.license       = 'MIT License'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.require_paths = ['lib']
+  spec.add_development_dependency 'bundler', '>= 2.2.10'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
 end

data/spec/delete_spec.rb

@@ -1,20 +1,24 @@
-require "spec_helper"
+# frozen_string_literal: true
+
+require 'spec_helper'
 describe NCMB do
   before do
     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']
+    )
     @Todo = NCMB::DataStore.new('TODO')
-    @todo = @Todo.new(text: "Test task")
+    @todo = @Todo.new(text: 'Test task')
     @object_id = @todo.save().objectId
   end
   
-  it "Delete #1" do
-    @todo.delete.should == true
+  it 'Delete #1' do
+    expect(@todo.delete).to eql(true)
   end
 
-  it "Delete again" do
-    @todo.delete.should == true
-    @todo.delete.should == false
-    @todo.error[:code].should == 'E404001'
+  it 'Delete again' do
+    expect(@todo.delete).to eql(true)
+    expect { @todo.delete }.to raise_error(NCMB::APIError, "No data available.")
   end
 end

data/spec/get_spec.rb

@@ -1,9 +1,13 @@
-# -*- coding: utf-8 -*-
-require "spec_helper"
+# frozen_string_literal: true
+
+require 'spec_helper'
 describe NCMB do
   before do
     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']
+    )
     @todoClass = todoClass = NCMB::DataStore.new 'GET_TODO'
     @todoClass.delete_all
     10.times do |i|
@@ -11,9 +15,9 @@ describe NCMB do
     end
   end
   
-  it "Get #1" do
+  it 'Get #1' do
     @items = @todoClass.order('-createDate').skip(0).all
-    @items.length.should == 10
+    expect(@items.length).to eql(10)
   end
   
 end

data/spec/post_spec.rb

@@ -1,19 +1,24 @@
-require "spec_helper"
+# frozen_string_literal: true
+
+require 'spec_helper'
 describe NCMB do
   before do
     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']
+    )
   end
   
-  it "Post #1" do
-    text = "Test task"
+  it 'Post #1' do
+    text = 'Test task'
     queries = {todo: text}
     todo_class = NCMB::DataStore.new 'POST_TODO'
     todo = todo_class.new(queries).save
-    todo.todo.should == text
+    expect(todo.todo).to eql(text)
   end
   
-  it "Post with location #1" do
+  it 'Post with location #1' do
     
   end
 end

data/spec/put_spec.rb

@@ -1,15 +1,24 @@
-require "spec_helper"
+require 'spec_helper'
 describe NCMB do
   before do
-    yaml = YAML.load_file(File.join(File.dirname(__FILE__), '..', 'setting.yml'))
-    @ncmb = NCMB::Client.new(application_key: yaml['application_key'], 
-                      client_key: yaml['client_key']
-                      )
-    @object_id = @ncmb.post('/2013-09-01/classes/TODO', todo: "Test task")[:objectId]
+    yaml = YAML.load_file(
+      File.join(File.dirname(__FILE__), '..', 'setting.yml')
+    )
+    @ncmb = NCMB::Client.new(
+      application_key: yaml['application_key'],
+      client_key: yaml['client_key']
+    )
+    @object_id = @ncmb.post(
+      '/2013-09-01/classes/TODO',
+      todo: 'Test task'
+    )[:objectId]
   end
-  
-  it "Put #1" do
-    res = @ncmb.put("/2013-09-01/classes/TODO/#{@object_id}", todo: "Test task updated")
-    res[:updateDate].should_not be_nil
+
+  it 'Put #1' do
+    res = @ncmb.put(
+      "/2013-09-01/classes/TODO/#{@object_id}",
+      todo: 'Test task updated'
+    )
+    expect(res[:updateDate]).not_to be_nil
   end
 end