ncmb-ruby-client 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12cc26d4c875deb46103f478e2d04bd752b813bc
-  data.tar.gz: 5b7cff028775e7e26dac5dde6093aa5a7c09ed1f
+  metadata.gz: a99591b3222464ef82634322a71414dfc6663465
+  data.tar.gz: 995375ed8c9a7ef1d3fce4cb4ae2304bfd0b9cea
 SHA512:
-  metadata.gz: f104345075bafde235ab95927daa6fbbf9a7c31901fb1a408a3a926f94ac44717024f19d4993440b293ff5bb21573629f7488150f641b5d170b38df04e9a5aab
-  data.tar.gz: 88edda35c363f9903be0591473571dcc285e1610a3dac6b4f856ab0c2c489756eb76ae48e4920d0119ddefef382d646a0f2a8c9165000b775b5d3f6ea8613c98
+  metadata.gz: d59a07ef9b8c75191ece14db9bfc5930017f4e706af983b56b245a4b9486ce9d22bb96147680ce076ec027499570aeaac338df71289e91dce0d49e2768149c0f
+  data.tar.gz: 7d66392148b933ebdeb52061a49122001d744c3fb98aae5d77d52bad2117bf8bb7156fac2a9bbcdee3130b90ecf703261f77c654a14ad7fc07b42b4887a929a1

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
-
+gem 'simplecov'
+gem 'simplecov-gem-profile'
 # Specify your gem's dependencies in ncmb-ruby-client.gemspec
 gemspec

data/Rakefile

@@ -5,5 +5,5 @@ require 'rspec/core/rake_task'
  
 desc "run spec"
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = ["-c", "-fs"]
+  t.rspec_opts = ["--color", "--format documentation"]
 end

data/examples/user_test.rb

@@ -0,0 +1,32 @@
+$:.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']
+
+if @user = NCMB::User.login('testUser2', 'testPassword2')
+  puts NCMB.CurrentUser.userName
+  NCMB.CurrentUser.delete
+  begin
+    @user.delete
+  rescue => e
+    puts e.message
+  end
+end
+
+@user = NCMB::User.new
+@user.set('userName', 'testUser2')
+@user.set('password', 'testPassword2')
+if @user.signUp
+  puts "User create successful."
+  @user.set("Hello", "World")
+  @user.update
+else
+  puts "User create failed. #{@user.error.message}"
+end
+
+
+
+

data/lib/ncmb.rb

@@ -13,6 +13,7 @@ require "ncmb/version"
 require "ncmb/client"
 require "ncmb/data_store"
 require "ncmb/object"
+require "ncmb/user"
 require "ncmb/push"
 require "ncmb/geo_point"
 require "ncmb/increment"

data/lib/ncmb/client.rb

@@ -11,6 +11,8 @@ module NCMB
   @application_key = nil
   @client_key = nil
   @@client = nil
+  @@current_user = nil
+  @@last_error = nil
   
   class Client
     include NCMB
@@ -22,20 +24,20 @@ module NCMB
       @client_key      = params[:client_key]
     end
     
-    def get(path, params)
-      request :get, path, params
+    def get(path, params = {}, session_key = nil)
+      request :get, path, params, session_key
     end
     
-    def post(path, params)
-      request :post, path, params
+    def post(path, params = {}, session_key = nil)
+      request :post, path, params, session_key
     end
 
-    def put(path, params)
-      request :put, path, params
+    def put(path, params = {}, session_key = nil)
+      request :put, path, params, session_key
     end
     
-    def delete(path, params)
-      request :delete, path
+    def delete(path, params = {}, session_key = nil)
+      request :delete, path, params, session_key
     end
     
     def array2hash(ary)
@@ -99,7 +101,15 @@ module NCMB
       params = method == :get ? params_base.merge(encode_query(queries)) : params_base
       now ||= Time.now.utc.iso8601
       params = params.merge "X-NCMB-Timestamp" => now
-      params = params.sort_by{|a, b| a.to_s}.to_h
+      if [].respond_to?("to_h") # Array#to_h inpremented over ruby 2.1
+        params = params.sort_by{|a, b| a.to_s}.to_h
+      else
+        sorted_params = {}
+        params = params.sort_by{|a, b| a.to_s}.each {|kv|
+          sorted_params[kv[0]] = kv[1]
+        }
+        params = sorted_params
+      end
       signature_base = []
       signature_base << method.upcase
       signature_base << @domain
@@ -108,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 = {})
+    def request(method, path, queries = {}, session_key = nil)
       now = Time.now.utc.iso8601
       signature = generate_signature(method, path, now, queries)
       http = Net::HTTP.new(@domain, 443)
@@ -119,23 +129,37 @@ module NCMB
         "X-NCMB-Timestamp" => now,
         "Content-Type" => 'application/json'
       }
+      if session_key
+        headers['X-NCMB-Apps-Session-Token'] = session_key
+      end
       # queries = hash2query(queries)
-      case method
-      when :get
-        query = encode_query(queries).map do |key, value|
-          "#{key}=#{value}"
-        end.join("&")
-        path = path + (query == '' ? "" : "?"+query)
-        return JSON.parse(http.get(path, headers).body, symbolize_names: true)
-      when :post
-        queries = change_query(queries)
-        return JSON.parse(http.post(path, queries.to_json, headers).body, symbolize_names: true)
-      when :put
-        return JSON.parse(http.put(path, queries.to_json, headers).body, symbolize_names: true)
-      when :delete
-        http.delete(path, headers)
-        return {}
+      json = nil
+      begin
+        case method
+        when :get
+          query = encode_query(queries).map do |key, value|
+            "#{key}=#{value}"
+          end.join("&")
+          path = path + (query == '' ? "" : "?"+query)
+          json = JSON.parse(http.get(path, headers).body, symbolize_names: true)
+        when :post
+          queries = change_query(queries)
+          json =  JSON.parse(http.post(path, queries.to_json, headers).body, symbolize_names: true)
+        when :put
+          json = JSON.parse(http.put(path, queries.to_json, headers).body, symbolize_names: true)
+        when :delete
+          response = http.delete(path, headers).body
+          return true if response == ""
+          json = JSON.parse(response, symbolize_names: true)
+        end
+      rescue => e
+        @@last_error =  e
+        raise NCMB::APIError.new(e.to_s)
       end
+      if json[:error] != nil
+        raise NCMB::APIError.new(json[:error])
+      end
+      json
     end
   end
   
@@ -147,4 +171,18 @@ module NCMB
     defaulted.merge!(params)
     @@client = Client.new(defaulted)
   end
+  
+  def NCMB.CurrentUser
+    @@current_user
+  end
+  
+  class APIError < StandardError
+    def initialize(msg)
+      @message = msg
+    end
+    
+    def message
+      @message
+    end
+  end
 end

data/lib/ncmb/data_store.rb

@@ -159,15 +159,21 @@ module NCMB
       end
       @items
     end
+    alias :all :get
+    
+    def queries
+      @queries
+    end
     
     def delete_all
       max = 1000
-      count = self.limit(max).count().get
+      dataStore = NCMB::DataStore.new(@name)
+      count = dataStore.limit(max).count().all
       if count == 0
         return true
       end
-      @queries.delete :count
-      self.limit(max).each do |item|
+      dataStore.queries.delete :count
+      dataStore.each do |item|
         item.delete
       end
       if count > max

data/lib/ncmb/object.rb

@@ -7,7 +7,11 @@ module NCMB
       @alc     = alc
       @fields  = fields
     end
-
+    
+    def fields
+      @fields
+    end
+    
     def method_missing(name)
       sym = name.to_sym
       if @fields.has_key?(sym)
@@ -18,7 +22,7 @@ module NCMB
     end
 
     def set(name, value)
-      @fields[name] = value
+      @fields[name.to_sym] = value
     end
     
     def call(name)
@@ -32,9 +36,8 @@ module NCMB
     def post
       path = "/#{@@client.api_version}/classes/#{@name}"
       result = @@client.post path, @fields
-      alc = result[:acl]
-      result.delete(:acl)
-      NCMB::Object.new(@name, result, alc)
+      @fields.merge!(result)
+      self
     end
     alias :save :post
     
@@ -46,12 +49,23 @@ module NCMB
       params.delete :updateDate
       result = @@client.put path, params
       @fields[:updateDate] = result[:updateDate]
+      self
     end
     alias :update :put
     
     def delete
       path = "/#{@@client.api_version}/classes/#{@name}/#{@fields[:objectId]}"
-      @@client.delete path, {}
+      response = @@client.delete path, {}
+      if response == true
+        return true
+      else
+        @@last_error = response
+        return false
+      end
+    end
+    
+    def error
+      @@last_error
     end
   end
 end

data/lib/ncmb/user.rb

@@ -0,0 +1,67 @@
+module NCMB
+  class User < NCMB::Object
+    include NCMB
+    
+    def initialize(params = {}, alc = nil)
+      super('users', params, alc)
+    end
+    
+    def signUp
+      path = "/#{@@client.api_version}/#{@name}"
+      begin
+        result = @@client.post path, @fields
+      rescue => e
+        @@last_error = e
+        return false
+      end
+      @fields.merge!(result)
+      @@current_user = self
+      self
+    end
+    
+    def put
+      path = "/#{@@client.api_version}/#{@name}/#{@fields[:objectId]}"
+      params = @fields
+      session_key = params[:sessionToken]
+      [:objectId, :createDate, :updateDate, :sessionToken, :password].each do |name|
+        params.delete name
+      end
+      result = @@client.put path, params, session_key
+      @fields[:updateDate] = result[:updateDate]
+      self
+    end
+    alias :update :put
+    
+    def delete
+      path = "/#{@@client.api_version}/#{@name}/#{@fields[:objectId]}"
+      response = @@client.delete path, {}, @fields[:sessionToken]
+      if response == true
+        @@current_user = nil
+        return true
+      else
+        @@last_error = response
+        return false
+      end
+    end
+    
+    def self.login(userid_or_email, password, authType = :id)
+      params = {password: password}
+      case authType.to_sym
+      when :id
+        params[:userName] = userid_or_email
+      when :email
+        params[:mailAddres] = userid_or_email
+      else
+        raise NCMB::APIError.new("No support #{authType} authentication. We support only id or email.")
+      end
+      begin
+        path = "/#{@@client.api_version}/login"
+        result = @@client.get path, params
+      rescue => e
+        @@last_error = e
+        return false
+      end
+      @@current_user = NCMB::User.new(result)
+    end
+  end
+end

data/lib/ncmb/version.rb

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

data/spec/delete_spec.rb

@@ -2,19 +2,19 @@ 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]
+    NCMB.initialize application_key: yaml['application_key'],  client_key: yaml['client_key']
+    @Todo = NCMB::DataStore.new('TODO')
+    @todo = @Todo.new(text: "Test task")
+    @object_id = @todo.save().objectId
   end
   
   it "Delete #1" do
-    res = @ncmb.delete("/2013-09-01/classes/TODO/#{@object_id}")
-    res.should == {}
+    @todo.delete.should == true
   end
 
-  it "Delete #2" do
-    res = @ncmb.delete("/2013-09-01/classes/TODO/doesnotexist")
-    res[:code].should == 'E404001'
+  it "Delete again" do
+    @todo.delete.should == true
+    @todo.delete.should == false
+    @todo.error[:code].should == 'E404001'
   end
 end

data/spec/get_spec.rb

@@ -3,40 +3,17 @@ require "spec_helper"
 describe NCMB do
   before do
     yaml = YAML.load_file(File.join(File.dirname(__FILE__), '..', 'setting.yml'))
-    @ncmb = NCMB.init(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|
+      @todoClass.new(text: "Task ##{i + 1}").save
+    end
   end
   
   it "Get #1" do
-    queries = {:count => "1", :limit => "20", :order => "-createDate", :skip => "0"}
-    todo_class = @ncmb.data_store 'TODO'
-    # {"count":5,"results":[{"objectId":"VwswoCe7PEuSbGEU","createDate":"2014-05-07T12:03:37.428Z","updateDate":"2014-05-07T12:03:37.428Z","acl":{"*":{"read":true,"write":true}},"todo":"タスクの追加"},{"objectId":"pj9scMgCGQ3wyd5m","createDate":"2014-05-07T08:03:56.268Z","updateDate":"2014-05-07T08:03:56.268Z","acl":{"*":{"read":true,"write":true}},"todo":"タスクを追加"},{"objectId":"lq3CIoaSAcM5Du6I","createDate":"2014-05-07T08:03:44.181Z","updateDate":"2014-05-07T08:03:44.181Z","acl":{"*":{"read":true,"write":true}},"todo":"テストのタスク"},{"objectId":"jln8aWojgUDUnCYo","createDate":"2014-05-07T08:02:23.104Z","updateDate":"2014-05-07T08:02:23.104Z","acl":{"*":{"read":true,"write":true}},"todo":"レビューします"},{"objectId":"zhRGEjECBdaUBLLn","createDate":"2014-05-07T08:02:10.573Z","updateDate":"2014-05-07T08:02:10.573Z","acl":{"*":{"read":true,"write":true}},"todo":"記事を書きます"}]}
-    #puts todo_class.get queries
+    @items = @todoClass.order('-createDate').skip(0).all
+    @items.length.should == 10
   end
   
-  it "Generate signature #3" do
-    params = {
-      :where => {
-        "point" => {
-          "$within" => {
-            "$box" => [
-                       {
-                         "__type" => "GeoPoint",
-                         "latitude" => 35.690921,
-                         "longitude" => 139.700258
-                       },
-                       {
-                         "__type" => "GeoPoint",
-                         "latitude" => 35.728926,
-                         "longitude" => 139.71038
-                       }
-                      ]
-          }
-        }
-      }
-    }
-    signature = @ncmb.generate_signature :get, "/#{@ncmb.api_version}/classes/Venue", URI.escape("2014-05-20T04:55:16.395Z", /[^-_.!~*'()a-zA-Z\d]/u), params
-    expect(signature).to eq("sqlhM3xxNPUxFWDHQ5CdDqBp6dInU/YkO2PzuY31Pbk=")
-  end
 end

data/spec/post_spec.rb

@@ -2,17 +2,15 @@ require "spec_helper"
 describe NCMB do
   before do
     yaml = YAML.load_file(File.join(File.dirname(__FILE__), '..', 'setting.yml'))
-    @ncmb = NCMB.init(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
-    queries = {todo: "Test task"}
-    todo_class = @ncmb.data_store 'TODO'
-    response = todo_class.post queries
-    # {"createDate":"2014-05-20T01:53:25.280Z","objectId":"rEDC6P4EgfiBf0AZ"}
-    puts response.body
+    text = "Test task"
+    queries = {todo: text}
+    todo_class = NCMB::DataStore.new 'POST_TODO'
+    todo = todo_class.new(queries).save
+    todo.todo.should == text
   end
   
   it "Post with location #1" do

data/spec/spec_helper.rb

@@ -4,3 +4,8 @@ $:.unshift(File.dirname(__FILE__))
   require f
 end
 require "ncmb"
+require 'simplecov'
+require 'simplecov-gem-profile'
+
+SimpleCov.minimum_coverage 90
+SimpleCov.start 'gem'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ncmb-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Atsushi Nakatsugawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,6 +68,7 @@ files:
 - examples/data_store.rb
 - examples/push.rb
 - examples/signature.rb
+- examples/user_test.rb
 - examples/venue_search.rb
 - examples/venues.json
 - lib/ncmb.rb
@@ -79,6 +80,7 @@ files:
 - lib/ncmb/increment.rb
 - lib/ncmb/object.rb
 - lib/ncmb/push.rb
+- lib/ncmb/user.rb
 - lib/ncmb/version.rb
 - ncmb-ruby-client.gemspec
 - setting_default.yml