ncmb-ruby-client 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5070337bf5759d8e8612db60a27a99fbf846071c
-  data.tar.gz: 8e3cc58ab2a7076b00a1ae606cf7d8916e0ff1e9
+  metadata.gz: 435261c7423b1f8fa49d777e11fc616934b12dc0
+  data.tar.gz: 3da4facc221ed5665cf74f04c9d36d9a78fc0ed3
 SHA512:
-  metadata.gz: 2ef149bd509da1aa9453ca2a7f19a5a736a9857f9ed0880286f0276040ade20484bf19f1cb151466802bb6c9f5dd816fa437a0c122de6d53b93f80c4438c88e8
-  data.tar.gz: c19ea27d7910c912e68fde7b9be91bbbaf53659a3a7f89e469026377ac888cc63fa326ac54619c8d07ba507dd0682e9be64ef707bc1d62e1533590c468686aa2
+  metadata.gz: 626fd1949667d4fa32bbf1821612da685b3f31b8128d980f86bd69aa97d43dc4eb2c110aaaf0576537acac4a1270baa0ec5456b8445aa46d41113eba630dd41b
+  data.tar.gz: 4aff5281bb913f54c5d1ffb5b9aa2e9649570ed88aa91fc2767882f34c158dca8fac680fda2d2917742d11b58bd63f7fd1b55d3472dafffddfa562f44c006936

data/Gemfile

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

data/examples/data_store.rb

@@ -21,6 +21,7 @@ example.delete_all
   item.set('Increment', NCMB::Increment.new(i + 1))
   item.set('Date', Time.now)
   item.save
+  puts "#{item.objectId} saved."
   sleep(2)
 end
 

data/examples/file_test.rb

@@ -0,0 +1,20 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$:.unshift(File.dirname(__FILE__))
+require 'rubygems'
+require 'ncmb'
+require 'yaml'
+require 'open-uri'
+yaml = YAML.load_file(File.join(File.dirname(__FILE__), '..', 'setting.yml'))
+NCMB.initialize application_key: yaml['application_key'],  client_key: yaml['client_key']
+
+f = NCMB::NFile.new('http://mb.cloud.nifty.com/assets/images/logo.png')
+f.acl.public('read', true)
+f.acl.public('write', true)
+f.fileName = "test.png"
+f.save()
+puts "Uploaded"
+f.file = 'http://k.yimg.jp/images/top/sp2/cmn/logo-ns_d_131205.png'
+f.update()
+puts "Updated"
+f.delete()
+puts "Deleted"

data/lib/ncmb/client.rb

@@ -118,6 +118,22 @@ module NCMB
       signature = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest.new('sha256'), @client_key, signature_base.join("\n"))).strip()
     end
     
+    def make_boundary(boundary, queries)
+      post_body = []
+      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}"
+      post_body << "Content-Disposition: form-data; name=\"acl\""
+      post_body << ""
+      post_body << queries[:acl].to_json
+      post_body << "--#{boundary}--"
+      post_body.join("\r\n")
+    end
+    
     def request(method, path, queries = {})
       now = Time.now.utc.iso8601
       signature = generate_signature(method, path, now, queries)
@@ -134,6 +150,7 @@ module NCMB
       end
       # queries = hash2query(queries)
       json = nil
+      begin
         case method
         when :get
           query = encode_query(queries).map do |key, value|
@@ -142,16 +159,38 @@ module NCMB
           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)
+          req = Net::HTTP::Post.new(path)
+          if queries[:file].is_a?(File) || queries[:file].is_a?(StringIO)
+            boundary = SecureRandom.uuid
+            req.body = make_boundary(boundary, queries)
+            headers["Content-Type"] = "multipart/form-data; boundary=#{boundary}"
+          else
+            queries = change_query(queries)
+            req.body = queries.to_json
+          end
+          headers.each do |key, value|
+            req[key] = value
+          end
+          json =  JSON.parse(http.request(req).body, symbolize_names: true)
         when :put
-          json = JSON.parse(http.put(path, queries.to_json, headers).body, symbolize_names: true)
+          req = Net::HTTP::Put.new(path)
+          if queries[:file].is_a?(File) || queries[:file].is_a?(StringIO)
+            boundary = SecureRandom.uuid
+            req.body = make_boundary(boundary, queries)
+            headers["Content-Type"] = "multipart/form-data; boundary=#{boundary}"
+          else
+            queries = change_query(queries)
+            req.body = queries.to_json
+          end
+          headers.each do |key, value|
+            req[key] = value
+          end
+          json =  JSON.parse(http.request(req).body, symbolize_names: true)
         when :delete
           response = http.delete(path, headers).body
           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

@@ -2,11 +2,15 @@ module NCMB
   class DataStore
     include NCMB
     
+    include NCMB::Query
+    
     def initialize(name, fields = {}, alc = "")
       @name    = name
       @alc     = alc
       @fields  = fields
-      @queries = {where: []}
+      @search_key = :where
+      @queries = {}
+      @queries[@search_key] = []
       @items   = nil
       @path    = nil
     end
@@ -64,71 +68,6 @@ module NCMB
       self
     end
     
-    [
-      {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)
       get[count]
     end

data/lib/ncmb/file.rb

@@ -0,0 +1,27 @@
+require 'mime/types'
+module NCMB
+  class NFile < NCMB::Object
+    include NCMB
+    def initialize(file_path = nil)
+      @fields = {acl: NCMB::Acl.new, file: file_path}
+      if file_path
+        @fields[:fileName] = File.basename(file_path)
+        @fields['mime-type'.to_sym] = MIME::Types.type_for(file_path)[0]
+      end
+    end
+    
+    def save
+      @fields[:file] = open(self.file)
+      super
+    end
+    alias :update :save
+    
+    def path
+      "#{base_path}/#{@fields[:fileName]}"
+    end
+    
+    def base_path
+      "/#{@@client.api_version}/files"
+    end
+  end
+end

data/lib/ncmb/object.rb

@@ -64,11 +64,12 @@ module NCMB
     alias :save :post
     
     def put
+      put_path = path
       params = @fields
       params.delete :objectId
       params.delete :createDate
       params.delete :updateDate
-      result = @@client.put path, params
+      result = @@client.put put_path, params
       @fields[:updateDate] = result[:updateDate]
       self
     end

data/lib/ncmb/push.rb

@@ -1,26 +1,22 @@
 module NCMB
-  class Push
+  class Push < NCMB::Object
     include NCMB
-    attr_accessor :deliveryTime, :immediateDeliveryFlag, :target, :searchCondition, :message,
-    :userSettingValue, :deliveryExpirationDate, :deliveryExpirationTime, :action, :title, :dialog,
-    :badgeIncrementFlag, :badgeSetting, :sound, :contentAvailable, :richUrl, :acl, :objectId, :createDate, :errors
     
-    def save
-      path = "/#{@@client.api_version}/push"
-      queries = {}
+    def initialize(params = {})
       [:deliveryTime, :immediateDeliveryFlag, :target, :searchCondition, :message,
-       :userSettingValue, :deliveryExpirationDate, :deliveryExpirationTime, :action, :title, :dialog,
-       :badgeIncrementFlag, :badgeSetting, :sound, :contentAvailable, :richUrl, :acl].each do |name|
-        queries[name] = send(name) unless send(name).nil?
+      :userSettingValue, :deliveryExpirationDate, :deliveryExpirationTime, :action, :title, :dialog,
+      :badgeIncrementFlag, :badgeSetting, :sound, :contentAvailable, :richUrl].each do |name|
+        params[name] = nil unless params[name]
       end
-      results = @@client.post path, queries
-      if results[:objectId].nil?
-        self.errors = results
-        return false
-      end
-      self.objectId = results[:objectId]
-      self.createDate = results[:createDate]
-      return true
+      @search_key = :search_condition
+      @queries = {}
+      @queries[@search_key] = []
+      super('push', params)
+    end
+    
+    def base_path
+      "/#{@@client.api_version}/#{@name}"
     end
+    
   end
 end

data/lib/ncmb/query.rb

@@ -0,0 +1,68 @@
+module NCMB
+  module Query
+    [
+      {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[@search_key] << 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[@search_key] << params
+        self
+      end
+    end
+      
+    def withinSquare(name, geo1, geo2)
+      params = {}
+      params[name] = {
+        "$within": {
+          "$box": [
+            geo1,
+            geo2
+          ]
+        }
+      }
+      @queries[@search_key] << params
+      self
+    end
+
+    def where(name, value)
+      params = {}
+      params[name] = value
+      @queries[@search_key] << params
+      self
+    end
+  end
+end

data/lib/ncmb/role.rb

@@ -10,6 +10,7 @@ module NCMB
           roleName: name
         }
       end
+      @fields[:acl] = NCMB::Acl.new(@fields[:acl])
     end
     
     def self.find_or_create(name)
@@ -23,13 +24,8 @@ module NCMB
       "role:#{@fields[:roleName]}"
     end
     
-    def to_json
-      
-    end
-    
     def base_path
       path = "/#{@@client.api_version}/roles"
     end
-    
   end
 end

data/lib/ncmb/version.rb

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

data/lib/ncmb.rb

@@ -8,11 +8,14 @@ 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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ncmb-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Atsushi Nakatsugawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,7 @@ files:
 - examples/acl_test.rb
 - examples/csv_test.rb
 - examples/data_store.rb
+- examples/file_test.rb
 - examples/push.rb
 - examples/signature.rb
 - examples/user_test.rb
@@ -78,10 +79,12 @@ files:
 - lib/ncmb/data_store.rb
 - lib/ncmb/device.rb
 - lib/ncmb/error.rb
+- lib/ncmb/file.rb
 - lib/ncmb/geo_point.rb
 - lib/ncmb/increment.rb
 - lib/ncmb/object.rb
 - lib/ncmb/push.rb
+- lib/ncmb/query.rb
 - lib/ncmb/role.rb
 - lib/ncmb/user.rb
 - lib/ncmb/version.rb