ncmb-ruby-client 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a99591b3222464ef82634322a71414dfc6663465
-  data.tar.gz: 995375ed8c9a7ef1d3fce4cb4ae2304bfd0b9cea
+  metadata.gz: 5070337bf5759d8e8612db60a27a99fbf846071c
+  data.tar.gz: 8e3cc58ab2a7076b00a1ae606cf7d8916e0ff1e9
 SHA512:
-  metadata.gz: d59a07ef9b8c75191ece14db9bfc5930017f4e706af983b56b245a4b9486ce9d22bb96147680ce076ec027499570aeaac338df71289e91dce0d49e2768149c0f
-  data.tar.gz: 7d66392148b933ebdeb52061a49122001d744c3fb98aae5d77d52bad2117bf8bb7156fac2a9bbcdee3130b90ecf703261f77c654a14ad7fc07b42b4887a929a1
+  metadata.gz: 2ef149bd509da1aa9453ca2a7f19a5a736a9857f9ed0880286f0276040ade20484bf19f1cb151466802bb6c9f5dd816fa437a0c122de6d53b93f80c4438c88e8
+  data.tar.gz: c19ea27d7910c912e68fde7b9be91bbbaf53659a3a7f89e469026377ac888cc63fa326ac54619c8d07ba507dd0682e9be64ef707bc1d62e1533590c468686aa2

data/examples/acl_test.rb

@@ -0,0 +1,49 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$:.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']
+
+@users = []
+
+@ids = [
+  {id: 'testUser1', password: 'testPassword1'},
+  {id: 'testUser2', password: 'testPassword2'}
+]
+@ids.each do |hash|
+  @user = NCMB::User.login(hash[:id], hash[:password])
+  if @user
+  else
+    @user = NCMB::User.new
+    @user.set('userName', hash[:id])
+    @user.set('password', hash[:password])
+    if @user.signUp
+    else
+      puts "User create failed. #{@user.error.message}"
+      exit
+    end
+  end
+  @users << @user
+end
+
+@testData = NCMB::DataStore.new 'testData'
+@testData.delete_all
+
+@item = @testData.new
+@item.Message = 'World'
+@item.acl.public('read', true)
+@item.acl.public('write', false)
+@item.acl.user(@users[0], 'read', true)
+@item.acl.user(@users[0], 'write', true)
+@role = NCMB::Role.find_or_create("manager2")
+
+@item.acl.role(@role, 'read', true)
+@item.acl.role(@role, 'write', true)
+@item.save
+
+@data = @testData.where('objectId', @item.objectId).limit(1).get
+
+@user = NCMB::User.login(@ids[0][:id], @ids[0][:password])
+@testData.delete_all

data/examples/data_store.rb

@@ -9,7 +9,7 @@ NCMB.initialize application_key: yaml['application_key'],  client_key: yaml['cli
 example = NCMB::DataStore.new 'Example'
 example.delete_all
 
-10.times do |i|
+9.times do |i|
   item = example.new
   item.set('String', "テスト#{i}00")
   item.set('Integer', i)

data/examples/user_test.rb

@@ -26,7 +26,3 @@ if @user.signUp
 else
   puts "User create failed. #{@user.error.message}"
 end
-
-
-
-

data/lib/ncmb/acl.rb

@@ -0,0 +1,41 @@
+module NCMB
+  class Acl < NCMB::Object
+    include NCMB
+    
+    def initialize(params = nil)
+      @fields = {'*': {
+          read: true,
+          write: true
+        }
+      }
+      if params
+        @fields = @fields.merge(params)
+      end
+    end
+    
+    def to_json(a = "")
+      params = {}
+      @fields.each do |key, value|
+        params[key.to_sym] = {} if value[:read] || value[:write]
+        [:read, :write].each do |name|
+          params[key.to_sym][name] = true if value[name]
+        end
+      end
+      params.to_json
+    end
+    
+    def public(read_or_write, value = true)
+      @fields['*'.to_sym][read_or_write.to_sym] = value
+    end
+    
+    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
+    
+    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
+    end
+  end
+end

data/lib/ncmb/client.rb

@@ -24,20 +24,20 @@ module NCMB
       @client_key      = params[:client_key]
     end
     
-    def get(path, params = {}, session_key = nil)
-      request :get, path, params, session_key
+    def get(path, params = {})
+      request :get, path, params
     end
     
-    def post(path, params = {}, session_key = nil)
-      request :post, path, params, session_key
+    def post(path, params = {})
+      request :post, path, params
     end
 
-    def put(path, params = {}, session_key = nil)
-      request :put, path, params, session_key
+    def put(path, params = {})
+      request :put, path, params
     end
     
-    def delete(path, params = {}, session_key = nil)
-      request :delete, path, params, session_key
+    def delete(path, params = {})
+      request :delete, path, params
     end
     
     def array2hash(ary)
@@ -118,7 +118,7 @@ module NCMB
       signature = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest.new('sha256'), @client_key, signature_base.join("\n"))).strip()
     end
     
-    def request(method, path, queries = {}, session_key = nil)
+    def request(method, path, queries = {})
       now = Time.now.utc.iso8601
       signature = generate_signature(method, path, now, queries)
       http = Net::HTTP.new(@domain, 443)
@@ -129,12 +129,11 @@ module NCMB
         "X-NCMB-Timestamp" => now,
         "Content-Type" => 'application/json'
       }
-      if session_key
-        headers['X-NCMB-Apps-Session-Token'] = session_key
+      if NCMB.CurrentUser
+        headers['X-NCMB-Apps-Session-Token'] = NCMB.CurrentUser.sessionToken
       end
       # queries = hash2query(queries)
       json = nil
-      begin
         case method
         when :get
           query = encode_query(queries).map do |key, value|
@@ -152,6 +151,7 @@ module NCMB
           return true if response == ""
           json = JSON.parse(response, symbolize_names: true)
         end
+        begin
       rescue => e
         @@last_error =  e
         raise NCMB::APIError.new(e.to_s)

data/lib/ncmb/data_store.rb

@@ -8,7 +8,9 @@ module NCMB
       @fields  = fields
       @queries = {where: []}
       @items   = nil
+      @path    = nil
     end
+    attr_accessor :path
     
     def error
       @error
@@ -131,9 +133,13 @@ module NCMB
       get[count]
     end
     
+    def path
+      return @path if @path
+      path = "/#{@@client.api_version}/classes/#{@name}"
+    end
+    
     def get
       return @items unless @items.nil?
-      path = "/#{@@client.api_version}/classes/#{@name}"
       results = @@client.get path, @queries
       return [] unless results
       if results[:error] && results[:error] != ""
@@ -153,9 +159,7 @@ module NCMB
             result[key] = Time.parse(field[:iso])
           end
         end
-        alc = result[:acl]
-        result.delete(:acl)
-        @items << NCMB::Object.new(@name, result, alc)
+        @items << NCMB::Object.new(@name, result)
       end
       @items
     end
@@ -174,7 +178,11 @@ module NCMB
       end
       dataStore.queries.delete :count
       dataStore.each do |item|
-        item.delete
+        begin
+          item.delete if item.deletable?
+        rescue
+          puts "Can't delete #{item.objectId}"
+        end
       end
       if count > max
         return delete_all

data/lib/ncmb/geo_point.rb

@@ -8,7 +8,11 @@ module NCMB
     end
     
     def to_json(a = "")
-      "{\"__type\": \"GeoPoint\", \"longitude\": #{@longitude}, \"latitude\": #{@latitude}}"
+      {
+        "__type": "GeoPoint",
+        "longitude": @longitude,
+        "latitude": @latitude
+      }.to_json
     end
     
     def to_s

data/lib/ncmb/object.rb

@@ -2,9 +2,9 @@ module NCMB
   class Object
     include NCMB
 
-    def initialize(name, fields = {}, alc = "")
+    def initialize(name, fields = {})
       @name    = name
-      @alc     = alc
+      fields[:acl] = NCMB::Acl.new(fields[:acl])
       @fields  = fields
     end
     
@@ -12,12 +12,17 @@ module NCMB
       @fields
     end
     
-    def method_missing(name)
-      sym = name.to_sym
-      if @fields.has_key?(sym)
-        return @fields[sym]
+    def method_missing(name, value = nil)
+      if name =~ /.*=$/
+        sym = name.to_s.gsub(/(.*?)=$/, '\1').to_sym
+        @fields[sym] = value
       else
-        raise NoMethodError, "#{name} is not found"
+        sym = name.to_sym
+        if @fields.has_key?(sym)
+          return @fields[sym]
+        else
+          raise NoMethodError, "#{name} is not found"
+        end
       end
     end
 
@@ -32,9 +37,26 @@ module NCMB
     def [](key)
       @fields[key]
     end
-
+    
+    def deletable?
+      if self.acl['*'.to_sym][: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]
+      true
+    end
+    
+    def base_path
+      "/#{@@client.api_version}/classes/#{@name}"
+    end
+    
+    def path
+      "#{base_path}/#{@fields[:objectId] || '' }"
+    end
+    
     def post
-      path = "/#{@@client.api_version}/classes/#{@name}"
       result = @@client.post path, @fields
       @fields.merge!(result)
       self
@@ -42,7 +64,6 @@ module NCMB
     alias :save :post
     
     def put
-      path = "/#{@@client.api_version}/classes/#{@name}/#{@fields[:objectId]}"
       params = @fields
       params.delete :objectId
       params.delete :createDate
@@ -54,7 +75,6 @@ module NCMB
     alias :update :put
     
     def delete
-      path = "/#{@@client.api_version}/classes/#{@name}/#{@fields[:objectId]}"
       response = @@client.delete path, {}
       if response == true
         return true

data/lib/ncmb/role.rb

@@ -0,0 +1,35 @@
+module NCMB
+  class Role < NCMB::Object
+    include NCMB
+    
+    def initialize(name)
+      if name.is_a? Hash
+        @fields = name
+      else
+        @fields = {
+          roleName: name
+        }
+      end
+    end
+    
+    def self.find_or_create(name)
+      d = NCMB::DataStore.new('role')
+      d.path = NCMB::Role.new(name).base_path
+      role = d.where('roleName', name).limit(1).get.first
+      role ? NCMB::Role.new(role.fields) : NCMB::Role.new(name).save()
+    end
+    
+    def name
+      "role:#{@fields[:roleName]}"
+    end
+    
+    def to_json
+      
+    end
+    
+    def base_path
+      path = "/#{@@client.api_version}/roles"
+    end
+    
+  end
+end

data/lib/ncmb/user.rb

@@ -2,12 +2,11 @@ module NCMB
   class User < NCMB::Object
     include NCMB
     
-    def initialize(params = {}, alc = nil)
-      super('users', params, alc)
+    def initialize(params = {})
+      super('users', params)
     end
     
     def signUp
-      path = "/#{@@client.api_version}/#{@name}"
       begin
         result = @@client.post path, @fields
       rescue => e
@@ -19,8 +18,11 @@ module NCMB
       self
     end
     
+    def base_path
+      path = "/#{@@client.api_version}/#{@name}"
+    end
+    
     def put
-      path = "/#{@@client.api_version}/#{@name}/#{@fields[:objectId]}"
       params = @fields
       session_key = params[:sessionToken]
       [:objectId, :createDate, :updateDate, :sessionToken, :password].each do |name|
@@ -33,7 +35,6 @@ module NCMB
     alias :update :put
     
     def delete
-      path = "/#{@@client.api_version}/#{@name}/#{@fields[:objectId]}"
       response = @@client.delete path, {}, @fields[:sessionToken]
       if response == true
         @@current_user = nil

data/lib/ncmb/version.rb

@@ -1,3 +1,3 @@
 module Ncmb
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/lib/ncmb.rb

@@ -17,4 +17,6 @@ require "ncmb/user"
 require "ncmb/push"
 require "ncmb/geo_point"
 require "ncmb/increment"
+require "ncmb/acl"
+require "ncmb/role"
 require "ncmb/error"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ncmb-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Atsushi Nakatsugawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,6 +64,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- examples/acl_test.rb
 - examples/csv_test.rb
 - examples/data_store.rb
 - examples/push.rb
@@ -72,6 +73,7 @@ files:
 - examples/venue_search.rb
 - examples/venues.json
 - lib/ncmb.rb
+- lib/ncmb/acl.rb
 - lib/ncmb/client.rb
 - lib/ncmb/data_store.rb
 - lib/ncmb/device.rb
@@ -80,6 +82,7 @@ files:
 - lib/ncmb/increment.rb
 - lib/ncmb/object.rb
 - lib/ncmb/push.rb
+- lib/ncmb/role.rb
 - lib/ncmb/user.rb
 - lib/ncmb/version.rb
 - ncmb-ruby-client.gemspec