moex_iss 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71d87cc339f313c78295e2d5d3569aade22989f93ecef8cf27fcfde8cb151562
-  data.tar.gz: '0181b5dc0b1e9e01b93a685ce68bee1a84767c354b35ac27d3b50f48eeff2b5c'
+  metadata.gz: dc6e59c116501d2490614026723ffe37b22c554da6a7e01283e61875b2ddd2aa
+  data.tar.gz: 2db4b513cb7cc9dcdd12ff144c5447b23d94ea4234dc6a856de899f2ae355ff4
 SHA512:
-  metadata.gz: d5fc0c6b4c6884de71e79c727bb0c5a9923038783736a10f2d0806eef5c765f5cd50dd9f45ce7670cf08dda27279118dee7766d0baca73e1ac1428dcbb9f8165
-  data.tar.gz: f6281f2e0f278f577bacdbd179ed3bb7ddd7db31a5ebefc89453de63c5f49235a1658a6e2440cd2cbb387cc3621781d0fdd14866fe7eed2c625d7b98cc8a0568
+  metadata.gz: 71eb024e491423c345d14b08a25751cbc6a535a3766773aa8d3b70ff20a68085c8402a6b8bb9058f640d262dfc6a27cb6a4254a00a405cadf1bce5a82f8a9413
+  data.tar.gz: 8a0b310f3682a646ee0402e19b990b7ce64c5688df504a35720214321c1ab3b126bfb629f2d4192285f4d4b9d3459d7b7136274a88b214255e29de4f97987557

data/README.md

@@ -22,7 +22,7 @@ gem "moex_iss"
 
 Или установите его самостоятельно как:
 
-    $ gem install moex_api
+    $ gem install moex_iss
 
 ### Поддерживаемые Ruby версии
 
@@ -42,8 +42,10 @@ client = MoexIss.client
 ```ruby
 currencies = client.currencies # => MoexIss::Market::Currencies
 
-cny_rub = currencues.cny_rub # => MoexIss::Market::Currency
-cny_urb.price = 12.5762
+currencies.map(&:short_name) # -> ["USDRUB_TOM", "EURRUB_TOM", "CNYRUB_TOM"]
+
+cny_rub = currencies.cny_rub # => MoexIss::Market::Currency
+cny_rub.price = 12.5762
 ...
 ```
 

data/lib/moex_iss/market/collection.rb

@@ -10,7 +10,7 @@ module MoexIss
       def initialize(response, instance_class: Security)
         @response = response
         @instance_class = instance_class
-        @stocks_map = {}
+        @collection_map = {}
 
         create_instances
       end
@@ -24,7 +24,7 @@ module MoexIss
       end
 
       def each
-        @stocks_map.values.each { |stock| yield stock }
+        @collection_map.values.each { |stock| yield stock }
       end
 
       private
@@ -34,9 +34,9 @@ module MoexIss
       end
 
       def setup_method(method, data)
-        @stocks_map[method] = @instance_class.new(data)
+        @collection_map[method] = @instance_class.new(data)
 
-        self.class.send(:define_method, method) { @stocks_map[method] }
+        self.class.send(:define_method, method) { @collection_map[method] }
       end
     end
   end

data/lib/moex_iss/market/currency.rb

@@ -2,33 +2,13 @@
 
 module MoexIss
   module Market
-    class Currency
+    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
-
-      attr_reader(:response, *METHODS.values)
-
-      def initialize(response)
-        @response = response
-
-        setup_instance_varibales(@response)
-      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
-      end
     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,19 +3,19 @@
 module MoexIss
   module Market
     module History
-      class Stocks < MoexIss::Market::Collection
+      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

@@ -7,14 +7,6 @@ module MoexIss
         super
       end
 
-      def create_instances_stock
-        @response.each do |data|
-          method = method_name(data)
-
-          setup_method(method, data)
-        end
-      end
-
       private
 
       def method_name(data)

data/lib/moex_iss/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moex_iss
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Vyacheslav Konovalov
@@ -101,6 +101,7 @@ files:
 - 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