lean_cloud 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bdcc7d98e55c298d4036e11dbf7f9cd209e969c
-  data.tar.gz: d696b5333a506609c1de167fbcc8b9f1710fb163
+  metadata.gz: 020545fc7a28d1a7a1292f102076cea9d1e22cf7
+  data.tar.gz: 40ece99f5a9db440af06602ae1672709e91f4559
 SHA512:
-  metadata.gz: e5db0df3d790166bff799638f9e717bf23881734b963ddca826992bc5f09c03e4291984836905ea42eb7575a716c95b194f8c9ba28e2347899a5627c20c826af
-  data.tar.gz: 991f034528d3a19001f013c81803d26d69e1449fb835cf43df58ed8b542bd3edfc8e425633ea70203ba29d30c548197ba768955aee7c33d57b606eb45a1c8e6c
+  metadata.gz: 70fe9d230da9f82aa3604be29716d361709b8c13567ba8405d2b4c4509daf510c86564bbd01f44af3a8cfae6c385880523f03e776648539291b8c4c383644b97
+  data.tar.gz: 6843d9561ee16ba62081b238097275625dc86b32d0fa399fa1ff1f888db44ac4b4c32287c9327a1bcc705c16b4524bc1dfb49928167eebca2b8a1a5ed40329f8

data/README.md

@@ -2,22 +2,46 @@
 
 This project rocks and uses MIT-LICENSE.
 
+
+## Usage
+
+```
+gem "lean_cloud"
+
+LeanCloud::Feedback.create({}) # 用户反馈
+LeanCloud::Function.run(function)
+....
+```
+### 更多请查看 lib/lean_cloud/modules
+
 # 配置
 
 ```
 LeanCloud.configure do
-  config.app_id   = "11f6ad8ec52a2984abaafd7c3b516503785c2072"
-  config.app_key  = "11f6ad8ec52a2984abaafd7c3b516503785c2072"
-  config.host     = "https://leancloud.cn"
-  config.version  = "1.1"
+  config.app_id     = "11f6ad8ec52a2984abaafd7c3b516503785c2072"
+  config.app_key    = "11f6ad8ec52a2984abaafd7c3b516503785c2072"
+  config.master_key = "11f6ad8ec52a2984abaafd7c3b516503785c2072"
+  config.host       = "https://leancloud.cn"
+  config.version    = "1.1"
 end
 ```
 
 # 在数据管理中添加一个class(GameScore)后:
 
 ```
+# the namespace option will generate https://leancloud.cn/1.1/classes/GameScore
 LeanCloud.register "GameScore", namespace: "classes/GameScore" do
   only :create, :update, :show, :destroy, :search
+
+  # GET https://leancloud.cn/1.1/classes/GameScore/sms/:code
+  match "sms/:code", via: :get, as: get_code  # LeanCloud::GameScore.get_code(code) 
+  # GET https://leancloud.cn/1.1/sms/:code
+  match "sms/:code", via: :get, as: get_code, unscope: true  # LeanCloud::GameScore.get_code(code)
+  # GET https://leancloud.cn/1.1/classes/GameScore/:id/sms/:code
+  match "sms/:code", via: :get, as: get_code, on: :member  # LeanCloud::GameScore.get_code(id, code)
+  
+  # GET https://leancloud.cn/1.1/classes/GameScore/result
+  route :result
 end
 ```
 

data/examples/AVOSRealtimeGroups.rb

@@ -0,0 +1,4 @@
+LeanCloud::Base.register "AVOSRealtimeGroups", namespace: "classes/AVOSRealtimeGroups" do
+  self.settings = { host: "https://cn.avoscloud.com" }
+  only :create, :update, :show, :search, :destroy
+end

data/examples/file.rb

@@ -0,0 +1,6 @@
+# 文件接口
+LeanCloud::Base.register "File", namespace: "files" do
+  # https://leancloud.cn/1.1/files/test.png
+  # only :create
+  match ":filename", via: :post, as: :upload
+end

data/examples/live_file.rb

@@ -0,0 +1,9 @@
+# 文件接口
+LeanCloud::Base.register "LiveFile", namespace: "classes/LiveFile" do
+  # https://leancloud.cn/1.1/classes/LiveFile
+  only :create, :show, :search, :update, :destroy
+
+  cattr_accessor :columns
+  self.columns = %i(file liveRoom userUUID selected mime_type)
+
+end

data/examples/live_room.rb

@@ -0,0 +1,158 @@
+LeanCloud::Base.register "LiveRoom", namespace: "classes/LiveRoom" do
+  extend  ActiveModel::Naming
+  include ActiveModel::Validations
+
+  only :create, :update, :show, :destroy, :search
+
+  cattr_accessor :columns, :status_hash
+  self.columns = %i(objectId title sourceTitle sourceType sourceId status cover liveTopic liveStartAt liveEndAt hosts avosGroup admins event_id)
+  self.status_hash     = {open: "开启", closed: "关闭", hidden: "隐藏", ready: "待开启"}
+  attr_accessor *columns
+
+  validates :title, :event_id, :status, :cover, :liveTopic, :liveStartAt, :liveEndAt, :hosts, :admins, presence: true
+  validates :status, :inclusion => { :in => status_hash.keys.map(&:to_s) }
+
+  class << self
+
+    def primary_key
+      :id
+    end
+
+    def find(*args,&block)
+      new show(*args, &block)
+    end
+
+    def id
+      objectId
+    end
+
+    def create_with_upload(attributes,&block)
+      room = new(attributes)
+      return room.errors if !room.valid?
+
+      cover = room.cover
+      request = LeanCloud::File.upload(cover.original_filename) do |req|
+        req.headers["Content-Type"] = cover.content_type
+        req.body = cover.tempfile.read
+      end
+
+      if !request.is_a?(Hash) || !request.key?("objectId")
+
+        room.errors.add(:base, request)
+        return room
+      end
+
+      attributes[:cover] = {
+        objectId: request["objectId"],
+        className: "_File",
+        __type: "Pointer"
+      }
+
+      attributes[:avosGroup] = {
+        __type: "Pointer",
+        objectId: LeanCloud::AVOSRealtimeGroups.create(m: [])["objectId"],
+        "className" => 'AVOSRealtimeGroups'
+      }
+
+      result = create_without_upload(attributes, &block)
+
+      Rails.logger.info result.to_json
+
+      if !request.is_a?(Hash) || result.key?("objectId")
+        room.errors.add(:base, result)
+        room
+      else
+        room
+      end
+    end
+    alias_method_chain :create, :upload
+  end
+
+  def initialize(attrs={})
+    assign_attributes(attrs)
+  end
+
+  def event_id=(val)
+    event = Event.find(val)
+    self.sourceTitle = event.title
+    self.sourceType = event.class.name
+    self.sourceId = val
+    @event_id = val
+  end
+
+  def event
+    @event ||= sourceType.constantize.find(sourceId)
+  end
+
+  def assign_attributes(attrs={})
+    attrs.symbolize_keys.slice(*self.class.columns).each do |attribute, value|
+      send("#{attribute}=", value)
+    end
+  end
+
+  def attributes
+    self.class.columns.map {|attribute| [attribute, send(attribute)]}.to_h
+  end
+
+  def hide
+    update(status: "hidden")
+  end
+
+  def update(attrs={})
+    self.class.update(id, attrs) if id.present?
+  end
+  
+  def hosts=(val)
+    @hosts = val.to_s.split(',') if val.present?
+  end
+
+  def admins=(val)
+    @admins = val.to_s.split(',') if val.present?
+  end
+
+  def save
+    id.present? ? update(attributes) : self.class.create(attributes)
+  end
+
+  def destroy
+    self.class.destroy(id)
+  end
+
+  def to_key
+    [id]
+  end
+
+  def status_name
+    STATUS[status.to_sym]
+  end
+
+  def liveStartAt=(val)
+    @liveStartAt = {
+      __type: "Date",
+      "iso" => val
+    }
+  end
+
+  def liveEndAt=(val)
+    @liveEndAt = {
+      __type: "Date",
+      "iso" => val
+    }
+  end
+
+  # 踢人
+  def kick(ids=[])
+    update(hosts: {__op: "Remove", objects: ids}) if ids.present?
+  end
+
+  # 查看聊天记录
+  def logs
+    LeanCloud::Message.logs(convid: avosGroup["objectId"]) if avosGroup.is_a?(Hash).present?
+  end
+  
+  # class << self
+  #   def self.column_names
+  #     ATTRIBUTES
+  #   end
+  # end
+end

data/lib/lean_cloud.rb

@@ -1,5 +1,6 @@
 require 'lean_cloud/modules'
 require 'lean_cloud/configuration'
+require 'logger'
 module LeanCloud
   class << self
 
@@ -10,6 +11,14 @@ module LeanCloud
     def config
       @config ||= Configuration.instance
     end
+
+    def logger
+      if defined?(Rails)
+        Rails.logger
+      else
+        Logger.new(STDOUT)
+      end
+    end
   end
 
   def config

data/lib/lean_cloud/base.rb

@@ -2,6 +2,7 @@ require 'lean_cloud'
 require 'lean_cloud/helper'
 require 'lean_cloud/client'
 require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/core_ext/object/blank'
 require 'active_support/json/decoding'
 require 'active_support/json/encoding'
 module LeanCloud
@@ -10,7 +11,7 @@ module LeanCloud
 
     class << self
       def register(klass, options={}, &block)
-        klass = if !LeanCloud.const_defined?(klass)
+        klass = if !LeanCloud.const_defined?(klass, false)
           LeanCloud.const_set(klass, Class.new(self))
         else
           LeanCloud.const_get(klass)
@@ -19,24 +20,38 @@ module LeanCloud
         klass.class_eval do
           include Helper
 
-          cattr_accessor :routes, :namespace
+          cattr_accessor :routes, :namespace, :settings
 
           self.routes ||= []
+          self.settings = {}
           self.namespace = options[:namespace]
 
-          
-
           class_exec(&block)
         end
       end
 
-      def client
-        Client.new(LeanCloud.config).instance
+      def client(options={}, &block)
+        Client.new(settings).instance(options,&block)
       end
 
       def dispatch(route, *args, &block)
         options = args.extract_options!
-        client.send(route.request, route.url(*args), options.to_json, &block)
+        data = parse_data(route, options)
+        request = client(&route.block).send(route.request, route.url(*args), data, &block)
+        LeanCloud.logger.info request.to_json
+        parse_body(request)
+      end
+
+      def parse_data(route, data)
+        if route.request == :get
+          data
+        elsif data.present?
+          data.to_json
+        end
+      end
+
+      def parse_body(request)
+        JSON.parse(request.body) rescue request.body
       end
     end
   end

data/lib/lean_cloud/client.rb

@@ -1,3 +1,4 @@
+require 'lean_cloud/version'
 require 'active_support/hash_with_indifferent_access'
 require 'active_support/core_ext/module/delegation'
 module LeanCloud
@@ -5,23 +6,29 @@ module LeanCloud
 
     attr_accessor :options
 
-    delegate :app_id, :app_key, :version, :http_adapter, :host, to: :options
+    delegate :app_id, :app_key, :master_key, :version, :http_adapter, :host, to: :options
     delegate :get, :put, :post, :delete, to: :instance
 
     def initialize(options)
-      @options = options
+      @options = LeanCloud.config.dup.merge(options)
     end
 
     def adapter
       http_adapter
     end
 
-    def instance
-      adapter.new(url, headers: headers)
+    def instance(options={}, &block)
+      adapter.new(url, headers: headers, &block)
     end
 
-    def headers
-      {"X-AVOSCloud-Application-Id" => app_id, "X-AVOSCloud-Application-Key" => app_key, 'Content-Type' => 'application/json' }
+    def headers(options={})
+      {
+        "X-AVOSCloud-Application-Id"  => app_id,
+        "X-AVOSCloud-Application-Key" => app_key,
+        "X-AVOSCloud-Master-Key"      => master_key,
+        'Content-Type'                => 'application/json',
+        'User-Agent'                  => "LeanCloud SDK Ruby / #{LeanCloud::VERSION}"
+      }.merge(options)
     end
 
     def url

data/lib/lean_cloud/configuration.rb

@@ -1,6 +1,6 @@
 require 'faraday'
 module LeanCloud
-  class Configuration
+  class Configuration < Hash
     class << self
       private :new
       def instance
@@ -9,24 +9,24 @@ module LeanCloud
     end
 
     def initialize
-      @@options = {
+      {
         :http_adapter => Faraday,
         :app_id       => nil,
         :app_key      => nil
-      }
+      }.each {|k, v| self[k] = v}
     end
 
     def respond_to?(name, include_private = false)
-      super || @@options.key?(name.to_sym)
+      super || key?(name.to_sym)
     end
 
     private
 
     def method_missing(name, *args, &blk)
       if name.to_s =~ /=$/
-        @@options[$`.to_sym] = args.first
-      elsif @@options.key?(name)
-        @@options[name]
+        self[$`.to_sym] = args.first
+      elsif self.key?(name)
+        self[name]
       else
         super
       end

data/lib/lean_cloud/helper.rb

@@ -18,30 +18,20 @@ module LeanCloud
         end
       end
 
-      def route(name, options={})
-        add_route(name, options)
+      def route(name, options={}, &block)
+        add_route(name, options, &block)
       end
 
-      def match(name, options={})
+      def match(name, options={}, &block)
         raise "`as' can't be nil!" if !options[:as]
-        add_route(options.delete(:as), options, name)
+        add_route(options.delete(:as), options, name, &block)
       end
 
-      def add_route(name, options={},match=nil)
+      def add_route(name, options={},match=nil, &block)
         options[:namespace] ||= namespace
-        routes << Route.new(name, options, match)
-      end
-
-      def respond_to?(method_id)
-        routes.any? {|route| route.name.to_s == method_id.to_s}
-      end
-
-      def method_missing(method_id, *args, &block)
-        if route=routes.find {|route| route.name.to_s == method_id.to_s}
-          dispatch(route, *args, &block)
-        else
-          super
-        end
+        route = Route.new(name, options, match, &block)
+        define_singleton_method(name) {|*args, &block| dispatch(route, *args, &block) }
+        routes << route
       end
     end
   end

data/lib/lean_cloud/modules/function.rb

@@ -2,5 +2,5 @@
 LeanCloud::Base.register "Function", namespace: "functions" do
   # /1.1/functions
   # 调用 Cloud Code 函数
-  only :create
+  match ":name", via: :post, as: :run
 end

data/lib/lean_cloud/modules/message.rb

@@ -1,4 +1,4 @@
-LeanCloud::Base.register "Message", namespace: "messages" do
+LeanCloud::Base.register "Message", namespace: "rtm/messages" do
   # /1.1/rtm/messages/logs/
   # 获得应用聊天记录
   route :logs

data/lib/lean_cloud/modules/sms.rb

@@ -2,8 +2,8 @@
 LeanCloud::Base.register "Sms" do
   # /1.1/requestSmsCode	
   # 请求发送短信验证码
-  route :requestSmsCode, via: :post
+  route :requestSmsCode, via: :post, as: :deliver
   # /1.1/verifySmsCode/<code>
   # 验证短信验证码
-  match "verifySmsCode/:code", via: :post, as: :verify_sms_code
+  match "verifySmsCode/:code", via: :post, as: :verify
 end

data/lib/lean_cloud/modules/stats.rb

@@ -1,8 +1,8 @@
 LeanCloud::Base.register "Stats",namespace: "stats" do
   # /1.1/stats/appinfo
   # 获取应用的基本信息
-  route :appinfo, via: :post
+  route :appinfo, via: :get
   # /1.1/stats/appmetrics
   # 获取应用的具体统计数据
-  route :appmetrics, via: :post
+  route :appmetrics, via: :get
 end

data/lib/lean_cloud/modules/user.rb

@@ -3,19 +3,19 @@ LeanCloud::Base.register "User", namespace: "users" do
   # /1.1/login	GET	用户登录
   route :login, via: :get, unscope: true
   # /1.1/users/<objectId>/updatePassword	PUT	更新密码，要求输入旧密码。
-  route :updatePassword, via: :put, on: :member
+  route :updatePassword, via: :put, on: :member, unscope: true
   # /1.1/requestPasswordReset	POST	请求密码重设
-  route :requestPasswordReset, via: :post
+  route :requestPasswordReset, via: :post, unscope: true
   # /1.1/requestEmailVerify	POST	请求验证用户邮箱
-  route :requestEmailVerify, via: :post
+  route :requestEmailVerify, via: :post, unscope: true
   # /1.1/requestMobilePhoneVerify	POST	请求发送用户手机号码验证短信
-  route :requestMobilePhoneVerify, via: :post
+  route :requestMobilePhoneVerify, via: :post, unscope: true
   # /1.1/verifyMobilePhone/<code>	POST	使用 "验证码" 验证用户手机号码
-  match "verifyMobilePhone/:code", via: :post, as: :verify_mobile_phone
+  match "verifyMobilePhone/:code", via: :post, as: :verify_mobile_phone, unscope: true
   # /1.1/requestLoginSmsCode	POST	请求发送手机号码登录短信。
-  route :requestLoginSmsCode, via: :post
+  route :requestLoginSmsCode, via: :post, unscope: true
   # /1.1/requestPasswordResetBySmsCode	POST	请求发送手机短信验证码重置用户密码。
-  route :requestPasswordResetBySmsCode, via: :post
+  route :requestPasswordResetBySmsCode, via: :post, unscope: true
   # /1.1/resetPasswordBySmsCode/<code>	PUT	验证手机短信验证码并重置密码。
-  match "resetPasswordBySmsCode/:code", via: :put, as: :reset_password_by_sms_code
+  match "resetPasswordBySmsCode/:code", via: :put, as: :reset_password_by_sms_code, unscope: true
 end

data/lib/lean_cloud/route.rb

@@ -1,18 +1,19 @@
 module LeanCloud
   class Route
-    attr_accessor :name, :request, :match, :options
-    def initialize(name, options, match=false)
+    attr_accessor :name, :request, :match, :options, :block
+    def initialize(name, options, match=false, &block)
       options[:on] ||= :collection
       @name     = name
       @request  = options[:via] ||= :get
       @match    = match
       @options  = options
+      @block    = block
     end
 
     def url(*args)
       namespace = options[:namespace] if !options[:unscope]
       id = args.shift                 if options[:on].to_sym == :member
-      path = !match ? name.to_s : match.sub(/(:\w+)/, args[0]) if !options[:root]
+      path = !match ? name.to_s : match.sub(/(:\w+)/, args[0].to_s) if !options[:root]
       [namespace, id, path].compact.join('/')
     end
   end

data/lib/lean_cloud/version.rb

@@ -1,3 +1,3 @@
 module LeanCloud
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lean_cloud
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - plusrez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-21 00:00:00.000000000 Z
+date: 2014-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -78,6 +78,10 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- examples/AVOSRealtimeGroups.rb
+- examples/file.rb
+- examples/live_file.rb
+- examples/live_room.rb
 - lean_cloud.gemspec
 - lib/lean_cloud.rb
 - lib/lean_cloud/base.rb