openassets-ruby 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35d1f08b8298e82ae2bcc4e445f9f417229881e0
-  data.tar.gz: f7bbece60f1d4e193be5eff4f5429056a6cf209d
+  metadata.gz: cf01309338f084d52c8fda8cf85695b4606d32b0
+  data.tar.gz: a0b83af7aaa19874a381ed21c2393caff99c095d
 SHA512:
-  metadata.gz: ccbe3eb5168cd30fccb69e4ed58fc532d3873ddfebd9ea420a4647e48b5e0a0d8a34a3d7c5c5a9b6fadd9cd977b4a46f99b85f837c36fc637ca574b7977f241d
-  data.tar.gz: ab571a435a7ed68a15eb84984f9a2d359d0d5071e8a8b2ab1d963f965f3f83979bd5e4ba9db2e6a20480ed79ed60a8e28590adaa2f37a15b3db8ada4b5036b5f
+  metadata.gz: 0552802edfa3962439b41ad80f62efcc2215bc8f1ec7c105f7d2ef3beea5c97a1d6f432137103a1360e0f96ff1b6b795c6296647f0321fe9dd259861a4da363b
+  data.tar.gz: d152dd700611ddfced626c6aed83b67eccba0d0257198cc427e66ee551242f78b05649ce2b84c4a4a82fabd5eba1a3dcdb1a5536f30ff286183c4e3bc8bbd2dc

data/lib/openassets/protocol/asset_definition.rb

@@ -0,0 +1,62 @@
+require 'rest-client'
+
+module OpenAssets
+  module Protocol
+
+    # The Definition of Open Asset
+    class AssetDefinition
+
+      attr_accessor :asset_ids
+      attr_accessor :name_short
+      attr_accessor :name
+      attr_accessor :contract_url
+      attr_accessor :issuer
+      attr_accessor :description
+      attr_accessor :description_mime
+      attr_accessor :type
+      attr_accessor :divisibility
+      attr_accessor :link_to_website
+      attr_accessor :icon_url
+      attr_accessor :image_url
+      attr_accessor :version
+
+      # Parse the JSON obtained from the json String, and create a AssetDefinition object.
+      # @param[String]
+      def self.parse_json(json)
+        parsed_json = JSON.parse(json)
+        definition = new
+        definition.asset_ids = parsed_json['asset_ids']
+        definition.name_short = parsed_json['name_short']
+        definition.name = parsed_json['name']
+        definition.contract_url = parsed_json['contract_url']
+        definition.issuer = parsed_json['issuer']
+        definition.description = parsed_json['description']
+        definition.description_mime = parsed_json['description_mime']
+        definition.type = parsed_json['type']
+        definition.divisibility = parsed_json['divisibility']
+        definition.link_to_website = parsed_json['link_to_website']
+        definition.icon_url = parsed_json['icon_url']
+        definition.image_url = parsed_json['image_url']
+        definition.version = parsed_json['version']
+        definition
+      end
+
+      # Parse the JSON obtained from the URL, and create a AssetDefinition object.
+      # @param[String] url The URL of Asset Definition.
+      def self.parse_url(url)
+        begin
+          parse_json(RestClient.get url, :accept => :json)
+        rescue => e
+          nil
+        end
+      end
+
+      def include_asset_id?(asset_id)
+        return false if asset_ids.nil? || asset_ids.empty?
+        asset_ids.include?(asset_id)
+      end
+
+    end
+
+  end
+end

data/lib/openassets/protocol/transaction_output.rb

@@ -1,5 +1,3 @@
-require 'rest-client'
-
 module OpenAssets
   module Protocol
 
@@ -14,7 +12,7 @@ module OpenAssets
       attr_accessor :account
       attr_accessor :metadata
       attr_accessor :asset_definition_url
-      attr_accessor :valid_asset_definition
+      attr_accessor :asset_definition
 
 
       # @param [Integer] value The satoshi value of the output.
@@ -43,46 +41,38 @@ module OpenAssets
 
       # get divisibility defined by asset definition file.
       def divisibility
-        return 0 unless @valid_asset_definition
-        json = metadata_to_json
-        (json.nil? || json.length == 0) ? 0 : json['divisibility']
+        return 0 unless valid_asset_definition?
+        @asset_definition.divisibility
       end
 
       # get Asset definition url that is included metadata.
       private
       def load_asset_definition_url
-        @valid_asset_definition = true
         @asset_definition_url = ''
         return if @metadata.nil? || @metadata.length == 0
         if @metadata.start_with?('u=')
-          json = metadata_to_json
-          if json['asset_ids'].include?(@asset_id)
+          @asset_definition = AssetDefinition.parse_url(metadata_url)
+          if valid_asset_definition?
             @asset_definition_url = metadata_url
           else
             @asset_definition_url = "The asset definition is invalid. #{metadata_url}"
-            @valid_asset_definition = false
           end
         else
           @asset_definition_url = 'Invalid metadata format.'
-          @valid_asset_definition = false
         end
       end
 
       private
-      def metadata_to_json
-        url = metadata_url
-        if url.nil?
-          ''
-        else
-          JSON.parse(RestClient.get url, :accept => :json)
-        end
-      end
 
       def metadata_url
         unless @metadata.nil?
            @metadata.slice(2..-1)
         end
       end
+
+      def valid_asset_definition?
+        !@asset_definition.nil? && @asset_definition.include_asset_id?(@asset_id)
+      end
     end
 
   end

data/lib/openassets/protocol.rb

@@ -3,5 +3,6 @@ module OpenAssets
     autoload :MarkerOutput, 'openassets/protocol/marker_output'
     autoload :TransactionOutput, 'openassets/protocol/transaction_output'
     autoload :OutputType, 'openassets/protocol/output_type'
+    autoload :AssetDefinition, 'openassets/protocol/asset_definition'
   end
 end

data/lib/openassets/version.rb

@@ -1,3 +1,3 @@
 module OpenAssets
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openassets-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitcoin-ruby
@@ -117,6 +117,7 @@ files:
 - lib/openassets/api.rb
 - lib/openassets/error.rb
 - lib/openassets/protocol.rb
+- lib/openassets/protocol/asset_definition.rb
 - lib/openassets/protocol/marker_output.rb
 - lib/openassets/protocol/output_type.rb
 - lib/openassets/protocol/transaction_output.rb
@@ -156,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: The implementation of the Open Assets Protocol for Ruby.