lightspeed_pos 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3960f7c39629798ffae0406f84fb2cbcf897390
-  data.tar.gz: f900f23a42324bf61268b0ab4f43ac0528971c38
+  metadata.gz: 3e50edadd52d55b1ed3b2def3b6b10b765d8ac2a
+  data.tar.gz: b59ae04766b48a27126491e94a4b88fbf7a71902
 SHA512:
-  metadata.gz: 7e7e1f10edaa984d5e232c9706f32e3b6d13bb8cae0cb3c5e00f773335493a3372085e7d85c7411ccb425f20fe8ab341d98075273d39f5e418d839b32cf99478
-  data.tar.gz: 856a6628c9c7c4dd36b10e25a253bc394230600e5632c3e961242a285e9154d34b99564fb063e06ebf376feb7ffd74ddd7397faaa9a2e20a08206f4e7a02e474
+  metadata.gz: 7951c24a7ee73b3840a1145b8f8c8d797e074a1b03277ea4fe814618fd7045116a41d06ae9ea1c8c723f1561e1b84547c0799a5a3d0d13f74fe0bf500a9841bd
+  data.tar.gz: f1c67e762048bfc0a08660027e2742ed6d3d85b33467062cb558b0569fc094498f2490ee41c6e3f250cc39b0316ffd971b3a1162181a8b943b8ccb512beee387

data/.rubocop.yml

@@ -49,8 +49,8 @@ IndentHash:
 IndentationWidth:
   Enabled: false
 
-CaseIndentation:
-  IndentWhenRelativeTo: end
+Layout/CaseIndentation:
+  EnforcedStyle: end
 
 FormatString:
   Enabled: false
@@ -65,5 +65,8 @@ SignalException:
 DoubleNegation:
   Enabled: false
 
-TrailingComma:
+Style/TrailingCommaInLiteral:
+  Enabled: false
+
+Style/TrailingCommaInArguments:
   Enabled: false

data/README.markdown

@@ -9,9 +9,11 @@ Not all endpoints are implemented yet, but you can help by submitting pull reque
 First, intialize a new client:
 
 ```ruby
-client = Lightspeed::Client.new(oauth_token: "YOUR_ACCESS_TOKEN_HERE")
+client = Lightspeed::Client.new(oauth_token_holder: yourOAuthAwareObjectHere)
 ```
 
+`yourOAuthAwareObjectHere` must be an object that responds to `oauth_token` and `refresh_oauth_token`. `oauth_token` must return an access token, and `refresh_oauth_token` must handle the refreshing of expired access tokens, so that a subsequent call to `oauth_token` will return a new, unexpired access token.
+
 Next, make a request for your accounts:
 
 ```ruby

data/bin/console

@@ -5,13 +5,31 @@ require 'dotenv'
 require 'lightspeed_pos'
 Lightspeed::Request.verbose = true
 
+class TokenHolder
+  def initialize(token: nil, refresh_token: nil)
+    @token = token
+    @refresh_token = refresh_token
+  end
+
+  def oauth_token
+    @token
+  end
+
+  def refresh_oauth_token
+    raise "Token expired, refresh not yet implemented"
+  end
+end
+
 # require "pry"
 # Pry.start
 Dotenv.load
 def client
   token = ENV['LIGHTSPEED_OAUTH_TOKEN']
+  refresh_token = ENV['LIGHTSPEED_OAUTH_REFRESH_TOKEN']
   raise 'set LIGHTSPEED_OAUTH_TOKEN as an envorinment variable to use this' unless token
-  @client ||= Lightspeed::Client.new(oauth_token: token)
+  raise 'set LIGHTSPEED_OAUTH_REFRESH_TOKEN as an envorinment variable to use this' unless refresh_token
+  token_holder = Tokenholder.new(token: token, refresh_token: refresh_token)
+  @client ||= Lightspeed::Client.new(oauth_token_holder: token_holder)
 end
 
 def account

data/lib/lightspeed/account.rb

@@ -7,6 +7,7 @@ require_relative 'item_attribute_sets'
 require_relative 'images'
 require_relative 'inventories'
 require_relative 'orders'
+require_relative 'price_levels'
 require_relative 'sales'
 require_relative 'shops'
 require_relative 'special_orders'
@@ -28,6 +29,7 @@ module Lightspeed
       :ItemAttributeSets,
       :Items,
       :Orders,
+      :PriceLevels,
       :Sales,
       :Shops,
       :SpecialOrders,

data/lib/lightspeed/client.rb

@@ -6,11 +6,13 @@ require_relative 'request_throttler'
 
 module Lightspeed
   class Client
-    attr_accessor :oauth_token, :throttler
+    attr_accessor :throttler
 
-    def initialize(oauth_token: nil)
-      @oauth_token = oauth_token
+    def initialize(oauth_token_holder: nil, oauth_token: nil)
+      @oauth_token_holder = oauth_token_holder
       @throttler = Lightspeed::RequestThrottler.new
+
+      raise "Passing an oauth token is no longer supported. Pass a token holder instead." if oauth_token
     end
 
     # Returns a list of accounts that you have access to.
@@ -18,14 +20,6 @@ module Lightspeed
       @accounts ||= Lightspeed::Accounts.new(context: self)
     end
 
-    def load_json(json)
-      data = JSON.parse(json)
-      Array.wrap(data).map do |resource|
-        resource = resource_class.new(context: self, attributes: resource)
-        @resources[resource.id] = resource
-      end
-    end
-
     def get(**args)
       perform_request(args.merge(method: :get))
     end
@@ -42,6 +36,14 @@ module Lightspeed
       perform_request(args.merge(method: :delete))
     end
 
+    def oauth_token
+      @oauth_token_holder.oauth_token
+    end
+
+    def refresh_oauth_token
+      @oauth_token_holder.refresh_oauth_token
+    end
+
     private
 
     def perform_request(**args)
@@ -51,6 +53,5 @@ module Lightspeed
     def request **args
       Lightspeed::Request.new(self, **args)
     end
-
   end
 end

data/lib/lightspeed/collection.rb

@@ -1,7 +1,5 @@
 require 'active_support/core_ext/string'
 require 'active_support/core_ext/array/wrap'
-require 'active_support/json'
-require 'active_support/core_ext/object/json'
 
 module Lightspeed
   class Collection
@@ -22,10 +20,6 @@ module Lightspeed
       @resources = {}
     end
 
-    def load_json(json)
-      instantiate(JSON.parse(json))
-    end
-
     def client
       return context if context.is_a?(Lightspeed::Client)
       account.client
@@ -94,11 +88,11 @@ module Lightspeed
     end
 
     def create(attributes = {})
-      instantiate(post(body: attributes.to_json)).first
+      instantiate(post(body: Yajl::Encoder.encode(attributes))).first
     end
 
     def update(id, attributes = {})
-      instantiate(put(id, body: attributes.to_json)).first
+      instantiate(put(id, body: Yajl::Encoder.encode(attributes))).first
     end
 
     def destroy(id)
@@ -125,14 +119,14 @@ module Lightspeed
       "#<#{self.class.name} API#{base_path}>"
     end
 
-    def as_json(*args)
+    def as_json
       return if all_loaded.empty?
-      { resource_name => all_loaded.as_json(*args) }
+      { resource_name => all_loaded.as_json }
     end
     alias_method :to_h, :as_json
 
-    def to_json(*args)
-      as_json.to_json(*args)
+    def to_json
+      Yajl::Encoder.encode(as_json)
     end
 
     def page(n, per_page: PER_PAGE, params: {})

data/lib/lightspeed/error.rb

@@ -1,9 +1,10 @@
 module Lightspeed
   class Error < Exception
-    class BadRequest < Exception; end # 400
-    class Unauthorized < Exception; end # 401
-    class NotFound < Exception; end # 404
-    class InternalServerError < Exception; end # 500
-    class Throttled < Exception; end # 503
+    class BadRequest < Lightspeed::Error; end # 400
+    class Unauthorized < Lightspeed::Error; end # 401
+    class NotAuthorized < Lightspeed::Error; end # 403
+    class NotFound < Lightspeed::Error; end # 404
+    class InternalServerError < Lightspeed::Error; end # 500
+    class Throttled < Lightspeed::Error; end # 503
   end
 end

data/lib/lightspeed/price_level.rb

@@ -0,0 +1,14 @@
+require_relative 'resource'
+
+module Lightspeed
+  class PriceLevel < Lightspeed::Resource
+    fields(
+      priceLevelID: :id,
+      name: :string,
+      archived: :boolean,
+      canBeArchived: :boolean,
+      type: :string,
+      Calculation: :String
+    )
+  end
+end

data/lib/lightspeed/price_levels.rb

@@ -0,0 +1,8 @@
+require_relative 'collection'
+
+require_relative 'price_level'
+
+module Lightspeed
+  class PriceLevels < Lightspeed::Collection
+  end
+end

data/lib/lightspeed/prices.rb

@@ -17,7 +17,7 @@ module Lightspeed
     alias_method :to_h, :as_json
 
     def to_json
-      as_json.to_json
+      Yajl::Encoder.encode(as_json)
     end
 
     def [](key)

data/lib/lightspeed/request.rb

@@ -34,10 +34,15 @@ module Lightspeed
       @raw_request = request_class.new(uri)
       @raw_request.body = body if body
       @raw_request.set_form_data(@params) if @params && @method != :get
-      @raw_request["Authorization"] = "OAuth #{client.oauth_token}" if client.oauth_token
+      @client = client
+      set_authorization_header
     end
 
-    def perform
+    def set_authorization_header
+      @raw_request["Authorization"] = "Bearer #{@client.oauth_token}" if @client.oauth_token
+    end
+
+    def perform_raw
       response = @http.request(raw_request)
       extract_rate_limits(response)
       if response.code == "200"
@@ -45,14 +50,22 @@ module Lightspeed
       else
         handle_error(response)
       end
+    end
+
+    def perform
+      perform_raw
     rescue Lightspeed::Error::Throttled
       retry_throttled_request
+    rescue Lightspeed::Error::Unauthorized
+      @client.refresh_oauth_token
+      set_authorization_header
+      perform_raw
     end
 
     private
 
     def handle_success(response)
-      json = JSON.parse(response.body)
+      json = Yajl::Parser.parse(response.body)
       pp json if self.class.verbose?
       json
     end
@@ -64,10 +77,11 @@ module Lightspeed
     end
 
     def handle_error(response)
-      data = JSON.parse(response.body)
+      data = Yajl::Parser.parse(response.body)
       error = case response.code.to_s
       when '400' then Lightspeed::Error::BadRequest
       when '401' then Lightspeed::Error::Unauthorized
+      when '403' then Lightspeed::Error::NotAuthorized
       when '404' then Lightspeed::Error::NotFound
       when '429' then Lightspeed::Error::Throttled
       when /5../ then Lightspeed::Error::InternalServerError

data/lib/lightspeed/resource.rb

@@ -1,8 +1,6 @@
 require 'bigdecimal'
 require 'active_support/core_ext/string'
 require 'active_support/core_ext/hash/slice'
-require 'active_support/json'
-require 'active_support/core_ext/object/json'
 
 require_relative 'collection'
 
@@ -74,7 +72,7 @@ module Lightspeed
     end
 
     def update(attributes = {})
-      self.attributes = put(body: attributes.to_json)[resource_name]
+      self.attributes = put(body: Yajl::Encoder.encode(attributes))[resource_name]
     end
 
     def destroy
@@ -115,12 +113,12 @@ module Lightspeed
     end
 
 
-    def to_json(*args)
-      as_json.to_json(*args)
+    def to_json
+      Yajl::Encoder.encode(as_json)
     end
 
-    def as_json(*args)
-      fields_to_h.merge(relationships_to_h).reject { |_, v| v.nil? || v == {} }.as_json(*args)
+    def as_json
+      fields_to_h.merge(relationships_to_h).reject { |_, v| v.nil? || v == {} }
     end
     alias_method :to_h, :as_json
 

data/lib/lightspeed/version.rb

@@ -1,3 +1,3 @@
 module Lightspeed
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/lightspeed_pos.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'yajl'
 
 module Lightspeed
 end

data/lightspeed_pos.gemspec

@@ -19,13 +19,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.license       = "MIT"
 
-  spec.add_dependency "activesupport", "~> 4.2.0"
+  spec.add_dependency "activesupport"
+  spec.add_dependency "yajl-ruby"
 
-  spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "3.2.0"
-  spec.add_development_dependency "webmock", "1.21.0"
-  spec.add_development_dependency "vcr", "2.9.3"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "vcr"
   spec.add_development_dependency "rubocop"
   spec.add_development_dependency "dotenv"
   spec.add_development_dependency "pry"

data/script/buildkite

@@ -3,9 +3,22 @@
 set -e
 set -x
 
+AWS_ACCOUNT='847437976396'
+REGION='us-west-2'
+REGISTRY="${AWS_ACCOUNT}.dkr.ecr.${REGION}.amazonaws.com"
+REPOSITORY='teg-ci'
+TAG='ci' # change this if you have pushed an image with a new tag
+IMAGE="${REGISTRY}/${REPOSITORY}:${TAG}"
+
 set
 echo $PWD
 
 REAL_CORES=`cat /proc/cpuinfo | grep "core id" | sort | uniq | wc -l`
 
-docker run --rm=true -e "PARALLEL_TEST_PROCESSORS=$REAL_CORES" -v $PWD:/source -v ~/.buildbox/be-bundle-cache:/cache -v /tmp/ramdisk:/tmp/ramdisk -t marketplacer/ci /source/script/docker_tests
+# Pull image if we don't have a locally cached version
+if ! docker images "$IMAGE" | grep --quiet "$IMAGE"; then
+  eval $(aws --region "$REGION" ecr get-login)
+  docker pull "$IMAGE"
+fi
+
+docker run --rm=true -e "PARALLEL_TEST_PROCESSORS=$REAL_CORES" -v $PWD:/source -v ~/.buildbox/be-bundle-cache:/cache -v /tmp/ramdisk:/tmp/ramdisk -t "$IMAGE" /source/script/docker_tests

metadata

@@ -1,99 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: lightspeed_pos
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.9.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.9.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +188,8 @@ files:
 - lib/lightspeed/items.rb
 - lib/lightspeed/order.rb
 - lib/lightspeed/orders.rb
+- lib/lightspeed/price_level.rb
+- lib/lightspeed/price_levels.rb
 - lib/lightspeed/prices.rb
 - lib/lightspeed/request.rb
 - lib/lightspeed/request_throttler.rb
@@ -213,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A gem for interacting with Lightspeed's Point of Sale system