ship_station 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d541da1b8d5a90890bcaa731a0234eea3c76b15d
-  data.tar.gz: cea268522b3bd920af0eba90432829e1e8827cf8
+  metadata.gz: e9e8ae106f4ee30f1a8fdad291e02a6093716a6b
+  data.tar.gz: 89cbb419ebaae46c18c68f04f886808029ea8252
 SHA512:
-  metadata.gz: ca7e489d5a5244c1ef29c7c592f7f9f461d2853ab235ba0927a12befd0910ffe11ea03e132e88b2fbf9030bdf43f3c6fb690a4e97934daea773595e54cd140a7
-  data.tar.gz: eb73d08ff8fdb0e2623c41bf5a258cc6198219083ce43715aeb252151b5e4118904e0e7943c395792b0df5719e13b12b9489f3c824896e4a72f9bf002c6f2439
+  metadata.gz: eb145eacbfa6be322a3703210b442550fd4e3715c67d5078b1a9a0256079b32a26b02bc3b22ed765de8dfaf2d4732ad4682f53029530b7076549efcd0ba149cb
+  data.tar.gz: 0d5eb871ecb14abd8d4f44beaed22551525e83c4e3c0b93743b108b598c0f46cf18ea8150d66110a24fa1eb3bc38bbdab968b729b74b77f3c10269fe9f42edcb

data/lib/ship_station/api/model.rb

@@ -1,20 +1,35 @@
 module ShipStation
   class Model
-    Her::API.setup
     include Her::Model
     use_api V1::API
     parse_root_in_json true, format: :active_model_serializers
 
-    def self.associated
-      @associated ||= {}
-    end
+    class << self
+      %w(where find create new save_existing destroy_existing).each do |name|
+        define_method "#{name}" do |i|
+          raise(ConfigurationError, "Shipstation username not configured") if ShipStation.username.nil?
+          raise(ConfigurationError, "Shipstation password not configured") if ShipStation.password.nil?
+          super(i)
+        end
+      end
 
-    def self.shipstation_has_many(name, opts={})
-      self.associated[name] = opts.merge(:relationship  => :has_many)
-    end
+      def all
+        raise(ConfigurationError, "Shipstation username not configured") if ShipStation.username.nil?
+        raise(ConfigurationError, "Shipstation password not configured") if ShipStation.password.nil?
+        super
+      end
 
-    def self.shipstation_belongs_to(name, opts={})
-      self.associated[name] = opts.merge(:relationship  => :belongs_to)
+      def associated
+        @associated ||= {}
+      end
+
+      def shipstation_has_many(name, opts={})
+        associated[name] = opts.merge(:relationship  => :has_many)
+      end
+
+      def shipstation_belongs_to(name, opts={})
+        associated[name] = opts.merge(:relationship  => :belongs_to)
+      end
     end
 
     def method_missing(name, *args, &block)

data/lib/ship_station/api/order.rb

@@ -2,5 +2,10 @@ module ShipStation
   class Order < Model
     shipstation_has_many :shipments, foreign_key: :orderNumber
     shipstation_belongs_to :customer, primary_key: :customerId
+
+    def all(args)
+      use_api V1::API
+      super(args)
+    end
   end
 end

data/lib/ship_station/api.rb

@@ -1,18 +1,23 @@
 module ShipStation
   module V1
     API = Her::API.new
-    API.setup url: "https://ssapi.shipstation.com" do |c|
-      #Authentication
-      c.use Faraday::Request::BasicAuthentication, ShipStation.username, ShipStation.password
 
-      # Request
-      c.use ShipStation::Middleware::JSONRequest
+    def self.setup
+      puts "Initializing API Setup"
+      API.setup url: "https://ssapi.shipstation.com" do |c|
+        #Authentication
+        c.use Faraday::Request::BasicAuthentication, ShipStation.username, ShipStation.password
 
-      # Response
-      c.use ShipStation::Middleware::ResponseParser
+        # Request
+        c.use ShipStation::Middleware::JSONRequest
 
-      # Adapter
-      c.use Faraday::Adapter::NetHttp
+        # Response
+        c.use ShipStation::Middleware::ResponseParser
+
+        # Adapter
+        c.use Faraday::Adapter::NetHttp
+      end
+      puts "API Setup Complete."
     end
   end
 end

data/lib/ship_station/base.rb

@@ -7,24 +7,33 @@ module ShipStation
   class << self
     extend ActiveSupport::Autoload
 
-    attr_writer :username
-    attr_writer :password
-
     attr_accessor :limit
     attr_accessor :remaining
     attr_accessor :reset_time
 
     def username
-      @username ||= ENV["SHIPSTATION_API_KEY"] or
-      raise(ConfigurationError, "Shipstation username not configured")
+      @username ||= ENV["SHIPSTATION_API_KEY"]
+    end
+
+    def username=(arg)
+      @username = arg
+      ShipStation::V1.setup
+      @password
     end
 
     def password
-      @password ||= ENV["SHIPSTATION_API_SECRET"] or
-      raise(ConfigurationError, "Shipstation password not configured")
+      @password ||= ENV["SHIPSTATION_API_SECRET"]
     end
 
+    def password=(arg)
+      @password = arg
+      ShipStation::V1.setup
+      @password
+    end
+
+
   end
 end
 
-SS = ShipStation
+SS = ShipStation
+SS::V1.setup if ShipStation.username && ShipStation.password

data/lib/ship_station/middleware.rb

@@ -8,6 +8,8 @@ module ShipStation
 
         errors = json.delete(:errors) || {}
         pagination = json.slice(:page, :pages, :total)
+
+        #change to new hash style
         {
           :data => json.except(:page, :pages, :total),
           :errors => errors,
@@ -33,11 +35,8 @@ module ShipStation
 
       # @private
       def call(env)
-        # puts "########Request Url############"
-        # puts env.url
-        # puts "###############################"
         unless env.method == :get
-          env[:body] = encode env[:body] unless env[:body].respond_to?(:to_str)
+          env[:body] = encode env[:body] unless env[:body].respond_to?(:to_s)
         end
         @app.call(env)
       end

data/lib/ship_station/version.rb

@@ -1,3 +1,3 @@
 module ShipStation
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/ship_station.rb

@@ -6,9 +6,9 @@ require 'logger'
 require 'her'
 
 # App
-require 'ship_station/base'
-require 'ship_station/middleware'
 require 'ship_station/api'
+require 'ship_station/middleware'
+require 'ship_station/base'
 
 # Models
 require 'ship_station/api/model'

data/spec/ship_station/base_spec.rb

@@ -1,16 +1,4 @@
 RSpec.describe ShipStation do
-  it "raises configurations error if missing API key" do
-    ENV["SHIPSTATION_API_KEY"] = nil
-    ShipStation.username = nil
-    expect{ ShipStation.username }.to raise_error(ShipStation::ConfigurationError)
-  end
-
-  it "raises configurations error if missing API secret" do
-    ENV["SHIPSTATION_API_SECRET"] = nil
-    ShipStation.password = nil
-    expect{ ShipStation.password }.to raise_error(ShipStation::ConfigurationError)
-  end
-
   it "stores rate limiting information after each request" do
     stub_api_for(ShipStation::Order) do |stub|
       stub.get("/orders") do |env|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ship_station
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ben Jacobs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: her