dropwallet 0.0.5 → 0.0.7

data/lib/dropwallet/core/model.rb

@@ -46,7 +46,10 @@ class Dropwallet::Core::Model
   end
 
   def self.baseServiceUrl
-    "https://#{Dropwallet::username}:#{Dropwallet::password}@api.dropwallet.net"
+    if Dropwallet::apiUrl.to_s == ''
+      return "https://api.dropwallet.net"
+    end
+    return Dropwallet::apiUrl.to_s
   end
 
   def self.serviceUrl
@@ -68,38 +71,55 @@ class Dropwallet::Core::Model
 
   #Default Restful Calls 
   def self.find(id, options = {})
-    defaults = {:path => "#{serviceUrl}/#{id}}"}
-    defaults.merge(options)
-    item = JSON.parse(RestClient.get(defaults[:path], {:accept => :json}))
-    if debug?
-      puts item.to_s
+    if options[:path].nil?
+      options[:path] = serviceUrl
+    end 
+    options[:path] = (options[:path] << "/#{id}")
+    doc = JSON.parse(RestClient.get(options[:path], {:accept => :json}))
+    if doc.include? 'errorMessage'
+      raise doc['errorMessage']
     end
-    if item.include? 'errorMessage'
-      raise item['errorMessage']
-    end
-    return self.new(item, :new=>false)
+    return self.new(doc, :new=>false)
   end
 
-  def self.all(page = 0, options={})
+  def self.all(page=1, options={})
     defaults = {:path => "#{serviceUrl}"}
-    defaults.merge(options)
-    items = JSON.parse(RestClient.get(defaults[:path], {:accept => :json}))
-    if items.include? 'errorMessage'
-      raise items['errorMessage']
-    end
-    if debug?
-      puts items.to_s
+    options.merge(defaults)
+    options[:path] = (options[:path] << "?page=#{page}&limit=20")
+    doc = JSON.parse(RestClient.get(options[:path], {:accept => :json}))
+    if doc.include? 'errorMessage'
+      raise doc['errorMessage']
     end
     objects = []
-    items.each do |item|
+    doc['items'].each do |item|
       objects << self.new(item)
     end
-    return items
+    return objects
   end
 
 
-  def self.count
-    return 0
+  def self.count(options={})
+    defaults = {:path => "#{serviceUrl}"}
+    options.merge(defaults)
+    options[:path] = (options[:path] << "?page=1&limit=1")
+    puts options[:path]
+    doc = JSON.parse(RestClient.get(options[:path], {:accept => :json}))
+    if doc.include? 'errorMessage'
+      raise doc['errorMessage']
+    end
+    return doc['pages']
+  end
+
+  def self.pages(options={})
+    defaults = {:path => "#{serviceUrl}"}
+    options.merge(defaults)
+    options[:path] = (options[:path] << "?page=1&limit=20")
+    puts options[:path]
+    doc = JSON.parse(RestClient.get(options[:path], {:accept => :json}))
+    if doc.include? 'errorMessage'
+      raise doc['errorMessage']
+    end
+    return doc['pages']
   end
 
   def save(options = {})
@@ -108,7 +128,7 @@ class Dropwallet::Core::Model
     end
     defaults = {:path => "#{serviceUrl}"}
     defaults.merge(options)
-    item = JSON.parse(RestClient.post(defaults[:path], to_json, {:accept => :json}))
+    item = JSON.parse(RestClient.post(defaults[:path].strip, to_json, {:accept => :json}))
     if item.include? 'errorMessage'
       raise item['errorMessage']
     end
@@ -122,13 +142,13 @@ class Dropwallet::Core::Model
     end
     defaults = {:path => "#{serviceUrl}/#{id}"}
     defaults.merge(options)
-    return JSON.parse(RestClient.put(defaults[:path], to_json, {:accept => :json}))
+    return JSON.parse(RestClient.put(defaults[:path].strip, to_json, {:accept => :json}))
   end
 
   def delete(options={})
     defaults = {:path => "#{serviceUrl}/#{id}"}
     defaults.merge(options)
-    item = JSON.parse(RestClient.delete(defaults[:path], {:accept => :json}))
+    item = JSON.parse(RestClient.delete(defaults[:path].strip, {:accept => :json}))
     if item.include? 'errorMessage'
       raise item['errorMessage']
     end
@@ -139,7 +159,7 @@ class Dropwallet::Core::Model
   def self.delete(itemId, options={})
     defaults = {:path => "#{serviceUrl}/#{itemId}"}
     defaults.merge(options)
-    item = JSON.parse(RestClient.delete(defaults[:path], {:accept => :json}))
+    item = JSON.parse(RestClient.delete(defaults[:path].strip, {:accept => :json}))
     if item.include? 'errorMessage'
       raise item['errorMessage']
     end

data/lib/dropwallet/core/order.rb

@@ -1,9 +1,25 @@
 class Dropwallet::Core::Order < Dropwallet::Core::Model
-  field :id
-  field :grandtotal
-  field :total
-  field :productName
-  field :status
-  field :productSku
-  field :qty
+  field :orderId
+  field :orderDate
+  field :grandTotal
+  field :taxTotal
+  field :shippingTotal
+  field :subTotal
+  field :shippingAddress
+  field :items
+
+  def status
+    canceled = true
+    self.items.each do |item|
+      if item['status'].upcase != 'CANCELLED'
+        canceled= false
+      end
+    end
+
+    if canceled
+      return 'CANCELLED'
+    end
+
+    return ''
+  end
 end

data/lib/dropwallet/core/user.rb

@@ -6,6 +6,20 @@ class Dropwallet::Core::User < Dropwallet::Core::Model
   field :firstName
   field :lastName
 
+  def orders(page = 1)
+    options = {:path => "#{Dropwallet::Core::Model.baseServiceUrl}/users/#{id}/orders.json"}
+    return Dropwallet::Core::Order.all(page, options)
+  end
+
+  def order(orderId)
+    options = {:path => "#{Dropwallet::Core::Model.baseServiceUrl}/users/#{id}/orders"}
+    return Dropwallet::Core::Order.find(orderId, options)
+  end
+
+  def ordersPages
+    options = {:path => "#{Dropwallet::Core::Model.baseServiceUrl}/users/#{id}/orders.json"}
+    return Dropwallet::Core::Order.pages(options)
+  end
     # Login Function, returns User object on success, nil on failure
   def self.login(username, password)
     login = JSON.parse(RestClient.post baseServiceUrl + '/session/login', "username=#{username}&password=#{password}", {:accept => :json})

data/lib/dropwallet/version.rb

@@ -1,5 +1,5 @@
 module Dropwallet
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 
   def self.username
     @username
@@ -7,7 +7,7 @@ module Dropwallet
   def self.username=(name)
     @username = name
   end
-    def self.password
+  def self.password
     @password
   end
   def self.password=(password)
@@ -19,6 +19,12 @@ module Dropwallet
   def self.cache
     return @cache
   end 
+  def self.apiUrl
+    @apiUrl
+  end
+  def self.apiUrl=(apiUrl)
+    @apiUrl = apiUrl
+  end
 
   module Core
   end

data/lib/dropwallet.rb

@@ -4,6 +4,7 @@ require "dropwallet/version"
 require "dropwallet/core/model"
 require "dropwallet/core/user"
 require "dropwallet/core/product"
+require "dropwallet/core/order"
 
 #CDN Web Services
 require "dropwallet/cdn/file"

data/test/testCdnFile.rb

@@ -1,10 +1,10 @@
-require 'test/unit'
-require 'dropwallet'
+# require 'test/unit'
+# require 'dropwallet'
 
-class TestCdnFile < Test::Unit::TestCase
-  def testUpload 
-    assert_nothing_raised do
-      Dropwallet::CDN::File.upload('/Users/bcentinaro/Desktop/RealSimple_DropWalletLogo.png' ,'Test', 'folder/secondFolder/logo.png')
-    end 
-  end
-end
+# class TestCdnFile < Test::Unit::TestCase
+#   def testUpload 
+#     assert_nothing_raised do
+#       #Dropwallet::CDN::File.upload('/Users/bcentinaro/Desktop/RealSimple_DropWalletLogo.png' ,'Test', 'folder/secondFolder/logo.png')
+#     end 
+#   end
+# end

data/test/testOrders.rb

@@ -0,0 +1,17 @@
+require 'test/unit'
+require 'dropwallet'
+
+class TestOrders < Test::Unit::TestCase
+  def testOrders
+    RestClient.log = "/dev/null"
+    Dropwallet::username = 'dropwallet'
+    Dropwallet::password = 'icuetv789'
+    user1 = Dropwallet::Core::User.login('customer0000@icuetv.com','password')
+    items =  user1.orders
+    puts 'ORDERS'
+    items.each do |item|
+      #order = Dropwallet::Core::Order.find(item.orderId)
+    end
+    
+  end 
+end

data/test/testProduct.rb

@@ -1,20 +1,20 @@
-require 'test/unit'
-require 'dropwallet'
+# require 'test/unit'
+# require 'dropwallet'
 
-class TestProduct < Test::Unit::TestCase
+# class TestProduct < Test::Unit::TestCase
 
-  def testFind
-    RestClient.log = "stdout"
-    Dropwallet::username = 'dropwallet'
-    Dropwallet::password = 'icuetv789'
-    product =  Dropwallet::Core::Product.find(123)
-    assert_not_nil product
-  end 
-  def testAll
-    RestClient.log = "stdout"
-    Dropwallet::username = 'dropwallet'
-    Dropwallet::password = 'icuetv789'
-    products =  Dropwallet::Core::Product.all
-    assert_not_nil products
-  end
-end
+#   def testFind
+#     RestClient.log = "stdout"
+#     Dropwallet::username = 'dropwallet'
+#     Dropwallet::password = 'icuetv789'
+#     product =  Dropwallet::Core::Product.find(123)
+#     assert_not_nil product
+#   end 
+#   def testAll
+#     RestClient.log = "stdout"
+#     Dropwallet::username = 'dropwallet'
+#     Dropwallet::password = 'icuetv789'
+#     products =  Dropwallet::Core::Product.all
+#     assert_not_nil products
+#   end
+# end

data/test/testUser.rb

@@ -27,4 +27,17 @@ class TestUser < Test::Unit::TestCase
     assert_not_nil user2
     assert_equal user2.id, user1.id
   end 
+  def testOrders
+    RestClient.log = "/dev/null"
+    Dropwallet::username = 'dropwallet'
+    Dropwallet::password = 'icuetv789'
+    user1 = Dropwallet::Core::User.login('customer0000@icuetv.com','password')
+    items =  user1.orders
+    puts 'ORDERS'
+    items.each do |item|
+      order = user1.order(item.orderId)
+      puts order.to_s
+    end
+    puts "Pages: #{user1.ordersPages}"
+  end 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dropwallet
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -102,6 +102,7 @@ files:
 - lib/dropwallet/core/user.rb
 - lib/dropwallet/version.rb
 - test/testCdnFile.rb
+- test/testOrders.rb
 - test/testProduct.rb
 - test/testUser.rb
 - test/testVersion.rb
@@ -131,6 +132,7 @@ specification_version: 3
 summary: Dropwallet API Bindings for Ruby
 test_files:
 - test/testCdnFile.rb
+- test/testOrders.rb
 - test/testProduct.rb
 - test/testUser.rb
 - test/testVersion.rb