pixallent-fetchapi-ruby 0.9 → 0.9.1

data/README

@@ -1,9 +1,53 @@
 == Installation                                                              
-
+	gem sources -a http://gems.github.com (you only have to do this once)
 	gem install pixallent-fetchapi-ruby                                                   
+                
+= Setup
+	FetchAPI::Base.basic_auth('youraccount.fetchapp.com', 'demokey', 'demotoken')
+	
+= Account
 
-== Usage
+	FetchAPI::Account.details
+	
+	token = FetchAPI::Account.new_token  *Subsequent calls will use the new token automatically
 
-	FetchAPI::Base.basic_auth('youraccount.fetchapp.com', 'demokey', 'demotoken')
-   FetchAPI::Item.find("ABC0001")
-	FetchAPI::Order.create(:id => "1015", :title => "Test Order", :first_name => "Donald", :last_name => "Duck", :email => "donald@duck.com", :order_items => [{:sku => 'ABC0001'}, {:sku => 'ABC0002}])
+= Downloads
+
+	downloads = FetchAPI::Download.find(:all, :per_page => 50, :page => 2)
+	
+	download = FetchAPI::Download.find(1)
+	
+
+= Items
+
+	items = FetchAPI::Item.find(:all, :per_page => 10, :page => 3)
+
+	item = FetchAPI::Item.find("CJ0001")
+
+	item = FetchAPI::Item.create(:sku => "CJ0001", :name => "Carrot Juice")
+	
+	item.update(:name => "Tomato Juice")
+	
+	item.destroy
+	
+	downloads = item.downloads  *Returns an array of FetchAPI::Downloads for this item
+
+= Orders	
+
+	all_orders = FetchAPI::Order.find(:all)            
+
+	current_orders = FetchAPI::Order.find(:current, :page => 3)
+	
+	manual_orders = FetchAPI::Order.find(:manual, :per_page => 10)
+
+	expired_orders = FetchAPI::Order.find(:expired, :per_page => 10, :page => 3)
+
+	order = FetchAPI::Order.find("1001")
+	
+	order = FetchAPI::Order.create(:id => "1015", :title => "Test Order", :first_name => "Donald", :last_name => "Duck", :email => "donald@duck.com", :order_items => [{:sku => 'ABC0001'}, {:sku => 'ABC0002}])
+	
+	order.update(:first_name => "Daffy")
+	
+	order.destroy
+	
+	downloads = order.downloads  *Returns an array of FetchAPI::Downloads for this order

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('fetchapi-ruby', '0.9') do |p|
+Echoe.new('fetchapi-ruby', '0.9.1') do |p|
   p.description    = "Integrate your site with http://fetchapp.com for seamless digital delivery."
   p.url            = "http://github.com/pixallent/fetchapi-ruby"
   p.author         = ["Thomas Reynolds, Michael Larkin"]

data/fetchapi-ruby.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fetchapi-ruby}
-  s.version = "0.9"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds, Michael Larkin"]

data/lib/fetchapi/account.rb

@@ -2,17 +2,23 @@ module FetchAPI
   class Account < FetchAPI::Base
     #--
     ################ Class Methods ###############
-    #--    
+    #--
 
     # Retrieves information about the Account
     def self.details
-      execute(:get, "/account")
+      new(execute(:get, "/account"))
     end
 
     # Generates a new API token.  Subsequent API calls using the
     # existing token will be refused.
     def self.new_token
-      execute(:get, "/new_token")
+      token = execute(:get, "/new_token")
+      unless token["message"].blank?
+        # Reauthorize
+		  puts "XXXXXXXX #{token["message"]}"
+		  Connector.basic_auth(@key, token["message"])
+        token
+      end
     end
 
   end

data/lib/fetchapi/base.rb

@@ -1,22 +1,28 @@
 module FetchAPI
   class Base
-    
-	 def initialize(id_or_attributes)  
+
+    def initialize(id_or_attributes)
       case id_or_attributes
       when Integer, String
         @attributes = get("/#{self.class.pluralized_class_name}/#{id_or_attributes.to_s}")
-		  @attributes = @attributes[self.class.singularized_class_name]
-		  @id = @attributes['id']
+        @attributes = @attributes[self.class.singularized_class_name]
+        @id = @attributes['id']
       when Hash
         @attributes = id_or_attributes
-		  @id = id_or_attributes['id']
+        @id = id_or_attributes['id']
       end
     end
 
     def self.find(selector, params={})
       case selector
       when :all
-        execute(:get, "/#{pluralized_class_name}")[pluralized_class_name].map { |data| new(data) }
+        objects = execute(:get, "/#{pluralized_class_name}")
+
+        if objects[pluralized_class_name].blank?
+          return []
+        else
+          objects[pluralized_class_name].map { |data| new(data) }
+        end
       when Integer, String
         new(selector)
       end
@@ -29,6 +35,7 @@ module FetchAPI
 
     # Initializes the connection
     def self.basic_auth(url, key, token)
+		@key = key # Save this in case they generate a new token
       Connector.base_uri(url)
       Connector.basic_auth(key, token)
     end
@@ -60,8 +67,8 @@ module FetchAPI
         raise(response.messsage)
       when 400..499 then
         raise(response.message)
-      when 500..599 then 
-			raise(response.message)
+      when 500..599 then
+        raise(response.message)
       else
         raise("Unknown Response")
       end

data/lib/fetchapi/item.rb

@@ -1,6 +1,6 @@
 module FetchAPI
   class Item < FetchAPI::Base
-	attr_accessor :attributes
+	attr_accessor :id, :attributes
 
     def initialize(id_or_attributes)
       case id_or_attributes
@@ -16,7 +16,7 @@ module FetchAPI
     ################ Class Methods ###############
     #--
     def self.create(options)
-      execute(:post, "/items/create", :item => options)
+      return FetchAPI::Item.new(execute(:post, "/items/create", :item => options)["item"])
     end
 
     #--
@@ -28,9 +28,17 @@ module FetchAPI
     end
 
     def update(options)
-      put("/items/#{sku}", :item => options)
+      self.attributes = put("/items/#{sku}", :item => options)["item"]
+		self.id = self.sku
     end
 
+	 def downloads
+		downloads = get("/items/#{sku}/downloads")
+		if downloads
+			downloads["downloads"].map { |data| FetchAPI::Download.new(data) }
+		end
+	 end
+
 
   end
 end

data/lib/fetchapi/order.rb

@@ -11,13 +11,28 @@ module FetchAPI
       case selector
       when :current
         params.merge!(:filter => "current")
-        execute(:get, "/#{pluralized_class_name}?#{params.to_params}")[pluralized_class_name].map { |data| new(data) }
+        orders = execute(:get, "/orders?#{params.to_params}")
+        if orders["orders"].blank?
+          return []
+        else
+          orders["orders"].map { |data| new(data) }
+        end
       when :manual
         params.merge!(:filter => "manual")
-        execute(:get, "/#{pluralized_class_name}?#{params.to_params}")[pluralized_class_name].map { |data| new(data) }
+        orders = execute(:get, "/orders?#{params.to_params}")
+        if orders["orders"].blank?
+          return []
+        else
+          orders["orders"].map { |data| new(data) }
+        end
       when :expired
         params.merge!(:filter => "expired")
-        execute(:get, "/#{pluralized_class_name}?#{params.to_params}")[pluralized_class_name].map { |data| new(data) }
+        orders = execute(:get, "/orders?#{params.to_params}")
+        if orders["orders"].blank?
+          return []
+        else
+          orders["orders"].map { |data| new(data) }
+        end
       else
         super
       end
@@ -25,7 +40,7 @@ module FetchAPI
 
     # Creates a new order
     def self.create(options={})
-      execute(:post, "/orders/create", :order => options)
+      return FetchAPI::Order.new(execute(:post, "/orders/create", :order => options)["order"])
     end
 
     #--
@@ -52,9 +67,15 @@ module FetchAPI
 
     # Immediately updates the order with the new parameters
     def update(options={})
-      put("/orders/#{id}", :order => options)
+      self.attributes = put("/orders/#{id}", :order => options)["order"]
     end
 
+    def downloads(params={})
+      downloads = get("/orders/#{id}/downloads")
+      if downloads
+        downloads["downloads"].map { |data| FetchAPI::Download.new(data) }
+      end
+    end
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pixallent-fetchapi-ruby
 version: !ruby/object:Gem::Version 
-  version: "0.9"
+  version: 0.9.1
 platform: ruby
 authors: 
 - Thomas Reynolds, Michael Larkin