versacommerce_api 1.0.2 → 1.0.3

data/.gitignore

@@ -1,18 +1,12 @@
-*.rbc
-*.sassc
-.sass-cache
-capybara-*.html
-.rspec
-/.bundle
-/vendor/bundle
-/log/*
-/tmp/*
-/db/*.sqlite3
-/public/system/*
-/coverage/
-/spec/tmp/*
-**.orig
-rerun.txt
-pickle-email-*.html
+*.gem
+*.swp
+.bundle
 .DS_Store
+<<<<<<< HEAD
+.rvmrc
+/coverage
+Gemfile.lock
+scratchpad
+=======
 /scratchpads
+>>>>>>> 14896020a14ac84df4a9646d0aff9843c5ca25a0

data/bin/versacommerce

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- encoding : utf-8 -*-
 require File.expand_path('../../lib/versacommerce_api',__FILE__)
 require File.expand_path('../../lib/versacommerce_api/cli',__FILE__)
 VersacommerceAPI::Cli.start(ARGV)

data/lib/active_resource/base_ext.rb

@@ -1,6 +1,7 @@
+# -*- encoding : utf-8 -*-
 module ActiveResource
   class Base
-    # Backported from ActiveResource master branch
+    # BACKPORTED FROM ACTIVERESOURCE MASTER BRANCH
     def self.headers
       @headers ||= {}
 

data/lib/active_resource/connection_ext.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'active_support/core_ext/module/aliasing'
 
 module ActiveResource

data/lib/active_resource/detailed_log_subscriber.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module ActiveResource
   class DetailedLogSubscriber < ActiveSupport::LogSubscriber
     def request(event)

data/lib/active_resource/disable_prefix_check.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module DisablePrefixCheck
   extend ActiveSupport::Concern
 

data/lib/active_resource/json_errors.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'active_resource/base'
 
 module ActiveResource

data/lib/versacommerce_api/associatable.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
 
   module Associatable

data/lib/versacommerce_api/cli.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'thor'
 require 'abbrev'
 

data/lib/versacommerce_api/countable.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
 
   module Countable

data/lib/versacommerce_api/resources/base.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
 
   class Base < ActiveResource::Base

data/lib/versacommerce_api/resources/billing_addres.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
 
   class BillingAddres < Base

data/lib/versacommerce_api/resources/collection.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
 
   class Collection < Base

data/lib/versacommerce_api/resources/customer.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
 
   class Customer < Base

data/lib/versacommerce_api/resources/item.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
 
   class Item < Base

data/lib/versacommerce_api/resources/link.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
   
   class Link < Base

data/lib/versacommerce_api/resources/linklist.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
 
   class Linklist < Base

data/lib/versacommerce_api/resources/order.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
 
   # An order comes by default with three associations: shipping_address, billing_address and customer.

data/lib/versacommerce_api/resources/page.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
 
   class Page < Base

data/lib/versacommerce_api/resources/payment.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
 
   class Payment < Base

data/lib/versacommerce_api/resources/product.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
 
   class Product < Base

data/lib/versacommerce_api/resources/product_image.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
   
   class ProductImage < Base

data/lib/versacommerce_api/resources/property.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
   
   class Property < Base

data/lib/versacommerce_api/resources/shipment.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
 
   class Shipment < Base

data/lib/versacommerce_api/resources/shipping_addres.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
 
   class ShippingAddres < Base

data/lib/versacommerce_api/resources/shop.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
 
   # Shop object. Use Shop.current to receive the shop.

data/lib/versacommerce_api/resources/variant.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
   
   class Variant < Base

data/lib/versacommerce_api/resources.rb

@@ -1,2 +1,3 @@
+# -*- encoding : utf-8 -*-
 require 'versacommerce_api/resources/base'
 Dir.glob "#{File.dirname(__FILE__)}/resources/*", &method(:require)

data/lib/versacommerce_api/session.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
 
   class Session

data/lib/versacommerce_api/version.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module VersacommerceAPI
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/versacommerce_api.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 $:.unshift File.dirname(__FILE__)
 
 require 'active_resource'

data/spec/resources/order_spec.rb

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

data/spec/resources/product_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe VersacommerceAPI::Product do

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'rubygems'
 require 'bundler/setup'
 require 'rspec'

data/versacommerce_api.gemspec

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: versacommerce_api
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler