mondo 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e632fdd6a8305a3df1ea490cb1268d7096d2942
-  data.tar.gz: 76a5319a7c8fba7d04340e6de7f02339f8320f98
+  metadata.gz: aa367255403286e6a08a8618b6dacb32ef4f0061
+  data.tar.gz: 6565cb07aa4629af082a1d435c1034611ed69e2c
 SHA512:
-  metadata.gz: 8eb379908ac8591a3f2d2247b7874a09845aeaa331caa45faaad43a1bc78ef56e6a8c91b1b9801d61699346c95bc1487ea74b1847ac0b5b4563df7aca3bd757b
-  data.tar.gz: 731148b2c8939ae47e74f9b20bbbd97d7a2a7c466068527650f5a6e4bd3e73e81afe737adcc5150f0bd4eac517f7f16f8d00d4287f5256fe0e970cd452941d29
+  metadata.gz: 77d92c08341d38b0641b3d32f886f9237dd823889752410b665b7de62ac6d68dc21e993b49d0285feca7a15f2e1b0c211d76f96a843e27389d5a7070e3d5febb
+  data.tar.gz: 816df40624d8911aaca5f23a02ceb2ba62435bb9a5b296ad0af6374190c0df7dc7a53e7843a159a1df01f11cc541e6ac7bcb095e0e04ed46eb9b63349ea7f0b4

data/README.md

@@ -37,39 +37,24 @@ mondo.transactions
   #<Mondo::Transaction -31GBP OZONE COFFEE ROASTERS  UNITED KINGDO GBR tx_00008zrYsmW9IVgPz3bUiv>,
   #<Mondo::Transaction -26GBP LAN TANA               LONDON        GBR tx_00008zru1CYoS6lW6nhpeD>,
   #<Mondo::Transaction -5GBP PRET A MANGER          LONDON        GBR tx_00008zvemPnUEdNo8attNB>,
-  #<Mondo::Transaction -4GBP EXPRESS OFF LICENSE    LONDON        GBR tx_00008zxnkK6vh3rvN38W6z>,
-  #<Mondo::Transaction -13GBP LOWER EAST SIDE DELI   LONDON  EC2A  GBR tx_00008zy3PP7LTxxiXVEXAn>,
-  #<Mondo::Transaction -6GBP OZONE COFFEE ROASTERS  LONDON        GBR tx_00008zy8VxynHJGWOqY3aD>,
-  #<Mondo::Transaction -28GBP FGW SELF SERVICE       PADDINGTON    GBR tx_00008zyGtoILjhPUwlZli5>,
-  #<Mondo::Transaction -6GBP EXPRESS OFF LICENSE    LONDON        GBR tx_00008zzwuRFvGsQCml15Kj>
+  etc...
 ]
 
-mondo.transactions(expand: :merchant, limit: 3, since: "2015-08-10T23:00:00Z")
+mondo.transactions(expand: [:merchant], limit: 2, since: "2015-08-10T23:00:00Z")
 => [
   #<Mondo::Transaction -6GBP OZONE COFFEE ROASTERS  LONDON        GBR tx_00008zy8VxynHJGWOqY3aD>,
   #<Mondo::Transaction -28GBP FGW SELF SERVICE       PADDINGTON    GBR tx_00008zyGtoILjhPUwlZli5>,
-  #<Mondo::Transaction -6GBP EXPRESS OFF LICENSE    LONDON        GBR tx_00008zzwuRFvGsQCml15Kj>
 ]
 
+# Fetch a single transaction
+mondo.transaction(tx_00008zvemPnUEdNo8attNB)
+=> #<Mondo::Transaction -5GBP PRET A MANGER          LONDON        GBR tx_00008zvemPnUEdNo8attNB>
+
+
 # TODO - make a Merchant object
 mondo.transactions.last.merchant
 =>
-{
-  "id"=>"merch_00008z40hJLCkWMs15lQDx",
-  "group_id"=>"grp_00008yEdbBXWcsqVNdftbd",
-  "created"=>"2015-08-15T11:07:04Z",
-  "name"=>"East Midlands Trains",
-  "logo"=>"https://pbs.twimg.com/profile_images/532472643694235648/vxJSda4F_400x400.png",
-  "address"=>{
-    "address"=>"St Pancras Station",
-    "city"=>"London",
-    "region"=>"",
-    "country"=>"GBR",
-    "postcode"=>"NW1 2QP",
-    "latitude"=>51.531427,
-    "longitude"=>-0.126133
-  }
-}
+#<Mondo::Merchant merch_000090ER75UzBxejYTIb4r {"id"=>"merch_000090ER75UzBxejYTIb4r", "group_id"=>"grp_00008yEdfHhvbwnQcsYryL", "created"=>"2015-09-19T09:42:16Z", "name"=>"Department Of Coffee And Social Affairs", "logo"=>"http://avatars.io/twitter/deptofcoffee/?size=large", "address"=>{"address"=>"14-16 Leather Ln", "city"=>"London", "region"=>"Greater London", "country"=>"GB", "postcode"=>"EC1N 7SU", "latitude"=>51.519348553897686, "longitude"=>-0.1090317964553833}}> 
 ```
 
 ## Update Transaction Tags

data/lib/mondo/merchant.rb

@@ -8,5 +8,6 @@ module Mondo
     def address
       ::Mondo::Address.new(raw_data['address'], self.client)
     end
+
   end
 end

data/lib/mondo/resource.rb

@@ -3,7 +3,6 @@ module Mondo
 
     attr_accessor :client, :raw_data
 
-
     def initialize(hash={}, client)
       self.raw_data = hash
       self.client = client
@@ -11,6 +10,14 @@ module Mondo
       self.to_s
     end
 
+     def to_s
+      "#<#{self.class} #{raw_data}>"
+    end
+
+    def inspect
+      self.to_s
+    end
+
     class << self
       def date_writer(*args)
         args.each do |attr|

data/lib/mondo/transaction.rb

@@ -10,14 +10,6 @@ module Mondo
 
     date_accessor :created
 
-    def to_s
-      "#<#{self.class} #{self.amount_with_currency} #{self.description} #{id}>"
-    end
-
-    def inspect
-      self.to_s
-    end
-
     # TODO - proper currency library
     def amount_with_currency
       "#{amount/100}#{currency}"
@@ -28,12 +20,12 @@ module Mondo
     end
 
     def merchant(opts={})
-      if raw_data['merchant'].kind_of?(Hash)
-        ::Mondo::Merchant.new(raw_data['merchant'], client)
-      else
+      unless raw_data['merchant'].kind_of?(Hash)
+        # Go and refetch the transaction with merchant info expanded
         self.raw_data['merchant'] = self.client.transaction(self.id, expand: [:merchant]).raw_data['merchant']
-        merchant(opts)
       end
+
+      ::Mondo::Merchant.new(raw_data['merchant'], client)
     end
 
     def tags

data/lib/mondo/version.rb

@@ -1,3 +1,3 @@
 module Mondo
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mondo
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Tom Blomfield