ncmb-ruby-client 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 448af6e36c731233c6857c9618ff96502f660721
-  data.tar.gz: fd1363bd10de8213e43a67b82fe30803774e7d5b
+  metadata.gz: 12cc26d4c875deb46103f478e2d04bd752b813bc
+  data.tar.gz: 5b7cff028775e7e26dac5dde6093aa5a7c09ed1f
 SHA512:
-  metadata.gz: 63b0f7174aca9b832151726243a9cbaf1d0e588afbebd39b5d2e43bbdf0d1983a26a29e4f66b1b5e8eccbadd601724f51bcab260ca1f01328587f3b203584e3b
-  data.tar.gz: ed607647195dd9468ab348b3292019b570bd4158d7fa29eb972a7964d2dbb53c154fa54a2b1cb982c56c6b4e688a714dfeeb5a93e6c1694ccf52847c3db2734c
+  metadata.gz: f104345075bafde235ab95927daa6fbbf9a7c31901fb1a408a3a926f94ac44717024f19d4993440b293ff5bb21573629f7488150f641b5d170b38df04e9a5aab
+  data.tar.gz: 88edda35c363f9903be0591473571dcc285e1610a3dac6b4f856ab0c2c489756eb76ae48e4920d0119ddefef382d646a0f2a8c9165000b775b5d3f6ea8613c98

data/Gemfile

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

data/README.md

@@ -10,8 +10,24 @@ Basic Usage
 NCMB.initialize application_key: application_key,  client_key: client_key
 
 @todo = NCMB::DataStore.new 'Todo'
-@todo = @todo.limit(20).count(1).skip(0)
-puts "@todo[0].name #{@todo[0].name}"
+@todo = @todo.limit(20)
+
+@todo.each do |item|
+  puts item[:String]
+  puts "  #{item[:Array]} -> #{item[:Array].class}"
+end
+
+@todo = NCMB::Object.new 'Todo'
+@todo.set('String', 'Test String')
+@todo.set('Integer', 100)
+@todo.set('Boolean', true)
+@todo.set('Array', [1, 2, 3, "Orange", "Tomato"])
+@todo.set('Object', {test1: 'a', test2: 'b'})
+@todo.set('Location', NCMB::GeoPoint.new(50, 30))
+@todo.set('MultipleLine', "test\ntest\n")
+@todo.set('Increment', NCMB::Increment.new(2))
+@todo.set('Date', Time.new(2016, 2, 24, 12, 30, 45))
+@todo.save
 ```
 
 ### Register push notification

data/examples/data_store.rb

@@ -5,9 +5,52 @@ 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']
-@todo = NCMB::DataStore.new 'TestClass'
-@todo = @todo.limit(20).count(1).skip(0)
-# @todo = @todo.where(testKey: "testValue")
-# puts "@todo[0] #{@todo[0]}"
-puts "@todo[0].name #{@todo[0].message}"
+
+example = NCMB::DataStore.new 'Example'
+example.delete_all
+
+10.times do |i|
+  item = example.new
+  item.set('String', "テスト#{i}00")
+  item.set('Integer', i)
+  item.set('Boolean', true)
+  item.set('Array', [i, i * 2, i * 3, "Orange", "Tomato"])
+  item.set('Object', {test1: 'a', test2: 'b'})
+  item.set('Location', NCMB::GeoPoint.new((i + 1) * 10, (i + 2) * 5))
+  item.set('MultipleLine', "test\ntest\n")
+  item.set('Increment', NCMB::Increment.new(i + 1))
+  item.set('Date', Time.now)
+  item.save
+  sleep(2)
+end
+
+# @todo = @todo.limit(20).where("String", 'テスト100').greaterThan("Integer", 1)
+# @todo = @todo.limit(20).notEqualTo("String", 'テスト100')
+# @todo = @todo.limit(20).in("String", ['テスト100'])
+# @todo = @todo.limit(20).notIn("String", ['テスト100'])
+# @todo = @todo.limit(20).inArray("Array", [4])
+# @todo = @todo.limit(20).notInArray("Array", ['Orange'])
+# @todo = @todo.limit(20).allInArray("Array", [1, 2, 4])
+
+geo1 = NCMB::GeoPoint.new(50, 30);
+geo2 = NCMB::GeoPoint.new(51, 31);
+
+# @todo = @todo.limit(20).withinKilometers("Location", geo1, 1000)
+example = example.limit(1).withinSquare("Location", geo1, geo2)
+begin
+  example.each_with_index do |item, i|
+    puts item[:String]
+    puts "  #{item[:Array]} -> #{item[:Array].class}"
+    puts "  #{item[:Location]} -> #{item[:Location].class}"
+    puts "  #{item[:Date]} -> #{item[:Date].class}"
+    item.set('Increment', NCMB::Increment.new(i + 1))
+    item.update
+    # item.set('String', 'テスト200')
+    # item.update
+  end
+rescue NCMB::FetchError => e
+  puts example.error
+end
+
+# puts "@todo[0].name #{@todo[0].text}"
 

data/lib/ncmb.rb

@@ -1,6 +1,19 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $:.unshift(File.dirname(__FILE__))
+
+require 'time'
+require 'openssl'
+require 'base64'
+require "net/http"
+require "uri"
+require "erb"
+require "json"
+
 require "ncmb/version"
 require "ncmb/client"
 require "ncmb/data_store"
+require "ncmb/object"
 require "ncmb/push"
+require "ncmb/geo_point"
+require "ncmb/increment"
+require "ncmb/error"

data/lib/ncmb/client.rb

@@ -1,9 +1,10 @@
-require 'time'
-require 'openssl'
-require 'base64'
-require "net/http"
-require "uri"
-require 'json'
+class Time
+  def to_json(a)
+    v = self.getgm
+    "{\"__type\": \"Date\", \"iso\": \"#{v.iso8601(3)}\"}"
+  end
+end
+
 module NCMB
   DOMAIN = 'mb.api.cloud.nifty.com'
   API_VERSION = '2013-09-01'
@@ -28,6 +29,14 @@ module NCMB
     def post(path, params)
       request :post, path, params
     end
+
+    def put(path, params)
+      request :put, path, params
+    end
+    
+    def delete(path, params)
+      request :delete, path
+    end
     
     def array2hash(ary)
       new_v = {}
@@ -39,6 +48,7 @@ module NCMB
           new_v = [hash]
         end
       end
+      new_v = new_v.sort_by{|a, b| a.to_s}.to_h
       new_v
     end
     
@@ -46,28 +56,38 @@ module NCMB
       results = {}
       queries.each do |k, v|
         v = array2hash(v) if v.is_a? Array
-        if v.is_a? Hash
-          results[k.to_s] = URI.escape(v.to_json.to_s, /[^-_.!~*'()a-zA-Z\d;\/?@&=+$,#]/)
-        else
-          results[k.to_s] = URI.escape(v.to_s, /[^-_.!~*'()a-zA-Z\d;\/?@&=+$,#]/)
-        end
+        value = URI.encode(v.is_a?(Hash) ? v.to_json : v.to_s).gsub("[", "%5B").gsub(":", "%3A").gsub("]", "%5D")
+        results[k.to_s] = value
       end
       results
     end
-
+    
+    def change_query(queries = {})
+      results = {}
+      queries.each do |k, v|
+        case v
+        when NCMB::Increment
+          queries[k] = v.amount
+        end
+      end
+      queries
+    end
+    
     def hash2query(queries = {})
       results = {}
       queries.each do |k, v|
-        v = array2hash(v) if v.is_a? Array
-        if v.is_a? Hash
-          results[k.to_s] = v.to_json.to_s
+        # v = array2hash(v) if v.is_a? Array
+        puts "#{k} -> #{v.class}"
+        case v
+        when Hash, TrueClass, FalseClass, Array then
+          results[k.to_s] = v
+        when Time then
         else
           results[k.to_s] = v.to_s
         end
       end
-      results.collect do |key, value|
-        "#{key}=#{value}"
-      end
+      puts results
+      results
     end
     
     def generate_signature(method, path, now = nil, queries = {})
@@ -91,7 +111,6 @@ module NCMB
     def request(method, path, queries = {})
       now = Time.now.utc.iso8601
       signature = generate_signature(method, path, now, queries)
-      query = hash2query(queries).join("&")
       http = Net::HTTP.new(@domain, 443)
       http.use_ssl=true
       headers = {
@@ -100,11 +119,22 @@ module NCMB
         "X-NCMB-Timestamp" => now,
         "Content-Type" => 'application/json'
       }
-      if method == :get
-        path = path + URI.escape((query == '' ? "" : "?"+query), /[^-_.!~*'()a-zA-Z\d;\/?@&=+$,#]/)
+      # 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)
-      else
+      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 {}
       end
     end
   end

data/lib/ncmb/data_store.rb

@@ -3,106 +3,177 @@ module NCMB
     include NCMB
     
     def initialize(name, fields = {}, alc = "")
-      @@name    = name
-      @@alc     = alc
-      @@fields  = fields
-      @@queries = {}
-      @@items   = nil
+      @name    = name
+      @alc     = alc
+      @fields  = fields
+      @queries = {where: []}
+      @items   = nil
     end
     
-    def new *opt
-      initialize opt
+    def error
+      @error
+    end
+    
+    def new opt = {}
+      NCMB::Object.new @name, opt
     end
     
     def columns
-      @@fields.keys
+      @fields.keys
     end
     
     def method_missing(name)
-      if @@fields[name.to_sym]
-        return @@fields[name.to_sym]
+      if @fields[name.to_sym]
+        return @fields[name.to_sym]
       else
-        raise NoMethod, "#{name} is not found"
+        raise NoMethodError, "#{name} is not found"
       end
     end
     
-    def call(name)
-      @@fields[name.to_sym] || NoMethod
-    end
-    
     def each(&block)
-      @@items.each(&block)
+      get.each(&block)
     end
     
     def each_with_index(&block)
-      @@items.each_with_index(&block)
+      get.each_with_index(&block)
     end
     
     def order(field)
-      @@queries[:order] = field
+      @queries[:order] = field
       self
     end
     
     def first
-      return @@items.first unless @@items.nil?
-      get(@@queries).first
+      get.first
     end
     
     def limit(count)
-      @@queries[:limit] = count
+      @queries[:limit] = count
       self
     end
     
-    def count(count)
-      @@queries[:count] = count
+    def count
+      @queries[:count] = 1
       self
     end
     
     def skip(count)
-      @@queries[:skip] = count
+      @queries[:skip] = count
       self
     end
     
-    def where(params = {})
-      @@queries[:where] = [] unless @@queries[:where]
-      if params.size == 1
-        @@queries[:where] << params
-      else
-        params.each do |hash|
-          @@queries[:where] << hash
+    [
+      {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"},
+    ].each do |m|
+      define_method m.keys.first do |name, value|
+        params = {}
+        if m.values.first.nil?
+          params[name] = value
+        else
+          params[name] = {}
+          params[name][m.values.first] = value
         end
+        @queries[:where] << params
+        self
       end
+    end
+    
+    [
+      {withinKilometers: "$maxDistanceInKilometers"},
+      {withinMiles: "$maxDistanceInMiles"},
+      {withinRadians: "$maxDistanceInRadians"}
+    ].each do |m|
+      define_method m.keys.first do |name, geo, value|
+        params = {}
+        params[name] = {
+          "$nearSphere": geo,
+        }
+        params[name][m.values.first] = value
+        @queries[:where] << params
+        self
+      end
+    end
+      
+    def withinSquare(name, geo1, geo2)
+      params = {}
+      params[name] = {
+        "$within": {
+          "$box": [
+            geo1,
+            geo2
+          ]
+        }
+      }
+      @queries[:where] << params
+      self
+    end
+    
+    def where(name, value)
+      params = {}
+      params[name] = value
+      @queries[:where] << params
       self
     end
     
     def [](count)
-      return @@items[count] unless @@items.nil?
-      get(@@queries)[count]
+      get[count]
     end
     
-    def get(queries = {})
-      path = "/#{@@client.api_version}/classes/#{@@name}"
-      results = @@client.get path, queries
+    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] != ""
-        @@error = results
-        raise 'error'
+        @error = results
+        raise NCMB::FetchError
+      end
+      if @queries[:count] == 1
+        return results[:count]
       end
-      items = []
+      @items = []
       results[:results].each do |result|
+        result.each do |key, field|
+          if field.is_a?(Hash) && field[:__type] == 'GeoPoint'
+            result[key] = NCMB::GeoPoint.new(field[:latitude], field[:longitude])
+          end
+          if field.is_a?(Hash) && field[:__type] == 'Date'
+            result[key] = Time.parse(field[:iso])
+          end
+        end
         alc = result[:acl]
         result.delete(:acl)
-        items << NCMB::DataStore.new(@@name, result, alc)
+        @items << NCMB::Object.new(@name, result, alc)
       end
-      @@items = items
+      @items
     end
     
-    def post(queries = {})
-      path = "/#{@@client.api_version}/classes/#{@@name}"
-      result = @@client.post path, queries
-      alc = result[:acl]
-      result.delete(:acl)
-      NCMB::DataStore.new(@@name, result, alc)
+    def delete_all
+      max = 1000
+      count = self.limit(max).count().get
+      if count == 0
+        return true
+      end
+      @queries.delete :count
+      self.limit(max).each do |item|
+        item.delete
+      end
+      if count > max
+        return delete_all
+      end
+      true
     end
   end
 end

data/lib/ncmb/error.rb

@@ -0,0 +1,4 @@
+module NCMB
+  class FetchError < StandardError
+  end
+end

data/lib/ncmb/geo_point.rb

@@ -0,0 +1,18 @@
+module NCMB
+  class GeoPoint
+    include NCMB
+    
+    def initialize(latitude, longitude)
+      @latitude = latitude
+      @longitude = longitude
+    end
+    
+    def to_json(a = "")
+      "{\"__type\": \"GeoPoint\", \"longitude\": #{@longitude}, \"latitude\": #{@latitude}}"
+    end
+    
+    def to_s
+      "GeoPoint (latitude: #{@latitude}, longitude: #{@longitude})"
+    end
+  end
+end

data/lib/ncmb/increment.rb

@@ -0,0 +1,17 @@
+module NCMB
+  class Increment
+    include NCMB
+    
+    def initialize(amount = 1)
+      @amount = amount
+    end
+    
+    def to_json(a)
+      "{\"__op\": \"Increment\", \"amount\": #{@amount}}"
+    end
+    
+    def amount
+      @amount
+    end
+  end
+end

data/lib/ncmb/object.rb

@@ -0,0 +1,57 @@
+module NCMB
+  class Object
+    include NCMB
+
+    def initialize(name, fields = {}, alc = "")
+      @name    = name
+      @alc     = alc
+      @fields  = fields
+    end
+
+    def method_missing(name)
+      sym = name.to_sym
+      if @fields.has_key?(sym)
+        return @fields[sym]
+      else
+        raise NoMethodError, "#{name} is not found"
+      end
+    end
+
+    def set(name, value)
+      @fields[name] = value
+    end
+    
+    def call(name)
+      @fields[name.to_sym] || NoMethodError
+    end
+    
+    def [](key)
+      @fields[key]
+    end
+
+    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)
+    end
+    alias :save :post
+    
+    def put
+      path = "/#{@@client.api_version}/classes/#{@name}/#{@fields[:objectId]}"
+      params = @fields
+      params.delete :objectId
+      params.delete :createDate
+      params.delete :updateDate
+      result = @@client.put path, params
+      @fields[:updateDate] = result[:updateDate]
+    end
+    alias :update :put
+    
+    def delete
+      path = "/#{@@client.api_version}/classes/#{@name}/#{@fields[:objectId]}"
+      @@client.delete path, {}
+    end
+  end
+end

data/lib/ncmb/version.rb

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

data/spec/delete_spec.rb

@@ -0,0 +1,20 @@
+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]
+  end
+  
+  it "Delete #1" do
+    res = @ncmb.delete("/2013-09-01/classes/TODO/#{@object_id}")
+    res.should == {}
+  end
+
+  it "Delete #2" do
+    res = @ncmb.delete("/2013-09-01/classes/TODO/doesnotexist")
+    res[:code].should == 'E404001'
+  end
+end

data/spec/put_spec.rb

@@ -0,0 +1,15 @@
+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]
+  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
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ncmb-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Atsushi Nakatsugawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,12 +74,18 @@ files:
 - lib/ncmb/client.rb
 - lib/ncmb/data_store.rb
 - lib/ncmb/device.rb
+- lib/ncmb/error.rb
+- lib/ncmb/geo_point.rb
+- lib/ncmb/increment.rb
+- lib/ncmb/object.rb
 - lib/ncmb/push.rb
 - lib/ncmb/version.rb
 - ncmb-ruby-client.gemspec
 - setting_default.yml
+- spec/delete_spec.rb
 - spec/get_spec.rb
 - spec/post_spec.rb
+- spec/put_spec.rb
 - spec/spec_helper.rb
 homepage: http://mb.cloud.nifty.com/
 licenses:
@@ -101,11 +107,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simple Ruby client for the nifty cloud mobile backend REST API
 test_files:
+- spec/delete_spec.rb
 - spec/get_spec.rb
 - spec/post_spec.rb
+- spec/put_spec.rb
 - spec/spec_helper.rb