versacommerce_api 1.0.4 → 1.0.6

data/CHANGELOG

@@ -1,2 +1,2 @@
-
+1.0.6 - Added Account resource 
 1.0.1 - First public release

data/Gemfile.lock

@@ -1,38 +1,38 @@
 PATH
   remote: .
   specs:
-    versacommerce_api (1.0.3)
+    versacommerce_api (1.0.6)
       activeresource (>= 3.2.14)
       thor (>= 0.14.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
+    activemodel (4.0.4)
+      activesupport (= 4.0.4)
       builder (~> 3.1.0)
     activeresource (4.0.0)
       activemodel (~> 4.0)
       activesupport (~> 4.0)
       rails-observers (~> 0.1.1)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
+    activesupport (4.0.4)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    atomic (1.1.14)
+    atomic (1.1.16)
     builder (3.1.4)
     coderay (1.0.9)
     diff-lcs (1.2.4)
     fakeweb (1.3.0)
-    i18n (0.6.5)
+    i18n (0.6.9)
     metaclass (0.0.1)
     method_source (0.8.2)
     minitest (4.7.5)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.2)
+    multi_json (1.9.2)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -51,10 +51,10 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.3)
     slop (3.4.6)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
-    tzinfo (0.3.38)
+    thor (0.19.1)
+    thread_safe (0.3.1)
+      atomic (>= 1.1.7, < 2)
+    tzinfo (0.3.39)
 
 PLATFORMS
   ruby

data/lib/versacommerce_api/resources/account.rb

@@ -0,0 +1,11 @@
+# -*- encoding : utf-8 -*-
+module VersacommerceAPI
+
+  # Account object. Use Account.current to receive the account details.
+  class Account < Base
+    def self.current
+      find(:one, :from => "/api/account.xml")
+    end
+  end
+
+end

data/lib/versacommerce_api/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module VersacommerceAPI
-  VERSION = "1.0.4"
+  VERSION = "1.0.6"
 end

data/spec/resources/order_spec.rb

@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 # -*- encoding : utf-8 -*-
-=======
->>>>>>> 14896020a14ac84df4a9646d0aff9843c5ca25a0
 require 'spec_helper'
 
 describe VersacommerceAPI::Order do

data/spec/spec_helper.rb

@@ -12,8 +12,8 @@ end
 
 
 def initialize_session
-	VersacommerceAPI::Session.setup(api_key: "4e6d0a2be244cff731f88caaff45e6ea3d2f9221", secret: "afe883e32194fc464c029e73fe9f3674b6e4996e")
-	token = "c26a0c74" #VersacommerceAPI::Session.request_token("test-produkte.versacommerce.de")
-	session = VersacommerceAPI::Session.new("test-produkte.versacommerce.de", token)
+	VersacommerceAPI::Session.setup(api_key: "xxxxx", secret: "xxxxx")
+	token = "xxxxx" #VersacommerceAPI::Session.request_token("test-produkte.versacommerce.de")
+	session = VersacommerceAPI::Session.new("xxxxx.versacommerce.de", token)
 	VersacommerceAPI::Base.activate_session(session)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: versacommerce_api
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -186,6 +186,7 @@ files:
 - lib/versacommerce_api/cli.rb
 - lib/versacommerce_api/countable.rb
 - lib/versacommerce_api/resources.rb
+- lib/versacommerce_api/resources/account.rb
 - lib/versacommerce_api/resources/base.rb
 - lib/versacommerce_api/resources/billing_addres.rb
 - lib/versacommerce_api/resources/collection.rb
@@ -230,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: The VersaCommerce API gem is a lightweight gem for accessing the VersaCommerce
@@ -239,4 +240,3 @@ test_files:
 - spec/resources/order_spec.rb
 - spec/resources/product_spec.rb
 - spec/spec_helper.rb
-has_rdoc: