stellar-base 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf6776556e7768bfa027ac24a2f5db5ab06cc2c5
-  data.tar.gz: 27742e565e992025460c86d1a85f95fccad3f238
+  metadata.gz: 19c996423e6ccb1a43a3da3de6338838ef443b8a
+  data.tar.gz: 1310708e376a5cd4dfe246d2a91e196f2c214cc2
 SHA512:
-  metadata.gz: 1e5322413bba96a461eb56e22203affb4b70fd1ac7cbca8db2dfafa9a61b143f90ce500ea282e2f77da8046bcf49b8d8094a3b5c4cc111ae64d5d2af0f4873bd
-  data.tar.gz: e55615e11ab0f4fc661a8887fae017f5822391b863d79aae8e3eb98275abbbed57029fbb788626434f8b651cc97b286d79e746318af6224dc77f6e9376cbf4bf
+  metadata.gz: 8fec9593753a0aa9928f57f62bc1079b7a55605aa4233c6faffb4b405d24b7e4a64db7080cde242ce3afb4495ba9c088432b9187b116d846c9816147e3070f9d
+  data.tar.gz: d66d8e6dbfe8c1557da22c11d484fe8593952ba2a06c122f703078423da1b87986626f83c40aa93e43ced422622b3c031bd5c44740c605d274cef13b34b9aa8a

data/Guardfile

@@ -1,5 +1,5 @@
-guard :rspec, cmd: 'rspec' do
+guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
-end
+end

data/examples/create_account.rb

@@ -10,13 +10,13 @@ $server = Faraday.new(url: "http://localhost:39132") do |conn|
   conn.adapter Faraday.default_adapter
 end
 
-master      = Stellar::KeyPair.from_raw_seed("allmylifemyhearthasbeensearching")
+master      = Stellar::KeyPair.master
 destination = Stellar::KeyPair.random
 
 tx = Stellar::Transaction.create_account({
   account:     master,
   destination: destination,
-  sequence:    2,
+  sequence:    1,
   starting_balance:  50 * Stellar::ONE
 })
 

data/lib/stellar/asset.rb

@@ -6,17 +6,30 @@ module Stellar
 
     def self.alphanum4(code, issuer)
       raise ArgumentError, "Bad :issuer" unless issuer.is_a?(KeyPair)
-      code = normalize_code(code)
+      code = normalize_code(code, 4)
       an = AlphaNum4.new({asset_code:code, issuer:issuer.account_id})
       new(:asset_type_credit_alphanum4, an)
     end
 
+    def self.alphanum12(code, issuer)
+      raise ArgumentError, "Bad :issuer" unless issuer.is_a?(KeyPair)
+      code = normalize_code(code, 12)
+      an = AlphaNum12.new({asset_code:code, issuer:issuer.account_id})
+      new(:asset_type_credit_alphanum12, an)
+    end
+
     def to_s
-      if switch == AssetType.asset_type_native
+      case switch
+      when AssetType.asset_type_native
         "native"
-      else
-        issuer_address = Stellar::Util::StrKey.check_encode(:account_id,alpha_num.issuer)
-        "#{alpha_num.asset_code}/#{issuer_address}"
+      when AssetType.asset_type_credit_alphanum4
+        anum = alpha_num4!
+        issuer_address = Stellar::Convert.pk_to_address(anum.issuer)
+        "#{anum.asset_code}/#{issuer_address}"
+      when AssetType.asset_type_credit_alphanum12
+        anum = alpha_num12!
+        issuer_address = Stellar::Convert.pk_to_address(anum.issuer)
+        "#{anum.asset_code}/#{issuer_address}"
       end
     end
 
@@ -26,13 +39,31 @@ module Stellar
     end
 
     def code
-      self.alpha_num!.asset_code
+      case switch
+      when AssetType.asset_type_credit_alphanum4
+        alpha_num4!.asset_code
+      when AssetType.asset_type_credit_alphanum12
+        alpha_num12!.asset_code
+      else
+        raise "#{switch} assets do not have a code"
+      end
+    end
+    
+    def issuer
+      case switch
+      when AssetType.asset_type_credit_alphanum4
+        alpha_num4!.issuer
+      when AssetType.asset_type_credit_alphanum12
+        alpha_num12!.issuer
+      else
+        raise "#{switch} assets do not have a isuuer"
+      end
     end
 
-    def self.normalize_code(code)
-      raise ArgumentError, "Invalid asset code: #{code}, must be <= 4 bytes" if code.length > 4
+    def self.normalize_code(code, length)
+      raise ArgumentError, "Invalid asset code: #{code}, must be <= #{length} bytes" if code.length > length
 
-      code.ljust(4, "\x00")
+      code.ljust(length, "\x00")
     end
   end
 end

data/lib/stellar/base/version.rb

@@ -1,5 +1,5 @@
 module Stellar
   module Base
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/lib/stellar/key_pair.rb

@@ -27,6 +27,10 @@ module Stellar
       new(public_key, secret_key)
     end
 
+    def self.master
+      from_raw_seed("allmylifemyhearthasbeensearching")
+    end
+
     def initialize(public_key, secret_key=nil)
       @public_key = public_key
       @secret_key = secret_key

data/spec/lib/stellar/asset_spec.rb

@@ -0,0 +1,45 @@
+require "spec_helper"
+
+describe Stellar::Asset, ".native" do
+  it "returns a asset instance whose type is 'AssetType.asset_type_native'" do
+    expect(Stellar::Asset.native.type).to eq(Stellar::AssetType.asset_type_native)
+  end
+end
+
+describe Stellar::Asset, ".alphanum4" do
+  it "returns a asset instance whose type is 'AssetType.asset_type_credit_alphanum4'" do
+    result = Stellar::Asset.alphanum4("USD", Stellar::KeyPair.master)
+    expect(result.type).to eq(Stellar::AssetType.asset_type_credit_alphanum4)
+  end
+
+  it "pads the code to 4 bytes, padding on the right and with null bytes" do
+    result = Stellar::Asset.alphanum4("USD", Stellar::KeyPair.master)
+    expect(result.code).to eq("USD\x00")
+  end
+end
+
+describe Stellar::Asset, ".alphanum12" do
+  it "returns a asset instance whose type is 'AssetType.asset_type_credit_alphanum12'" do
+    result = Stellar::Asset.alphanum12("USD", Stellar::KeyPair.master)
+    expect(result.type).to eq(Stellar::AssetType.asset_type_credit_alphanum12)
+  end
+
+  it "pads the code to 12 bytes, padding on the right and with null bytes" do
+    result = Stellar::Asset.alphanum12("USD", Stellar::KeyPair.master)
+    expect(result.code).to eq("USD\x00\x00\x00\x00\x00\x00\x00\x00\x00")
+  end
+end
+
+describe Stellar::Asset, "#code" do
+  it "returns the asset_code for either alphanum4 or alphanum12 assets" do
+    a4 = Stellar::Asset.alphanum4("USD", Stellar::KeyPair.master)
+    a12 = Stellar::Asset.alphanum12("USD", Stellar::KeyPair.master)
+
+    expect(a4.code.strip).to eq("USD")
+    expect(a12.code.strip).to eq("USD")
+  end
+
+  it "raises an error when called on a native asset" do
+    expect{ Stellar::Asset.native.code }.to raise_error
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stellar-base
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Scott Fleckenstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xdr
@@ -374,6 +374,7 @@ files:
 - lib/stellar/util/strkey.rb
 - ruby-stellar-base.gemspec
 - spec/lib/stellar/account_flags_spec.rb
+- spec/lib/stellar/asset_spec.rb
 - spec/lib/stellar/convert_spec.rb
 - spec/lib/stellar/key_pair_spec.rb
 - spec/lib/stellar/path_payment_result_spec.rb
@@ -422,6 +423,7 @@ specification_version: 4
 summary: 'Stellar client library: XDR'
 test_files:
 - spec/lib/stellar/account_flags_spec.rb
+- spec/lib/stellar/asset_spec.rb
 - spec/lib/stellar/convert_spec.rb
 - spec/lib/stellar/key_pair_spec.rb
 - spec/lib/stellar/path_payment_result_spec.rb