moex_iss 1.1.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2a3f9ad4ce42c5fe38d5b16bf09ec3d937654cf12225360c2c24f4a16b0322a
-  data.tar.gz: fa3d5358f2ce99cf174c31a1eb27da86f2ba827d632bcd1214e19cd356080431
+  metadata.gz: dc6e59c116501d2490614026723ffe37b22c554da6a7e01283e61875b2ddd2aa
+  data.tar.gz: 2db4b513cb7cc9dcdd12ff144c5447b23d94ea4234dc6a856de899f2ae355ff4
 SHA512:
-  metadata.gz: 5a9374940f414e6309bbb3fa1249c1406fb34932deeeb33d50a99c762faffede6a063dd891fa4fac96ec479da194c4dff5c8af5b7c81335cfe29243d40a268e9
-  data.tar.gz: feee8548808c648d93726e2a79ac4240f15bd9afd4f469f7123cc743a714e8d12a56ea7d2147d4e42c9b9328fc492d07bb0ac0e048ca390ca3ac7cdb39984f47
+  metadata.gz: 71eb024e491423c345d14b08a25751cbc6a535a3766773aa8d3b70ff20a68085c8402a6b8bb9058f640d262dfc6a27cb6a4254a00a405cadf1bce5a82f8a9413
+  data.tar.gz: 8a0b310f3682a646ee0402e19b990b7ce64c5688df504a35720214321c1ab3b126bfb629f2d4192285f4d4b9d3459d7b7136274a88b214255e29de4f97987557

data/CHANGELOG.md

@@ -4,4 +4,7 @@
 Формат основан на ведении журнала изменений, и этот проект придерживается семантического управления версиями.
 ## [1.1.0] - 2023-12-30
 ### Добавлено
-- Возможность работы с историческими данными акции
+- Возможность работы с историческими данными акции
+## [1.11.0] - 2024-01-03
+### Добавлено
+- Возможность получать данные об актуальных курсах валют ЦБ РФ

data/README.md

@@ -22,7 +22,7 @@ gem "moex_iss"
 
 Или установите его самостоятельно как:
 
-    $ gem install moex_api
+    $ gem install moex_iss
 
 ### Поддерживаемые Ruby версии
 
@@ -37,6 +37,18 @@ gem "moex_iss"
 client = MoexIss.client
 ```
 
+### Валюты
+Для получения последних актульных данных о курсах валют:
+```ruby
+currencies = client.currencies # => MoexIss::Market::Currencies
+
+currencies.map(&:short_name) # -> ["USDRUB_TOM", "EURRUB_TOM", "CNYRUB_TOM"]
+
+cny_rub = currencies.cny_rub # => MoexIss::Market::Currency
+cny_rub.price = 12.5762
+...
+```
+
 ### Акции
 
 Для получения последних актульных данных:
@@ -65,9 +77,10 @@ stocks['2023-12-03']  # => MoexIss::Market::History::Stock
 
 Аргументы `from` и `till` можно использовать по одиночке
 
+### Обратите внимание
 
 Все экземпляры классов отвечает на метод `response`, который содержит полный ответ от MOEX ISS, из которого можно получать доп.параметры,
-так же у кажого класса свой набор спецефических методов для удобства работы с данными.
+так же у каждого класса свой набор специфических методов для удобства работы с данными.
 ```ruby
 # Пример
 client.stock(:sber).market_price # => 271.37

data/lib/moex_iss/client.rb

@@ -6,15 +6,16 @@ module MoexIss
     include MoexIss::Hendler
 
     STOCKS_ENDPOINT = "engines/stock/markets/shares/boards/tqbr/securities"
+    CURRENCIES_ENDPOINT = "statistics/engines/currency/markets/selt/rates"
     STANDARD_PARAMS = {
       "iss.json" => "extended",
-      "iss.only" => "securities,marketdata",
       "iss.meta" => "off"
     }
 
     def stocks
       endpoint = "#{STOCKS_ENDPOINT}.json"
       params = STANDARD_PARAMS
+      params["iss.only"] = "securities,marketdata"
 
       raw_response = get(endpoint, params)
 
@@ -26,12 +27,23 @@ module MoexIss
 
       endpoint = "#{STOCKS_ENDPOINT}/#{isin}.json"
       params = STANDARD_PARAMS
+      params["iss.only"] = "securities,marketdata"
 
       raw_response = get(endpoint, params)
 
       MoexIss::Market::Stock.new(handle_response(raw_response))
     end
 
+    def currencies
+      endpoint = "#{CURRENCIES_ENDPOINT}.json"
+      params = STANDARD_PARAMS
+      params["iss.only"] = "wap_rates"
+
+      raw_response = get(endpoint, params)
+
+      MoexIss::Market::Currencies.new(handle_response(raw_response))
+    end
+
     private
 
     def historical_data_of_the_stock(isin, from, till)

data/lib/moex_iss/connection.rb

@@ -34,5 +34,3 @@ module MoexIss
     end
   end
 end
-
-# CURENCY    https://iss.moex.com/iss/statistics/engines/currency/markets/selt/rates.json?iss.meta=off&iss.json=extended&iss.only=wap_rates

data/lib/moex_iss/hendler.rb

@@ -4,7 +4,8 @@ module MoexIss
   module Hendler
     def handle_response(response)
       return standard_hendler(response) if standard_schema?(response)
-      return history_hendler(response) if history_schema?(response)
+      return response[1] if history_schema?(response)
+      return response[1] if currencies_schema?(response)
 
       fail MoexIss::Error::ResponseSchemaError, "Неизвестная схема ответа"
     end
@@ -22,14 +23,14 @@ module MoexIss
       response.is_a?(Array) && response[1]&.has_key?("history")
     end
 
+    def currencies_schema?(response)
+      response.is_a?(Array) && response[1]&.has_key?("wap_rates")
+    end
+
     def standard_hendler(response)
       response[1]["securities"].map.with_index do |x, i|
         {"securities" => x, "marketdata" => response[1]["marketdata"][i]}
       end
     end
-
-    def history_hendler(response)
-      response[1]
-    end
   end
 end

data/lib/moex_iss/market/collection.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module MoexIss
+  module Market
+    class Collection
+      include Enumerable
+
+      attr_reader :response
+
+      def initialize(response, instance_class: Security)
+        @response = response
+        @instance_class = instance_class
+        @collection_map = {}
+
+        create_instances
+      end
+
+      def create_instances
+        @response.each do |data|
+          method = method_name(data)
+
+          setup_method(method, data)
+        end
+      end
+
+      def each
+        @collection_map.values.each { |stock| yield stock }
+      end
+
+      private
+
+      def method_name(data)
+        :some_name
+      end
+
+      def setup_method(method, data)
+        @collection_map[method] = @instance_class.new(data)
+
+        self.class.send(:define_method, method) { @collection_map[method] }
+      end
+    end
+  end
+end

data/lib/moex_iss/market/currencies.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module MoexIss
+  module Market
+    class Currencies < Collection
+      def initialize(response, instance_class: MoexIss::Market::Currency)
+        super
+      end
+
+      def create_instances
+        @response["wap_rates"].each do |data|
+          method = method_name(data)
+
+          setup_method(method, data)
+        end
+      end
+
+      private
+
+      def method_name(data)
+        data["shortname"]
+          .split("_")
+          .first.downcase
+          .insert(3, "_")
+          .to_sym
+      end
+    end
+  end
+end

data/lib/moex_iss/market/currency.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module MoexIss
+  module Market
+    class Currency < Security
+      METHODS = {
+        "tradedate" => :trade_date, "tradetime" => :trade_time,
+        "secid" => :secid, "shortname" => :short_name,
+        "price" => :price, "lasttoprevprice" => :last_top_rev_price,
+        "nominal" => :nominal, "decimals" => :decimals
+      }.freeze
+    end
+  end
+end

data/lib/moex_iss/market/history/stock.rb

@@ -3,31 +3,17 @@
 module MoexIss
   module Market
     module History
-      class Stock
+      class Stock < Security
         METHODS = {
           "TRADEDATE" => :trade_date, "SHORTNAME" => :short_name, "SECID" => :secid, "VALUE" => :value,
           "OPEN" => :open, "LOW" => :low, "HIGH" => :high, "LEGALCLOSEPRICE" => :legal_close_price,
           "VOLUME" => :volume
         }.freeze
 
-        attr_reader(:response, *METHODS.values)
-
         def initialize(response)
-          @response = response
-
-          setup_instance_varibales(@response["history"])
-        end
-
-        private
-
-        def setup_instance_varibales(data)
-          return if data.nil?
-
-          data.each do |key, value|
-            next unless METHODS.has_key?(key)
+          setup_methods(response["history"])
 
-            instance_variable_set("@#{METHODS[key]}", value)
-          end
+          super
         end
       end
     end

data/lib/moex_iss/market/history/stocks.rb

@@ -3,15 +3,19 @@
 module MoexIss
   module Market
     module History
-      class Stocks < MoexIss::Market::Stocks
-        def create_instances_stock
+      class Stocks < Collection
+        def initialize(response, instance_class: MoexIss::Market::History::Stock)
+          super
+        end
+
+        def create_instances
           @response["history"].each do |data|
-            @stocks_map[data["TRADEDATE"]] = History::Stock.new({"history" => data})
+            @collection_map[data["TRADEDATE"]] = @instance_class.new({"history" => data})
           end
         end
 
         def [](key)
-          @stocks_map[key]
+          @collection_map[key]
         end
       end
     end

data/lib/moex_iss/market/security.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module MoexIss
+  module Market
+    class Security
+      attr_reader :response
+
+      def initialize(response)
+        @response = response
+
+        setup_methods(response)
+      end
+
+      private
+
+      def setup_methods(data)
+        return if data.nil?
+
+        data.each do |key, value|
+          next unless self.class::METHODS.has_key?(key)
+
+          define_singleton_method self.class::METHODS[key] do
+            value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/moex_iss/market/stock.rb

@@ -2,40 +2,24 @@
 
 module MoexIss
   module Market
-    class Stock
+    class Stock < Security
       METHODS = {
         "BID" => :bid, "MARKETPRICETODAY" => :market_price_today,
         "MARKETPRICE" => :market_price, "SECID" => :secid,
         "SHORTNAME" => :short_name, "LATNAME" => :lat_name,
         "BOARDID" => :board_id, "BOARDNAME" => :board_name,
         "ISIN" => :isin, "PREVPRICE" => :prev_price,
-        "PREVDATE" => :prev_date
+        "PREVDATE" => :prev_date, "CLOSEPRICE" => :close_price,
+        "OPEN" => :open, "LOW" => :low, "HIGH" => :high,
+        "LAST" => :last, "VALUE" => :value, "SYSTIME" => :systime
       }.freeze
 
-      MARKET_DATA = %w[CLOSEPRICE OPEN LOW HIGH LAST VALUE SYSTIME]
-
-      attr_reader(:response, :market_data, *METHODS.values)
-
       def initialize(response)
         @response = response.is_a?(Array) ? response.first : response
 
-        setup_instance_varibales(@response["securities"])
-        setup_instance_varibales(@response["marketdata"])
-        setup_instance_varibales(@response["history"])
-
-        @market_data = @response["marketdata"]&.slice(*MARKET_DATA)
-      end
-
-      private
-
-      def setup_instance_varibales(data)
-        return if data.nil?
-
-        data.each do |key, value|
-          next unless METHODS.has_key?(key)
-
-          instance_variable_set("@#{METHODS[key]}", value)
-        end
+        setup_methods(@response["securities"])
+        setup_methods(@response["marketdata"])
+        setup_methods(@response["history"])
       end
     end
   end

data/lib/moex_iss/market/stocks.rb

@@ -2,36 +2,15 @@
 
 module MoexIss
   module Market
-    class Stocks
-      include Enumerable
-
-      attr_reader :response
-
-      def initialize(response)
-        @response = response
-        @stocks_map = {}
-
-        create_instances_stock
-      end
-
-      def create_instances_stock
-        @response.each do |data|
-          method = data["securities"]["SECID"].downcase.to_sym
-
-          setup_method(method, data)
-        end
-      end
-
-      def each
-        @stocks_map.values.each { |stock| yield stock }
+    class Stocks < Collection
+      def initialize(response, instance_class: MoexIss::Market::Stock)
+        super
       end
 
       private
 
-      def setup_method(method, data)
-        @stocks_map[method] = Stock.new(data)
-
-        self.class.send(:define_method, method) { @stocks_map[method] }
+      def method_name(data)
+        data["securities"]["SECID"].downcase.to_sym
       end
     end
   end

data/lib/moex_iss/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MoexIss # :nodoc:
-  VERSION = "1.1.0"
+  VERSION = "1.11.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moex_iss
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Vyacheslav Konovalov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-30 00:00:00.000000000 Z
+date: 2024-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,8 +96,12 @@ files:
 - lib/moex_iss/connection.rb
 - lib/moex_iss/error.rb
 - lib/moex_iss/hendler.rb
+- lib/moex_iss/market/collection.rb
+- lib/moex_iss/market/currencies.rb
+- lib/moex_iss/market/currency.rb
 - lib/moex_iss/market/history/stock.rb
 - lib/moex_iss/market/history/stocks.rb
+- lib/moex_iss/market/security.rb
 - lib/moex_iss/market/stock.rb
 - lib/moex_iss/market/stocks.rb
 - lib/moex_iss/request.rb
@@ -126,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Client for MOEX ISS API