bitrix24_cloud_api 0.1.0 → 0.1.2

data/lib/bitrix24_cloud_api/CRM/userfield.rb

@@ -0,0 +1,22 @@
+module Bitrix24CloudApi
+  module CRM
+    module USERFIELD
+      def self.const_missing(c)
+        if [:Settings, :Enumeration].any?{|x| x == c}
+          target_class = Bitrix24CloudApi::CRM.const_get(c)
+          target_class.define_singleton_method(:resource_path) { "crm.userfield.#{c.downcase}" }
+          target_class
+        end
+      end
+    end
+
+    class Userfield < Bitrix24CloudApi::Crm
+      class << self
+
+        def types(client, query = {})
+          client.make_get_request(resource_url(client, __method__), query)
+        end
+      end
+    end
+  end
+end

data/lib/bitrix24_cloud_api/CRM/vat.rb

@@ -0,0 +1,6 @@
+module Bitrix24CloudApi
+  module CRM
+    class Vat < Bitrix24CloudApi::Crm
+    end
+  end
+end

data/lib/bitrix24_cloud_api/aliases.rb

@@ -0,0 +1,7 @@
+module B24
+  include Bitrix24CloudApi
+end
+
+module B24_CRM
+  include Bitrix24CloudApi::CRM
+end

data/lib/bitrix24_cloud_api/base.rb

@@ -4,16 +4,22 @@ module Bitrix24CloudApi
   class Base
     require "httparty"
     extend Forwardable
-    def_delegators 'self.class', :resource_url
+    def_delegators 'self.class', :resource_url, :to_query
 
     class << self
 
+      def to_query(params)
+        params.to_a.map { |x| "#{CGI.escape(x[0].to_s)}=#{CGI.escape(x[1].to_s)}" }.join("&")
+      end
+
       def resource_url(client, action)
-        "#{client.api_endpoint + resource_path}.#{action}.#{client.extension}"
+        path = client.api_endpoint
+        path << "#{resource_path}." unless resource_path.empty?
+        path << "#{action}.#{client.extension}"
       end
 
-      def resource_path
-        name.gsub("Bitrix24CloudApi::", "").gsub("::", ".").downcase
+      def resource_path(exact_name = nil)
+        exact_name || name.gsub("Bitrix24CloudApi::", "").gsub("::", ".").downcase
       end
     end
   end

data/lib/bitrix24_cloud_api/client.rb

@@ -3,11 +3,12 @@ module Bitrix24CloudApi
   class Client < Base
     require 'oauth2'
 
+    B24_OAUTH_ENDPOINT = 'https://oauth.bitrix.info/oauth/token'
+
     attr_reader :endpoint, :access_token, :redirect_uri, :client_id, :client_secret, :scope, :oauth2client, :extension
     attr_writer :access_token
 
     def initialize(attrs = {})
-      puts attrs[:extension]
       @extension = attrs[:extension] || "json"
       @endpoint = attrs[:endpoint]
       @access_token = attrs[:access_token]
@@ -27,47 +28,43 @@ module Bitrix24CloudApi
     def authorize_url
       return nil unless oauth2client
 
-      oauth2client.auth_code.authorize_url(:redirect_uri => redirect_uri)
+      oauth2client.auth_code.authorize_url(:redirect_uri => redirect_uri, state: true)
     end
 
     def get_access_token(code)
       return nil unless oauth2client
 
-      auth_token_query = {}
-      auth_token_query[:client_id] = client_id
-      auth_token_query[:client_secret] = client_secret
-      auth_token_query[:grant_type] = "authorization_code"
-      auth_token_query[:scope] = scope
-      auth_token_query[:redirect_uri] = redirect_uri
-      auth_token_path = oauth2client.options[:token_url] + "?#{to_query(auth_token_query)}"
+      auth_token_query = { client_id: client_id,
+                           client_secret: client_secret,
+                           grant_type: 'authorization_code',
+                           code: code }
+      auth_token_path = "#{B24_OAUTH_ENDPOINT}?#{to_query(auth_token_query)}"
       oauth2client.options[:token_url] = auth_token_path
-
       begin
         token = oauth2client.auth_code.get_token(code, :redirect_uri => redirect_uri)
-        token.params.merge({:access_token => token.token,
-                            :refresh_token => token.refresh_token,
-                            :expires_at => token.expires_at})
+        token.params.merge({ access_token: token.token,
+                             refresh_token: token.refresh_token,
+                             expires_at: token.expires_at })
       rescue OAuth2::Error
         return nil
       end
     end
 
-    def refresh_token(refresh_token_hash)
+    def refresh_token(refresh_token)
       return nil unless oauth2client
 
-      auth_token_query = {}
-      auth_token_query[:client_id] = client_id
-      auth_token_query[:client_secret] = client_secret
-      auth_token_query[:grant_type] = 'refresh_token'
-      auth_token_query[:refresh_token] = refresh_token_hash
-      auth_token_path = "/oauth/token?#{to_query(auth_token_query)}"
+      auth_token_query = { client_id: client_id,
+                           client_secret: client_secret,
+                           grant_type: 'refresh_token',
+                           refresh_token: refresh_token }
+      auth_token_path = "#{B24_OAUTH_ENDPOINT}?#{to_query(auth_token_query)}"
       oauth2client.options[:token_url] = auth_token_path
 
       begin
         token = oauth2client.get_token(auth_token_query)
-        token.params.merge({:access_token => token.token,
-                            :refresh_token => token.refresh_token,
-                            :expires_at => token.expires_at})
+        token.params.merge({ access_token: token.token,
+                             refresh_token: token.refresh_token,
+                             expires_at: token.expires_at })
       rescue OAuth2::Error
         return false
       end
@@ -80,8 +77,7 @@ module Bitrix24CloudApi
     end
 
     def make_post_request(path, params = {})
-      params.merge!(auth: access_token)
-      response = HTTParty.post(path, query: params)
+      response = HTTParty.post(path, body: params, query: {auth: access_token})
       check_response(response)
     end
 

data/lib/bitrix24_cloud_api/common_methods/common_methods.rb

@@ -0,0 +1,62 @@
+module Bitrix24CloudApi
+  module COMMON_METHODS
+    class User < Base
+      [:admin, :access, :get].each do |action|
+        define_singleton_method(action) do |client, query = {}|
+          client.make_get_request(resource_url(client, action), query)
+        end
+      end
+
+      class << self
+        def resource_path
+          "user"
+        end
+      end
+    end
+
+    class App < Base
+      class << self
+
+        def info(client)
+          client.make_get_request(resource_url(client, __method__))
+        end
+
+        def resource_path
+          "app"
+        end
+      end
+    end
+
+    class Event < Base
+      [:bind, :unbind, :get].each do |action|
+        define_singleton_method(action) do |client, query = {}|
+          client.make_get_request(resource_url(client, action), query)
+        end
+      end
+
+      class << self
+        def resource_path
+          "event"
+        end
+      end
+    end
+  end
+
+  class CommonMethods < Base
+    METHODS_SCOPE = [:methods, :scope, :batch, :access_name, :events]
+
+    METHODS_SCOPE.each do |action|
+      define_singleton_method(action) do |client, query = {}|
+        client.make_get_request(resource_url(client, action), query)
+      end
+    end
+
+    class << self
+      def resource_path
+        name = super
+        name.gsub("commonmethods", "")
+      end
+    end
+  end
+end
+

data/lib/bitrix24_cloud_api/crm.rb

@@ -8,7 +8,6 @@ module Bitrix24CloudApi
      end
    end
 
-
    [:get, :list, :fields].each do |action|
      define_singleton_method(action) do |client, query = {}|
        client.make_get_request(resource_url(client, action), query)
@@ -18,15 +17,26 @@ module Bitrix24CloudApi
 end
 
 require "bitrix24_cloud_api/CRM/additional_entities"
+require "bitrix24_cloud_api/CRM/address"
 require "bitrix24_cloud_api/CRM/activity"
 require "bitrix24_cloud_api/CRM/catalog"
 require "bitrix24_cloud_api/CRM/company"
 require "bitrix24_cloud_api/CRM/contact"
 require "bitrix24_cloud_api/CRM/currency"
 require "bitrix24_cloud_api/CRM/deal"
+require "bitrix24_cloud_api/CRM/deal_category"
+require "bitrix24_cloud_api/CRM/externalchannel"
 require "bitrix24_cloud_api/CRM/invoice"
 require "bitrix24_cloud_api/CRM/invoice_status"
 require "bitrix24_cloud_api/CRM/lead"
+require "bitrix24_cloud_api/CRM/live_feed_message"
+require "bitrix24_cloud_api/CRM/measure"
 require "bitrix24_cloud_api/CRM/product"
+require "bitrix24_cloud_api/CRM/product_row"
 require "bitrix24_cloud_api/CRM/product_section"
+require "bitrix24_cloud_api/CRM/property"
+require "bitrix24_cloud_api/CRM/requisite"
+require "bitrix24_cloud_api/CRM/status"
+require "bitrix24_cloud_api/CRM/vat"
 require "bitrix24_cloud_api/CRM/quote"
+require "bitrix24_cloud_api/CRM/userfield"

data/lib/bitrix24_cloud_api/version.rb

@@ -1,3 +1,3 @@
 module Bitrix24CloudApi
-  VERSION = "0.1.0"
+  VERSION = '0.1.2'
 end

data/lib/bitrix24_cloud_api.rb

@@ -1,8 +1,9 @@
 require "bitrix24_cloud_api/base"
 require "bitrix24_cloud_api/client"
+require "bitrix24_cloud_api/common_methods/common_methods"
 require "bitrix24_cloud_api/crm"
+require "bitrix24_cloud_api/aliases"
 require "bitrix24_cloud_api/version"
 
 module Bitrix24CloudApi
-  # Your code goes here...
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: bitrix24_cloud_api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Viacheslav Gruzdov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: oauth2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,33 +81,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: oauth2
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.7
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.7
+        version: '2.0'
 description: Bitrix24 REST API wrapper (for only cloud version)
 email:
 - lucky-@mail.ru
@@ -88,13 +130,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".idea/.name"
-- ".idea/.rakeTasks"
-- ".idea/bitrix24_cloud_api.iml"
-- ".idea/misc.xml"
-- ".idea/modules.xml"
-- ".idea/vcs.xml"
-- ".idea/workspace.xml"
 - ".rspec"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
@@ -108,19 +143,32 @@ files:
 - lib/bitrix24_cloud_api.rb
 - lib/bitrix24_cloud_api/CRM/activity.rb
 - lib/bitrix24_cloud_api/CRM/additional_entities.rb
+- lib/bitrix24_cloud_api/CRM/address.rb
 - lib/bitrix24_cloud_api/CRM/catalog.rb
 - lib/bitrix24_cloud_api/CRM/company.rb
 - lib/bitrix24_cloud_api/CRM/contact.rb
 - lib/bitrix24_cloud_api/CRM/currency.rb
 - lib/bitrix24_cloud_api/CRM/deal.rb
+- lib/bitrix24_cloud_api/CRM/deal_category.rb
+- lib/bitrix24_cloud_api/CRM/externalchannel.rb
 - lib/bitrix24_cloud_api/CRM/invoice.rb
 - lib/bitrix24_cloud_api/CRM/invoice_status.rb
 - lib/bitrix24_cloud_api/CRM/lead.rb
+- lib/bitrix24_cloud_api/CRM/live_feed_message.rb
+- lib/bitrix24_cloud_api/CRM/measure.rb
 - lib/bitrix24_cloud_api/CRM/product.rb
+- lib/bitrix24_cloud_api/CRM/product_row.rb
 - lib/bitrix24_cloud_api/CRM/product_section.rb
+- lib/bitrix24_cloud_api/CRM/property.rb
 - lib/bitrix24_cloud_api/CRM/quote.rb
+- lib/bitrix24_cloud_api/CRM/requisite.rb
+- lib/bitrix24_cloud_api/CRM/status.rb
+- lib/bitrix24_cloud_api/CRM/userfield.rb
+- lib/bitrix24_cloud_api/CRM/vat.rb
+- lib/bitrix24_cloud_api/aliases.rb
 - lib/bitrix24_cloud_api/base.rb
 - lib/bitrix24_cloud_api/client.rb
+- lib/bitrix24_cloud_api/common_methods/common_methods.rb
 - lib/bitrix24_cloud_api/crm.rb
 - lib/bitrix24_cloud_api/version.rb
 homepage: https://github.com/nononoy/bitrix24_cloud_api
@@ -148,4 +196,3 @@ signing_key:
 specification_version: 4
 summary: Bitrix24 REST API on Ruby
 test_files: []
-has_rdoc: 

data/.idea/.name

@@ -1 +0,0 @@
-bitrix24_cloud_api

data/.idea/.rakeTasks

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Settings><!--This file was automatically generated by Ruby plugin.
-You are allowed to: 
-1. Remove rake task
-2. Add existing rake tasks
-To add existing rake tasks automatically delete this file and reload the project.
---><RakeGroup description="" fullCmd="" taksId="rake" /></Settings>

data/.idea/bitrix24_cloud_api.iml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RUBY_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="gem" name="Ruby Gem">
-      <configuration>
-        <option name="GEM_APP_ROOT_PATH" value="$MODULE_DIR$" />
-        <option name="GEM_APP_TEST_PATH" value="" />
-        <option name="GEM_APP_LIB_PATH" value="" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="RVM: ruby-2.3.1 [global]" jdkType="RUBY_SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.12.4, RVM: ruby-2.3.1 [global]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v10.4.2, RVM: ruby-2.3.1 [global]) [gem]" level="application" />
-  </component>
-</module>