mastercoin-wallet 0.0.2 → 0.0.3

data/lib/mastercoin-wallet/gui/ui_simple_send.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'simple_send_window.ui'
 **
-** Created: Sun Sep 29 16:35:18 2013
+** Created: Sat Nov 2 14:56:54 2013
 **      by: Qt User Interface Compiler version 4.8.4
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
@@ -88,6 +88,10 @@ class Ui_SimpleSend
     @submit_button.enabled = false
     @submit_button.geometry = Qt::Rect.new(410, 170, 114, 32)
     @submit_button.autoDefault = false
+    Qt::Widget.setTabOrder(@address_input, @amount_input)
+    Qt::Widget.setTabOrder(@amount_input, @currency_box)
+    Qt::Widget.setTabOrder(@currency_box, @password_input)
+    Qt::Widget.setTabOrder(@password_input, @submit_button)
 
     retranslateUi(simpleSend)
 

data/lib/mastercoin-wallet/models/selling_offer.rb

@@ -0,0 +1,18 @@
+module MastercoinWallet
+  module Models
+    class SellingOffer
+      include HTTParty
+      base_uri 'mastercoin-explorer.com/api/v1/selling_offers'
+
+      attr_accessor :address
+
+      def all
+        self.class.get(".json")
+      end
+
+      def current
+        self.class.get("/current.json")
+      end
+    end
+  end
+end

data/lib/mastercoin-wallet/network/selling_offer.rb

@@ -0,0 +1,15 @@
+module MastercoinWallet
+  module Network
+    class SellingOffer
+      include Observable
+
+      def retrieve!
+        #Thread.new do 
+          @selling_offers = MastercoinWallet::Models::SellingOffer.new.current
+          self.changed(true)
+          notify_observers(@selling_offers)
+        #end.join
+      end
+    end
+  end
+end

data/lib/mastercoin-wallet/network/wallet.rb

@@ -0,0 +1,32 @@
+module MastercoinWallet
+  module Network
+    class Wallet
+      include Observable
+
+      def sync!
+#        Thread.new do 
+          @address = MastercoinWallet::Address.new(MastercoinWallet::config.address).find
+
+          MastercoinWallet.config.set_key(:balance, (@address["balance"] || 0))
+          MastercoinWallet.config.set_key(:test_balance, (@address["test_balance"] || 0))
+
+          ["sold", "bought", "received_transactions","pending_offers", "sent_transactions", "exodus_transactions", "bitcoin_transactions", "spendable_outputs"].each do |x|
+            if @address[x]
+              MastercoinWallet.config.set_key(x, @address[x])
+            end
+          end
+
+          if @address["spendable_outputs"]
+            MastercoinWallet.config.set_key(:btc_balance, "%.8f" % MastercoinWallet.config.spendable_outputs.inject(0){|sum, x| sum += x["value"].to_f})
+          end
+
+          self.changed(true)
+
+          MastercoinWallet.config.save
+
+          notify_observers(true)
+        end
+      end
+#    end
+  end
+end

data/lib/mastercoin-wallet.rb

@@ -1,4 +1,4 @@
-require 'qt'
+require 'Qt'
 require 'httparty'
 require 'qtuitools'
 require 'openssl'
@@ -15,14 +15,33 @@ module MastercoinWallet
 
   autoload :Address, 'mastercoin-wallet/models/address'
   autoload :Transaction, 'mastercoin-wallet/models/transaction'
+
+
   autoload :MainWindow, 'mastercoin-wallet/gui/main_window'
   autoload :FirstRunWindow, 'mastercoin-wallet/gui/first_run_window'
   autoload :SimpleSendWindow, 'mastercoin-wallet/gui/simple_send_window'
+  autoload :SellingOfferWindow, 'mastercoin-wallet/gui/selling_offer_window'
+  autoload :PurchaseOfferWindow, 'mastercoin-wallet/gui/purchase_offer_window'
+  autoload :BitcoinOfferWindow, 'mastercoin-wallet/gui/bitcoin_offer_window'
   autoload :Config, 'mastercoin-wallet/config'
-  autoload :Network, 'mastercoin-wallet/network'
+
+  module Models
+    autoload :SellingOffer, 'mastercoin-wallet/models/selling_offer'
+  end
+
+  module Network
+    autoload :Wallet, 'mastercoin-wallet/network/wallet'
+    autoload :SellingOffer, 'mastercoin-wallet/network/selling_offer'
+  end
+
+  autoload :Builder, 'mastercoin-wallet/builder'
 
   autoload :Ui_FirstRunWindow, 'mastercoin-wallet/gui/ui_first_run'
   autoload :Ui_SimpleSend, 'mastercoin-wallet/gui/ui_simple_send'
+  autoload :Ui_SellingOffer, 'mastercoin-wallet/gui/ui_selling_offer'
+  autoload :Ui_PurchaseOffer, 'mastercoin-wallet/gui/ui_purchase_offer'
+  autoload :Ui_BitcoinOffer, 'mastercoin-wallet/gui/ui_bitcoin_offer'
+  autoload :Ui_MainWindow, 'mastercoin-wallet/gui/ui_main'
 
   CONFIG_PATH = "#{Dir.home}/.mastercoin-wallet/"
   FILE_PATH   = CONFIG_PATH + "config.json"
@@ -31,8 +50,12 @@ module MastercoinWallet
     @@config ||= MastercoinWallet::Config.new
   end
 
-  def self.network
-    @@network ||= MastercoinWallet::Network.new
+  def self.selling_offers
+    @@selling_offers ||= MastercoinWallet::Network::SellingOffer.new
+  end
+
+  def self.wallet
+    @@wallet ||= MastercoinWallet::Network::Wallet.new
   end
 
   def self.init_logger(level = Logger::DEBUG)

data/mastercoin-wallet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mastercoin-wallet"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Maran"]
-  s.date = "2013-09-29"
+  s.date = "2013-11-03"
   s.description = "Mastercoin wallet using QT bindings to create a useful gui wallet"
   s.email = "maran.hidskes@gmail.com"
   s.executables = ["mastercoin-wallet"]
@@ -29,20 +29,35 @@ Gem::Specification.new do |s|
     "bin/mastercoin-wallet",
     "lib/.DS_Store",
     "lib/mastercoin-wallet.rb",
+    "lib/mastercoin-wallet/builder.rb",
     "lib/mastercoin-wallet/config.rb",
+    "lib/mastercoin-wallet/gui/bitcoin_offer_window.rb",
+    "lib/mastercoin-wallet/gui/bitcoin_offer_window.ui",
     "lib/mastercoin-wallet/gui/first_run_window.rb",
     "lib/mastercoin-wallet/gui/first_run_window.ui",
     "lib/mastercoin-wallet/gui/images.rb",
     "lib/mastercoin-wallet/gui/main_window.rb",
+    "lib/mastercoin-wallet/gui/main_window.ui",
+    "lib/mastercoin-wallet/gui/purchase_offer_window.rb",
+    "lib/mastercoin-wallet/gui/purchase_offer_window.ui",
+    "lib/mastercoin-wallet/gui/selling_offer_window.rb",
+    "lib/mastercoin-wallet/gui/selling_offer_window.ui",
     "lib/mastercoin-wallet/gui/simple_send_window.rb",
     "lib/mastercoin-wallet/gui/simple_send_window.ui",
+    "lib/mastercoin-wallet/gui/ui_bitcoin_offer.rb",
     "lib/mastercoin-wallet/gui/ui_first_run.rb",
+    "lib/mastercoin-wallet/gui/ui_main.rb",
+    "lib/mastercoin-wallet/gui/ui_purchase_offer.rb",
+    "lib/mastercoin-wallet/gui/ui_selling_offer.rb",
     "lib/mastercoin-wallet/gui/ui_simple_send.rb",
     "lib/mastercoin-wallet/models/address.rb",
+    "lib/mastercoin-wallet/models/selling_offer.rb",
     "lib/mastercoin-wallet/models/transaction.rb",
-    "lib/mastercoin-wallet/network.rb",
+    "lib/mastercoin-wallet/network/selling_offer.rb",
+    "lib/mastercoin-wallet/network/wallet.rb",
     "mastercoin-wallet.gemspec",
     "resources/images.qrc",
+    "resources/logo.icns",
     "resources/logo.svg",
     "test/helper.rb",
     "test/test_mastercoin-wallet.rb"
@@ -57,33 +72,39 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<mastercoin-ruby>, [">= 0"])
       s.add_runtime_dependency(%q<qtbindings>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
       s.add_runtime_dependency(%q<active_support>, [">= 0"])
       s.add_runtime_dependency(%q<bitcoin-ruby>, ["~> 0.0.1"])
-      s.add_runtime_dependency(%q<mastercoin-ruby>, [">= 0"])
       s.add_runtime_dependency(%q<ffi>, [">= 0"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0"])
+      s.add_development_dependency(%q<releasy>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.7"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.8"])
     else
+      s.add_dependency(%q<mastercoin-ruby>, [">= 0"])
       s.add_dependency(%q<qtbindings>, [">= 0"])
       s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<active_support>, [">= 0"])
       s.add_dependency(%q<bitcoin-ruby>, ["~> 0.0.1"])
-      s.add_dependency(%q<mastercoin-ruby>, [">= 0"])
       s.add_dependency(%q<ffi>, [">= 0"])
+      s.add_dependency(%q<i18n>, [">= 0"])
+      s.add_dependency(%q<releasy>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.8"])
     end
   else
+    s.add_dependency(%q<mastercoin-ruby>, [">= 0"])
     s.add_dependency(%q<qtbindings>, [">= 0"])
     s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<active_support>, [">= 0"])
     s.add_dependency(%q<bitcoin-ruby>, ["~> 0.0.1"])
-    s.add_dependency(%q<mastercoin-ruby>, [">= 0"])
     s.add_dependency(%q<ffi>, [">= 0"])
+    s.add_dependency(%q<i18n>, [">= 0"])
+    s.add_dependency(%q<releasy>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.8"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mastercoin-wallet
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-29 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mastercoin-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: qtbindings
   requirement: !ruby/object:Gem::Requirement
@@ -76,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
-  name: mastercoin-ruby
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ffi
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -107,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: releasy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.7
+        version: 1.8.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.7
+        version: 1.8.8
 description: Mastercoin wallet using QT bindings to create a useful gui wallet
 email: maran.hidskes@gmail.com
 executables:
@@ -159,20 +191,35 @@ files:
 - bin/mastercoin-wallet
 - lib/.DS_Store
 - lib/mastercoin-wallet.rb
+- lib/mastercoin-wallet/builder.rb
 - lib/mastercoin-wallet/config.rb
+- lib/mastercoin-wallet/gui/bitcoin_offer_window.rb
+- lib/mastercoin-wallet/gui/bitcoin_offer_window.ui
 - lib/mastercoin-wallet/gui/first_run_window.rb
 - lib/mastercoin-wallet/gui/first_run_window.ui
 - lib/mastercoin-wallet/gui/images.rb
 - lib/mastercoin-wallet/gui/main_window.rb
+- lib/mastercoin-wallet/gui/main_window.ui
+- lib/mastercoin-wallet/gui/purchase_offer_window.rb
+- lib/mastercoin-wallet/gui/purchase_offer_window.ui
+- lib/mastercoin-wallet/gui/selling_offer_window.rb
+- lib/mastercoin-wallet/gui/selling_offer_window.ui
 - lib/mastercoin-wallet/gui/simple_send_window.rb
 - lib/mastercoin-wallet/gui/simple_send_window.ui
+- lib/mastercoin-wallet/gui/ui_bitcoin_offer.rb
 - lib/mastercoin-wallet/gui/ui_first_run.rb
+- lib/mastercoin-wallet/gui/ui_main.rb
+- lib/mastercoin-wallet/gui/ui_purchase_offer.rb
+- lib/mastercoin-wallet/gui/ui_selling_offer.rb
 - lib/mastercoin-wallet/gui/ui_simple_send.rb
 - lib/mastercoin-wallet/models/address.rb
+- lib/mastercoin-wallet/models/selling_offer.rb
 - lib/mastercoin-wallet/models/transaction.rb
-- lib/mastercoin-wallet/network.rb
+- lib/mastercoin-wallet/network/selling_offer.rb
+- lib/mastercoin-wallet/network/wallet.rb
 - mastercoin-wallet.gemspec
 - resources/images.qrc
+- resources/logo.icns
 - resources/logo.svg
 - test/helper.rb
 - test/test_mastercoin-wallet.rb
@@ -191,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -852878329844165909
+      hash: 4559082734438484052
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/mastercoin-wallet/network.rb

@@ -1,34 +0,0 @@
-module MastercoinWallet
-  class Network
-    include Observable
-
-    def initialize
-       @mutex = Mutex.new
-    end
-
-    def sync!
-      Thread.new do 
-        @address = Address.new(MastercoinWallet::config.address).find
-
-        MastercoinWallet.config.set_key(:balance, (@address["balance"] || 0))
-        MastercoinWallet.config.set_key(:test_balance, (@address["test_balance"] || 0))
-
-        ["received_transactions", "sent_transactions", "exodus_transactions", "bitcoin_transactions", "spendable_outputs"].each do |x|
-          if @address[x]
-            MastercoinWallet.config.set_key(x, @address[x])
-          end
-        end
-
-        if @address["spendable_outputs"]
-          MastercoinWallet.config.set_key(:btc_balance, "%.8f" % MastercoinWallet.config.spendable_outputs.inject(0){|sum, x| sum += x["value"].to_f})
-        end
-
-        self.changed(true)
-
-        MastercoinWallet.config.save
-
-        notify_observers(true)
-      end
-    end
-  end
-end